Replace hardcoded song ids

This commit is contained in:
U-Fish-PC\Daniel 2014-02-02 12:02:09 -05:00
parent ed4ac6d551
commit 4ddba9774e

View file

@ -13755,7 +13755,7 @@ Func_5849:
ld [wMusicHeaderPointer], a ld [wMusicHeaderPointer], a
ld a, $2 ld a, $2
ld [$c0f0], a ld [$c0f0], a
ld a, $e5 ld a, MUSIC_SAFARI_ZONE
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld c, $64 ld c, $64
@ -37049,7 +37049,7 @@ Func_1a514: ; 1a514 (6:6514)
ld a, Bank(Func_9876) ld a, Bank(Func_9876)
ld [$c0ef], a ld [$c0ef], a
ld [$c0f0], a ld [$c0f0], a
ld a, $e1 ld a, MUSIC_MUSEUM_GUY
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld a, [$cf13] ld a, [$cf13]
@ -37106,7 +37106,7 @@ Func_1a581: ; 1a581 (6:6581)
ld a, Bank(Func_9876) ld a, Bank(Func_9876)
ld [$c0ef], a ld [$c0ef], a
ld [$c0f0], a ld [$c0f0], a
ld a, $e1 ld a, MUSIC_MUSEUM_GUY
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld a, [$cf13] ld a, [$cf13]
@ -68089,7 +68089,7 @@ Func_4188a: ; 4188a (10:588a)
ld a, Bank(Func_7d8ea) ld a, Bank(Func_7d8ea)
ld [$c0ef], a ld [$c0ef], a
ld [$c0f0], a ld [$c0f0], a
ld a, $dc ld a, MUSIC_INTRO_BATTLE
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
call Func_417f8 call Func_417f8
@ -73326,12 +73326,12 @@ MomHealPokemon: ; 4818a (12:418a)
call GBFadeOut2 call GBFadeOut2
call ReloadMapData call ReloadMapData
PREDEF HealPartyPredef PREDEF HealPartyPredef
ld a, $E8 ld a, MUSIC_PKMN_HEALED
ld [$C0EE], a ld [$C0EE], a
call PlaySound ; play sound? call PlaySound ; play sound?
.next .next
ld a, [$C026] ld a, [$C026]
cp $E8 cp MUSIC_PKMN_HEALED
jr z, .next jr z, .next
ld a, [$D35B] ld a, [$D35B]
ld [$C0EE], a ld [$C0EE], a
@ -96583,12 +96583,12 @@ SSAnne7RubText: ; 618ec (18:58ec)
ld a, Bank(Func_9876) ld a, Bank(Func_9876)
ld [$c0ef], a ld [$c0ef], a
.asm_61908 .asm_61908
ld a, $e8 ld a, MUSIC_PKMN_HEALED
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
.asm_61910 .asm_61910
ld a, [$c026] ld a, [$c026]
cp $e8 cp MUSIC_PKMN_HEALED
jr z, .asm_61910 ; 0x61915 $f9 jr z, .asm_61910 ; 0x61915 $f9
call Func_2307 call Func_2307
ld hl, $d803 ld hl, $d803
@ -98766,14 +98766,14 @@ Func_70433: ; 70433 (1c:4433)
ld a, Bank(Func_9876) ld a, Bank(Func_9876)
ld [$c0ef], a ld [$c0ef], a
.asm_70495 .asm_70495
ld a, $e8 ld a, MUSIC_PKMN_HEALED
ld [$c0ee], a ld [$c0ee], a
call PlaySound call PlaySound
ld d, $28 ld d, $28
call Func_704f3 call Func_704f3
.asm_704a2 .asm_704a2
ld a, [$c026] ld a, [$c026]
cp $e8 cp MUSIC_PKMN_HEALED
jr z, .asm_704a2 jr z, .asm_704a2
ld c, $20 ld c, $20
call DelayFrames call DelayFrames