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

Merge pull request #24 from KevinCathcart/fix_dark_world

Browse Source 
Fix the dark world
This commit is contained in:
Karkat
2018-02-11 00:03:17 -05:00
committed by GitHub
parent ac274f444c 60eafcaf46
commit 9f8e241538
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:
JSL.l FakeWorldFix
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
RTL
RTS
;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------

3
hooks.asm
View File

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

2
inventory.asm
View File

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