From 236e888bdb99de4e90b4d6ff09007ef168fc17c6 Mon Sep 17 00:00:00 2001 From: scawful Date: Sun, 19 Jan 2025 13:30:19 -0500 Subject: [PATCH] npc housekeeping --- Sprites/NPCs/eon_owl.asm | 2 +- Sprites/NPCs/eon_zora.asm | 2 +- Sprites/NPCs/eon_zora_elder.asm | 2 +- Sprites/NPCs/farore.asm | 4 +--- Sprites/NPCs/goron.asm | 2 +- Sprites/NPCs/korok.asm | 2 +- Sprites/NPCs/maku_tree.asm | 10 ++-------- Sprites/NPCs/mask_salesman.asm | 2 +- Sprites/NPCs/mermaid.asm | 2 +- Sprites/NPCs/piratian.asm | 4 ++-- Sprites/NPCs/tingle.asm | 2 +- Sprites/NPCs/vasu.asm | 2 +- Sprites/NPCs/village_dog.asm | 2 +- 13 files changed, 15 insertions(+), 23 deletions(-) diff --git a/Sprites/NPCs/eon_owl.asm b/Sprites/NPCs/eon_owl.asm index 643458a..cbed333 100644 --- a/Sprites/NPCs/eon_owl.asm +++ b/Sprites/NPCs/eon_owl.asm @@ -84,7 +84,7 @@ Sprite_EonOwl_Prep: Sprite_EonOwl_Main: { LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw EonOwl_Idle dw EonOwl_IntroDialogue diff --git a/Sprites/NPCs/eon_zora.asm b/Sprites/NPCs/eon_zora.asm index 1a419a3..0c21bef 100644 --- a/Sprites/NPCs/eon_zora.asm +++ b/Sprites/NPCs/eon_zora.asm @@ -9,7 +9,7 @@ Sprite_EonZora_Main: JSL Sprite_BounceFromTileCollision LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw EonZora_Forward dw EonZora_Left diff --git a/Sprites/NPCs/eon_zora_elder.asm b/Sprites/NPCs/eon_zora_elder.asm index 109de7d..9332775 100644 --- a/Sprites/NPCs/eon_zora_elder.asm +++ b/Sprites/NPCs/eon_zora_elder.asm @@ -3,7 +3,7 @@ Sprite_EonZoraElder_Main: { LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw EonZoraElder_Idle dw EonZoraElder_Surprised diff --git a/Sprites/NPCs/farore.asm b/Sprites/NPCs/farore.asm index 056ff3b..85fd3c0 100644 --- a/Sprites/NPCs/farore.asm +++ b/Sprites/NPCs/farore.asm @@ -71,7 +71,7 @@ STORY_STATE = $B6 Sprite_Farore_Main: { LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw IntroStart dw MoveUpTowardsFarore @@ -195,10 +195,8 @@ Sprite_Farore_Main: MakuArea_FaroreWaitForKydrog: { %PlayAnimation(5, 5, 8) - RTS } - } Sprite_Farore_Draw: diff --git a/Sprites/NPCs/goron.asm b/Sprites/NPCs/goron.asm index 9c3bbce..fb4e12b 100644 --- a/Sprites/NPCs/goron.asm +++ b/Sprites/NPCs/goron.asm @@ -81,7 +81,7 @@ Sprite_Goron_Main: JSL Sprite_PlayerCantPassThrough LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw KalyxoGoron_Main dw KalyxoGoron_OpenMines diff --git a/Sprites/NPCs/korok.asm b/Sprites/NPCs/korok.asm index 0c63a25..f1c3086 100644 --- a/Sprites/NPCs/korok.asm +++ b/Sprites/NPCs/korok.asm @@ -70,7 +70,7 @@ KorokWalkSpeed = $02 Sprite_Korok_Main: { LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw Sprite_Korok_Idle dw Sprite_Korok_WalkingDown diff --git a/Sprites/NPCs/maku_tree.asm b/Sprites/NPCs/maku_tree.asm index 80131de..3c203b0 100644 --- a/Sprites/NPCs/maku_tree.asm +++ b/Sprites/NPCs/maku_tree.asm @@ -1,6 +1,5 @@ ; ========================================================= -; Sprite Properties -; ========================================================= +; Maku Tree !SPRID = Sprite_MakuTree !NbrTiles = 00 ; Number of tiles used in a frame @@ -32,8 +31,6 @@ %Set_Sprite_Properties(Sprite_MakuTree_Prep, Sprite_MakuTree_Long) -; ========================================================= - Sprite_MakuTree_Long: { PHB : PHK : PLB @@ -43,7 +40,6 @@ Sprite_MakuTree_Long: PLB RTL } -; ========================================================= Sprite_MakuTree_Prep: { @@ -56,8 +52,6 @@ Sprite_MakuTree_Prep: RTL } -; ========================================================= - PaletteFilter_StartBlindingWhite = $00EEF1 ApplyPaletteFilter = $00E914 @@ -66,7 +60,7 @@ Sprite_MakuTree_Main: JSL Sprite_PlayerCantPassThrough LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw MakuTree_Handler dw MakuTree_MeetLink diff --git a/Sprites/NPCs/mask_salesman.asm b/Sprites/NPCs/mask_salesman.asm index fdf9455..10896d9 100644 --- a/Sprites/NPCs/mask_salesman.asm +++ b/Sprites/NPCs/mask_salesman.asm @@ -53,7 +53,7 @@ Sprite_MaskSalesman_Main: JSL Sprite_PlayerCantPassThrough LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw InquiryHandler dw NoOcarina diff --git a/Sprites/NPCs/mermaid.asm b/Sprites/NPCs/mermaid.asm index e6957aa..d5eb1636 100644 --- a/Sprites/NPCs/mermaid.asm +++ b/Sprites/NPCs/mermaid.asm @@ -79,7 +79,7 @@ Sprite_Mermaid_Prep: Sprite_Mermaid_Main: { LDA.w SprMiscE, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw MermaidHandler dw MapleHandler diff --git a/Sprites/NPCs/piratian.asm b/Sprites/NPCs/piratian.asm index e29a52c..8e87ec8 100644 --- a/Sprites/NPCs/piratian.asm +++ b/Sprites/NPCs/piratian.asm @@ -56,7 +56,7 @@ Sprite_Piratian_Main: JSR Sprite_Piratian_Move LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw Piratian_MoveDown dw Piratian_MoveUp @@ -123,7 +123,7 @@ Sprite_Piratian_Move: JMP .return .no_aggro - JSR Sprite_Pirate_Friendly + JSR Sprite_Piratian_Friendly .return RTS } diff --git a/Sprites/NPCs/tingle.asm b/Sprites/NPCs/tingle.asm index dd868b3..bf98e45 100644 --- a/Sprites/NPCs/tingle.asm +++ b/Sprites/NPCs/tingle.asm @@ -54,7 +54,7 @@ Sprite_Tingle_Main: { JSL Sprite_PlayerCantPassThrough LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw Tingle_Forward dw Tingle_Right diff --git a/Sprites/NPCs/vasu.asm b/Sprites/NPCs/vasu.asm index 1e8c85b..0ec3340 100644 --- a/Sprites/NPCs/vasu.asm +++ b/Sprites/NPCs/vasu.asm @@ -64,7 +64,7 @@ Sprite_Vasu_Main: JSL Sprite_PlayerCantPassThrough LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw Vasu_Idle dw Vasu_MessageHandler diff --git a/Sprites/NPCs/village_dog.asm b/Sprites/NPCs/village_dog.asm index 8c05100..63a4152 100644 --- a/Sprites/NPCs/village_dog.asm +++ b/Sprites/NPCs/village_dog.asm @@ -88,7 +88,7 @@ LiftOrTalk: Sprite_VillageDog_Main: { LDA.w SprAction, X - JSL UseImplicitRegIndexedLocalJumpTable + JSL JumpTableLocal dw Dog_Handler ; 00 dw Dog_LookLeftAtLink ; 01