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

No dash Arrgus

Browse Source
This commit is contained in:
karafruit
2023-03-18 23:19:18 -05:00
parent 136854436d
commit 1efd8f0f3d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
boots.asm
View File

@@ -3,9 +3,11 @@
;--------------------------------------------------------------------------------
ModifyBoots:
PHA
LDA.b RoomIndex : CMP.b #$06 : BEQ .no_boots
LDA.l BootsModifier : CMP.b #$01 : BNE +
PLA : AND.l AbilityFlags : ORA.b #$04 : RTL ; yes boots
+ : CMP.b #$02 : BNE +
.no_boots
PLA : AND.l AbilityFlags : AND.b #$FB : RTL ; no boots
+ : LDA.l FakeBoots : CMP.b #$01 : BNE +
LDA.b LinkSlipping : BEQ ++ : LDA.b $59 : BNE + ; hover check

4
timer.asm
View File

@@ -110,7 +110,7 @@ dw #$003C, #$0000
dw #$FFFF, #$7FFF
;--------------------------------------------------------------------------------
DrawChallengeTimer:
LDA.l RoomIndex : AND.w #$00FF : CMP.w #$00C8 : BEQ .is_ohko
LDA.b RoomIndex : AND.w #$00FF : CMP.w #$00C8 : BEQ .is_ohko
LDA.l OHKOFlag : AND.w #$00FF : BEQ +
.is_ohko
LDA.w #$2807 : STA.l HUDTileMapBuffer+$90
@@ -164,7 +164,7 @@ DrawChallengeTimer:
RTL
;--------------------------------------------------------------------------------
OHKOTimer:
LDA.l RoomIndex : CMP.b #$C8 : BEQ .kill
LDA.b RoomIndex : CMP.b #$C8 : BEQ .kill
LDA.l OHKOFlag : BNE .kill
LDA.l TimeoutBehavior : CMP.b #$02 : BNE +
LDA.l ClockStatus : AND.b #$02 : BEQ +