Merge pull request #106 from nanaian/area-table-neo

Match gAreas

Makefile

@@ -132,12 +132,12 @@ $(BUILD_DIR)/%.Yay0.o: $(BUILD_DIR)/%.bin.Yay0
 # Compile C files
 $(BUILD_DIR)/%.c.o: %.c $(MDEPS)
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $(CPPMFLAGS) $< | iconv --from UTF-8 --to SHIFT-JIS | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Compile C files (with DSL macros)
 $(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS) tools/compile_dsl_macros.py
 	@mkdir -p $(shell dirname $@)
-	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(PYTHON) tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
+	$(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(PYTHON) tools/compile_dsl_macros.py | iconv --from UTF-8 --to SHIFT-JIS | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ -
 
 # Assemble handwritten ASM
 $(BUILD_DIR)/%.s.o: %.s

asm/nonmatchings/code_341d0_len_20d0/load_map_by_IDs.s

@@ -99,7 +99,7 @@ glabel load_map_by_IDs
 /* 35C60 8005A860 0C01BB50 */  jal       strcpy
 /* 35C64 8005A864 00000000 */   nop
 .L8005A868:
-/* 35C68 8005A868 0C0169B0 */  jal       load_map_script_lib
+/* 35C68 8005A868 0C0169B0 */  jal       load_world_script_api
 /* 35C6C 8005A86C 00000000 */   nop
 /* 35C70 8005A870 8E440008 */  lw        $a0, 8($s2)
 /* 35C74 8005A874 10800004 */  beqz      $a0, .L8005A888

asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s

@@ -106,7 +106,7 @@ glabel func_80033BC0
 /* F150 80033D50 2442F290 */  addiu     $v0, $v0, %lo(gPlayerData)
 /* F154 80033D54 0C03AC80 */  jal       func_800EB200
 /* F158 80033D58 80440012 */   lb       $a0, 0x12($v0)
-/* F15C 80033D5C 0C0169B0 */  jal       load_map_script_lib
+/* F15C 80033D5C 0C0169B0 */  jal       load_world_script_api
 /* F160 80033D60 00000000 */   nop
 /* F164 80033D64 3C04800E */  lui       $a0, 0x800e
 /* F168 80033D68 24849230 */  addiu     $a0, $a0, -0x6dd0

asm/nonmatchings/code_f270_len_1190/func_80034C3C.s

@@ -119,7 +119,7 @@ glabel func_80034C3C
 /* 101F8 80034DF8 00000000 */   nop
 /* 101FC 80034DFC 0C052B1C */  jal       func_8014AC70
 /* 10200 80034E00 00000000 */   nop
-/* 10204 80034E04 0C0169B0 */  jal       load_map_script_lib
+/* 10204 80034E04 0C0169B0 */  jal       load_world_script_api
 /* 10208 80034E08 00000000 */   nop
 /* 1020C 80034E0C 3C04800E */  lui       $a0, 0x800e
 /* 10210 80034E10 24849230 */  addiu     $a0, $a0, -0x6dd0

include/functions.h

@@ -9,6 +9,7 @@ void osCleanupThread(void);
 
 s32 heap_malloc(s32 size);
 HeapNode* _heap_create(void* addr, s32 size);
+void dma_copy(void* romStart, void* romEnd, void* vramDest);
 
 s32 get_global_byte(s32 index);
 s32 get_global_flag(s32 index);

include/map.h

@@ -33,6 +33,8 @@ typedef struct MapConfig {
     } tattle;
 } MapConfig; // size = 0x40
 
