Skip to content

Commit 6da3356

Browse files
committed
param fixes
1 parent c2de57e commit 6da3356

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

fighters/pikmin/src/pikmin/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ impl From<i32> for PikminInfo {
2727
attr_special: Hash40::new("collision_attr_fire"),
2828
sound: *COLLISION_SOUND_ATTR_FIRE,
2929
color: Vector3f{x: 1.0, y: 0.05, z: 0.0},
30-
cling_frame: 4
30+
cling_frame: 5
3131
},
3232
1 => PikminInfo { // yellow
3333
dmg: 0.94,
@@ -38,7 +38,7 @@ impl From<i32> for PikminInfo {
3838
attr_special: Hash40::new("collision_attr_paralyze"),
3939
sound: *COLLISION_SOUND_ATTR_ELEC,
4040
color: Vector3f{x: 1.0, y: 1.0, z: 0.14},
41-
cling_frame: 6
41+
cling_frame: 7
4242
},
4343
2 => PikminInfo { // Blue
4444
dmg: 1.0,
@@ -49,7 +49,7 @@ impl From<i32> for PikminInfo {
4949
attr_special: Hash40::new("collision_attr_water"),
5050
sound: *COLLISION_SOUND_ATTR_WATER,
5151
color: Vector3f{x: 0.1, y: 0.4, z: 1.0},
52-
cling_frame: 4
52+
cling_frame: 5
5353
},
5454
3 => PikminInfo { // White
5555
dmg: 0.75,
@@ -60,7 +60,7 @@ impl From<i32> for PikminInfo {
6060
attr_special: Hash40::new("collision_attr_flower"),
6161
sound: *COLLISION_SOUND_ATTR_FIRE,
6262
color: Vector3f{x: 1.0, y: 1.0, z: 1.0},
63-
cling_frame: 2
63+
cling_frame: 3
6464
},
6565
_ => PikminInfo { // Violet (Rock), also default
6666
dmg: 1.2,

romfs/source/fighter/pikmin/param/vl.prcxml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<hash40 index="2">dummy</hash40>
1818
<hash40 index="3">dummy</hash40>
1919
</list>
20-
<list hash="param_pikmin_particular">
20+
<list hash="param_pikmin">
2121
<struct index="0">
2222
<int hash="special_s_lever_clatter_frame">0</int>
2323
<int hash="special_s_damage_remove_rate">0</int>

0 commit comments

Comments
 (0)