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

Merge remote-tracking branch 'baserom/master' into MergeDecompression

Browse Source 
# Conflicts:
#	bookofmudora.asm
This commit is contained in:
aerinon
2023-09-01 11:37:46 -06:00
parent 5ccdebe09d 6fbce240b8
commit aecc65595e
10 changed files with 83 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
events.asm
View File

@@ -29,10 +29,19 @@ RTL
OnDungeonBossExit:
JSL.l StatTransitionCounter
LDX.w DungeonID : BMI +
REP #$20
LDA.l DungeonItemMasks, X : ORA.l DungeonsCompleted : STA.l DungeonsCompleted
SEP #$20
LDA.w RoomIndex : CMP.b #$0D : BEQ .aga2
LDA.w RoomIndex : CMP.b #$20 : BEQ .aga
.set_completed
REP #$20
LDA.l DungeonItemMasks, X : ORA.l DungeonsCompleted : STA.l DungeonsCompleted
SEP #$20
+
RTL
.aga2
CPX.b #$1A : BEQ .set_completed
RTL
.aga
CPX.b #$08 : BEQ .set_completed
RTL
;--------------------------------------------------------------------------------
OnPlayerDead: