From 6f060a92222076cc55a8ecc2ac6942d1a0a68d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?= <serprex@users.noreply.github.com>
Date: Fri, 2 Jan 2026 20:18:54 +0000
Subject: [PATCH] jabu mq: fix copy paste error, rename MQ_EAST_ROOM to
 MQ_NEAR_BOSS_ROOM (#6074)

renaming matches vanilla naming convention
---
 .../dungeons/jabujabus_belly.cpp              | 22 +++++++++----------
 .../Enhancements/randomizer/randomizerTypes.h |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/soh/soh/Enhancements/randomizer/location_access/dungeons/jabujabus_belly.cpp b/soh/soh/Enhancements/randomizer/location_access/dungeons/jabujabus_belly.cpp
index 4532bf3ea..71dd5ed2f 100644
--- a/soh/soh/Enhancements/randomizer/location_access/dungeons/jabujabus_belly.cpp
+++ b/soh/soh/Enhancements/randomizer/location_access/dungeons/jabujabus_belly.cpp
@@ -499,7 +499,7 @@ void RegionTable_Init_JabuJabusBelly() {
         Entrance(RR_JABU_JABUS_BELLY_MQ_ABOVE_LIFT_ROOM, []{return logic->CanUse(RG_BOOMERANG) && logic->CanUse(RG_FAIRY_SLINGSHOT);}),
     });
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_ABOVE_LIFT_ROOM] = Region("Jabu Jabus Belly MQ Cubes Room", SCENE_JABU_JABU, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_ABOVE_LIFT_ROOM] = Region("Jabu Jabus Belly MQ Above Lift Room", SCENE_JABU_JABU, {
         //Events
         EventAccess(LOGIC_JABU_LOWERED_PATH, []{return true;}),
     }, {}, {
@@ -513,19 +513,19 @@ void RegionTable_Init_JabuJabusBelly() {
         LOCATION(RC_JABU_JABUS_BELLY_MQ_SECOND_ROOM_UPPER_CHEST, logic->Get(LOGIC_JABU_MQ_LIFT_ROOM_COW)),
     }, {
         //Exits
-        Entrance(RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM,    []{return true;}),
-        Entrance(RR_JABU_JABUS_BELLY_MQ_TO_EAST_ROOM, []{return true;}),
+        Entrance(RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM,         []{return true;}),
+        Entrance(RR_JABU_JABUS_BELLY_MQ_TO_NEAR_BOSS_ROOM, []{return true;}),
     });
 
     // this handles spawning in tentacle
-    areaTable[RR_JABU_JABUS_BELLY_MQ_TO_EAST_ROOM] = Region("Jabu Jabus Belly To East Room", SCENE_JABU_JABU, {}, {}, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_TO_NEAR_BOSS_ROOM] = Region("Jabu Jabus Belly MQ To Near Boss Room", SCENE_JABU_JABU, {}, {}, {
         //Exits
-        Entrance(RR_JABU_JABUS_BELLY_FORKED_CORRIDOR, []{return logic->Get(LOGIC_JABU_NORTH_TENTACLE) || logic->TakeDamage();}),
-        Entrance(RR_JABU_JABUS_BELLY_FORK_NORTH_WEST, []{return logic->Get(LOGIC_JABU_NORTH_TENTACLE);}),
+        Entrance(RR_JABU_JABUS_BELLY_MQ_LIFT_ROOM_EAST_LEDGE, []{return logic->Get(LOGIC_JABU_NORTH_TENTACLE) || logic->TakeDamage();}),
+        Entrance(RR_JABU_JABUS_BELLY_MQ_NEAR_BOSS_ROOM,       []{return logic->Get(LOGIC_JABU_NORTH_TENTACLE);}),
     });
 
 
-    areaTable[RR_JABU_JABUS_BELLY_MQ_EAST_ROOM] = Region("Jabu Jabus Belly MQ Boss Region", SCENE_JABU_JABU, {
+    areaTable[RR_JABU_JABUS_BELLY_MQ_NEAR_BOSS_ROOM] = Region("Jabu Jabus Belly MQ Near Boss Room", SCENE_JABU_JABU, {
         //Events
         EventAccess(LOGIC_FAIRY_ACCESS, []{return logic->CanBreakPots();}),
     }, {
@@ -537,8 +537,8 @@ void RegionTable_Init_JabuJabusBelly() {
         LOCATION(RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_GRASS_2, logic->CanCutShrubs()),
     }, {
         //Exits
-        Entrance(RR_JABU_JABUS_BELLY_MQ_TO_EAST_ROOM, []{return true;}),
-        Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY,   []{return AnyAgeTime([]{return logic->CanUse(RG_FAIRY_SLINGSHOT);});}),
+        Entrance(RR_JABU_JABUS_BELLY_MQ_TO_NEAR_BOSS_ROOM, []{return true;}),
+        Entrance(RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY,        []{return AnyAgeTime([]{return logic->CanUse(RG_FAIRY_SLINGSHOT);});}),
     });
 
 #pragma endregion
@@ -551,8 +551,8 @@ void RegionTable_Init_JabuJabusBelly() {
 
     areaTable[RR_JABU_JABUS_BELLY_BOSS_EXIT] = Region("Jabu Jabus Belly Boss Exit", SCENE_JABU_JABU, {}, {}, {
         //Exits
-        Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM, []{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla();}),
-        Entrance(RR_JABU_JABUS_BELLY_MQ_EAST_ROOM,   []{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsMQ();}),
+        Entrance(RR_JABU_JABUS_BELLY_NEAR_BOSS_ROOM,    []{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsVanilla();}),
+        Entrance(RR_JABU_JABUS_BELLY_MQ_NEAR_BOSS_ROOM, []{return ctx->GetDungeon(JABU_JABUS_BELLY)->IsMQ();}),
     });
 
     areaTable[RR_JABU_JABUS_BELLY_BOSS_ROOM] = Region("Jabu Jabus Belly Boss Room", SCENE_JABU_JABU_BOSS, {
diff --git a/soh/soh/Enhancements/randomizer/randomizerTypes.h b/soh/soh/Enhancements/randomizer/randomizerTypes.h
index 06fba0c4f..2e27b69e7 100644
--- a/soh/soh/Enhancements/randomizer/randomizerTypes.h
+++ b/soh/soh/Enhancements/randomizer/randomizerTypes.h
@@ -843,8 +843,8 @@ typedef enum {
     RR_JABU_JABUS_BELLY_MQ_ABOVE_BIGOCTO,
     RR_JABU_JABUS_BELLY_MQ_JIGGLIES_ROOM,
     RR_JABU_JABUS_BELLY_MQ_ABOVE_LIFT_ROOM,
-    RR_JABU_JABUS_BELLY_MQ_TO_EAST_ROOM,
-    RR_JABU_JABUS_BELLY_MQ_EAST_ROOM,
+    RR_JABU_JABUS_BELLY_MQ_TO_NEAR_BOSS_ROOM,
+    RR_JABU_JABUS_BELLY_MQ_NEAR_BOSS_ROOM,
 
     RR_JABU_JABUS_BELLY_BOSS_ENTRYWAY,
     RR_JABU_JABUS_BELLY_BOSS_EXIT,