Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename fuzzy leech anim #1174

Merged
merged 2 commits into from
Feb 18, 2024
Merged

rename fuzzy leech anim #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec50283
fix pm_sprites caching
whosblumiere Feb 18, 2024
93dc064
name fuzzy leech anim
whosblumiere Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/battle/common/actor/forest_fuzzy.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/battle/common/actor/fuzzy.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/battle/common/actor/jungle_fuzzy.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/world/area_jan/jan_01/jan_01_3_npc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions tools/renames/1_sprite_anims.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tools/splat_ext/npc_sprite_names.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2382,7 +2382,7 @@ Fuzzy:
- Idle
- Walk
- Run
- Anim04
- Leech
- Jump
- Anim06
- Bite
Expand Down
10 changes: 7 additions & 3 deletions tools/splat_ext/pm_sprites.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,11 +719,15 @@ class N64SegPm_sprites(N64Segment):
def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml) -> None:
super().__init__(rom_start, rom_end, type, name, vram_start, args=args, yaml=yaml)

with (Path(__file__).parent / f"npc_sprite_names.yaml").open("r") as f:
path = Path(__file__).parent / f"npc_sprite_names.yaml"
with path.open("r") as f:
self.npc_cfg = yaml_loader.load(f.read(), Loader=yaml_loader.SafeLoader)
self.npc_cfg_modified_time = path.stat().st_mtime

with (Path(__file__).parent / f"player_sprite_names.yaml").open("r") as f:
path = Path(__file__).parent / f"player_sprite_names.yaml"
with path.open("r") as f:
self.player_cfg = yaml_loader.load(f.read(), Loader=yaml_loader.SafeLoader)
self.player_cfg_modified_time = path.stat().st_mtime

def out_path(self):
return options.opts.asset_path / "sprite" / "sprites"
Expand Down Expand Up @@ -852,4 +856,4 @@ def get_linker_entries(self):
return [LinkerEntry(self, src_paths, self.out_path(), self.get_linker_section(), self.get_linker_section())]

def cache(self):
return (self.yaml, self.rom_end, self.player_cfg, self.npc_cfg)
return (self.yaml, self.rom_end, self.player_cfg_modified_time, self.npc_cfg_modified_time)
Loading