+typedef s32 MapInit(void);
+
 #define MAP_ID_MAX_LEN 7 ///< "xxx_yyy" excluding null terminator.
 typedef struct Map {
     /* 0x00 */ char* id; ///< @see MAP_ID_MAX_LEN
@@ -41,10 +43,10 @@ typedef struct Map {
     /* 0x0C */ void* dmaEnd;
     /* 0x10 */ void* dmaDest;
     /* 0x14 */ char* bgName;
-    /* 0x18 */ s32(*init)(void);  ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading.
+    /* 0x18 */ MapInit* init; ///< Return TRUE to skip normal asset (shape/hit/bg/tex) loading.
-    /* 0x1C */ s16 flags1;
+    /* 0x1C */ s16 unk_1C; // Unused?
-    /* 0x1E */ s8 flags2;
+    /* 0x1E */ s8 songVariation; ///< 0 or 1. @see get_song_variation_override_for_cur_map
-    /* 0x1F */ s8 flags3;
+    /* 0x1F */ s8 flags;
 } Map; // size = 0x20
 
 typedef struct Area {
@@ -246,9 +248,9 @@ typedef struct {
 Enemy* get_enemy(NpcId npcId);
 
 /// Zero-terminated.
-extern Area gAreas[];
+Area gAreas[29];
 
-/// Lists the songs that are forced to use the variation determined by `map.flags2 & 1`.
+/// Lists the songs that are forced to use the variation determined by `map.songVariation & 1`.
 /// @see get_song_variation_override_for_cur_map
 extern SongID gSongsUsingVariationFlag[6];
 

include/variables.h

@@ -154,10 +154,6 @@ extern s32 D_8009A5D8;
 extern u8 D_800779B0;
 extern u8 D_800A0963;
 
-extern s32 mapScriptLibStart;
-extern s32 mapScriptLibEnd;
-extern s32 mapScriptLibVram;
-
 // Scripts
 extern Bytecode* SCRIPT_NpcDefeat;
 extern Bytecode* ShakeCam1;

src/code_341d0_len_20d0.c

@@ -1,59 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058DD0);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058E84);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058F88);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059008);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005904C);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059310);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_800598A0);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059AB8);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059BD4);
-
-void func_80059C80(void) {
-}
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C88);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C9C);
-
-void func_80059D48(void) {
-}
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D50);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", render_effects);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059F94);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005A2BC);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_effect);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_all_effects);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", play_effect);
-
-void load_map_script_lib(void) {
-    dma_copy(&mapScriptLibStart, &mapScriptLibEnd, &mapScriptLibVram);
-}
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_by_IDs);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_config);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_header);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", get_map_IDs_by_name);
-
-INCLUDE_ASM(void*, "code_341d0_len_20d0", load_asset_by_name, char* name, s32* decompressedSize);
-
-INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset);

src/code_42e0_len_1f60.c

@@ -53,7 +53,7 @@ void copy_matrix(Matrix4f* src, Matrix4f* dest) {
     bcopy(src, dest, sizeof(Matrix4f));
 }
 
-INCLUDE_ASM(s32, "code_42e0_len_1f60", dma_copy);
+INCLUDE_ASM(void, "code_42e0_len_1f60", dma_copy, void* romStart, void* romEnd, void* vramDest);
 
 INCLUDE_ASM(s32, "code_42e0_len_1f60", func_800297D4);
 

src/code_e0b30_len_b80.c

@@ -4,7 +4,7 @@
 void transition_music_volume_to(s16 volume);
 
 /// If the given song ID is present in gSongsUsingVariationFlag, returns the current
-/// map's `flags2 & 1` value. Otherwise, returns -1.
+/// map's `songVariation & 1` value. Otherwise, returns -1.
 ///
 /// @see gSongsUsingVariationFlag
 /// @returns -1: no override; 0: override to variation 0; 1 override to variation 1
@@ -17,7 +17,7 @@ s32 get_song_variation_override_for_cur_map(SongID songID) {
         if (allowed[i] == songID) {
             Map* map = &areas[GAME_STATUS->areaID].maps[GAME_STATUS->mapID];
 
-            return map->flags2 & 1;
+            return map->songVariation & 1;
         }
     }
 

src/world/area_kmr/kmr_12/kmr_12.h

@@ -8,6 +8,8 @@
 #define GetGoomba M(GetGoomba)
 ApiStatus GetGoomba(ScriptInstance* script, s32 isInitialCall);
 
+MapConfig M(config);
+
 Script M(Main);
 Script M(PlayMusic);
 Script M(MakeEntities);

src/world/world.c

