name fuzzy leech anim

pmret · Feb 18, 2024 · 93dc064 · 93dc064
1 parent ec50283
commit 93dc064
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/src/battle/common/actor/forest_fuzzy.inc.c b/src/battle/common/actor/forest_fuzzy.inc.c
@@ -332,7 +332,7 @@ EvtScript N(EVS_Attack_Leech) = {
  Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Idle)
  Label(100)
  Call(SetActorDispOffset, ACTOR_SELF, 0, 10, 0)
- Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Anim04)
+ Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Leech)
  Call(SetActorDispOffset, ACTOR_SELF, 0, 9, 0)
  Wait(1)
  Call(SetActorDispOffset, ACTOR_SELF, 0, 8, 0)

diff --git a/src/battle/common/actor/fuzzy.inc.c b/src/battle/common/actor/fuzzy.inc.c
@@ -262,7 +262,7 @@ EvtScript N(EVS_TakeTurn) = {
  Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Idle)
  Label(100)
  Call(SetActorDispOffset, ACTOR_SELF, 0, 10, 0)
- Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Anim04)
+ Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Leech)
  Call(SetActorDispOffset, ACTOR_SELF, 0, 9, 0)
  Wait(1)
  Call(SetActorDispOffset, ACTOR_SELF, 0, 8, 0)

diff --git a/src/battle/common/actor/jungle_fuzzy.inc.c b/src/battle/common/actor/jungle_fuzzy.inc.c
@@ -336,7 +336,7 @@ EvtScript N(EVS_Attack_Leech) = {
  Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Idle)
  Label(100)
  Call(SetActorDispOffset, ACTOR_SELF, 0, 10, 0)
- Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Anim04)
+ Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Leech)
  Call(SetActorDispOffset, ACTOR_SELF, 0, 9, 0)
  Wait(1)
  Call(SetActorDispOffset, ACTOR_SELF, 0, 8, 0)

diff --git a/src/world/area_jan/jan_01/jan_01_3_npc.c b/src/world/area_jan/jan_01/jan_01_3_npc.c
@@ -259,7 +259,7 @@ EvtScript N(EVS_NpcDefeat_JungleFuzzyBoss) = {
 EvtScript N(EVS_NpcInit_JungleFuzzy_01) = {
  IfLt(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_FUZZIES)
  Call(SetSelfVar, 0, 0)
- Call(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Jungle_Anim04)
+ Call(SetNpcAnimation, NPC_SELF, ANIM_Fuzzy_Jungle_Leech)
  Call(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_JungleFuzzy_01)))
  Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_JungleFuzzyBoss)))
  Else

diff --git a/tools/renames/1_sprite_anims.txt b/tools/renames/1_sprite_anims.txt
@@ -0,0 +1,3 @@
+ANIM_Fuzzy_Anim04 ANIM_Fuzzy_Leech
+ANIM_Fuzzy_Forest_Anim04 ANIM_Fuzzy_Forest_Leech
+ANIM_Fuzzy_Jungle_Anim04 ANIM_Fuzzy_Jungle_Leech
diff --git a/tools/splat_ext/npc_sprite_names.yaml b/tools/splat_ext/npc_sprite_names.yaml
@@ -2382,7 +2382,7 @@ Fuzzy:
  - Idle
  - Walk
  - Run
- - Anim04
+ - Leech
  - Jump
  - Anim06
  - Bite