scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add more explicit length suffices

Browse Source
This commit is contained in:
scawful
2024-09-18 18:43:47 -04:00
parent 25085330d1
commit 2b452cc04c
31 changed files with 250 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sprites/NPCs/eon_owl.asm
View File

@@ -54,7 +54,7 @@ Sprite_EonOwl_Prep:
{
PHB : PHK : PLB
LDA AreaIndex : CMP.b #$50 : BNE .not_intro
LDA.w AreaIndex : CMP.b #$50 : BNE .not_intro
; If Map 0x50, don't spawn after meeting Maku Tree
LDA.l OOSPROG : AND.b #$02 : BEQ .continue
STZ.w SprState, X
@@ -83,10 +83,10 @@ Sprite_EonOwl_Main:
{
%PlayAnimation(0,1,16)
LDA POSX : STA $02
LDA POSY : STA $03
LDA SprX, X : STA $04
LDA SprY, X : STA $05
LDA.w POSX : STA $02
LDA.w POSY : STA $03
LDA.w SprX, X : STA $04
LDA.w SprY, X : STA $05
JSL GetDistance8bit_Long : CMP #$28 : BCS .not_too_close
%GotoAction(1)
.not_too_close

6
Sprites/NPCs/farore.asm
View File

@@ -113,7 +113,7 @@ Sprite_Farore_Main:
; 01
MoveUpTowardsFarore:
{
LDA WALKSPEED : STA.b $57 ; Slow Link down for the cutscene
LDA.w WALKSPEED : STA.b $57 ; Slow Link down for the cutscene
LDA.b #$08 : STA.b $49 ; Auto-movement north
LDA.b $20 ; Link's Y Position
@@ -130,7 +130,7 @@ Sprite_Farore_Main:
MoveLeftTowardsFarore:
{
; Move Link Left
LDA WALKSPEED : STA.b $57 ; Slow Link down for the cutscene
LDA.w WALKSPEED : STA.b $57 ; Slow Link down for the cutscene
LDA.b #$02 : STA.b $49
LDA.b $22 ; Link's X position
@@ -178,7 +178,7 @@ Sprite_Farore_Main:
FaroreFollowPlayer:
{
LDA #$01 : STA InCutScene
LDA WALKSPEED : STA.b $57 ; Slow Link down for the cutscene
LDA.w WALKSPEED : STA.b $57 ; Slow Link down for the cutscene
LDA.b #$08 : STA.b $49 ; Auto-movement north
%PlayAnimation(3, 4, 8)

12
Sprites/NPCs/followers.asm
View File

@@ -825,15 +825,15 @@ DrawMinecartFollower:
JSL Sprite_SetSpawnedCoords
LDA.w !MinecartDirection : CMP.b #$00 : BEQ .vert_adjust
CMP.b #$02 : BEQ .vert_adjust
LDA POSY : CLC : ADC #$08 : STA.w SprY, X
LDA POSX : STA.w SprX, X
LDA.w POSY : CLC : ADC #$08 : STA.w SprY, X
LDA.w POSX : STA.w SprX, X
JMP .finish_prep
.vert_adjust
LDA POSY : STA.w SprY, X
LDA POSX : CLC : ADC #$02 : STA.w SprX, X
LDA.w POSY : STA.w SprY, X
LDA.w POSX : CLC : ADC #$02 : STA.w SprX, X
.finish_prep
LDA POSYH : STA.w SprYH, X
LDA POSXH : STA.w SprXH, X
LDA.w POSYH : STA.w SprYH, X
LDA.w POSXH : STA.w SprXH, X
LDA.w !MinecartDirection : CLC : ADC.b #$03 : STA.w SprSubtype, X
LDA .direction_to_anim, X : STA $0D90, X

8
Sprites/NPCs/korok.asm
View File

@@ -108,7 +108,7 @@ Sprite_Korok_Main:
Sprite_Korok_WalkingDown:
{
%PlayAnimation(0, 2, 10)
LDA.b #KorokWalkSpeed : STA SprYSpeed, X
LDA.b #KorokWalkSpeed : STA.w SprYSpeed, X
JSL Sprite_Move
LDA.w SprTimerB, X : BNE +
JSL GetRandomInt : AND.b #$03 : STA.w SprAction, X
@@ -119,7 +119,7 @@ Sprite_Korok_Main:
Sprite_Korok_WalkingUp:
{
%PlayAnimation(3, 5, 10)
LDA.b #-KorokWalkSpeed : STA SprYSpeed, X
LDA.b #-KorokWalkSpeed : STA.w SprYSpeed, X
JSL Sprite_Move
LDA.w SprTimerB, X : BNE +
JSL GetRandomInt : AND.b #$03 : STA.w SprAction, X
@@ -130,7 +130,7 @@ Sprite_Korok_Main:
Sprite_Korok_WalkingLeft:
{
%PlayAnimation(6, 8, 10)
LDA.b #KorokWalkSpeed : STA SprXSpeed, X
LDA.b #KorokWalkSpeed : STA.w SprXSpeed, X
JSL Sprite_Move
LDA.w SprTimerB, X : BNE +
JSL GetRandomInt : AND.b #$03 : STA.w SprAction, X
@@ -141,7 +141,7 @@ Sprite_Korok_Main:
Sprite_Korok_WalkingRight:
{
%PlayAnimation(9, 11, 10)
LDA.b #-KorokWalkSpeed : STA SprXSpeed, X
LDA.b #-KorokWalkSpeed : STA.w SprXSpeed, X
JSL Sprite_Move
LDA.w SprTimerB, X : BNE +

8
Sprites/NPCs/maku_tree.asm
View File

@@ -96,10 +96,10 @@ Sprite_MakuTree_Main:
MakuTree_MeetLink:
{
LDA POSX : STA $02
LDA POSY : STA $03
LDA SprX, X : STA $04
LDA SprY, X : STA $05
LDA.w POSX : STA $02
LDA.w POSY : STA $03
LDA.w SprX, X : STA $04
LDA.w SprY, X : STA $05
JSL GetDistance8bit_Long : CMP #$28 : BCS .not_too_close
%ShowUnconditionalMessage($20)
LDA.b #$01 : STA.l $7EF3D4

2
Sprites/NPCs/ranch_girl.asm
View File

@@ -27,7 +27,7 @@ RanchGirl_Message:
RanchGirl_TeachSong:
{
LDA SprMiscD, X : CMP.b #$01 : BNE .not_started
LDA.w SprMiscD, X : CMP.b #$01 : BNE .not_started
LDA $10 : CMP.b #$0E : BEQ .running_dialog
LDA $7EF34C : CMP.b #$01 : BCS .has_song