@@ -0,0 +1,661 @@
+#include "common.h"
+#include "ld_addrs.h"
+#include "map.h"
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058DD0);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058E84);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80058F88);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059008);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005904C);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059310);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_800598A0);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059AB8);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059BD4);
+
+void func_80059C80(void) {
+}
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C88);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059C9C);
+
+void func_80059D48(void) {
+}
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059D50);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", render_effects);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_80059F94);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", func_8005A2BC);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_effect);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", remove_all_effects);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", play_effect);
+
+void load_world_script_api(void) {
+    dma_copy(&world_script_api_ROM_START, &world_script_api_ROM_END, &world_script_api_VRAM);
+}
+
+// TODO
+static const s32 rodata_73DA0[] = {
+    0x82C882B5, 0x00000000, 0x82A982AD, 0x82B982A2,
+    0x00000000, 0x82B982C1, 0x82AB82E5, 0x82A40000,
+    0x82DE82C9, 0x82E182DE, 0x82C982E1, 0x00000000,
+    0x82D082C6, 0x82E882DA, 0x82AF0000, 0x83748340,
+    0x83438369, 0x838B837B, 0x83808377, 0x83430000,
+    0x83748340, 0x83438369, 0x838B834E, 0x838A8357,
+    0x83430000, 0X82C282A4, 0x82B682E5, 0x82A40000,
+
+    // These string literals belong to load_map_by_IDs
+    0x25735F73, 0x68617065, 0x00000000, // "%_shape"
+    0x25735F68, 0x69740000, // "%s_hit"
+    0x25735F74, 0x65780000, // "%s_tex"
+};
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", load_map_by_IDs);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_config);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", get_current_map_header);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", get_map_IDs_by_name);
+
+INCLUDE_ASM(void*, "code_341d0_len_20d0", load_asset_by_name, char* name, s32* decompressedSize);
+
+INCLUDE_ASM(s32, "code_341d0_len_20d0", get_asset_offset);
+
+#define AREA(area, jp_name) { ARRAY_COUNT(area##_maps), area##_maps, "area_" #area, jp_name }
+
+#define MAP(map) \
+    .id = #map, \
+    .config = &map##_config, \
+    .dmaStart = &code_##map##_ROM_START, \
+    .dmaEnd = &code_##map##_ROM_END, \
+    .dmaDest = &code_##map##_VRAM \
+
+// Should be removed once the data section containing .init and .config of all maps have been disassembled
+#define MAP_UNSPLIT(map, configVRAM) \
+    .id = #map, \
+    .config = (MapConfig*)(configVRAM), \
+    .dmaStart = &code_##map##_ROM_START, \
+    .dmaEnd = &code_##map##_ROM_END, \
+    .dmaDest = &code_##map##_VRAM \
+
+/// Toad Town
+static Map mac_maps[] = {
+    { MAP_UNSPLIT(machi,  0x802407A0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_00, 0x80243BE0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_01, 0x80246730), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_02, 0x80243580), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_03, 0x802428B0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_04, 0x80242080), .bgName = "nok_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(mac_05, 0x802441A0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mac_06, 0x802416A0), .bgName = "nok_bg" },
+};
+
+/// Toad Town Tunnels
+static Map tik_maps[] = {
+    { MAP_UNSPLIT(tik_01, 0x80240AE0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_02, 0x802409B0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_03, 0x80240B00), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_04, 0x80240CB0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_05, 0x80240A90), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_06, 0x802409A0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_07, 0x80242920), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_08, 0x80240B10), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_09, 0x802412D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_10, 0x802413D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_12, 0x80242260), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_14, 0x80240980), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_15, 0x80240B30), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_17, 0x80241380), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_18, 0x802406D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_19, 0x80241340), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_20, 0x80241170), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_21, 0x80240990), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_22, 0x802409D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_23, 0x80241160), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(tik_24, 0x80240ED0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(tik_25, 0x802407D0), .songVariation = 1, .flags = 2 },
+};
+
+/// Inside the Whale
+static Map kgr_maps[] = {
+    { MAP_UNSPLIT(kgr_01, 0x80240540), .flags = 1 },
+    { MAP_UNSPLIT(kgr_02, 0x80240790), .flags = 1 },
+};
+
+/// Goomba Region
+MapConfig kmr_12_config;
+static Map kmr_maps[] = {
+    { MAP_UNSPLIT(kmr_00, 0x80240D80), .bgName = "kmr_bg", .flags = 1 },
+    { MAP_UNSPLIT(kmr_02, 0x80243AF0), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_03, 0x80240680), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_04, 0x80240520), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_05, 0x802417A0), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_06, 0x80241DC0), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_07, 0x80240B70), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_09, 0x80241550), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_10, 0x80240640), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_11, 0x80241180), .bgName = "kmr_bg" },
+    { MAP(kmr_12), .bgName = "kmr_bg" },
+    { MAP_UNSPLIT(kmr_20, 0x80242C00), .bgName = "kmr_bg" }, // Mario's House
+    { MAP_UNSPLIT(kmr_21, 0x802402F0), .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kmr_22, 0x80240DA0), .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kmr_23, 0x80241150), .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kmr_24, 0x80240120), .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kmr_30, 0x802404F0) },
+};
+
+/// Mt. Rugged
+static Map iwa_maps[] = {
+    { MAP_UNSPLIT(iwa_00, 0x80240310), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_01, 0x80243320), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_02, 0x80241140), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_03, 0x80241360), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_04, 0x80241100), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_10, 0x80241810), .bgName = "iwa_bg" },
+    { MAP_UNSPLIT(iwa_11, 0x80240330), .bgName = "iwa_bg" },
+};
+
+/// Dry Dry Outpost
+static Map dro_maps[] = {
+    { MAP_UNSPLIT(dro_01, 0x80243B70), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(dro_02, 0x80243AB0), .bgName = "sbk_bg" },
+};
+
+/// Dry Dry Desert
+static Map sbk_maps[] = {
+    { MAP_UNSPLIT(sbk_00, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_01, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_02, 0x80240C80), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_03, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_04, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_05, 0x802400B0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_06, 0x802403C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_10, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_11, 0x802401A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_12, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_13, 0x802401A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_14, 0x80240090), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_15, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_16, 0x802402C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_20, 0x80240180), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_21, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_22, 0x802401A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_23, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_24, 0x802403D0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_25, 0x802403C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_26, 0x802403E0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_30, 0x80241870), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_31, 0x80240180), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_32, 0x802401B0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_33, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_34, 0x80240A20), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_35, 0x802403C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_36, 0x802402C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_40, 0x80240180), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_41, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_42, 0x80240180), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_43, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_44, 0x802401A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_45, 0x80240090), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_46, 0x802403E0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_50, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_51, 0x802401A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_52, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_53, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_54, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_55, 0x802402E0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_56, 0x80241040), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_60, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_61, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_62, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_63, 0x802400A0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_64, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_65, 0x80240080), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_66, 0x802403C0), .bgName = "sbk_bg" },
+    { MAP_UNSPLIT(sbk_99, 0x80240020), .bgName = "sbk_bg" },
+};
+
+/// Dry Dry Ruins
+static Map isk_maps[] = {
+    { MAP_UNSPLIT(isk_01, 0x80240020), .bgName = "sbk3_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_02, 0x80240140), .bgName = "sbk3_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_03, 0x80240030), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_04, 0x80240AD0), .bgName = "sbk3_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_05, 0x80241ED0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_06, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_07, 0x80240130), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_08, 0x80240930), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_09, 0x80240340), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_10, 0x80240DE0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_11, 0x802401A0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_12, 0x80240040), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_13, 0x80242080), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_14, 0x80241D70), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_16, 0x80240B20), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_18, 0x80240910), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(isk_19, 0x80240020), .songVariation = 1, .flags = 2 },
+};
+
+/// Koopa Bros. Fortress
+static Map trd_maps[] = {
+    { MAP_UNSPLIT(trd_00, 0x80240690), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(trd_01, 0x80241700), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_02, 0x80241AA0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_03, 0x80240A40), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_04, 0x80243900), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_05, 0x802407B0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_06, 0x80240D60), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_07, 0x80242910), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_08, 0x80240A30), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(trd_09, 0x80240200), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(trd_10, 0x80240870), .songVariation = 1, .flags = 3 },
+};
+
+/// Koopa Region
+static Map nok_maps[] = {
+    { MAP_UNSPLIT(nok_01, 0x80242B90), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_02, 0x802445F0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_03, 0x80240E40), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_04, 0x80240F40), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_11, 0x80241F70), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_12, 0x80242100), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_13, 0x802414C0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_14, 0x80242440), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(nok_15, 0x802427D0), .bgName = "nok_bg" },
+};
+
+/// Star Region
+static Map hos_maps[] = {
+    { MAP_UNSPLIT(hos_00, 0x80240D50), .bgName = "nok_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(hos_01, 0x80240E40), .bgName = "hos_bg" },
+    { MAP_UNSPLIT(hos_02, 0x80242B90), .bgName = "hos_bg" },
+    { MAP_UNSPLIT(hos_03, 0x802435F0), .bgName = "hos_bg" },
+    { MAP_UNSPLIT(hos_04, 0x80240EE0), .bgName = "hos_bg" },
+    { MAP_UNSPLIT(hos_05, 0x80245910), .bgName = "hos_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(hos_06, 0x80242570), .bgName = "hos_bg" },
+    { MAP_UNSPLIT(hos_10, 0x80240CE0), .bgName = "hos_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(hos_20, 0x80240390), .bgName = "hos_bg" },
+};
+
+/// Bowser's Castle
+static Map kpa_maps[] = {
+    { MAP_UNSPLIT(kpa_01,  0x80240A70), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_03,  0x80241EE0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_04,  0x80240190), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_08,  0x802414C0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_09,  0x80241310), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_10,  0x80240360), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_11,  0x80240B40), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_12,  0x802404A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_13,  0x802404A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_14,  0x802408A0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_15,  0x802405E0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_16,  0x802403B0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_17,  0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_32,  0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_33,  0x80240350), .bgName = "kpa_bg", .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_40,  0x80240040), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_41,  0x80240040), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_50,  0x80241A40), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_51,  0x80241C40), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_52,  0x80241360), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_53,  0x80240190), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_60,  0x80240450), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_61,  0x80242360), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_62,  0x80240430), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kpa_63,  0x802401B0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_70,  0x80240B10), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_81,  0x80240480), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_82,  0x80240460), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_83,  0x80240090), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_90,  0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_91,  0x80241920), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_94,  0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_95,  0x80241920), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_96,  0x80240040), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(kpa_100, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_101, 0x80240060), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_102, 0x802435B0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_111, 0x802413E0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_112, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_113, 0x80240AD0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_114, 0x80240070), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kpa_115, 0x802413F0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_116, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_117, 0x80240010), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(kpa_118, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_119, 0x80240010), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(kpa_121, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kpa_130, 0x80240760), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_133, 0x802404B0), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kpa_134, 0x80240740), .songVariation = 1, .flags = 3 },
+};
+
+/// Peach's Castle Grounds
+static Map osr_maps[] = {
+    { MAP_UNSPLIT(osr_00, 0x802407E0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(osr_01, 0x80240B00), .bgName = "nok_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(osr_02, 0x80240170), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(osr_03, 0x802403F0), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(osr_04, 0x802400D0), .bgName = "nok_bg", .init = (MapInit*)0x80240000 },
+};
+
+/// Peach's Castle
+/// @bug There are two entries for kkj_26; the latter is unreachable.
+static Map kkj_maps[] = {
+    { MAP_UNSPLIT(kkj_00, 0x80241030), .bgName = "nok_bg", .songVariation = 1, .flags = 3, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kkj_01, 0x80240F10), .bgName = "nok_bg", .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kkj_02, 0x80240030), .bgName = "nok_bg", .flags = 2 },
+    { MAP_UNSPLIT(kkj_03, 0x80240360), .bgName = "nok_bg", .flags = 3, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kkj_10, 0x80241120), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kkj_11, 0x80241160), .songVariation = 1, .flags = 3 },
+    { MAP_UNSPLIT(kkj_12, 0x802408D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kkj_13, 0x802407A0), .bgName = "kpa_bg", .songVariation = 1, .flags = 3, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kkj_14, 0x80240580), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kkj_15, 0x80240640) },
+    { MAP_UNSPLIT(kkj_16, 0x80241090), .flags = 0x1 },
+    { MAP_UNSPLIT(kkj_17, 0x802405B0) },
+    { MAP_UNSPLIT(kkj_18, 0x80240830), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kkj_19, 0x80240D20) },
+    { MAP_UNSPLIT(kkj_20, 0x80240600) },
+    { MAP_UNSPLIT(kkj_21, 0x80240010), .flags = 0x1 },
+    { MAP_UNSPLIT(kkj_22, 0x80240020), .bgName = "kpa_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kkj_23, 0x802409F0), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kkj_24, 0x80240040), .bgName = "kpa_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kkj_25, 0x80240F50), .bgName = "kpa_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(kkj_26, 0x80240070), .bgName = "kpa_bg" },
+    { MAP_UNSPLIT(kkj_26, 0x80240070), .flags = 0x2 },
+    { MAP_UNSPLIT(kkj_27, 0x802404C0), .flags = 0x1 },
+    { MAP_UNSPLIT(kkj_28, 0x80240010), .flags = 0x1 },
+    { MAP_UNSPLIT(kkj_29, 0x80240080), .flags = 0x1 },
+};
+
+/// Jade Jungle
+static Map jan_maps[] = {
+    { MAP_UNSPLIT(jan_00, 0x80241BD0), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_01, 0x802413F0), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_02, 0x80242940), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_03, 0x802432D0), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_04, 0x80241140), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_05, 0x80242710), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_06, 0x80242620), .bgName = "jan_bg" },
+    { MAP_UNSPLIT(jan_07, 0x80241230), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_08, 0x80242460), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_09, 0x80241960), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_10, 0x80241750), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_11, 0x80240810), .bgName = "jan_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(jan_12, 0x80241280), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_13, 0x802405F0), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_14, 0x80241300), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_15, 0x80240320), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_16, 0x80240590), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_17, 0x80240040), .bgName = "jan_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(jan_18, 0x80240020), .bgName = "yos_bg" },
+    { MAP_UNSPLIT(jan_19, 0x80240040), .bgName = "jan_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(jan_22, 0x802419A0), .bgName = "jan_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(jan_23, 0x80240010), .bgName = "yos_bg" },
+};
+
+/// Forever Forest
+static Map mim_maps[] = {
+    { MAP_UNSPLIT(mim_01, 0x80241EF0), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_02, 0x80241220), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_03, 0x80240570), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_04, 0x80241170), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_05, 0x80241A60), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_06, 0x80242D70), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_07, 0x802410D0), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_08, 0x80242F80), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_09, 0x80240F00), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_10, 0x802401B0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(mim_11, 0x80240C20), .bgName = "obk_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(mim_12, 0x80240600), .bgName = "arn_bg", .songVariation = 1, .flags = 2 },
+};
+
+/// Boo's Mansion
+static Map obk_maps[] = {
+    { MAP_UNSPLIT(obk_01, 0x802411B0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(obk_02, 0x802402E0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_03, 0x80241020), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_04, 0x80240E90), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_05, 0x802409F0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_06, 0x80240020), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_07, 0x80241BA0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_08, 0x802417B0), .bgName = "obk_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(obk_09, 0x80240460), .songVariation = 1, .flags = 2 },
+};
+
+/// Gusty Gulch
+static Map arn_maps[] = {
+    { MAP_UNSPLIT(arn_02, 0x80241000), .bgName = "arn_bg" },
+    { MAP_UNSPLIT(arn_03, 0x80241740), .bgName = "arn_bg" },
+    { MAP_UNSPLIT(arn_04, 0x80243390), .bgName = "arn_bg" },
+    { MAP_UNSPLIT(arn_05, 0x80241320), .bgName = "arn_bg" },
+    { MAP_UNSPLIT(arn_07, 0x80241ED0), .bgName = "arn_bg" },
+    { MAP_UNSPLIT(arn_08, 0x802402C0), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(arn_09, 0x80240060), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(arn_10, 0x80240020), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(arn_11, 0x80240010), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(arn_12, 0x80240020), .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(arn_13, 0x80240020), .songVariation = 1, .flags = 1 },
+};
+
+/// Tubba Blubba's Castle
+static Map dgb_maps[] = {
+    { MAP_UNSPLIT(dgb_00, 0x802400D0), .bgName = "arn_bg", .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(dgb_01, 0x80243460), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_02, 0x80241470), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_03, 0x80242830), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_04, 0x80243130), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_05, 0x802414A0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_06, 0x802402E0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_07, 0x80241450), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_08, 0x80243CB0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_09, 0x80243840), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_10, 0x80240210), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_11, 0x80240090), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_12, 0x802402D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_13, 0x80240010), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_14, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_15, 0x802418A0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_16, 0x80241440), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_17, 0x80240020), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(dgb_18, 0x80241280), .songVariation = 1, .flags = 2 },
+};
+
+/// Mt. Lavalava
+static Map kzn_maps[] = {
+    { MAP_UNSPLIT(kzn_01, 0x80240330), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_02, 0x80242850), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_03, 0x802430E0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_04, 0x80241770), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_05, 0x80240330), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_06, 0x80240AA0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_07, 0x80242320), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_08, 0x80244130), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_09, 0x80243A40), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_10, 0x802406F0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_11, 0x80242680), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_17, 0x802430C0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_18, 0x802403F0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_19, 0x80241D70), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_20, 0x80240AE0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_22, 0x802403A0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(kzn_23, 0x80240630), .bgName = "yos_bg", .songVariation = 1, .flags = 2 },
+};
+
+/// Flower Fields
+static Map flo_maps[] = {
+    { MAP_UNSPLIT(flo_00, 0x80241490), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_03, 0x80240660), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_07, 0x80240760), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_08, 0x80241F00), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_09, 0x80241840), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_10, 0x802414A0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_11, 0x802403A0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_12, 0x80240710), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_13, 0x80243690), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_14, 0x802423B0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_15, 0x80240020), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_16, 0x80242990), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_17, 0x80243240), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_18, 0x802407F0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_19, 0x80240980), .bgName = "sra_bg" },
+    { MAP_UNSPLIT(flo_21, 0x80240D00), .bgName = "sra_bg" },
+    { MAP_UNSPLIT(flo_22, 0x802402A0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_23, 0x80240CF0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_24, 0x802405C0), .bgName = "fla_bg" },
+    { MAP_UNSPLIT(flo_25, 0x802422F0), .bgName = "fla_bg" },
+};
+
+/// Shiver Region
+static Map sam_maps[] = {
+    { MAP_UNSPLIT(sam_01, 0x80241F70), .bgName = "yki_bg" },
+    { MAP_UNSPLIT(sam_02, 0x80241C00), .bgName = "yki_bg" },
+    { MAP_UNSPLIT(sam_03, 0x80240940), .bgName = "yki_bg" },
+    { MAP_UNSPLIT(sam_04, 0x80240740), .bgName = "yki_bg" },
+    { MAP_UNSPLIT(sam_05, 0x80241D60), .bgName = "sam_bg" },
+    { MAP_UNSPLIT(sam_06, 0x80242630), .bgName = "sam_bg" },
+    { MAP_UNSPLIT(sam_07, 0x80242020), .bgName = "yki_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(sam_08, 0x802417D0), .bgName = "yki_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(sam_09, 0x80240420), .bgName = "yki_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(sam_10, 0x80240CE0), .bgName = "yki_bg", .songVariation = 1, .flags = 1 },
+    { MAP_UNSPLIT(sam_11, 0x802421A0), .bgName = "yki_bg" },
+    { MAP_UNSPLIT(sam_12, 0x802403B0), .bgName = "yki_bg", .songVariation = 1, .flags = 1 },
+};
+
+/// Crystal Palace
+static Map pra_maps[] = {
+    { MAP_UNSPLIT(pra_01, 0x80241400), .bgName = "yki_bg", .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_02, 0x802416C0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_03, 0x802401E0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_04, 0x80240970), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_05, 0x802411F0), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_06, 0x80240F60), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_09, 0x80241670), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_10, 0x802416D0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_11, 0x802411F0), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_12, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_13, 0x80241620), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_14, 0x80241200), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_15, 0x80240050), .bgName = "yki_bg", .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_16, 0x80240F60), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_18, 0x80240F50), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_19, 0x802419D0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_20, 0x80240F70), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_21, 0x80240140), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_22, 0x802402F0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_27, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_28, 0x80241220), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_29, 0x802412C0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_31, 0x802410E0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_32, 0x80240850), .bgName = "sam_bg", .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_33, 0x802410C0), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_34, 0x80241040), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_35, 0x80242C40), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_36, 0x80240F70), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_37, 0x80241840), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_38, 0x80241700), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_39, 0x80241700), .songVariation = 1, .flags = 2, .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(pra_40, 0x80240F40), .songVariation = 1, .flags = 1, .init = (MapInit*)0x80240000 },
+};
+
+/// Shy Guy's Toy Box
+static Map omo_maps[] = {
+    { MAP_UNSPLIT(omo_01, 0x80240C40), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_02, 0x80242BD0), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_03, 0x80240900), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_04, 0x80241F30), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_05, 0x80242440), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_06, 0x80240B80), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_07, 0x80243310), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_08, 0x80240E10), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_09, 0x80243700), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_10, 0x802408B0), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_11, 0x802414F0), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_12, 0x802404D0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_13, 0x80241510), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_14, 0x802405E0), .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_15, 0x80240810), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_16, 0x80240620), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+    { MAP_UNSPLIT(omo_17, 0x80243770), .bgName = "omo_bg", .songVariation = 1, .flags = 2 },
+};
+
+/// Debug
+static Map tst_maps[] = {
+    { MAP_UNSPLIT(tst_01, 0x802400B0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_02, 0x802400B0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_03, 0x802400B0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_04, 0x80240740), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_10, 0x80240040), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_11, 0x80240780), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_12, 0x80240010), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_13, 0x802403D0), .bgName = "nok_bg" },
+    { MAP_UNSPLIT(tst_20, 0x80240010), .bgName = "nok_bg" },
+};
+
+/// Credits
+static Map end_maps[] = {
+    { MAP_UNSPLIT(end_00, 0x80242B50), .init = (MapInit*)0x80240000 },
+    { MAP_UNSPLIT(end_01, 0x80243000), .init = (MapInit*)0x80240000 },
+};
+
+/// Toad Town Playroom
+static Map mgm_maps[] = {
+    { MAP_UNSPLIT(mgm_00, 0x80241810) },
+    { MAP_UNSPLIT(mgm_01, 0x802417C0) },
+    { MAP_UNSPLIT(mgm_02, 0x80242410) },
+    { MAP_UNSPLIT(mgm_03, 0x80240010) },
+};
+
+/// Game Over
+static Map gv_maps[] = {
+    { MAP_UNSPLIT(gv_01, 0x802407D0) },
+};
+
+Area gAreas[] = {
+    AREA(kmr, "クリむら"),  // kuri mura [kuribou village, Goomba Village]
+    AREA(mac, "まち"),  // machi [town, Toad Town]
+    AREA(tik, "まちのちか"),  // machi no chika [under the town, Toad Town Tunnels]
+    AREA(kgr, "くじらのなか"),  // kujira no naka [inside the whale]
+    AREA(kkj, "きのこ城"),  // kinoko shiro [mushroom castle, Princess Peach's Castle]
+    AREA(hos, "星ふる丘"),  // hoshi furu oka [star fall hill, Shooting Star Summit]
+    AREA(nok, "ノコノコむら"),  // nokonoko mura [nokonoko village, Koopa Village]
+    AREA(trd, "とりで"),  // toride [fortress, Koopa Bros. Fortress]
+    AREA(iwa, "岩山"),  // iwayama [rock mountain, Mt. Rugged]
+    AREA(dro, "カラカラタウン"),  // karakara taun [dried up town, Dry Dry Outpost]
+    AREA(sbk, "カラカラ砂漠"),  // karakara sabaku [dried up desert, Dry Dry Desert]
+    AREA(isk, "カラカラいせき"),  // karakara iseki [dried up ruins, Dry Dry Ruins]
+    AREA(mim, "迷いの森"),  // mayoi no mori [lost forest, Forever Forest]
+    AREA(obk, "テレサハウス"),  // teresa hausu [teresa house, Boo's Mansion]
+    AREA(arn, "あれの"),  // areno [wasteland, Gusty Gulch]
+    AREA(dgb, "ドガボンの城"),  // dogabon no shiro [dogabon's castle, Tubba Blubba's Castle]
+    AREA(omo, "ヘイホーのおもちゃばこ"),  // heiho no omochabako [heiho's toy box, Shy Guy's Toy Box]
+    AREA(jan, "ジャングル"),  // janguru [jungle, Jade Jungle]
+    AREA(kzn, "火山"),  // kazan [volcano, Mt. Lavalava]
+    AREA(flo, "フラワーランド"),  // furawaa rando [flower land, Flower Fields]
+    AREA(sam, "さむいさむい村"),  // samui samui mura [cold cold village, Shiver City]
+    AREA(pra, "パラレルきゅうでん"),  // parareru kyuuden [parallel palace, Crystal Palace]
+    AREA(kpa, "クッパ城"),  // kuppa shiro [koopa's castle, Bowser's Castle]
+    AREA(osr, "きのこ城そと"),  // kinoko shiro soto [outside mushroom castle, Outside Peach's Castle]
+    AREA(end, "エンディング"),  // endingu [Ending]
+    AREA(mgm, "ミニゲーム"),  // minige-mu [Minigames]
+    AREA(gv, "ゲームオーバー"),  // ge-mu o-ba- [Game Over]
+    AREA(tst, "テストマップ"),  // tesuto mappu [Test map]
+    0, 0, 0, 0,
+};

tools/splat.yaml

@@ -58,7 +58,7 @@ segments:
     - [0x2d9a0, "c", "code_2d9a0_len_890"]
     - [0x2e230, "c", "code_2e230_len_2190"]
     - [0x303c0, "c", "code_303c0_len_3e10"]
-    - [0x341d0, "c", "code_341d0_len_20d0"]
+    - [0x341d0, "c", "world/world"]
     - [0x362a0, "c", "code_362a0_len_2f70"]
     - [0x39210, "c", "code_39210_len_aa0"]
     - [0x39cb0, "c", "os/code_39cb0_len_100"]
@@ -197,7 +197,11 @@ segments:
     - [0x4a360, "c", "os/code_4a360_len_930"]
     - [0x4ac90, "c", "os/code_4ac90_len_3910"]
     - [0x4E5A0, "bin"]
-  - [0x6E8F0, "bin", "world/area_table"]
+    - [0x52D50, "bin"]
+    - [0x6B450, ".data", "world/world"]
+    - [0x6EAC0, "bin"] # has scripts
+    - [0x73DA0, ".rodata", "world/world"]
+    - [0x74EA0, "bin"]
   - type: code
     start: 0x759B0
     vram: 0x800DC500
@@ -883,11 +887,13 @@ segments:
     files:
     - [0x415D90, "c"]
   - [0x4200C0, "bin"] # todo split this further
