summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rwxr-xr-xengine/intro.asm2
-rwxr-xr-xengine/overworld/healing_machine.asm2
-rwxr-xr-xengine/overworld/npc_movement.asm4
-rwxr-xr-xengine/titlescreen.asm2
4 files changed, 5 insertions, 5 deletions
diff --git a/engine/intro.asm b/engine/intro.asm
index 8e344e48..00907065 100755
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -322,7 +322,7 @@ PlayShootingStar: ; 4188a (10:588a)
ld c, $28
call DelayFrames
.asm_418d0
- ld a, Bank(Func_7d8ea)
+ ld a, BANK(Music_IntroBattle)
ld [wc0ef], a
ld [wc0f0], a
ld a, MUSIC_INTRO_BATTLE
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index f9636fcb..a30a5dff 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -41,7 +41,7 @@ AnimateHealingMachine: ; 70433 (1c:4433)
ld a, $ff
ld [wc0ee], a
call PlaySound
- ld a, Bank(Func_9876)
+ ld a, BANK(Music_PkmnHealed)
ld [wc0ef], a
.asm_70495
ld a, MUSIC_PKMN_HEALED
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index 234b7645..260dafd9 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -158,7 +158,7 @@ PointerTable_1a510: ; 1a510 (6:6510)
dw Func_1a56b
Func_1a514: ; 1a514 (6:6514)
- ld a, Bank(Func_9876)
+ ld a, BANK(Music_MuseumGuy)
ld [wc0ef], a
ld [wc0f0], a
ld a, MUSIC_MUSEUM_GUY
@@ -215,7 +215,7 @@ PointerTable_1a57d: ; 1a57d (6:657d)
dw Func_1a56b
Func_1a581: ; 1a581 (6:6581)
- ld a, Bank(Func_9876)
+ ld a, BANK(Music_MuseumGuy)
ld [wc0ef], a
ld [wc0f0], a
ld a, MUSIC_MUSEUM_GUY
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index 10081d63..e281af31 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -17,7 +17,7 @@ SetDefaultNamesBeforeTitlescreen: ; 42b7 (1:42b7)
ld [hli], a
ld [hli], a
ld [hl], a
- ld a, Bank(Func_7d8ea)
+ ld a, BANK(Music_TitleScreen)
ld [wc0ef], a
ld [wc0f0], a