pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-10-18 10:42:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename fuzzy leech anim (#1174)

Browse Source 
* fix pm_sprites caching

Co-authored-by: Alex Bates <alex@bates64.com>

* name fuzzy leech anim

---------

Co-authored-by: Alex Bates <alex@bates64.com>
This commit is contained in:
Josh Diamond 2024-02-18 02:55:01 -05:00 committed by GitHub
parent e1176acfed
commit 562ccb68ad
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle/common/actor/forest_fuzzy.inc.c
View File

@ -332,7 +332,7 @@ EvtScript N(EVS_Attack_Leech) = {
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Idle) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Forest_Idle)
Label(100) Label(100)
Call(SetActorDispOffset, ACTOR_SELF, 0, 10, 0) 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) Call(SetActorDispOffset, ACTOR_SELF, 0, 9, 0)
Wait(1) Wait(1)
Call(SetActorDispOffset, ACTOR_SELF, 0, 8, 0) Call(SetActorDispOffset, ACTOR_SELF, 0, 8, 0)

2
src/battle/common/actor/fuzzy.inc.c
View File

@ -262,7 +262,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Idle) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Idle)
Label(100) Label(100)
Call(SetActorDispOffset, ACTOR_SELF, 0, 10, 0) 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) Call(SetActorDispOffset, ACTOR_SELF, 0, 9, 0)
Wait(1) Wait(1)
Call(SetActorDispOffset, ACTOR_SELF, 0, 8, 0) Call(SetActorDispOffset, ACTOR_SELF, 0, 8, 0)

2
src/battle/common/actor/jungle_fuzzy.inc.c
View File

@ -336,7 +336,7 @@ EvtScript N(EVS_Attack_Leech) = {
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Idle) Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_Fuzzy_Jungle_Idle)
Label(100) Label(100)
Call(SetActorDispOffset, ACTOR_SELF, 0, 10, 0) 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) Call(SetActorDispOffset, ACTOR_SELF, 0, 9, 0)
Wait(1) Wait(1)
Call(SetActorDispOffset, ACTOR_SELF, 0, 8, 0) Call(SetActorDispOffset, ACTOR_SELF, 0, 8, 0)

2
src/world/area_jan/jan_01/jan_01_3_npc.c
View File

@ -259,7 +259,7 @@ EvtScript N(EVS_NpcDefeat_JungleFuzzyBoss) = {
EvtScript N(EVS_NpcInit_JungleFuzzy_01) = { EvtScript N(EVS_NpcInit_JungleFuzzy_01) = {
IfLt(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_FUZZIES) IfLt(GB_StoryProgress, STORY_CH5_KOLORADO_ESCAPED_FUZZIES)
Call(SetSelfVar, 0, 0) 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(BindNpcIdle, NPC_SELF, Ref(N(EVS_NpcIdle_JungleFuzzy_01)))
Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_JungleFuzzyBoss))) Call(BindNpcDefeat, NPC_SELF, Ref(N(EVS_NpcDefeat_JungleFuzzyBoss)))
Else Else

3
tools/renames/1_sprite_anims.txt Normal file
View File

@ -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
tools/splat_ext/npc_sprite_names.yaml
View File

@ -2382,7 +2382,7 @@ Fuzzy:
- Idle - Idle
- Walk - Walk
- Run - Run
- Anim04 - Leech
- Jump - Jump
- Anim06 - Anim06
- Bite - Bite

10
tools/splat_ext/pm_sprites.py
View File

@ -719,11 +719,15 @@ class N64SegPm_sprites(N64Segment):
def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml) -> None: 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) 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 = 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 = yaml_loader.load(f.read(), Loader=yaml_loader.SafeLoader)
self.player_cfg_modified_time = path.stat().st_mtime
def out_path(self): def out_path(self):
return options.opts.asset_path / "sprite" / "sprites" return options.opts.asset_path / "sprite" / "sprites"
@ -852,4 +856,4 @@ class N64SegPm_sprites(N64Segment):
return [LinkerEntry(self, src_paths, self.out_path(), self.get_linker_section(), self.get_linker_section())] return [LinkerEntry(self, src_paths, self.out_path(), self.get_linker_section(), self.get_linker_section())]
def cache(self): 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)