-  - type: code
+  - name: world/script_api/
+    ld_name: world_script_api
+    type: code
     start: 0x7E0E80
     vram: 0x80280000
     files:
-    - [0x7e0e80, "c", "code_7e0e80"]
+    - [0x7e0e80, "c"]
     - [0x7E2AA0, "c"]
     - [0x7E3700, "c"]
     - [0x7e4d00, "bin"]
@@ -4943,7 +4949,7 @@ segments:
       - [0xC047F0, "bin"]
       - [0xC20C70, "bin"] # rodata
       - [0xC20CF8, "bin"] # rodata
-      - [0xC20F40, "bin"] # rodata
+  - [0xC20F40, "bin"]
   - name: world/area_dgb/dgb_02/
     type: code
     overlay: True

undefined_syms.txt

@@ -68,10 +68,6 @@ gBattleState = 0x800DC068;
 gBattleStatus = 0x800DC070;
 gPauseMenuStrings = 0x8026F778;
 
-mapScriptLibStart = 0x7E0E80;
-mapScriptLibEnd = 0x7E73A0;
-mapScriptLibVram = 0x80280000;
-
 D_000759B0 = 0x000759B0;
 D_000759B0_end = 0x000A5DD0;
 D_000A5DD0 = 0x000A5DD0;
@@ -271,5 +267,4 @@ EnemyNpcDefeat = 0x8007809C;
 D_80078DB0 = 0x80078DB0;
 D_80078DB4 = 0x80078DB4;
 
-gAreas = 0x800934F0;
 gSongsUsingVariationFlag = 0x8014F720;