diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-12 16:10:24 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-06-12 16:10:24 -0400 |
| commit | 427b3ce1ad4ecfe03ab84d90c6f8545648a6d55a (patch) | |
| tree | d114519779f3e1b0d28f7fd89cf93d87a4eec27a /engine/home.asm | |
| parent | 8824079a7ac2ac326ae247d54a694623adae3073 (diff) | |
Use some music constants
Diffstat (limited to 'engine/home.asm')
| -rwxr-xr-x | engine/home.asm | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/engine/home.asm b/engine/home.asm index 05c0562..305887c 100755 --- a/engine/home.asm +++ b/engine/home.asm @@ -3867,7 +3867,7 @@ Func_3a1f: ; 3a1f (0:3a1f) jr z, .asm_3a37 cp $c jr z, .asm_3a37 - ld a, $f + ld a, MUSIC_RONALD ret .asm_3a37 ld a, [$d111] @@ -4201,7 +4201,28 @@ Func_3dbf: ; 3dbf (0:3dbf) ret ; 0x3ddb -INCBIN "baserom.gbc",$3ddb,$3fe0 - $3ddb +INCBIN "baserom.gbc",$3ddb,$3df3 - $3ddb + +Func_3df3: ; 3df3 (0:3df3) + push af + ld a, [$ff80] + push af + push hl + ld a, BANK(Func_12c7f) + call BankswitchHome + ld hl, [sp+$5] + ld a, [hl] + call Func_12c7f + call Func_0404 + pop hl + pop af + call BankswitchHome + pop af + ld a, [$d61b] + ret +; 0x3e10 + +INCBIN "baserom.gbc",$3e10,$3fe0 - $3e10 ; jumps to 3f:hl Bankswitch3dTo3f: ; 3fe0 (0:3fe0) |