diff --git a/levels/bbh/areas/1/geo.inc.c b/levels/bbh/areas/1/geo.inc.c
index 3d744724..feff1490 100644
--- a/levels/bbh/areas/1/geo.inc.c
+++ b/levels/bbh/areas/1/geo.inc.c
@@ -481,41 +481,38 @@ const GeoLayout geo_bbh_000F00[] = {
          GEO_OPEN_NODE(),
             GEO_CAMERA(4, 0, 2000, 6000, 0, 0, 0, geo_camera_main),
             GEO_OPEN_NODE(),
-               GEO_SWITCH_CASE(32, geo_switch_area),
-               GEO_OPEN_NODE(),
-                  GEO_BRANCH(1, geo_bbh_000670), // 0x0E000670
-                  GEO_BRANCH(1, geo_bbh_0006B0), // 0x0E0006B0
-                  GEO_BRANCH(1, geo_bbh_0006E8), // 0x0E0006E8
-                  GEO_BRANCH(1, geo_bbh_000730), // 0x0E000730
-                  GEO_BRANCH(1, geo_bbh_000750), // 0x0E000750
-                  GEO_BRANCH(1, geo_bbh_000768), // 0x0E000768
-                  GEO_BRANCH(1, geo_bbh_0007B0), // 0x0E0007B0
-                  GEO_BRANCH(1, geo_bbh_0007D0), // 0x0E0007D0
-                  GEO_BRANCH(1, geo_bbh_000800), // 0x0E000800
-                  GEO_BRANCH(1, geo_bbh_000828), // 0x0E000828
-                  GEO_BRANCH(1, geo_bbh_000860), // 0x0E000860
-                  GEO_BRANCH(1, geo_bbh_000888), // 0x0E000888
-                  GEO_BRANCH(1, geo_bbh_0008B0), // 0x0E0008B0
-                  GEO_BRANCH(1, geo_bbh_0008E8), // 0x0E0008E8
-                  GEO_BRANCH(1, geo_bbh_000950), // 0x0E000950
-                  GEO_BRANCH(1, geo_bbh_0009C8), // 0x0E0009C8
-                  GEO_BRANCH(1, geo_bbh_000A18), // 0x0E000A18
-                  GEO_BRANCH(1, geo_bbh_000A60), // 0x0E000A60
-                  GEO_BRANCH(1, geo_bbh_000AD8), // 0x0E000AD8
-                  GEO_BRANCH(1, geo_bbh_000B28), // 0x0E000B28
-                  GEO_BRANCH(1, geo_bbh_000B88), // 0x0E000B88
-                  GEO_BRANCH(1, geo_bbh_000BF0), // 0x0E000BF0
-                  GEO_BRANCH(1, geo_bbh_000C38), // 0x0E000C38
-                  GEO_BRANCH(1, geo_bbh_000C88), // 0x0E000C88
-                  GEO_BRANCH(1, geo_bbh_000CE8), // 0x0E000CE8
-                  GEO_BRANCH(1, geo_bbh_000D20), // 0x0E000D20
-                  GEO_BRANCH(1, geo_bbh_000D68), // 0x0E000D68
-                  GEO_BRANCH(1, geo_bbh_000DB0), // 0x0E000DB0
-                  GEO_BRANCH(1, geo_bbh_000DF0), // 0x0E000DF0
-                  GEO_BRANCH(1, geo_bbh_000E40), // 0x0E000E40
-                  GEO_BRANCH(1, geo_bbh_000E80), // 0x0E000E80
-                  GEO_BRANCH(1, geo_bbh_000EB0), // 0x0E000EB0
-               GEO_CLOSE_NODE(),
+               GEO_BRANCH(1, geo_bbh_000670), // 0x0E000670
+               GEO_BRANCH(1, geo_bbh_0006B0), // 0x0E0006B0
+               GEO_BRANCH(1, geo_bbh_0006E8), // 0x0E0006E8
+               GEO_BRANCH(1, geo_bbh_000730), // 0x0E000730
+               GEO_BRANCH(1, geo_bbh_000750), // 0x0E000750
+               GEO_BRANCH(1, geo_bbh_000768), // 0x0E000768
+               GEO_BRANCH(1, geo_bbh_0007B0), // 0x0E0007B0
+               GEO_BRANCH(1, geo_bbh_0007D0), // 0x0E0007D0
+               GEO_BRANCH(1, geo_bbh_000800), // 0x0E000800
+               GEO_BRANCH(1, geo_bbh_000828), // 0x0E000828
+               GEO_BRANCH(1, geo_bbh_000860), // 0x0E000860
+               GEO_BRANCH(1, geo_bbh_000888), // 0x0E000888
+               GEO_BRANCH(1, geo_bbh_0008B0), // 0x0E0008B0
+               GEO_BRANCH(1, geo_bbh_0008E8), // 0x0E0008E8
+               GEO_BRANCH(1, geo_bbh_000950), // 0x0E000950
+               GEO_BRANCH(1, geo_bbh_0009C8), // 0x0E0009C8
+               GEO_BRANCH(1, geo_bbh_000A18), // 0x0E000A18
+               GEO_BRANCH(1, geo_bbh_000A60), // 0x0E000A60
+               GEO_BRANCH(1, geo_bbh_000AD8), // 0x0E000AD8
+               GEO_BRANCH(1, geo_bbh_000B28), // 0x0E000B28
+               GEO_BRANCH(1, geo_bbh_000B88), // 0x0E000B88
+               GEO_BRANCH(1, geo_bbh_000BF0), // 0x0E000BF0
+               GEO_BRANCH(1, geo_bbh_000C38), // 0x0E000C38
+               GEO_BRANCH(1, geo_bbh_000C88), // 0x0E000C88
+               GEO_BRANCH(1, geo_bbh_000CE8), // 0x0E000CE8
+               GEO_BRANCH(1, geo_bbh_000D20), // 0x0E000D20
+               GEO_BRANCH(1, geo_bbh_000D68), // 0x0E000D68
+               GEO_BRANCH(1, geo_bbh_000DB0), // 0x0E000DB0
+               GEO_BRANCH(1, geo_bbh_000DF0), // 0x0E000DF0
+               GEO_BRANCH(1, geo_bbh_000E40), // 0x0E000E40
+               GEO_BRANCH(1, geo_bbh_000E80), // 0x0E000E80
+               GEO_BRANCH(1, geo_bbh_000EB0), // 0x0E000EB0
                GEO_RENDER_OBJ(),
                GEO_ASM(0, geo_envfx_main),
             GEO_CLOSE_NODE(),
diff --git a/levels/castle_inside/areas/2/geo.inc.c b/levels/castle_inside/areas/2/geo.inc.c
index 9071800a..e8681ed2 100644
--- a/levels/castle_inside/areas/2/geo.inc.c
+++ b/levels/castle_inside/areas/2/geo.inc.c
@@ -176,20 +176,17 @@ const GeoLayout castle_geo_001858[] = {
          GEO_OPEN_NODE(),
             GEO_CAMERA(4, 0, 2000, 6000, 0, 0, 0, geo_camera_main),
             GEO_OPEN_NODE(),
-               GEO_SWITCH_CASE(11, geo_switch_area),
-               GEO_OPEN_NODE(),
-                  GEO_BRANCH(1, castle_geo_001560), // 0x0E001560
-                  GEO_BRANCH(1, castle_geo_001578), // 0x0E001578
-                  GEO_BRANCH(1, castle_geo_0015B8), // 0x0E0015B8
-                  GEO_BRANCH(1, castle_geo_0015F8), // 0x0E0015F8
-                  GEO_BRANCH(1, castle_geo_001628), // 0x0E001628
-                  GEO_BRANCH(1, castle_geo_001668), // 0x0E001668
-                  GEO_BRANCH(1, castle_geo_001690), // 0x0E001690
-                  GEO_BRANCH(1, castle_geo_0016D8), // 0x0E0016D8
-                  GEO_BRANCH(1, castle_geo_001740), // 0x0E001740
-                  GEO_BRANCH(1, castle_geo_001798), // 0x0E001798
-                  GEO_BRANCH(1, castle_geo_001800), // 0x0E001800
-               GEO_CLOSE_NODE(),
+               GEO_BRANCH(1, castle_geo_001560), // 0x0E001560
+               GEO_BRANCH(1, castle_geo_001578), // 0x0E001578
+               GEO_BRANCH(1, castle_geo_0015B8), // 0x0E0015B8
+               GEO_BRANCH(1, castle_geo_0015F8), // 0x0E0015F8
+               GEO_BRANCH(1, castle_geo_001628), // 0x0E001628
+               GEO_BRANCH(1, castle_geo_001668), // 0x0E001668
+               GEO_BRANCH(1, castle_geo_001690), // 0x0E001690
+               GEO_BRANCH(1, castle_geo_0016D8), // 0x0E0016D8
+               GEO_BRANCH(1, castle_geo_001740), // 0x0E001740
+               GEO_BRANCH(1, castle_geo_001798), // 0x0E001798
+               GEO_BRANCH(1, castle_geo_001800), // 0x0E001800
                GEO_RENDER_OBJ(),
                GEO_ASM(0, geo_envfx_main),
             GEO_CLOSE_NODE(),
diff --git a/levels/castle_inside/areas/3/geo.inc.c b/levels/castle_inside/areas/3/geo.inc.c
index ba9e0281..4bb63616 100644
--- a/levels/castle_inside/areas/3/geo.inc.c
+++ b/levels/castle_inside/areas/3/geo.inc.c
@@ -162,19 +162,16 @@ const GeoLayout castle_geo_001C10[] = {
          GEO_OPEN_NODE(),
             GEO_CAMERA(4, 0, 2000, 6000, 0, 0, 0, geo_camera_main),
             GEO_OPEN_NODE(),
-               GEO_SWITCH_CASE(10, geo_switch_area),
-               GEO_OPEN_NODE(),
-                  GEO_BRANCH(1, castle_geo_001958), // 0x0E001958
-                  GEO_BRANCH(1, castle_geo_001980), // 0x0E001980
-                  GEO_BRANCH(1, castle_geo_0019C8), // 0x0E0019C8
-                  GEO_BRANCH(1, castle_geo_0019F8), // 0x0E0019F8
-                  GEO_BRANCH(1, castle_geo_001A30), // 0x0E001A30
-                  GEO_BRANCH(1, castle_geo_001A58), // 0x0E001A58
-                  GEO_BRANCH(1, castle_geo_001AB8), // 0x0E001AB8
-                  GEO_BRANCH(1, castle_geo_001AF8), // 0x0E001AF8
-                  GEO_BRANCH(1, castle_geo_001B48), // 0x0E001B48
-                  GEO_BRANCH(1, castle_geo_001BB0), // 0x0E001BB0
-               GEO_CLOSE_NODE(),
+               GEO_BRANCH(1, castle_geo_001958), // 0x0E001958
+               GEO_BRANCH(1, castle_geo_001980), // 0x0E001980
+               GEO_BRANCH(1, castle_geo_0019C8), // 0x0E0019C8
+               GEO_BRANCH(1, castle_geo_0019F8), // 0x0E0019F8
+               GEO_BRANCH(1, castle_geo_001A30), // 0x0E001A30
+               GEO_BRANCH(1, castle_geo_001A58), // 0x0E001A58
+               GEO_BRANCH(1, castle_geo_001AB8), // 0x0E001AB8
+               GEO_BRANCH(1, castle_geo_001AF8), // 0x0E001AF8
+               GEO_BRANCH(1, castle_geo_001B48), // 0x0E001B48
+               GEO_BRANCH(1, castle_geo_001BB0), // 0x0E001BB0
                GEO_RENDER_OBJ(),
                GEO_ASM(0, geo_envfx_main),
             GEO_CLOSE_NODE(),
diff --git a/levels/hmc/areas/1/geo.inc.c b/levels/hmc/areas/1/geo.inc.c
index 082db126..61e8aabe 100644
--- a/levels/hmc/areas/1/geo.inc.c
+++ b/levels/hmc/areas/1/geo.inc.c
@@ -304,27 +304,24 @@ const GeoLayout hmc_geo_000B90[] = {
          GEO_OPEN_NODE(),
             GEO_CAMERA(16, 0, 2000, 6000, 0, 0, 0, geo_camera_main),
             GEO_OPEN_NODE(),
-               GEO_SWITCH_CASE(18, geo_switch_area),
-               GEO_OPEN_NODE(),
-                  GEO_BRANCH(1, hmc_geo_0005E8), // 0x0E0005E8
-                  GEO_BRANCH(1, hmc_geo_000618), // 0x0E000618
-                  GEO_BRANCH(1, hmc_geo_000658), // 0x0E000658
-                  GEO_BRANCH(1, hmc_geo_0006A8), // 0x0E0006A8
-                  GEO_BRANCH(1, hmc_geo_0006E0), // 0x0E0006E0
-                  GEO_BRANCH(1, hmc_geo_000700), // 0x0E000700
-                  GEO_BRANCH(1, hmc_geo_000748), // 0x0E000748
-                  GEO_BRANCH(1, hmc_geo_000770), // 0x0E000770
-                  GEO_BRANCH(1, hmc_geo_000798), // 0x0E000798
-                  GEO_BRANCH(1, hmc_geo_0007F8), // 0x0E0007F8
-                  GEO_BRANCH(1, hmc_geo_000850), // 0x0E000850
-                  GEO_BRANCH(1, hmc_geo_0008D0), // 0x0E0008D0
-                  GEO_BRANCH(1, hmc_geo_000938), // 0x0E000938
-                  GEO_BRANCH(1, hmc_geo_000998), // 0x0E000998
-                  GEO_BRANCH(1, hmc_geo_000A18), // 0x0E000A18
-                  GEO_BRANCH(1, hmc_geo_000A88), // 0x0E000A88
-                  GEO_BRANCH(1, hmc_geo_000AE8), // 0x0E000AE8
-                  GEO_BRANCH(1, hmc_geo_000B48), // 0x0E000B48
-               GEO_CLOSE_NODE(),
+               GEO_BRANCH(1, hmc_geo_0005E8), // 0x0E0005E8
+               GEO_BRANCH(1, hmc_geo_000618), // 0x0E000618
+               GEO_BRANCH(1, hmc_geo_000658), // 0x0E000658
+               GEO_BRANCH(1, hmc_geo_0006A8), // 0x0E0006A8
+               GEO_BRANCH(1, hmc_geo_0006E0), // 0x0E0006E0
+               GEO_BRANCH(1, hmc_geo_000700), // 0x0E000700
+               GEO_BRANCH(1, hmc_geo_000748), // 0x0E000748
+               GEO_BRANCH(1, hmc_geo_000770), // 0x0E000770
+               GEO_BRANCH(1, hmc_geo_000798), // 0x0E000798
+               GEO_BRANCH(1, hmc_geo_0007F8), // 0x0E0007F8
+               GEO_BRANCH(1, hmc_geo_000850), // 0x0E000850
+               GEO_BRANCH(1, hmc_geo_0008D0), // 0x0E0008D0
+               GEO_BRANCH(1, hmc_geo_000938), // 0x0E000938
+               GEO_BRANCH(1, hmc_geo_000998), // 0x0E000998
+               GEO_BRANCH(1, hmc_geo_000A18), // 0x0E000A18
+               GEO_BRANCH(1, hmc_geo_000A88), // 0x0E000A88
+               GEO_BRANCH(1, hmc_geo_000AE8), // 0x0E000AE8
+               GEO_BRANCH(1, hmc_geo_000B48), // 0x0E000B48
                GEO_RENDER_OBJ(),
                GEO_ASM(0, geo_envfx_main),
             GEO_CLOSE_NODE(),