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

Merge branch 'master' into star-rod-0-4-0

Browse Source
This commit is contained in:
Alex Bates 2021-02-06 22:25:26 +00:00
commit 1f8f92e276
2 changed files with 142 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/world/partners.c
View File

@ -63,7 +63,7 @@ WorldPartner gWorldPartners[] = {
.update = 0x802BEB64,
.useAbility = 0x802BEB80,
.putAway = 0x802BEB9C,
.idle = NPC_ANIM(world_kooper, Palette_00, Anim_3),
.idle = NPC_ANIM(world_kooper, normal, idle),
.testFirstStrike = 0x802BE818,
.canUseAbility = world_partner_can_use_ability_default,
.canPlayerPause = world_partner_can_use_ability_default,
@ -81,7 +81,7 @@ WorldPartner gWorldPartners[] = {
.update = 0x802BE8A0,
.useAbility = 0x802BE8BC,
.putAway = 0x802BE8D8,
.idle = NPC_ANIM(world_bombette, Palette_00, Anim_3),
.idle = NPC_ANIM(world_bombette, normal, idle),
.testFirstStrike = 0x802BE520,
.canUseAbility = 0x802BD720,
.canPlayerPause = 0x802BD748,

145
tools/splat.yaml
View File

@ -8954,10 +8954,10 @@ segments:
- read_paper
palettes:
- normal
- poisoned
- green
- inactive
- electrified
- burnt
- yellow
- gray
animations:
- still
- idle
@ -8970,8 +8970,143 @@ segments:
- talk
- celebrate
- read_paper
- world_kooper
- world_bombette
- name: world_kooper
frames:
- walk1
- walk2
- walk3
- idle1
- idle2
- idle3
- idle4
- shell1
- shell2
- shell3
- shell4
- shell5
- shell6
- shell7
- shell8
- pain1
- pain2
- shell_start1
- shell_start2
- shell_start3
- talk
- talk_wave1
- talk_wave2
- happy1
- happy2
- happy3
- happy4
- jump
- fall
- read_paper
- talk_sad1
- talk_sad2
palettes:
- normal
- green
- inactive
- yellow
- gray
animations:
- still
- happy_still
- sad_still
- idle
- walk
- walk_fast
- jump
- fall
- shell_still1
- shell_spin
- shell_start
- shell_end
- pain
- talk
- talk_wave
- anim_0f
- celebrate
- celebrate_loop
- shell_still2
- read_paper
- name: world_bombette
frames:
- still
- walk1
- walk2
- walk3
- walk4
- idle1
- idle2
- idle3
- idle4
- jump
- fall
- key_fall
- still_lit
- walk_lit1
- walk_lit2
- walk_lit3
- charge_lit
- pain1
- pain2
- frame_13
- happy1
- happy2
- happy3
- happy4
- happy5
- happy_jump
- happy_fall
- lit_fuse1
- lit_fuse2
- lit_fuse3
- lit_fuse4
- lit_fuse5
- lit_fuse6
- key1
- key2
- key3
- key4
- key5
- key6
- key7
- key8
palettes:
- normal
- fuse
- red
- green
- fuse2
- black
- inactive
- purple
- black2
- yellow
- fuse3
- black3
- gray
animations:
- still
- happy
- still_lit
- idle
- happy_idle
- walk
- walk_lit
- walk_fast
- walk_fast_lit
- jump
- fall
- happy_jump
- happy_fall
- pain
- idle_fast
- celebrate
- lit_charge
- anim_11
- world_parakarry
- world_bow
- world_watt