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

Fix Bow icon

Browse Source 
Set dungeon ID to $FF after Aga 2 kill for proper HUD draw
This commit is contained in:
cassidoxa
2023-06-10 12:26:01 -04:00
parent d5b5a20862
commit bbd25c2543
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
events.asm
View File

@@ -29,19 +29,19 @@ OnPlayerDead:
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnDungeonExit: OnDungeonExit:
PHA : PHP PHA : PHP
SEP #$20 ; set 8-bit accumulator SEP #$20 ; set 8-bit accumulator
JSL.l SQEGFix JSL.l SQEGFix
PLP : PLA PLP : PLA
STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over STA.w DungeonID : STZ.w Map16ChangeIndex ; thing we wrote over
PHA : PHP PHA : PHP
JSL.l HUD_RebuildLong JSL.l HUD_RebuildLong
INC.w UpdateHUD INC.w UpdateHUD
JSL.l FloodGateResetInner JSL.l FloodGateResetInner
JSL.l SetSilverBowMode JSL.l SetSilverBowMode
PLP : PLA PLP : PLA
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnQuit: OnQuit:
@@ -79,6 +79,7 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnAga2Defeated: OnAga2Defeated:
JSL.l Dungeon_SaveRoomData_justKeys ; thing we wrote over, make sure this is first JSL.l Dungeon_SaveRoomData_justKeys ; thing we wrote over, make sure this is first
LDA.b #$FF : STA.w DungeonID
LDA.b #$01 : STA.l Aga2Duck LDA.b #$01 : STA.l Aga2Duck
JML.l IncrementAgahnim2Sword JML.l IncrementAgahnim2Sword
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
@@ -195,12 +196,13 @@ OnLinkDamagedFromPitOutdoors:
JML.l OHKOTimer ; make sure this is last JML.l OHKOTimer ; make sure this is last
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnOWTransition: OnOWTransition:
JSL.l FloodGateReset JSL.l FloodGateReset
JSL.l StatTransitionCounter JSL.l StatTransitionCounter
PHP PHP
SEP #$20 ; set 8-bit accumulator SEP #$20 ; set 8-bit accumulator
LDA.b #$FF : STA.l RNGLockIn ; clear lock-in LDA.b #$FF : STA.l RNGLockIn ; clear lock-in
PLP INC.w UpdateHUD
PLP
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnLoadDuckMap: OnLoadDuckMap:

3
hooks.asm
View File

@@ -368,7 +368,6 @@ STA.l StalfosBombDamage
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $0AB76E ; <- 5376E - Bank0A.asm : 30 (JSL OverworldMap_InitGfx) org $0AB76E ; <- 5376E - Bank0A.asm : 30 (JSL OverworldMap_InitGfx)
JSL.l OnLoadDuckMap JSL.l OnLoadDuckMap
;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================
; Infinite Bombs / Arrows / Magic ; Infinite Bombs / Arrows / Magic
@@ -1358,7 +1357,7 @@ JSL.l DrawMagicHeader
BRA + : NOP #15 : + BRA + : NOP #15 : +
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $0DFB29 ; <- headsup_display.asm : 688 (LDA.b #$86 : STA $7EC71E) org $0DFB29 ; <- headsup_display.asm : 688 (LDA.b #$86 : STA $7EC71E)
BRA + : NOP #$1C : + BRA + : NOP #$16 : +
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $01CF67 ; <- CF67 - Bank01.asm : 11625 (STA $7EF36F) org $01CF67 ; <- CF67 - Bank01.asm : 11625 (STA $7EF36F)
JSL.l DecrementSmallKeys JSL.l DecrementSmallKeys

1
newhud.asm
View File

@@ -338,6 +338,7 @@ DrawMapCounts:
.done .done
SEP #$20 SEP #$20
RTS RTS
;================================================================================ ;================================================================================
; Exits with: ; Exits with:
; X - ones place tile ; X - ones place tile

1
vanillalabels.asm
View File

@@ -70,6 +70,7 @@ AddAncillaLong = $099D04
Ancilla_CheckIfAlreadyExistsLong = $099D1A Ancilla_CheckIfAlreadyExistsLong = $099D1A
Sprite_SetSpawnedCoords = $09AE64 Sprite_SetSpawnedCoords = $09AE64
GiveRupeeGift = $09AD58 GiveRupeeGift = $09AD58
Overworld_LoadOverlayAndMap = $0AB96C
OverworldMap_InitGfx = $0ABA4F OverworldMap_InitGfx = $0ABA4F
OverworldMap_DarkWorldTilemap = $0ABA99 OverworldMap_DarkWorldTilemap = $0ABA99
OverworldMap_LoadSprGfx = $0ABAB9 OverworldMap_LoadSprGfx = $0ABAB9