alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the dark world

Browse Source 
Restore fake world fix to previous position

Change how the FixBunnyOnExitToLightworld Code works, and where it is
called from
This commit is contained in:
Kevin Cathcart
2018-02-10 22:05:44 -05:00
parent 6728d21fd5
commit 60eafcaf46
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bugfixes.asm
View File

@@ -66,12 +66,12 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
FixBunnyOnExitToLightWorld: FixBunnyOnExitToLightWorld:
JSL.l FakeWorldFix
LDA.w $02E0 : BEQ + LDA.w $02E0 : BEQ +
JMP.w DecideIfBunny JSL.l DecideIfBunny : BEQ +
STZ $5D ; set player mode to Normal
STZ $02E0 : STZ $56 ; return player graphics to normal
+ +
LDA $7EF357; thing we overwrote RTS
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

3
hooks.asm
View File

@@ -1108,9 +1108,6 @@ JSL.l LoadModifiedTileBufferAddress : NOP #2
org $078F32 ; <- 38F32 - Bank07.asm:2420 - (LDA $7EF357) org $078F32 ; <- 38F32 - Bank07.asm:2420 - (LDA $7EF357)
JSL.l DecideIfBunny ; for bunny beams JSL.l DecideIfBunny ; for bunny beams
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $028468 ; <- 10468 Bank02.asm:911 - (LDA $7EF357)
JSL.l FixBunnyOnExitToLightWorld ; for cross-world connections
;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================
; Other bunny Fixes ; Other bunny Fixes

2
inventory.asm
View File

@@ -830,6 +830,8 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
ClearOWKeys: ClearOWKeys:
PHA PHA
JSL.l FakeWorldFix
JSR.w FixBunnyOnExitToLightWorld
LDA.l GenericKeys : BEQ + LDA.l GenericKeys : BEQ +
PLA : LDA $7EF38B : STA $7EF36F PLA : LDA $7EF38B : STA $7EF36F
RTL RTL