Refactor SongFlag handling to use byte operations
This commit is contained in:
@@ -148,12 +148,12 @@ LinkItem_NewFlute:
|
||||
JMP .song_of_storms
|
||||
.song_of_time
|
||||
LDA.b #$27 : JSR $802F ; Player_DoSfx3
|
||||
LDA.b #$02 : STA SongFlag
|
||||
LDA.b #$02 : STA.b SongFlag
|
||||
RTS
|
||||
|
||||
.song_of_healing
|
||||
LDA.b #$13 : JSR Player_DoSfx2
|
||||
LDA.b #$01 : STA SongFlag
|
||||
LDA.b #$01 : STA.b SongFlag
|
||||
RTS
|
||||
|
||||
.song_of_storms
|
||||
|
||||
@@ -193,7 +193,7 @@ RunClock:
|
||||
CheckForSongOfTime:
|
||||
{
|
||||
; Check if Song of Time was activated
|
||||
LDA SongFlag : CMP.b #$02 : BNE +
|
||||
LDA.b SongFlag : CMP.b #$02 : BNE +
|
||||
; Speed up the time
|
||||
LDA.b #$00 : STA.l TimeSpeed
|
||||
|
||||
@@ -201,14 +201,14 @@ CheckForSongOfTime:
|
||||
LDA.l Hours : CMP.b #$06 : BNE ++
|
||||
LDA.l Minutes : BNE ++
|
||||
LDA.b #$3F : STA.l TimeSpeed
|
||||
STZ SongFlag
|
||||
STZ.b SongFlag
|
||||
++
|
||||
|
||||
; If we reached 6pm
|
||||
LDA.l Hours : CMP.b #$12 : BNE ++
|
||||
LDA.l Minutes : BNE ++
|
||||
LDA.b #$3F : STA.l TimeSpeed
|
||||
STZ SongFlag
|
||||
STZ.b SongFlag
|
||||
++
|
||||
+
|
||||
RTS
|
||||
|
||||
@@ -250,7 +250,7 @@ Sprite_Wolfos_Main:
|
||||
|
||||
; Wait for Song of Healing before granting the mask.
|
||||
LDA.b SongFlag : CMP.b #$01 : BNE .ninguna_cancion
|
||||
STZ.w SongFlag
|
||||
STZ.b SongFlag
|
||||
LDA.b #$20 : STA.w SprTimerD, X
|
||||
LDA.w POSX : STA.w SprX, X
|
||||
LDA.w POSXH : STA.w SprXH, X
|
||||
|
||||
@@ -126,7 +126,7 @@ Sprite_PolsVoice_Main:
|
||||
PolsVoice_CheckForFluteSong:
|
||||
{
|
||||
; If the player plays the flute
|
||||
LDA SongFlag : BEQ +
|
||||
LDA.b SongFlag : BEQ +
|
||||
LDA.b #$03 : STA.w SprState, X
|
||||
+
|
||||
RTS
|
||||
|
||||
@@ -3,10 +3,10 @@
|
||||
|
||||
SickKid_CheckForSongOfHealing:
|
||||
{
|
||||
LDA SongFlag : CMP.b #$01 : BNE .no_song
|
||||
LDA.b SongFlag : CMP.b #$01 : BNE .no_song
|
||||
INC $0D80, X
|
||||
INC $02E4
|
||||
STZ.w SongFlag
|
||||
STZ.b SongFlag
|
||||
.no_song
|
||||
RTL
|
||||
}
|
||||
|
||||
@@ -107,8 +107,8 @@ Sprite_DekuScrub_Main:
|
||||
QuiereCuracion:
|
||||
{
|
||||
%PlayAnimation(0, 1, 16)
|
||||
LDA SongFlag : CMP.b #$01 : BNE .ninguna_cancion
|
||||
STZ.w SongFlag
|
||||
LDA.b SongFlag : CMP.b #$01 : BNE .ninguna_cancion
|
||||
STZ.b SongFlag
|
||||
LDA.b #$C0 : STA.w SprTimerD, X
|
||||
%GotoAction(2)
|
||||
.ninguna_cancion
|
||||
|
||||
Reference in New Issue
Block a user