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

Move setting DungeonsCompleted bitfield to post-boss/prize transition

Browse Source
This commit is contained in:
cassidoxa
2023-08-23 13:24:46 -04:00
parent 9bde734ca3
commit 247128b9f6
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dungeondrops.asm
View File

@@ -103,7 +103,6 @@ SetCutsceneFlag:
CLC CLC
RTL RTL
.dungeon_prize .dungeon_prize
JSR.w SetDungeonCompletion
LDA.w ItemReceiptID : TAX LDA.w ItemReceiptID : TAX
LDA.l InventoryTable_properties,X : BPL .no_cutscene LDA.l InventoryTable_properties,X : BPL .no_cutscene
PLX PLX
@@ -172,14 +171,6 @@ CheckSpawnPrize:
SEP #$21 SEP #$21
RTL RTL
SetDungeonCompletion:
LDX.w DungeonID : BMI +
REP #$20
LDA.l DungeonItemMasks, X : ORA.l DungeonsCompleted : STA.l DungeonsCompleted
SEP #$20
+
RTS
CheckDungeonCompletion: CheckDungeonCompletion:
LDX.w DungeonID LDX.w DungeonID
REP #$20 REP #$20

5
events.asm
View File

@@ -27,6 +27,11 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnDungeonBossExit: OnDungeonBossExit:
JSL.l StatTransitionCounter JSL.l StatTransitionCounter
LDX.w DungeonID : BMI +
REP #$20
LDA.l DungeonItemMasks, X : ORA.l DungeonsCompleted : STA.l DungeonsCompleted
SEP #$20
+
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnPlayerDead: OnPlayerDead: