diff --git a/bin/title_screen_bg.c b/bin/title_screen_bg.c
index afb560adb..476ddb751 100644
--- a/bin/title_screen_bg.c
+++ b/bin/title_screen_bg.c
@@ -143,7 +143,7 @@ const Gfx title_screen_bg_dl_face_easter_egg_end[] = {
 };
 #endif
 
-#if ENABLE_RUMBLE
+#if defined(VERSION_SH)
 ALIGNED8 static const Texture title_texture_rumble_pak[] = {
 #include "textures/title_screen_bg/title_screen_bg.06648.rgba16.inc.c"
 };
diff --git a/levels/intro/geo.c b/levels/intro/geo.c
index c99074100..3c93bee7e 100644
--- a/levels/intro/geo.c
+++ b/levels/intro/geo.c
@@ -72,7 +72,7 @@ const GeoLayout intro_geo_mario_head_regular[] = {
          GEO_CLOSE_NODE(),
 #endif
       GEO_CLOSE_NODE(),
-#if ENABLE_RUMBLE
+#if defined(VERSION_SH)
    GEO_ZBUFFER(0),
    GEO_OPEN_NODE(),
       GEO_ASM(INTRO_CONTEXT_NORMAL, geo_intro_rumble_pak_graphic),
@@ -105,7 +105,7 @@ const GeoLayout intro_geo_mario_head_dizzy[] = {
          GEO_CLOSE_NODE(),
 #endif
       GEO_CLOSE_NODE(),
-#if ENABLE_RUMBLE
+#if defined(VERSION_SH)
       GEO_ZBUFFER(0),
       GEO_OPEN_NODE(),
          GEO_ASM(INTRO_CONTEXT_GAME_OVER, geo_intro_rumble_pak_graphic),
diff --git a/src/game/mario.c b/src/game/mario.c
index 6cd418e76..757c7f0be 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -1791,7 +1791,7 @@ s32 execute_mario_action(UNUSED struct Object *obj) {
         play_infinite_stairs_music();
         gMarioState->marioObj->oInteractStatus = INT_STATUS_NONE;
 #if ENABLE_RUMBLE
-        queue_rumble_particles(m);
+        queue_rumble_particles(gMarioState);
 #endif
 
         return gMarioState->particleFlags;
diff --git a/src/game/rumble_init.c b/src/game/rumble_init.c
index b5cd6286f..e9145841a 100644
--- a/src/game/rumble_init.c
+++ b/src/game/rumble_init.c
@@ -120,7 +120,7 @@ static void update_rumble_data_queue(void) {
     if (gRumbleDataQueue[0].comm) {
         gCurrRumbleSettings.count = 0;
         gCurrRumbleSettings.start = 4;
-        gCurrRumbleSettings.comm  = gRumbleDataQueue[0].comm;
+        gCurrRumbleSettings.event  = gRumbleDataQueue[0].comm;
         gCurrRumbleSettings.timer = gRumbleDataQueue[0].time;
         gCurrRumbleSettings.level = gRumbleDataQueue[0].level;
         gCurrRumbleSettings.decay = gRumbleDataQueue[0].decay;
diff --git a/src/menu/intro_geo.c b/src/menu/intro_geo.c
index cbb4f145f..89d77e651 100644
--- a/src/menu/intro_geo.c
+++ b/src/menu/intro_geo.c
@@ -263,7 +263,7 @@ Gfx *geo_intro_gameover_backdrop(s32 callContext, struct GraphNode *node, UNUSED
     return dl;
 }
 
-#if ENABLE_RUMBLE
+#if defined(VERSION_SH)
 extern Gfx title_screen_bg_dl_rumble_pak[];
 #endif
 #ifdef GODDARD_EASTER_EGG
@@ -405,7 +405,7 @@ Gfx *geo_intro_face_easter_egg(s32 callContext, struct GraphNode *node, UNUSED v
 }
 #endif
 
-#if ENABLE_RUMBLE
+#if defined(VERSION_SH)
 Gfx *geo_intro_rumble_pak_graphic(s32 callContext, struct GraphNode *node, UNUSED void *context) {
     struct GraphNodeGenerated *genNode = (struct GraphNodeGenerated *)node;
     Gfx *dlIter;