diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-02-02 12:02:09 -0500 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-02-02 12:03:41 -0500 |
| commit | 4ddba9774eb1acec44600da1771576618c390157 (patch) | |
| tree | 0c8562bc77fad6c31c71a0bd35f8115422dd59e5 | |
| parent | ed4ac6d55156f7dab8e609f4086db270264ce594 (diff) | |
Replace hardcoded song ids
| -rw-r--r-- | main.asm | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -13755,7 +13755,7 @@ Func_5849: ld [wMusicHeaderPointer], a ld a, $2 ld [$c0f0], a - ld a, $e5 + ld a, MUSIC_SAFARI_ZONE ld [$c0ee], a call PlaySound ld c, $64 @@ -37049,7 +37049,7 @@ Func_1a514: ; 1a514 (6:6514) ld a, Bank(Func_9876) ld [$c0ef], a ld [$c0f0], a - ld a, $e1 + ld a, MUSIC_MUSEUM_GUY ld [$c0ee], a call PlaySound ld a, [$cf13] @@ -37106,7 +37106,7 @@ Func_1a581: ; 1a581 (6:6581) ld a, Bank(Func_9876) ld [$c0ef], a ld [$c0f0], a - ld a, $e1 + ld a, MUSIC_MUSEUM_GUY ld [$c0ee], a call PlaySound ld a, [$cf13] @@ -68089,7 +68089,7 @@ Func_4188a: ; 4188a (10:588a) ld a, Bank(Func_7d8ea) ld [$c0ef], a ld [$c0f0], a - ld a, $dc + ld a, MUSIC_INTRO_BATTLE ld [$c0ee], a call PlaySound call Func_417f8 @@ -73326,12 +73326,12 @@ MomHealPokemon: ; 4818a (12:418a) call GBFadeOut2 call ReloadMapData PREDEF HealPartyPredef - ld a, $E8 + ld a, MUSIC_PKMN_HEALED ld [$C0EE], a call PlaySound ; play sound? .next ld a, [$C026] - cp $E8 + cp MUSIC_PKMN_HEALED jr z, .next ld a, [$D35B] ld [$C0EE], a @@ -96583,12 +96583,12 @@ SSAnne7RubText: ; 618ec (18:58ec) ld a, Bank(Func_9876) ld [$c0ef], a .asm_61908 - ld a, $e8 + ld a, MUSIC_PKMN_HEALED ld [$c0ee], a call PlaySound .asm_61910 ld a, [$c026] - cp $e8 + cp MUSIC_PKMN_HEALED jr z, .asm_61910 ; 0x61915 $f9 call Func_2307 ld hl, $d803 @@ -98766,14 +98766,14 @@ Func_70433: ; 70433 (1c:4433) ld a, Bank(Func_9876) ld [$c0ef], a .asm_70495 - ld a, $e8 + ld a, MUSIC_PKMN_HEALED ld [$c0ee], a call PlaySound ld d, $28 call Func_704f3 .asm_704a2 ld a, [$c026] - cp $e8 + cp MUSIC_PKMN_HEALED jr z, .asm_704a2 ld c, $20 call DelayFrames |