Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts: # inventory.asm # newhud.asm
This commit is contained in:
@@ -17,7 +17,7 @@ RTL
|
||||
;================================================================================
|
||||
HUDRebuildIndoorHole:
|
||||
PHA
|
||||
INC.w UpdateHUD
|
||||
INC.w UpdateHUDFlag
|
||||
LDA.l GenericKeys : BEQ .normal
|
||||
.generic
|
||||
PLA
|
||||
@@ -30,7 +30,7 @@ RTL
|
||||
RTL
|
||||
;================================================================================
|
||||
HUDRebuildIndoor:
|
||||
INC.w UpdateHUD
|
||||
INC.w UpdateHUDFlag
|
||||
LDA.l GenericKeys : BEQ .normal
|
||||
.generic
|
||||
LDA.b #$00 : STA.l RoomDarkness
|
||||
|
||||
Reference in New Issue
Block a user