diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2026-02-04 17:18:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-04 17:18:33 -0700 |
| commit | ddd47126ecc19841cd7fb7adb89767475dbcd707 (patch) | |
| tree | f7c753b1f2d48ce6e49460a08eefb7fdc561e0e8 /src/code_80057C60.c | |
| parent | a59dcc1e75a525ab825b237077ba2a06350b0029 (diff) | |
Maybe fix some interpolation (#637)
* Update render_player.c
* Refactor FrameInterpolation_RecordOpenChild calls
* Update GrandPrixBalloons.cpp
* Modify func_80053D74 to include an additional parameter
Diffstat (limited to 'src/code_80057C60.c')
| -rw-r--r-- | src/code_80057C60.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/code_80057C60.c b/src/code_80057C60.c index ec2f6f59a..7e820f65b 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -5785,8 +5785,7 @@ void render_battle_balloon(Player* player, s8 arg1, s16 arg2, s8 arg3) { sp12C[2] = D_8018D7D0[arg1][arg2] - (D_8018D860[arg1][arg2] * coss(temp_t1)) - ((D_8018D890[arg1][arg2] * 8) * sins(temp_t1)); - // @port: Tag the transform. - FrameInterpolation_RecordOpenChild((uintptr_t) player, arg1 | arg2 << 16); + FrameInterpolation_RecordOpenChild("battle_balloon", (arg1 << 8) | (arg3 << 4) | arg2); mtxf_translate_rotate(mtx, sp134, sp12C); mtxf_scale(mtx, var_f20); @@ -6303,7 +6302,7 @@ void func_8006D474(Player* player, s8 playerId, s8 screenId) { if ((player->unk_002 & (SIDE_OF_KART << (screenId * 4))) == (SIDE_OF_KART << (screenId * 4))) { for (var_s2 = 0; var_s2 < 10; var_s2++) { // @port: Tag the transform. - FrameInterpolation_RecordOpenChild("SmokeDust", TAG_SMOKE_DUST((playerId << 8) + var_s2)); + FrameInterpolation_RecordOpenChild("smoke_dust", TAG_SMOKE_DUST((playerId << 8) | (screenId << 4) | var_s2)); switch (player->particlePool0[var_s2].type) { case 1: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { @@ -6325,7 +6324,7 @@ void func_8006D474(Player* player, s8 playerId, s8 screenId) { break; } FrameInterpolation_RecordCloseChild(); - FrameInterpolation_RecordOpenChild("SmokeDust", TAG_SMOKE_DUST((playerId << 8) + var_s2 + 30)); + FrameInterpolation_RecordOpenChild("smoke_dust2", TAG_SMOKE_DUST((playerId << 8) | (screenId << 4) | var_s2)); switch (player->particlePool3[var_s2].type) { case 1: case 9: @@ -6388,7 +6387,7 @@ void func_8006D474(Player* player, s8 playerId, s8 screenId) { break; } FrameInterpolation_RecordCloseChild(); - FrameInterpolation_RecordOpenChild("SmokeDust", TAG_SMOKE_DUST((playerId << 8) + var_s2 + 10)); + FrameInterpolation_RecordOpenChild("smoke_dust3", TAG_SMOKE_DUST((playerId << 8) | (screenId << 4) | var_s2)); switch (player->particlePool1[var_s2].type) { case DRIFT_PARTICLE: if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { @@ -6475,7 +6474,7 @@ void func_8006DD3C(Player* player, s8 playerId, s8 arg2) { } if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && (arg2 == playerId)) { - FrameInterpolation_RecordOpenChild("onomatopoeia", TAG_SMOKE_DUST((playerId << 8) + 20)); + FrameInterpolation_RecordOpenChild("onomatopoeia", TAG_SMOKE_DUST((playerId << 8) | (arg2 << 4))); switch (player->particlePool2[0].type) { case 2: render_player_onomatopoeia_crash(player, playerId, player->particlePool2[0].scale, arg2, 0); |