From 6bb695e6b33ff34fa4c00d761510c476cc0c4ca7 Mon Sep 17 00:00:00 2001
From: WBmarioo <64marioluigii@gmail.com>
Date: Tue, 10 Mar 2026 18:14:38 -0500
Subject: [PATCH 1/5] Fix Bob-omb Buddy and Cannon Lid (#1125)

---
 mods/star-road/actors/bobomb_buddy_geo.bin    | Bin 3311 -> 4112 bytes
 .../cannon_lid_seg8_texture_08004058.tex      | Bin 0 -> 4150 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 mods/star-road/textures/cannon_lid_seg8_texture_08004058.tex

diff --git a/mods/star-road/actors/bobomb_buddy_geo.bin b/mods/star-road/actors/bobomb_buddy_geo.bin
index f7f376a1a24221956bdc179e806b638335ce128f..97619e7b82578fd370b3867a01af3d6efdf845fa 100644
GIT binary patch
literal 4112
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
O{s<f5*1rI-^j$r^*ew<S

literal 3311
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

diff --git a/mods/star-road/textures/cannon_lid_seg8_texture_08004058.tex b/mods/star-road/textures/cannon_lid_seg8_texture_08004058.tex
new file mode 100644
index 0000000000000000000000000000000000000000..c64a1cbe1bb9558f3685054fe7fc36a518954997
GIT binary patch
literal 4150
zcmZ`+A*|y@5VcgY(4>-KprJu41qK=#ntfO8sjgIAqxLEp8U_Xi1_lNi1_lNO1_lP2
zP2U^utk?P1lSaGt&dhsnX4bj?<LcL6zJC4d>&Kse{PywBm*3YP-@bI;{{8#QN3kx7
zpNgN?3I6>6TX{=TY?4$Gm%(yL(qgi(UrUm~QX0;5kJYWbzkkoO)n+#H(>ROwzRazL
z90419`dSW)v*&mvmhmG_I4iL?1DBAG?>x7_3pq3oaJ`m1&*gr<Prme9<euV#kLLM4
zcJMJw<CGx>;=;LV^gOW7vP{pE_ow{CFK3^SdwM_Xj(il)&bdw&a1_JWl6x9`VqV5$
zQA^a*d;<@wd$cmfIB3qOUKVe8Gw|R$Gxp|_;aqdhzIjnfzNuwXZ6z<;piy-Y+i>4k
z@+KBBY}GxVVK$@2!RF1ct70viO(}if%lSOWIF53?-lXexQr6({ju$@@Z-MXe42$@-
z*SLre@o`=Nzbs4H_B%P8E^>d4a=G1Qw?9bTY@>LeE7aB3IP?v52wJ1F;Qxm0Ym~1m
z$-0YVr<Y{sQC7oC^2;d2=^^W;n`#&|Acy7SYPGN$@c!|ga<ch}`olcN5k9Uti`%~>
zJ&nMRurDtut`m=JcM-Q?AH4opZ;V4eTGQxW>U{;i)!u6+Ki8bZ^>;~kPsOM1^>vi;
z?(H_p2F7=*<3rrKiL@ana)kR&9>xz?;a(cP)@rVu+w|hvL0or*e&jv^1DY$~HIGs1
z`?TjXITSccQHO*am`inUA{>uT{mNtZneGIhL$4}v)qc{yy&&&hYG|)Lehd9OaOh#=
z!g>%t8%A;Uet~a1!oAb}vriGe;To^JMn8ARb(94CZx45QJx94gXX*7n@XUL7Aimen
z*>wF?lA;d!KjTOG11`1u*<tMzzY|wN3pnhLH+cf*37ypint?|?uh%F8-mmeT1Do^7
zIZX=RgQyQdzu_#fV|?@}D>VmaAOVMdH^}4ql*jEQ<>@IE>P$Z5Fn|;1Qn3%fhb5cs
zd<Xp;XdV6+JHjU~;;$;qQVZ*(ZVxixyEB|`lB2%G;UN#qAMuY@Vq*3VxFftLuw>IM
z`)eFxe5(ytt%a{Y_Kw)bA#bH9J89azY`Y_7l6IB@dU8BJq{3_@-3@)8E!1CesRcE)
zZ;I*zW;nz78wZCwx!{0)X6vn_CHsN7tPYZaN7kN|i{8`iAP#qh-we%d`iNut^zKdA
z^LGLGdd@od8sN7q<qR(BP-{ONYCFxvPG^H$cu%IfU}f)_PxVFLAIq(4^!-`<Zdwlt
zad`y}m2zM`=6*EdiWas7*2IN(m37g%Bd%&k4C3bRobLhgd2aOy+9Un&DeF{<O(GfY
z^30=(c%UA6<7c#$ZJXk^Fq>*<x$WC(J>a*;*CnhA{S$}2S;_rY$@R4L9MFHvz@jId
zPnb(<^`S3g7#p-H7V7}*#=-Pj4eZ&k)XY5N>jCTKeo3V1GO3z0a3Bv_T{$)S(3dfc
zWsZQUHHbL8fB$2AaB7hAuutVWtYN8KhD7=<nR414@+)z8Mj!ezhOx{s<3l^OvhNnp
zeW(q%83*)&IZIemC(<^F)a8V&n)LtfsIOmF#dJm=`Z9*G>dU@{x*IlQ^N9;Ftv2-a
z{tl~I;2m=}4Yu-34f&im!;M$f=y{mlaL)eFjI%vQ?~FshBQEe*TeA@F^B7K8iH{oK
zdH(*;*W<k9nSK0uzy>CB0&nRP^Tz%ihcSv@MBfFUo7^qG*Rl9^us?Rrm0aOB`$Tzs
z{PNt#>)*bsz(3Snx#iP*MDdGr;_Cc({mKV>&qY^Xmk`HXd}sN?-@w4K_jYFUZ90v|
U`}wEY^YtJP^9{LiW;~JqKXep!b^rhX

literal 0
HcmV?d00001


From 1f3de4fe0afb2567071cdac44ba2fa1e19aec533 Mon Sep 17 00:00:00 2001
From: ColbyRayz! <118496277+ColbyRayz@users.noreply.github.com>
Date: Tue, 10 Mar 2026 16:15:00 -0700
Subject: [PATCH 2/5] fixed error models in sm74 jrb area 2 and mad toads
 transparency (#1126)

---
 mods/sm74/levels/level_jrb_entry.lvl | Bin 137970 -> 137978 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/mods/sm74/levels/level_jrb_entry.lvl b/mods/sm74/levels/level_jrb_entry.lvl
index 712df327f80b54efe8bb17455c4832518db9506b..fd757d73e9fdeefbf3be661354297187ce9324a1 100644
GIT binary patch
delta 9607
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

delta 9624
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
O=q@BC=KlfZ2SWviu*Tv5


From 52446ded91f151aa9f1e21500075693e0c75aa30 Mon Sep 17 00:00:00 2001
From: Altiami <yoshiweegee@users.noreply.github.com>
Date: Tue, 10 Mar 2026 16:15:25 -0700
Subject: [PATCH 3/5] Merry-Go-Round Fixes (includes fixes for rooms and remote
 object-spawned objects) (#1094)

---
 src/engine/behavior_script.c                | 17 ++++++++++-
 src/engine/surface_load.c                   |  5 +++-
 src/game/behaviors/bbh_merry_go_round.inc.c | 31 +++++++++++++++++++--
 src/game/behaviors/boo.inc.c                | 16 ++++-------
 src/game/object_helpers.c                   | 22 ++++++++++-----
 5 files changed, 69 insertions(+), 22 deletions(-)

diff --git a/src/engine/behavior_script.c b/src/engine/behavior_script.c
index bd6218775..8af14f249 100644
--- a/src/engine/behavior_script.c
+++ b/src/engine/behavior_script.c
@@ -797,7 +797,22 @@ static s32 bhv_cmd_load_collision_data(void) {
 // Command 0x2D: Sets the home position of the object to its current position.
 // Usage: SET_HOME()
 static s32 bhv_cmd_set_home(void) {
-    if (!(gCurrentObject->coopFlags & (COOP_OBJ_FLAG_LUA | COOP_OBJ_FLAG_NETWORK))) {
+    // COOP: only set home via behavior for the following cases
+    if (
+        // if the object wasn't created via Lua
+        !(gCurrentObject->coopFlags & COOP_OBJ_FLAG_LUA)
+        // if the object wasn't created via network
+        // OR
+        // the object has never had its home set via behavior AND its home is default (e.g. (0, 0, 0))
+        // (this case handles an object that needs its home set via behavior after being spawned by another player)
+        && (
+            !(gCurrentObject->coopFlags & COOP_OBJ_FLAG_NETWORK)
+            || (
+                !gCurrentObject->setHome
+                && gCurrentObject->oHomeX == 0.0f && gCurrentObject->oHomeY == 0.0f && gCurrentObject->oHomeZ == 0.0f
+            )
+        )
+    ) {
         gCurrentObject->oHomeX = gCurrentObject->oPosX;
         gCurrentObject->oHomeY = gCurrentObject->oPosY;
         gCurrentObject->oHomeZ = gCurrentObject->oPosZ;
diff --git a/src/engine/surface_load.c b/src/engine/surface_load.c
index d78d7999d..345a73202 100644
--- a/src/engine/surface_load.c
+++ b/src/engine/surface_load.c
@@ -806,7 +806,10 @@ static void load_object_collision_model_internal(bool isSOC) {
 
         for (s32 i = 0; i < MAX_PLAYERS; i++) {
             f32 dist = dist_between_objects(gCurrentObject, gMarioStates[i].marioObj);
-            if (dist < tangibleDist) { anyPlayerInTangibleRange = TRUE; }
+            if (dist < tangibleDist) {
+                anyPlayerInTangibleRange = TRUE;
+                break;
+            }
         }
 
         // If the object collision is supposed to be loaded more than the
diff --git a/src/game/behaviors/bbh_merry_go_round.inc.c b/src/game/behaviors/bbh_merry_go_round.inc.c
index 3f38561c9..6cf25c912 100644
--- a/src/game/behaviors/bbh_merry_go_round.inc.c
+++ b/src/game/behaviors/bbh_merry_go_round.inc.c
@@ -10,6 +10,9 @@
  * in the enclosure nor in the room around it.
  */
 static void handle_merry_go_round_music(void) {
+    // COOP: raise scope of this variable since floor check is no longer strictly tied to music
+    u16 marioFloorType = 0;
+
     // If the music should play, play it and check whether it still should.
     // Otherwise, don't play it and check whether it should.
     if (o->oMerryGoRoundMusicShouldPlay == FALSE) {
@@ -23,7 +26,7 @@ static void handle_merry_go_round_music(void) {
         // Get Mario's floor and floor surface type
         struct Surface *marioFloor = NULL;
         struct Object *marioObject = gMarioObjects[0];
-        u16 marioFloorType = 0;
+        // COOP: `marioFloorType` originally here
 
         if (marioObject) {
             find_floor(marioObject->oPosX, marioObject->oPosY, marioObject->oPosZ, &marioFloor);
@@ -37,7 +40,9 @@ static void handle_merry_go_round_music(void) {
         // The cur_obj_is_mario_on_platform check is redundant since the merry-go-round
         // has surface type 0x1A, so Mario cannot be on the merry-go-round
         // without being on a floor with surface type 0x1A (SURFACE_MGR_MUSIC).
-        gMarioOnMerryGoRound = cur_obj_is_any_player_on_platform();
+
+        // COOP: `gMarioOnMerryGoRound` is used to determine if the merry-go-round Boos should be active
+        // for co-op, this means that this check needs to be separated from the music check, since music is client-side.
         if (cur_obj_is_mario_on_platform() || marioFloorType == SURFACE_MGR_MUSIC) {
             // If Mario is in the merry-go-round's enclosure, play only the merry-go-round music.
             play_secondary_music(SEQ_EVENT_MERRY_GO_ROUND, 0, 78, 50);
@@ -60,6 +65,28 @@ static void handle_merry_go_round_music(void) {
             cur_obj_play_sound_1(SOUND_ENV_MERRY_GO_ROUND_CREAKING);
         }
     }
+
+    // COOP: floor check happens here
+    // `marioFloorType` refers to the local player's character
+    gMarioOnMerryGoRound = marioFloorType == SURFACE_MGR_MUSIC || cur_obj_is_any_player_on_platform();
+    if (!gMarioOnMerryGoRound) {
+        // check the other Marios' floors
+        // starting at 1 since local player was already checked
+        for (s32 i = 1; i < MAX_PLAYERS; i++) {
+            if (!is_player_active(&gMarioStates[i])) { continue; }
+
+            struct Object *marioObject = gMarioStates[i].marioObj;
+            if (marioObject == NULL) { continue; }
+
+            struct Surface *marioFloor = NULL;
+            find_floor(marioObject->oPosX, marioObject->oPosY, marioObject->oPosZ, &marioFloor);
+            
+            if (marioFloor != NULL && marioFloor->type == SURFACE_MGR_MUSIC) {
+                gMarioOnMerryGoRound = TRUE;
+                break;
+            }
+        }
+    }
 }
 
 /**
diff --git a/src/game/behaviors/boo.inc.c b/src/game/behaviors/boo.inc.c
index 37bd4b6fe..5561e19c3 100644
--- a/src/game/behaviors/boo.inc.c
+++ b/src/game/behaviors/boo.inc.c
@@ -56,16 +56,11 @@ void bhv_boo_init(void) {
 
 static s32 boo_should_be_stopped(void) {
     if (cur_obj_has_behavior(bhvMerryGoRoundBigBoo) || cur_obj_has_behavior(bhvMerryGoRoundBoo)) {
-        for (s32 i = 0; i < MAX_PLAYERS; i++) {
-            if (!is_player_active(&gMarioStates[i])) { continue; }
-            if (gMarioStates[i].currentRoom != BBH_DYNAMIC_SURFACE_ROOM && gMarioStates[i].currentRoom != BBH_NEAR_MERRY_GO_ROUND_ROOM) { return TRUE; }
-        }
-        return FALSE;
-        /*if (!gMarioOnMerryGoRound) {
+        if (!gMarioOnMerryGoRound) {
             return TRUE;
         } else {
             return FALSE;
-        }*/
+        }
     } else {
         if (o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM) {
             return TRUE;
@@ -384,9 +379,7 @@ static void boo_chase_mario(f32 a0, s16 a1, f32 a2) {
     if (boo_vanish_or_appear()) {
         o->oInteractType = 0x8000;
 
-
-        u8 isMerryGoRoundBoo = (cur_obj_has_behavior(bhvMerryGoRoundBigBoo) || cur_obj_has_behavior(bhvMerryGoRoundBoo));
-        if (!isMerryGoRoundBoo && cur_obj_lateral_dist_from_obj_to_home(player) > 1500.0f) {
+        if (cur_obj_lateral_dist_from_obj_to_home(player) > 1500.0f) {
             sp1A = cur_obj_angle_to_home();
         } else {
             sp1A = angleToPlayer;
@@ -535,7 +528,8 @@ static void (*sBooActions[])(void) = {
 };
 
 void bhv_boo_loop(void) {
-    if (o->oAction < 3) {
+    // COOP: only sync when Boo isn't in a death state
+    if (o->oAction < 3 || o->oAction == 5) {
         if (!sync_object_is_initialized(o->oSyncID)) {
             struct SyncObject* so = boo_sync_object_init();
             if (so) { so->syncDeathEvent = FALSE; }
diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c
index 695a3fbd0..f0bf4d162 100644
--- a/src/game/object_helpers.c
+++ b/src/game/object_helpers.c
@@ -2942,19 +2942,27 @@ void bhv_init_room(void) {
 void cur_obj_enable_rendering_if_mario_in_room(void) {
     if (!o) { return; }
     if (o->oRoom == -1) { return; }
-    if (gMarioCurrentRoom == 0) { return; }
 
+    // COOP: if any active player character's room is 0, then either:
+    // 1) There are no rooms in the area
+    // 2) They are on an object surface with no explicit room
+    // In vanilla, a room of 0 stops the game from checking if the object shouldn't be rendered
+    // In coop, this needs to be respected to ensure the object remains active in areas with rooms
     u8 marioInRoom = FALSE;
 
+    // check if any player character can "see" the object's room
     for (s32 i = 0; i < MAX_PLAYERS; i++) {
-        if (gMarioStates[i].currentRoom != 0) {
+        if (is_player_active(&gMarioStates[i])) {
+            // TODO: separate rendering and activation
+            if (gMarioStates[i].currentRoom == 0) { return; }
             s16 currentRoom = gMarioStates[i].currentRoom;
-            if (currentRoom == o->oRoom) {
-                marioInRoom = TRUE;
-            } else if (gDoorAdjacentRooms[currentRoom][0] == o->oRoom) {
-                marioInRoom = TRUE;
-            } else if (gDoorAdjacentRooms[currentRoom][1] == o->oRoom) {
+            if (
+                currentRoom == o->oRoom
+                || gDoorAdjacentRooms[currentRoom][0] == o->oRoom
+                || gDoorAdjacentRooms[currentRoom][1] == o->oRoom
+            ) {
                 marioInRoom = TRUE;
+                break;
             }
         }
     }

From 5ca41153a61b22539927c2107151c60ae7f510c5 Mon Sep 17 00:00:00 2001
From: EmeraldLockdown <86802223+EmeraldLoc@users.noreply.github.com>
Date: Tue, 10 Mar 2026 18:33:38 -0500
Subject: [PATCH 4/5] Fix freecam not being toggleable after teleport warp
 (#1133)

This was happening because the previous mode would be reset before it was actually called. It was unique to `WARP_TYPE_SAME_AREA`. The solution is explained in the code comment. Also added some unused keywords to suppress warnings.
---
 src/game/camera.c       | 16 ++++++++--------
 src/game/level_update.c |  9 +++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/game/camera.c b/src/game/camera.c
index 9983130d9..962e0fb3e 100644
--- a/src/game/camera.c
+++ b/src/game/camera.c
@@ -1781,7 +1781,7 @@ s32 unused_update_mode_5_camera(UNUSED struct Camera *c, UNUSED Vec3f focus, UNU
     return 0;
 }
 
-static void stub_camera_1(UNUSED s32 unused) {
+UNUSED static void stub_camera_1(UNUSED s32 unused) {
 }
 
 void mode_boss_fight_camera(struct Camera *c) {
@@ -5614,7 +5614,7 @@ void set_focus_rel_mario(struct Camera *c, f32 leftRight, f32 yOff, f32 forwBack
  * @param forwBack offset to Mario's front/back, relative to his faceAngle
  * @param yawOff offset to Mario's faceAngle, changes the direction of `leftRight` and `forwBack`
  */
-static void unused_set_pos_rel_mario(struct Camera *c, f32 leftRight, f32 yOff, f32 forwBack, s16 yawOff) {
+UNUSED static void unused_set_pos_rel_mario(struct Camera *c, f32 leftRight, f32 yOff, f32 forwBack, s16 yawOff) {
     if (!c) { return; }
     u16 yaw = sMarioCamState->faceAngle[1] + yawOff;
 
@@ -7606,7 +7606,7 @@ void cutscene_unsoften_music(UNUSED struct Camera *c) {
     seq_player_unlower_volume(SEQ_PLAYER_LEVEL, 60);
 }
 
-static void stub_camera_5(UNUSED struct Camera *c) {
+UNUSED static void stub_camera_5(UNUSED struct Camera *c) {
 }
 
 BAD_RETURN(s32) cutscene_unused_start(UNUSED struct Camera *c) {
@@ -8133,7 +8133,7 @@ BAD_RETURN(s32) cutscene_dance_rotate_move_towards_mario(struct Camera *c) {
 /**
  * Speculated to be dance-related due to its proximity to the other dance functions
  */
-static BAD_RETURN(s32) cutscene_dance_unused(UNUSED struct Camera *c) {
+UNUSED static BAD_RETURN(s32) cutscene_dance_unused(UNUSED struct Camera *c) {
 }
 
 /**
@@ -9089,7 +9089,7 @@ BAD_RETURN(s32) cutscene_death_stomach_goto_mario(struct Camera *c) {
 /**
  * Ah, yes
  */
-static void unused_water_death_move_to_side_of_mario(struct Camera *c) {
+UNUSED static void unused_water_death_move_to_side_of_mario(struct Camera *c) {
     water_death_move_to_mario_side(c);
 }
 
@@ -9377,7 +9377,7 @@ BAD_RETURN(s32) cutscene_enter_pyramid_top(struct Camera *c) {
     }
 }
 
-static void unused_cutscene_goto_cvar(struct Camera *c) {
+UNUSED static void unused_cutscene_goto_cvar(struct Camera *c) {
     if (!c) { return; }
     f32 dist;
 
@@ -9543,7 +9543,7 @@ BAD_RETURN(s32) cutscene_read_message_start(struct Camera *c) {
     sCutsceneVars[0].angle[0] = 0;
 }
 
-static void unused_cam_to_mario(struct Camera *c) {
+UNUSED static void unused_cam_to_mario(struct Camera *c) {
     if (!c) { return; }
     Vec3s dir;
 
@@ -10972,7 +10972,7 @@ void cutscene_palette_editor(struct Camera *c) {
             &gDjuiPaletteToggle->base,
             (
                 m->action == ACT_IDLE ||
-                m->action == ACT_PALETTE_EDITOR_CAP 
+                m->action == ACT_PALETTE_EDITOR_CAP
             ) && !capMissing
         );
     }
diff --git a/src/game/level_update.c b/src/game/level_update.c
index 7a69632d3..1ad390601 100644
--- a/src/game/level_update.c
+++ b/src/game/level_update.c
@@ -18,6 +18,7 @@
 #include "sound_init.h"
 #include "mario.h"
 #include "camera.h"
+#include "bettercamera.h"
 #include "object_list_processor.h"
 #include "ingame_menu.h"
 #include "obj_behaviors.h"
@@ -471,6 +472,14 @@ void init_mario_after_warp(void) {
 
     if (gCurrentArea) {
         reset_camera(gCurrentArea->camera);
+        if (sWarpDest.type == WARP_TYPE_SAME_AREA && gCurrentArea->camera->mode == CAMERA_MODE_NEWCAM) {
+            // When we warp to a level in the same area, the camera mode never has the chance
+            // to reset. This is bad if our camera mode is newcam, since when init cam is called
+            // our old camera mode will be set to newcam, which causes newcam to not be able to be
+            // turned off. The fix is setting our mode to newcam's old mode
+            gCurrentArea->camera->mode = gNewCamera.savedMode;
+            gCurrentArea->camera->defMode = gNewCamera.savedDefMode;
+        }
     }
     sWarpDest.type = WARP_TYPE_NOT_WARPING;
     sDelayedWarpOp = WARP_OP_NONE;

From 8b4fadc89e0121514259f4e568fb0ab436920495 Mon Sep 17 00:00:00 2001
From: Blockyyy <88585273+Blockyyy@users.noreply.github.com>
Date: Wed, 11 Mar 2026 01:07:29 +0100
Subject: [PATCH 5/5] what happened (#1138)

---
 autogen/convert_functions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen/convert_functions.py b/autogen/convert_functions.py
index 0ec22b12c..9a9f7d53a 100644
--- a/autogen/convert_functions.py
+++ b/autogen/convert_functions.py
@@ -951,7 +951,7 @@ def build_function(function, do_extern):
             sparam = build_param(fid, param, i)
             param_var, param_value = sparam.split('=')
             param_type = param_var.replace(pid, '').strip()
-            s += '    %s = (%s) NULL;\n' % (param_var.strip(), param_type)
+            s += '    %s = (%s) %s;\n' % (param_var.strip(), param_type, "NULL" if '*' in param_type else "0")
             s += '    if (top >= %d) {\n' % (i)
             s += '        %s = %s\n' % (pid, param_value.strip())
             s += '        if (!gSmLuaConvertSuccess) { LOG_LUA("Failed to convert parameter %%u for function \'%%s\'", %d, "%s"); return 0; }\n' % (i, fid)