From 0c72ca9e0e63ac4b58630b07822c5ff13487c386 Mon Sep 17 00:00:00 2001 From: Kevin Cathcart Date: Mon, 5 Feb 2018 19:36:27 -0500 Subject: [PATCH] Fix not being bunny after defeating aga2 w/o moon Pearl --- LTTP_RND_GeneralBugfixes.asm | 3 +++ bugfixes.asm | 25 +++++++++++++++++++++++++ hooks.asm | 6 ++++++ 3 files changed, 34 insertions(+) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 2ad0946..37f7732 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -351,6 +351,9 @@ Dungeon_SaveRoomData_justKeys: org $02B861 Dungeon_SaveRoomQuadrantData: +org $02FD8A ; 17D8A - Bank07.asm: 3732 Note: Different bank +LoadGearPalettes_bunny: + org $05A51D Sprite_SpawnFallingItem: diff --git a/bugfixes.asm b/bugfixes.asm index 04c9038..2c5bc4f 100644 --- a/bugfixes.asm +++ b/bugfixes.asm @@ -53,3 +53,28 @@ FixBunnyOnExitToLightWorld: LDA $7EF357; thing we overwrote RTL ;-------------------------------------------------------------------------------- + +;-------------------------------------------------------------------------------- +; fix issue where if a player beats aga1 without moon pearl, they don't turn into +; bunny on the pyramid +FixAga2Bunny: + LDA.l FixFakeWorld : BEQ + ; Only use this fix is fakeworld fix is in use + JSL DecideIfBunny : BNE + + JSR MakeBunny + LDA.b #$04 : STA.w $012C ; play bunny music + BRA .done + + + LDA.b #$09 : STA.w $012C ; what we wrote over + .done +RTL +;-------------------------------------------------------------------------------- + +;-------------------------------------------------------------------------------- +MakeBunny: + PHX : PHY + LDA.b #$17 : STA $5D ; set player mode to permabunny + LDA.b #$01 : STA $02E0 : STA $56 ; make player look like bunny + JSL LoadGearPalettes_bunny + PLY : PLX +RTS +;-------------------------------------------------------------------------------- diff --git a/hooks.asm b/hooks.asm index e8255ba..72f1683 100644 --- a/hooks.asm +++ b/hooks.asm @@ -1097,6 +1097,12 @@ org $028468 ; <- 10468 Bank02.asm:911 - (LDA $7EF357) JSL.l FixBunnyOnExitToLightWorld ; for cross-world connections ;-------------------------------------------------------------------------------- +;================================================================================ +; Other bunny Fixes +;-------------------------------------------------------------------------------- +org $029E7C; <- 11E7C - module_ganon_emerges.asm:127 - (LDA.b #$09 : STA $012C) +JSL.l FixAga2Bunny : NOP +;-------------------------------------------------------------------------------- ;================================================================================ ; Open Mode Fixes