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

Add light world check to more unbunny-ing code

Browse Source 
This time the code that tries to unbunny you when leaving a dungeon.This
is needed to make ER's new cross world connects work properly.

Move the fake world fix to happen in time for this.
This commit is contained in:
Kevin Cathcart
2018-01-29 20:47:58 -05:00
parent 3764deb4d3
commit 16259ce158
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bugfixes.asm
View File

@@ -24,7 +24,7 @@ RTL
;1 = Don't Reset Music ;1 = Don't Reset Music
MSMusicReset: MSMusicReset:
LDA $8A : CMP.b #$80 : BNE + LDA $8A : CMP.b #$80 : BNE +
LDA $23 LDA $23
+ +
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
@@ -42,4 +42,14 @@ RTL
; CPX.b #$1B : BNE + : LDA.b #$01 : RTL : + ; CPX.b #$1B : BNE + : LDA.b #$01 : RTL : +
; LDA $7EF340, X ; LDA $7EF340, X
;RTL ;RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
FixBunnyOnExitToLightWorld:
JSL.l FakeWorldFix
LDA.w $02E0 : BEQ +
JMP.w DecideIfBunny
+
LDA $7EF357; thing we overwrote
RTL
;--------------------------------------------------------------------------------

7
hooks.asm
View File

@@ -1091,8 +1091,12 @@ JSL.l LoadModifiedTileBufferAddress : NOP #2
; Permabunny Fix ; Permabunny Fix
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $078F32 ; <- 38F32 - Bank07.asm:2420 - (LDA $7EF357) org $078F32 ; <- 38F32 - Bank07.asm:2420 - (LDA $7EF357)
JSL.l DecideIfBunny JSL.l DecideIfBunny ; for bunny beams
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $028468 ; <- 10468 Bank02.asm:911 - (LDA $7EF357)
JSL.l FixBunnyOnExitToLightWorld ; for cross-world connections
;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================
; Open Mode Fixes ; Open Mode Fixes
@@ -2018,4 +2022,3 @@ org $00DF62 ; <- Bank00.asm:4672 (LDX.w #$0000 : LDY.w #$0040)
org $00DF6E ; <- A few instructions later, right after JSR Do3To4High16Bit org $00DF6E ; <- A few instructions later, right after JSR Do3To4High16Bit
ReloadingFloorsCancel: ReloadingFloorsCancel:
;================================================================================ ;================================================================================

1
inventory.asm
View File

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