summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-04-01 21:07:14 -0400
committeryenatch <yenatch@gmail.com>2018-04-01 21:07:48 -0400
commit722ca8af43d7d61b08723a1153e402b4100ce9d2 (patch)
treedca535a3294e578857214ada1bdb97eb55d0e0be /audio
parentec4e76299c339c90ec6730213121ae9447ec462d (diff)
remove BANK[] and bank constants from ROMX sections
Diffstat (limited to 'audio')
-rw-r--r--audio/engine_1.asm2
-rw-r--r--audio/pikachu_cries.asm26
2 files changed, 14 insertions, 14 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index 4faf06cf..bb780975 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -1053,7 +1053,7 @@ Audio1_IsCry:
Audio1_96c3:
ld a, [wAudioROMBank]
- cp AUDIO_2
+ cp BANK(AudioEngine2)
jr nz, .asm_96dc
ld a, [wChannelSoundIDs + CH7]
ld b, a
diff --git a/audio/pikachu_cries.asm b/audio/pikachu_cries.asm
index 9648b740..ce3184dc 100644
--- a/audio/pikachu_cries.asm
+++ b/audio/pikachu_cries.asm
@@ -5,7 +5,7 @@ pcm: MACRO
.End:
ENDM
-SECTION "Pikachu Cries 1", ROMX, BANK[PCM_1]
+SECTION "Pikachu Cries 1", ROMX
PikachuCry1::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_1.pcm"
@@ -25,7 +25,7 @@ PikachuCry4::
db $e0 ; unused
-SECTION "Pikachu Cries 2", ROMX, BANK[PCM_2]
+SECTION "Pikachu Cries 2", ROMX
PikachuCry5::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_5.pcm"
@@ -40,7 +40,7 @@ PikachuCry7::
db $ff ; unused
-SECTION "Pikachu Cries 3", ROMX, BANK[PCM_3]
+SECTION "Pikachu Cries 3", ROMX
PikachuCry8::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_8.pcm"
@@ -55,7 +55,7 @@ PikachuCry10::
db $ff ; unused
-SECTION "Pikachu Cries 4", ROMX, BANK[PCM_4]
+SECTION "Pikachu Cries 4", ROMX
PikachuCry11::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_11.pcm"
@@ -70,7 +70,7 @@ PikachuCry13::
db $f0 ; unused
-SECTION "Pikachu Cries 5", ROMX, BANK[PCM_5]
+SECTION "Pikachu Cries 5", ROMX
PikachuCry14::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_14.pcm"
@@ -80,7 +80,7 @@ PikachuCry15::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_15.pcm"
db $77 ; unused
-SECTION "Pikachu Cries 6", ROMX, BANK[PCM_6]
+SECTION "Pikachu Cries 6", ROMX
PikachuCry16::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_16.pcm"
@@ -95,7 +95,7 @@ PikachuCry22::
db $7e ; unused
-SECTION "Pikachu Cries 7", ROMX, BANK[PCM_7]
+SECTION "Pikachu Cries 7", ROMX
PikachuCry20::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_20.pcm"
@@ -106,7 +106,7 @@ PikachuCry21::
db $ff ; unused
-SECTION "Pikachu Cries 8", ROMX, BANK[PCM_8]
+SECTION "Pikachu Cries 8", ROMX
PikachuCry19::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_19.pcm"
@@ -119,7 +119,7 @@ PikachuCry24::
PikachuCry26::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_26.pcm"
-SECTION "Pikachu Cries 9", ROMX, BANK[PCM_9]
+SECTION "Pikachu Cries 9", ROMX
PikachuCry17::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_17.pcm"
@@ -134,7 +134,7 @@ PikachuCry25::
db $03 ; unused
-SECTION "Pikachu Cries 10", ROMX, BANK[PCM_10]
+SECTION "Pikachu Cries 10", ROMX
PikachuCry27::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_27.pcm"
@@ -155,7 +155,7 @@ PikachuCry30::
PikachuCry31::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_31.pcm"
-SECTION "Pikachu Cries 11", ROMX, BANK[PCM_11]
+SECTION "Pikachu Cries 11", ROMX
PikachuCry32::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_32.pcm"
@@ -174,7 +174,7 @@ PikachuCry41::
db $9b ; unused
-SECTION "Pikachu Cries 12", ROMX, BANK[PCM_12]
+SECTION "Pikachu Cries 12", ROMX
PikachuCry35::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_35.pcm"
@@ -189,7 +189,7 @@ PikachuCry39::
db $0f ; unused
-SECTION "Pikachu Cries 13", ROMX, BANK[PCM_13]
+SECTION "Pikachu Cries 13", ROMX
PikachuCry37::
pcm INCBIN "audio/pikachu_cries/pikachu_cry_37.pcm"