From 511fcfb9131931e39388dbf3f2b8694b09f81968 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 21:00:49 -0400 Subject: Accessory function for Mt Moon B2F --- main.asm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/main.asm b/main.asm index 8b3569e3..b12a6b58 100755 --- a/main.asm +++ b/main.asm @@ -801,7 +801,35 @@ MtMoon3Blocks: INCBIN "maps/mtmoon3.blk" MtMoon3Script_4a325: ; pikachu-related function? - dr $4a325,$4a540 + ld a, [wd472] + bit 7, a + ret z + ld a, [wWalkBikeSurfState] + and a + ret nz + + push hl + push bc + callab GetPikachuFacingDirectionAndReturnToE + pop bc + pop hl + ld a, b + cp e + ret nz + + push hl + ld a, [wUpdateSpritesEnabled] + push af + ld a, $ff + ld [wUpdateSpritesEnabled], a + callab LoadPikachuShadowIntoVRAM + pop af + ld [wUpdateSpritesEnabled], a + pop hl + call Func_159b + ret + + dr $4a35a,$4a540 SECTION "bank13",ROMX,BANK[$13] -- cgit v1.3.1-sl0p