alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Fix For PoD accidentally arming EG.

Browse Source
This commit is contained in:
Kevin Cathcart
2018-07-05 19:37:55 -04:00
parent 4669f7fbf8
commit 3177ccc395
4 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bugfixes.asm
View File

@@ -115,3 +115,13 @@ FixFrogSmith:
.done .done
RTS RTS
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;--------------------------------------------------------------------------------
;Fix for PoD causing accidental Exploration Glitch
PodEGFix:
LDA Bugfix_PodEG : BNE .done
LDA $040C : CMP.b #$0C : BNE .done ;check if we are in PoD
STZ $047A ;disarm exploration glitch
.done
RTL
;--------------------------------------------------------------------------------

11
events.asm
View File

@@ -27,6 +27,11 @@ OnPlayerDead:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnDungeonExit: OnDungeonExit:
PHA : PHP
SEP #$20 ; set 8-bit accumulator
JSL.l PodEGFix
PLP : PLA
STA $040C : STZ $04AC ; thing we wrote over STA $040C : STZ $04AC ; thing we wrote over
PHA : PHP PHA : PHP
@@ -36,6 +41,12 @@ OnDungeonExit:
PLP : PLA PLP : PLA
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnQuit:
JSL.l PodEGFix
LDA.b #$10 : STA $1C ; thing we wrote over
RTL
;--------------------------------------------------------------------------------
OnUncleItemGet: OnUncleItemGet:
JSL Link_ReceiveItem JSL Link_ReceiveItem

7
hooks.asm
View File

@@ -65,6 +65,13 @@ org $02E21B ; <- 1621B - Bank02.asm : 11211 (STA $040C)
JSL.l OnDungeonExit : NOP #2 JSL.l OnDungeonExit : NOP #2
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;================================================================================
; Quit Hook (for both types of save and quit)
;--------------------------------------------------------------------------------
org $09F60B ; <- 4F60B - module_death.asm : 530 (LDA.b #$10 : STA $1C)
JSL.l OnQuit
;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================
; Duck Map Load Hook ; Duck Map Load Hook
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------

6
tables.asm
View File

@@ -372,7 +372,7 @@ db #$47 ; #$47 - 20 Rupees (default)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; 0x180098 - 0x18009F (unused) ; 0x180098 - 0x18009F (unused)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $3080A0 ; PC 0x1800A0 - 0x1800A3 org $3080A0 ; PC 0x1800A0 - 0x1800A4
Bugfix_MirrorlessSQToLW: Bugfix_MirrorlessSQToLW:
db #$01 ; #$00 = Original Behavior - #$01 = Randomizer Behavior (Default) db #$01 ; #$00 = Original Behavior - #$01 = Randomizer Behavior (Default)
Bugfix_SwampWaterLevel: Bugfix_SwampWaterLevel:
@@ -381,8 +381,10 @@ Bugfix_PreAgaDWDungeonDeathToFakeDW:
db #$01 ; #$00 = Original Behavior - #$01 = Randomizer Behavior (Default) db #$01 ; #$00 = Original Behavior - #$01 = Randomizer Behavior (Default)
Bugfix_SetWorldOnAgahnimDeath: Bugfix_SetWorldOnAgahnimDeath:
db #$01 ; #$00 = Original Behavior - #$01 = Randomizer Behavior (Default) db #$01 ; #$00 = Original Behavior - #$01 = Randomizer Behavior (Default)
Bugfix_PodEG
db #$01 ; #$00 = Original Behavior - #$01 = Randomizer Behavior (Default)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; 0x1800A4- 0x1800FF (unused) ; 0x1800A5- 0x1800FF (unused)
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $308100 ; PC 0x180100 (0x40 bytes) org $308100 ; PC 0x180100 (0x40 bytes)
ShovelSpawnTable: ShovelSpawnTable: