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

npc housekeeping

Browse Source
This commit is contained in:
scawful
2025-01-19 13:30:19 -05:00
parent a9d42e398f
commit 236e888bdb
13 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sprites/NPCs/eon_owl.asm
View File

@@ -84,7 +84,7 @@ Sprite_EonOwl_Prep:
Sprite_EonOwl_Main: Sprite_EonOwl_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw EonOwl_Idle dw EonOwl_Idle
dw EonOwl_IntroDialogue dw EonOwl_IntroDialogue

2
Sprites/NPCs/eon_zora.asm
View File

@@ -9,7 +9,7 @@ Sprite_EonZora_Main:
JSL Sprite_BounceFromTileCollision JSL Sprite_BounceFromTileCollision
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw EonZora_Forward dw EonZora_Forward
dw EonZora_Left dw EonZora_Left

2
Sprites/NPCs/eon_zora_elder.asm
View File

@@ -3,7 +3,7 @@
Sprite_EonZoraElder_Main: Sprite_EonZoraElder_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw EonZoraElder_Idle dw EonZoraElder_Idle
dw EonZoraElder_Surprised dw EonZoraElder_Surprised

4
Sprites/NPCs/farore.asm
View File

@@ -71,7 +71,7 @@ STORY_STATE = $B6
Sprite_Farore_Main: Sprite_Farore_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw IntroStart dw IntroStart
dw MoveUpTowardsFarore dw MoveUpTowardsFarore
@@ -195,10 +195,8 @@ Sprite_Farore_Main:
MakuArea_FaroreWaitForKydrog: MakuArea_FaroreWaitForKydrog:
{ {
%PlayAnimation(5, 5, 8) %PlayAnimation(5, 5, 8)
RTS RTS
} }
} }
Sprite_Farore_Draw: Sprite_Farore_Draw:

2
Sprites/NPCs/goron.asm
View File

@@ -81,7 +81,7 @@ Sprite_Goron_Main:
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw KalyxoGoron_Main dw KalyxoGoron_Main
dw KalyxoGoron_OpenMines dw KalyxoGoron_OpenMines

2
Sprites/NPCs/korok.asm
View File

@@ -70,7 +70,7 @@ KorokWalkSpeed = $02
Sprite_Korok_Main: Sprite_Korok_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw Sprite_Korok_Idle dw Sprite_Korok_Idle
dw Sprite_Korok_WalkingDown dw Sprite_Korok_WalkingDown

10
Sprites/NPCs/maku_tree.asm
View File

@@ -1,6 +1,5 @@
; ========================================================= ; =========================================================
; Sprite Properties ; Maku Tree
; =========================================================
!SPRID = Sprite_MakuTree !SPRID = Sprite_MakuTree
!NbrTiles = 00 ; Number of tiles used in a frame !NbrTiles = 00 ; Number of tiles used in a frame
@@ -32,8 +31,6 @@
%Set_Sprite_Properties(Sprite_MakuTree_Prep, Sprite_MakuTree_Long) %Set_Sprite_Properties(Sprite_MakuTree_Prep, Sprite_MakuTree_Long)
; =========================================================
Sprite_MakuTree_Long: Sprite_MakuTree_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
@@ -43,7 +40,6 @@ Sprite_MakuTree_Long:
PLB PLB
RTL RTL
} }
; =========================================================
Sprite_MakuTree_Prep: Sprite_MakuTree_Prep:
{ {
@@ -56,8 +52,6 @@ Sprite_MakuTree_Prep:
RTL RTL
} }
; =========================================================
PaletteFilter_StartBlindingWhite = $00EEF1 PaletteFilter_StartBlindingWhite = $00EEF1
ApplyPaletteFilter = $00E914 ApplyPaletteFilter = $00E914
@@ -66,7 +60,7 @@ Sprite_MakuTree_Main:
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw MakuTree_Handler dw MakuTree_Handler
dw MakuTree_MeetLink dw MakuTree_MeetLink

2
Sprites/NPCs/mask_salesman.asm
View File

@@ -53,7 +53,7 @@ Sprite_MaskSalesman_Main:
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw InquiryHandler dw InquiryHandler
dw NoOcarina dw NoOcarina

2
Sprites/NPCs/mermaid.asm
View File

@@ -79,7 +79,7 @@ Sprite_Mermaid_Prep:
Sprite_Mermaid_Main: Sprite_Mermaid_Main:
{ {
LDA.w SprMiscE, X LDA.w SprMiscE, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw MermaidHandler dw MermaidHandler
dw MapleHandler dw MapleHandler

4
Sprites/NPCs/piratian.asm
View File

@@ -56,7 +56,7 @@ Sprite_Piratian_Main:
JSR Sprite_Piratian_Move JSR Sprite_Piratian_Move
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw Piratian_MoveDown dw Piratian_MoveDown
dw Piratian_MoveUp dw Piratian_MoveUp
@@ -123,7 +123,7 @@ Sprite_Piratian_Move:
JMP .return JMP .return
.no_aggro .no_aggro
JSR Sprite_Pirate_Friendly JSR Sprite_Piratian_Friendly
.return .return
RTS RTS
} }

2
Sprites/NPCs/tingle.asm
View File

@@ -54,7 +54,7 @@ Sprite_Tingle_Main:
{ {
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw Tingle_Forward dw Tingle_Forward
dw Tingle_Right dw Tingle_Right

2
Sprites/NPCs/vasu.asm
View File

@@ -64,7 +64,7 @@ Sprite_Vasu_Main:
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw Vasu_Idle dw Vasu_Idle
dw Vasu_MessageHandler dw Vasu_MessageHandler

2
Sprites/NPCs/village_dog.asm
View File

@@ -88,7 +88,7 @@ LiftOrTalk:
Sprite_VillageDog_Main: Sprite_VillageDog_Main:
{ {
LDA.w SprAction, X LDA.w SprAction, X
JSL UseImplicitRegIndexedLocalJumpTable JSL JumpTableLocal
dw Dog_Handler ; 00 dw Dog_Handler ; 00
dw Dog_LookLeftAtLink ; 01 dw Dog_LookLeftAtLink ; 01