Add light world check to more unbunny-ing code
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:
10
bugfixes.asm
10
bugfixes.asm
@@ -43,3 +43,13 @@ RTL
|
||||
; LDA $7EF340, X
|
||||
;RTL
|
||||
;--------------------------------------------------------------------------------
|
||||
|
||||
;--------------------------------------------------------------------------------
|
||||
FixBunnyOnExitToLightWorld:
|
||||
JSL.l FakeWorldFix
|
||||
LDA.w $02E0 : BEQ +
|
||||
JMP.w DecideIfBunny
|
||||
+
|
||||
LDA $7EF357; thing we overwrote
|
||||
RTL
|
||||
;--------------------------------------------------------------------------------
|
||||
|
||||
@@ -1091,8 +1091,12 @@ JSL.l LoadModifiedTileBufferAddress : NOP #2
|
||||
; Permabunny Fix
|
||||
;--------------------------------------------------------------------------------
|
||||
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
|
||||
@@ -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
|
||||
ReloadingFloorsCancel:
|
||||
;================================================================================
|
||||
|
||||
|
||||
@@ -830,7 +830,6 @@ RTL
|
||||
;--------------------------------------------------------------------------------
|
||||
ClearOWKeys:
|
||||
PHA
|
||||
JSL.l FakeWorldFix
|
||||
LDA.l GenericKeys : BEQ +
|
||||
PLA : LDA $7EF38B : STA $7EF36F
|
||||
RTL
|
||||
|
||||
Reference in New Issue
Block a user