From 98d5844f9190d80a935182e86645052e4cf9eebe Mon Sep 17 00:00:00 2001 From: sitton76 <58642183+sitton76@users.noreply.github.com> Date: Wed, 21 May 2025 23:56:13 -0500 Subject: [PATCH 1/2] Fixed loading battle maps. --- src/engine/actors/Finishline.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/engine/actors/Finishline.cpp b/src/engine/actors/Finishline.cpp index 0680e60bd..33f12120f 100644 --- a/src/engine/actors/Finishline.cpp +++ b/src/engine/actors/Finishline.cpp @@ -6,6 +6,7 @@ #include "engine/Actor.h" #include "World.h" #include "assets/common_data.h" +#include "src/port/Game.h" extern "C" { #include "macros.h" @@ -20,6 +21,10 @@ extern f32 gKartGravityTable[]; AFinishline::AFinishline(std::optional pos) { Name = "Finishline"; + if (GetCup() == GetBattleCup()) { + return; + } + if (pos.has_value()) { // Set spawn point to the provided position Pos[0] = D_8015F8D0[0] = pos.value().x; From f6d1064a7a5395eaca40f08d099d8cc07badf02c Mon Sep 17 00:00:00 2001 From: sitton76 <58642183+sitton76@users.noreply.github.com> Date: Thu, 22 May 2025 00:16:21 -0500 Subject: [PATCH 2/2] Tagged battle balloons --- src/code_80057C60.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 0a8e22749..50622a10a 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -6101,6 +6101,10 @@ void render_battle_balloon(Player* player, s8 arg1, s16 arg2, s8 arg3) { sp12C[1] = player->unk_048[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); + mtxf_translate_rotate(mtx, sp134, sp12C); mtxf_scale(mtx, var_f20); // convert_to_fixed_point_matrix(&gGfxPool->mtxEffect[gMatrixEffectCount], sp140); @@ -6130,6 +6134,10 @@ void render_battle_balloon(Player* player, s8 arg1, s16 arg2, s8 arg3) { gSPVertex(gDisplayListHead++, gBalloonVertexPlane2, 4, 0); gSPDisplayList(gDisplayListHead++, common_square_plain_render); gSPTexture(gDisplayListHead++, 0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF); + + // @port Pop the transform id. + FrameInterpolation_RecordCloseChild(); + gMatrixEffectCount++; }