diff --git a/bin/title_screen_bg.c b/bin/title_screen_bg.c
index 476ddb75..c0108aea 100644
--- a/bin/title_screen_bg.c
+++ b/bin/title_screen_bg.c
@@ -143,7 +143,8 @@ const Gfx title_screen_bg_dl_face_easter_egg_end[] = {
 };
 #endif
 
-#if defined(VERSION_SH)
+// Not part of segment2, but define still covers same use case
+#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
 ALIGNED8 static const Texture title_texture_rumble_pak[] = {
 #include "textures/title_screen_bg/title_screen_bg.06648.rgba16.inc.c"
 };
diff --git a/include/config/config_game.h b/include/config/config_game.h
index 387c4bdd..ede580bf 100644
--- a/include/config/config_game.h
+++ b/include/config/config_game.h
@@ -71,7 +71,7 @@
 // #define DIALOG_INDICATOR
 
 /**
- * Include the English characters that were missing from US segment2
+ * Include the English characters that were missing from US segment2 and the rumble pak texture if using rumble.
  * J, Q, V, X, Z, ¨, !, !!, ?, &, %, ., and the beta key.
  * [MAKE SURE TO INCLUDE EU AND JP/SH BASEROMS IN THE REPO TO OBTAIN THE ASSETS]
  * If this is disabled, backup assets will be used.
diff --git a/levels/intro/geo.c b/levels/intro/geo.c
index 0285b524..58b3cdd3 100644
--- a/levels/intro/geo.c
+++ b/levels/intro/geo.c
@@ -75,7 +75,7 @@ const GeoLayout intro_geo_mario_head_regular[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
 #endif
-#ifdef ENABLE_RUMBLE
+#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
       GEO_ZBUFFER(0),
       GEO_OPEN_NODE(),
          GEO_ASM(INTRO_CONTEXT_NORMAL, geo_intro_rumble_pak_graphic),
@@ -111,7 +111,7 @@ const GeoLayout intro_geo_mario_head_dizzy[] = {
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
 #endif
-#ifdef ENABLE_RUMBLE
+#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
       GEO_ZBUFFER(0),
       GEO_OPEN_NODE(),
          GEO_ASM(INTRO_CONTEXT_GAME_OVER, geo_intro_rumble_pak_graphic),
diff --git a/src/game/rumble_init.c b/src/game/rumble_init.c
index 2ebf75d0..133b1b00 100644
--- a/src/game/rumble_init.c
+++ b/src/game/rumble_init.c
@@ -261,7 +261,7 @@ void cancel_rumble(void) {
 
 void create_thread_6(void) {
     osCreateMesgQueue(&gRumbleThreadVIMesgQueue, gRumbleThreadVIMesgBuf, 1);
-    osCreateThread(&gRumblePakThread, THREAD_6_RUMBLE, thread6_rumble_loop, NULL, gThread6Stack + 0x400, 30);
+    osCreateThread(&gRumblePakThread, THREAD_6_RUMBLE, thread6_rumble_loop, NULL, gThread6Stack + THREAD6_STACK, 30);
     osStartThread(&gRumblePakThread);
 }
 
diff --git a/src/menu/intro_geo.c b/src/menu/intro_geo.c
index 89d77e65..2b616f84 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 defined(VERSION_SH)
+#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
 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 defined(VERSION_SH)
+#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
 Gfx *geo_intro_rumble_pak_graphic(s32 callContext, struct GraphNode *node, UNUSED void *context) {
     struct GraphNodeGenerated *genNode = (struct GraphNodeGenerated *)node;
     Gfx *dlIter;
diff --git a/src/menu/intro_geo.h b/src/menu/intro_geo.h
index eb534d5c..5e17323b 100644
--- a/src/menu/intro_geo.h
+++ b/src/menu/intro_geo.h
@@ -20,7 +20,7 @@ Gfx *geo_intro_gameover_backdrop(s32 callContext, struct GraphNode *node, UNUSED
 #ifdef GODDARD_EASTER_EGG
 Gfx *geo_intro_face_easter_egg(s32 callContext, struct GraphNode *node, UNUSED void *context);
 #endif
-#if ENABLE_RUMBLE
+#if (defined(COMPLETE_EN_US_SEGMENT2) && ENABLE_RUMBLE)
 Gfx *geo_intro_rumble_pak_graphic(s32 callContext, struct GraphNode *node, UNUSED void *context);
 #endif