summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreinstein95 <einstein95@users.noreply.github.com>2017-09-30 22:03:20 +1300
committereinstein95 <einstein95@users.noreply.github.com>2017-09-30 22:05:07 +1300
commitfbffb08e293f9be53326c4d4b19451fc1531e9f2 (patch)
tree244f60033fb44ccd868c349b7d84a7358d11d1d2
parent32932fea59687ef15441b0be6cba22b6bdc5afe8 (diff)
Fix building
-rw-r--r--audio.asm12
-rwxr-xr-xmain.asm2
2 files changed, 7 insertions, 7 deletions
diff --git a/audio.asm b/audio.asm
index 72bd9278..0a344ae7 100644
--- a/audio.asm
+++ b/audio.asm
@@ -127,7 +127,7 @@ INCLUDE "audio/sfx/cry21_1.asm"
INCLUDE "audio/sfx/cry22_1.asm"
-SECTION "Sound Effects 2", ROMX[$42FD], BANK[AUDIO_2]
+SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2]
INCLUDE "audio/sfx/snare1_2.asm"
INCLUDE "audio/sfx/snare2_2.asm"
@@ -252,7 +252,7 @@ INCLUDE "audio/sfx/cry21_2.asm"
INCLUDE "audio/sfx/cry22_2.asm"
-SECTION "Sound Effects 3", ROMX[$42FD], BANK[AUDIO_3]
+SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3]
INCLUDE "audio/sfx/snare1_3.asm"
INCLUDE "audio/sfx/snare2_3.asm"
@@ -360,7 +360,7 @@ INCLUDE "audio/sfx/cry22_3.asm"
-SECTION "Audio Engine 1", ROMX[$50C6], BANK[AUDIO_1]
+SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1]
PlayBattleMusic::
xor a
@@ -453,7 +453,7 @@ Music_Cities1AlternateTempo::
jp Audio1_OverwriteChannelPointer
-SECTION "Audio Engine 2", ROMX[$536E], BANK[AUDIO_2]
+SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
Music_DoLowHealthAlarm::
ld a, [wLowHealthAlarm]
@@ -557,7 +557,7 @@ Audio2_OverwriteChannelPointer:
ret
-SECTION "Audio Engine 3", ROMX[$513B], BANK[AUDIO_3]
+SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3]
PlayPokedexRatingSfx::
ld a, [$ffdc]
@@ -601,7 +601,7 @@ INCLUDE "audio/engine_3.asm"
-SECTION "Music 1", ROMX[$5BA3], BANK[AUDIO_1]
+SECTION "Music 1", ROMX, BANK[AUDIO_1]
INCLUDE "audio/music/pkmnhealed.asm"
INCLUDE "audio/music/routes1.asm"
diff --git a/main.asm b/main.asm
index ee8ba388..fafd32bd 100755
--- a/main.asm
+++ b/main.asm
@@ -86,7 +86,7 @@ INCLUDE "engine/remove_pokemon.asm"
INCLUDE "engine/display_pokedex.asm"
-SECTION "bank3",ROMX[$4000],BANK[$3]
+SECTION "bank3",ROMX,BANK[$3]
INCLUDE "engine/joypad.asm"