pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 20:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into mstory_jp

Browse Source
This commit is contained in:
mrshigure 2024-09-12 23:15:20 -07:00 committed by GitHub
commit 97f5fe5361
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/effects/chomp_drop.c
View File

@ -40,7 +40,7 @@ EffectInstance* chomp_drop_main(s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4
data->unk_18 = arg6;
data->unk_34 = 1.0f;
data->unk_20 = arg7;
data->unk_38 = rand_int(0x168);
data->unk_38 = rand_int(360);
data->unk_40 = arg9;
data->unk_44 = 0;
data->unk_3C = arg5;

2
src/effects/damage_stars.c
View File

@ -19,7 +19,7 @@ u8 D_E0030E90[] = {
254, 213, 172
};
f32 D_E0030EB4;
f32 D_E0030EB4 = 0.0f;
void damage_stars_init(EffectInstance* effect);
void damage_stars_update(EffectInstance* effect);

10
src/effects/flame.c
View File

@ -21,7 +21,7 @@ FlamePreset FlamePresets[] = {
.colorScale = { 255, 109, 255 },
.keyCenter = 92,
.envColor = { 102, 191, 255 },
.primIntensity = 75,
.primIntensity = 75,
.sizeScale = 50,
.dlist = D_09000800_3543B0,
},
@ -29,7 +29,7 @@ FlamePreset FlamePresets[] = {
.colorScale = { 255, 255, 255 },
.keyCenter = 0,
.envColor = { 255, 32, 0 },
.primIntensity = 75,
.primIntensity = 75,
.sizeScale = 100,
.dlist = D_09000800_3543B0,
},
@ -37,7 +37,7 @@ FlamePreset FlamePresets[] = {
.colorScale = { 255, 0, 255 },
.keyCenter = 92,
.envColor = { 107, 168, 255 },
.primIntensity = 75,
.primIntensity = 75,
.sizeScale = 10,
.dlist = D_09000800_3543B0,
},
@ -45,13 +45,13 @@ FlamePreset FlamePresets[] = {
.colorScale = { 255, 255, 255 },
.keyCenter = 244,
.envColor = { 247, 175, 175 },
.primIntensity = 22,
.primIntensity = 22,
.sizeScale = 30,
.dlist = D_09000800_3543B0,
},
};
s32 LastFlameRenderFrame;
s32 LastFlameRenderFrame = 0;
void flame_init(EffectInstance* effect);
void flame_update(EffectInstance* effect);

8
src/effects/recover.c
View File

@ -87,14 +87,14 @@ EffectInstance* recover_main(s32 type, f32 posX, f32 posY, f32 posZ, s32 duratio
if (i == 1) {
part->pos.x = 0.0f;
part->unk_34 = 0;
part->scaleX = 0.0f;;
part->scaleY = 0.0f;;
part->scaleX = 0.0f;
part->scaleY = 0.0f;
part->vel.y = 1.4f;
} else {
part->vel.y = 1.4f;
part->unk_34 = i + 10;
part->scaleX = 0.0f;;
part->scaleY = 0.0f;;
part->scaleX = 0.0f;
part->scaleY = 0.0f;
part->pos.x = ((i & 1) * 2 - 1) * ((i - 1) >> 1) * 4;
}
part->timeLeft = 0;