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

Fix incorrect dungeon reminder appearing briefly out of map

Browse Source
This commit is contained in:
karafruit
2026-01-07 20:21:20 -06:00
parent aae220fb46
commit ba9f0c7555
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
doorrando/hudadditions.asm
View File

@@ -45,10 +45,10 @@ DRHUD_BossIndicator:
LDA.w CompassField : AND.l DungeonMask, x LDA.w CompassField : AND.l DungeonMask, x
SEP #$20 SEP #$20
BEQ .draw_indicator BEQ .draw_indicator
LDA.l CompassBossIndicator, x : CMP.b RoomIndex : BNE .draw_indicator LDA.l CompassBossIndicator, x : CMP.b RoomIndex : BNE .draw_indicator
LDY.w #!RedSquare LDY.w #!RedSquare
.draw_indicator .draw_indicator
STY.w HUDMultiIndicator STY.w HUDMultiIndicator
BRA DRHUD_DrawCurrentDungeonIndicator BRA DRHUD_DrawCurrentDungeonIndicator
DRHUD_EnemyDropIndicator: DRHUD_EnemyDropIndicator:
@@ -59,12 +59,20 @@ DRHUD_EnemyDropIndicator:
SEP #$10 : TAX : REP #$10 SEP #$10 : TAX : REP #$10
DRHUD_DrawCurrentDungeonIndicator: ; mX DRHUD_DrawCurrentDungeonIndicator: ; mX
LDA.l DRMode : BIT.b #$02 : BEQ DRHUD_Finished LDA.l DRMode : BIT.b #$02 : BNE + : JMP DRHUD_Finished : +
LDY.w #!BlankTile LDY.w #!BlankTile
LDA.w CurrentHealth : BEQ .draw_indicator LDA.w CurrentHealth : BEQ .draw_indicator
REP #$20 : LDA.l DungeonReminderTable,X : TAY LDA.b GameMode
SEP #$20 CMP.b #$0E : BNE .get_indicator
LDA.b GameSubMode
CMP.b #$03 : BNE .get_indicator
LDA.w SubModuleInterface
CMP.b #$06 : BEQ .draw_indicator
.get_indicator
REP #$20 : LDA.l DungeonReminderTable,X : TAY
SEP #$20
.draw_indicator .draw_indicator
STY.w HUDCurrentDungeonWorld STY.w HUDCurrentDungeonWorld

8
dungeon_map/dungeon_switch.asm
View File

@@ -23,7 +23,7 @@ CheckSwitchMap:
STA.w DungeonID STA.w DungeonID
LDA.b #$04 LDA.b #$04
STA.w $0200 STA.w SubModuleInterface
REP #$20 REP #$20
LDA.w #$0000 LDA.w #$0000
RTL RTL
@@ -37,7 +37,7 @@ DungeonMapSwitch_Submodule:
STA.w $0710 STA.w $0710
LDA.b #$01 LDA.b #$01
STA.w $0200 STA.w SubModuleInterface
STA.w $020D STA.w $020D
STZ.w $0213 STZ.w $0213
STZ.w $021B STZ.w $021B
@@ -78,7 +78,7 @@ SkipMapSprites:
LDA.l DRMode LDA.l DRMode
BNE + BNE +
LDA.w $0200 LDA.w SubModuleInterface
CMP.b #$04 CMP.b #$04
BEQ + BEQ +
JSL DrawEntrances JSL DrawEntrances
@@ -91,7 +91,7 @@ SkipMapSprites:
STZ.b $0E STZ.b $0E
STZ.b $0F STZ.b $0F
LDA.w $0200 LDA.w SubModuleInterface
CMP.b #$04 CMP.b #$04
BNE + BNE +
JML $8AEAFC JML $8AEAFC