Revert "Sampled Pokémon cries"

BloodlessNS · Feb 18, 2019 · 89c1aa5 · 89c1aa5
1 parent c089d7d
commit 89c1aa5
Show file tree

Hide file tree

Showing 34 changed files with 86 additions and 348 deletions.
diff --git a/ancientruby.sn1 b/ancientruby.sn1
diff --git a/audio.asm b/audio.asm
@@ -164,5 +164,3 @@ SECTION "Cries", ROMX
 INCLUDE "data/pokemon/cries.asm"
 
 INCLUDE "audio/cries.asm"
-
-INCLUDE "audio/sample_player.asm"
diff --git a/audio/engine.asm b/audio/engine.asm
@@ -82,11 +82,6 @@ MusicOff:
 _UpdateSound::
 ; called once per frame
 	; no use updating audio if it's not playing
-	ld	a,[SamplePlaying]
-	and	a
-	jr	z,.continue
-	ret
-.continue
 	ld a, [wMusicPlaying]
 	and a
 	ret z
@@ -2380,15 +2375,7 @@ _PlayCry::
 	add hl, de
 	add hl, de
 	add hl, de
-	
-	; check if current cry is a sample
-	dec	d
-	jr	nz,.notsample
-.sample
-	call	PlaySample
-	jr	.end
-	
-.notsample
+
 	ld a, [hli]
 	ld [wMusicBank], a
 
@@ -2405,7 +2392,7 @@ _PlayCry::
 
 ; For each channel:
 	inc a
-.loop2
+.loop
 	push af
 	call LoadChannel
 
@@ -2463,7 +2450,7 @@ _PlayCry::
 .next
 	pop af
 	dec a
-	jr nz, .loop2
+	jr nz, .loop
 
 ; Cries play at max volume, so we save the current volume for later.
 	ld a, [wLastVolume]

diff --git a/audio/sample_player.asm b/audio/sample_player.asm
diff --git a/audio/samples/beautifly.pcm b/audio/samples/beautifly.pcm
diff --git a/audio/samples/blaziken.pcm b/audio/samples/blaziken.pcm
diff --git a/audio/samples/cascoon.pcm b/audio/samples/cascoon.pcm
diff --git a/audio/samples/combusken.pcm b/audio/samples/combusken.pcm
diff --git a/audio/samples/dustox.pcm b/audio/samples/dustox.pcm
diff --git a/audio/samples/grovyle.pcm b/audio/samples/grovyle.pcm
diff --git a/audio/samples/linoone.pcm b/audio/samples/linoone.pcm
diff --git a/audio/samples/lombre.pcm b/audio/samples/lombre.pcm
diff --git a/audio/samples/lotad.pcm b/audio/samples/lotad.pcm
diff --git a/audio/samples/ludicolo.pcm b/audio/samples/ludicolo.pcm
diff --git a/audio/samples/marshtomp.pcm b/audio/samples/marshtomp.pcm
diff --git a/audio/samples/mightyena.pcm b/audio/samples/mightyena.pcm
diff --git a/audio/samples/mudkip.pcm b/audio/samples/mudkip.pcm
diff --git a/audio/samples/nuzleaf.pcm b/audio/samples/nuzleaf.pcm
diff --git a/audio/samples/poochyena.pcm b/audio/samples/poochyena.pcm
diff --git a/audio/samples/sceptile.pcm b/audio/samples/sceptile.pcm
diff --git a/audio/samples/seedot.pcm b/audio/samples/seedot.pcm
diff --git a/audio/samples/shiftry.pcm b/audio/samples/shiftry.pcm
diff --git a/audio/samples/silcoon.pcm b/audio/samples/silcoon.pcm
diff --git a/audio/samples/swampert.pcm b/audio/samples/swampert.pcm
diff --git a/audio/samples/torchic.pcm b/audio/samples/torchic.pcm
diff --git a/audio/samples/treecko.pcm b/audio/samples/treecko.pcm
diff --git a/audio/samples/wurmple.pcm b/audio/samples/wurmple.pcm
diff --git a/audio/samples/zigzagoon.pcm b/audio/samples/zigzagoon.pcm