Clean up map filenames (#1175)

Co-authored-by: Ethan <[email protected]>
pmret · Mar 24, 2024 · c43d15e · c43d15e
1 parent db9dbbe
commit c43d15e
Show file tree

Hide file tree

Showing 2,267 changed files with 6,719 additions and 6,717 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -70,4 +70,6 @@
         "-l 120"
     ],
     "search.useIgnoreFiles": false,
+    "nixEnvSelector.nixFile": "${workspaceFolder}/shell.nix",
+    "workbench.editor.labelFormat": "short",
 }
diff --git a/src/world/area_arn/arn_02/arn_02_3_entity.c → src/world/area_arn/arn_02/entity.c b/src/world/area_arn/arn_02/arn_02_3_entity.c → src/world/area_arn/arn_02/entity.c
diff --git a/src/world/area_arn/arn_02/arn_02_2_main.c → src/world/area_arn/arn_02/main.c b/src/world/area_arn/arn_02/arn_02_2_main.c → src/world/area_arn/arn_02/main.c
diff --git a/src/world/area_arn/arn_02/arn_02_1_music.c → src/world/area_arn/arn_02/music.c b/src/world/area_arn/arn_02/arn_02_1_music.c → src/world/area_arn/arn_02/music.c
diff --git a/src/world/area_arn/arn_02/arn_02_4_npc.c → src/world/area_arn/arn_02/npc.c b/src/world/area_arn/arn_02/arn_02_4_npc.c → src/world/area_arn/arn_02/npc.c
diff --git a/src/world/area_arn/arn_02/arn_02_0_header.c → src/world/area_arn/arn_02/settings.c b/src/world/area_arn/arn_02/arn_02_0_header.c → src/world/area_arn/arn_02/settings.c
diff --git a/src/world/area_arn/arn_03/arn_03_4_entity.c → src/world/area_arn/arn_03/entity.c b/src/world/area_arn/arn_03/arn_03_4_entity.c → src/world/area_arn/arn_03/entity.c
diff --git a/src/world/area_arn/arn_03/arn_03_2_main.c → src/world/area_arn/arn_03/main.c b/src/world/area_arn/arn_03/arn_03_2_main.c → src/world/area_arn/arn_03/main.c
diff --git a/src/world/area_arn/arn_03/arn_03_1_music.c → src/world/area_arn/arn_03/music.c b/src/world/area_arn/arn_03/arn_03_1_music.c → src/world/area_arn/arn_03/music.c
diff --git a/src/world/area_arn/arn_03/arn_03_3_npc.c → src/world/area_arn/arn_03/npc.c b/src/world/area_arn/arn_03/arn_03_3_npc.c → src/world/area_arn/arn_03/npc.c
diff --git a/src/world/area_arn/arn_03/arn_03_0_header.c → src/world/area_arn/arn_03/settings.c b/src/world/area_arn/arn_03/arn_03_0_header.c → src/world/area_arn/arn_03/settings.c
diff --git a/src/world/area_arn/arn_04/arn_04_4_entity.c → src/world/area_arn/arn_04/entity.c b/src/world/area_arn/arn_04/arn_04_4_entity.c → src/world/area_arn/arn_04/entity.c
diff --git a/src/world/area_arn/arn_04/arn_04_2_main.c → src/world/area_arn/arn_04/main.c b/src/world/area_arn/arn_04/arn_04_2_main.c → src/world/area_arn/arn_04/main.c
diff --git a/src/world/area_arn/arn_04/arn_04_1_music.c → src/world/area_arn/arn_04/music.c b/src/world/area_arn/arn_04/arn_04_1_music.c → src/world/area_arn/arn_04/music.c
diff --git a/src/world/area_arn/arn_04/arn_04_3_npc.c → src/world/area_arn/arn_04/npc.c b/src/world/area_arn/arn_04/arn_04_3_npc.c → src/world/area_arn/arn_04/npc.c
diff --git a/src/world/area_arn/arn_04/arn_04_0_header.c → src/world/area_arn/arn_04/settings.c b/src/world/area_arn/arn_04/arn_04_0_header.c → src/world/area_arn/arn_04/settings.c
diff --git a/src/world/area_arn/arn_05/arn_05_4_entity.c → src/world/area_arn/arn_05/entity.c b/src/world/area_arn/arn_05/arn_05_4_entity.c → src/world/area_arn/arn_05/entity.c
diff --git a/src/world/area_arn/arn_05/arn_05_2_main.c → src/world/area_arn/arn_05/main.c b/src/world/area_arn/arn_05/arn_05_2_main.c → src/world/area_arn/arn_05/main.c
diff --git a/src/world/area_arn/arn_05/arn_05_1_music.c → src/world/area_arn/arn_05/music.c b/src/world/area_arn/arn_05/arn_05_1_music.c → src/world/area_arn/arn_05/music.c
diff --git a/src/world/area_arn/arn_05/arn_05_3_npc.c → src/world/area_arn/arn_05/npc.c b/src/world/area_arn/arn_05/arn_05_3_npc.c → src/world/area_arn/arn_05/npc.c
diff --git a/src/world/area_arn/arn_05/arn_05_0_header.c → src/world/area_arn/arn_05/settings.c b/src/world/area_arn/arn_05/arn_05_0_header.c → src/world/area_arn/arn_05/settings.c
diff --git a/src/world/area_arn/arn_07/arn_07_4_entity.c → src/world/area_arn/arn_07/entity.c b/src/world/area_arn/arn_07/arn_07_4_entity.c → src/world/area_arn/arn_07/entity.c
diff --git a/src/world/area_arn/arn_07/arn_07_2_main.c → src/world/area_arn/arn_07/main.c b/src/world/area_arn/arn_07/arn_07_2_main.c → src/world/area_arn/arn_07/main.c
diff --git a/src/world/area_arn/arn_07/arn_07_1_music.c → src/world/area_arn/arn_07/music.c b/src/world/area_arn/arn_07/arn_07_1_music.c → src/world/area_arn/arn_07/music.c
diff --git a/src/world/area_arn/arn_07/arn_07_5_npc.c → src/world/area_arn/arn_07/npc.c b/src/world/area_arn/arn_07/arn_07_5_npc.c → src/world/area_arn/arn_07/npc.c
diff --git a/src/world/area_arn/arn_07/arn_07_0_header.c → src/world/area_arn/arn_07/settings.c b/src/world/area_arn/arn_07/arn_07_0_header.c → src/world/area_arn/arn_07/settings.c
diff --git a/...world/area_arn/arn_07/arn_07_3_windmill.c → src/world/area_arn/arn_07/windmill.c b/...world/area_arn/arn_07/arn_07_3_windmill.c → src/world/area_arn/arn_07/windmill.c
diff --git a/src/world/area_arn/arn_08/arn_08_5_demo.c → src/world/area_arn/arn_08/demo.c b/src/world/area_arn/arn_08/arn_08_5_demo.c → src/world/area_arn/arn_08/demo.c
diff --git a/src/world/area_arn/arn_08/arn_08_7_entity.c → src/world/area_arn/arn_08/entity.c b/src/world/area_arn/arn_08/arn_08_7_entity.c → src/world/area_arn/arn_08/entity.c
diff --git a/src/world/area_arn/arn_08/arn_08_4_gears.c → src/world/area_arn/arn_08/gears.c b/src/world/area_arn/arn_08/arn_08_4_gears.c → src/world/area_arn/arn_08/gears.c
diff --git a/src/world/area_arn/arn_08/arn_08_2_main.c → src/world/area_arn/arn_08/main.c b/src/world/area_arn/arn_08/arn_08_2_main.c → src/world/area_arn/arn_08/main.c
diff --git a/src/world/area_arn/arn_08/arn_08_1_music.c → src/world/area_arn/arn_08/music.c b/src/world/area_arn/arn_08/arn_08_1_music.c → src/world/area_arn/arn_08/music.c
diff --git a/src/world/area_arn/arn_08/arn_08_6_npc.c → src/world/area_arn/arn_08/npc.c b/src/world/area_arn/arn_08/arn_08_6_npc.c → src/world/area_arn/arn_08/npc.c
diff --git a/src/world/area_arn/arn_08/arn_08_0_header.c → src/world/area_arn/arn_08/settings.c b/src/world/area_arn/arn_08/arn_08_0_header.c → src/world/area_arn/arn_08/settings.c
diff --git a/src/world/area_arn/arn_08/arn_08_3_well.c → src/world/area_arn/arn_08/well.c b/src/world/area_arn/arn_08/arn_08_3_well.c → src/world/area_arn/arn_08/well.c
diff --git a/src/world/area_arn/arn_09/arn_09_3_entity.c → src/world/area_arn/arn_09/entity.c b/src/world/area_arn/arn_09/arn_09_3_entity.c → src/world/area_arn/arn_09/entity.c
diff --git a/src/world/area_arn/arn_09/arn_09_4_launch.c → src/world/area_arn/arn_09/launch.c b/src/world/area_arn/arn_09/arn_09_4_launch.c → src/world/area_arn/arn_09/launch.c
diff --git a/src/world/area_arn/arn_09/arn_09_2_main.c → src/world/area_arn/arn_09/main.c b/src/world/area_arn/arn_09/arn_09_2_main.c → src/world/area_arn/arn_09/main.c
diff --git a/src/world/area_arn/arn_09/arn_09_1_music.c → src/world/area_arn/arn_09/music.c b/src/world/area_arn/arn_09/arn_09_1_music.c → src/world/area_arn/arn_09/music.c
diff --git a/src/world/area_arn/arn_09/arn_09_5_npc.c → src/world/area_arn/arn_09/npc.c b/src/world/area_arn/arn_09/arn_09_5_npc.c → src/world/area_arn/arn_09/npc.c
diff --git a/src/world/area_arn/arn_09/arn_09_0_header.c → src/world/area_arn/arn_09/settings.c b/src/world/area_arn/arn_09/arn_09_0_header.c → src/world/area_arn/arn_09/settings.c
diff --git a/src/world/area_arn/arn_10/arn_10_4_entity.c → src/world/area_arn/arn_10/entity.c b/src/world/area_arn/arn_10/arn_10_4_entity.c → src/world/area_arn/arn_10/entity.c
diff --git a/src/world/area_arn/arn_10/arn_10_2_main.c → src/world/area_arn/arn_10/main.c b/src/world/area_arn/arn_10/arn_10_2_main.c → src/world/area_arn/arn_10/main.c
diff --git a/src/world/area_arn/arn_10/arn_10_1_music.c → src/world/area_arn/arn_10/music.c b/src/world/area_arn/arn_10/arn_10_1_music.c → src/world/area_arn/arn_10/music.c
diff --git a/src/world/area_arn/arn_10/arn_10_3_npc.c → src/world/area_arn/arn_10/npc.c b/src/world/area_arn/arn_10/arn_10_3_npc.c → src/world/area_arn/arn_10/npc.c
diff --git a/src/world/area_arn/arn_10/arn_10_0_header.c → src/world/area_arn/arn_10/settings.c b/src/world/area_arn/arn_10/arn_10_0_header.c → src/world/area_arn/arn_10/settings.c
diff --git a/src/world/area_arn/arn_11/arn_11_2_main.c → src/world/area_arn/arn_11/main.c b/src/world/area_arn/arn_11/arn_11_2_main.c → src/world/area_arn/arn_11/main.c
diff --git a/src/world/area_arn/arn_11/arn_11_1_music.c → src/world/area_arn/arn_11/music.c b/src/world/area_arn/arn_11/arn_11_1_music.c → src/world/area_arn/arn_11/music.c
diff --git a/src/world/area_arn/arn_11/arn_11_3_npc.c → src/world/area_arn/arn_11/npc.c b/src/world/area_arn/arn_11/arn_11_3_npc.c → src/world/area_arn/arn_11/npc.c
diff --git a/src/world/area_arn/arn_11/arn_11_0_header.c → src/world/area_arn/arn_11/settings.c b/src/world/area_arn/arn_11/arn_11_0_header.c → src/world/area_arn/arn_11/settings.c
diff --git a/src/world/area_arn/arn_12/arn_12_4_entity.c → src/world/area_arn/arn_12/entity.c b/src/world/area_arn/arn_12/arn_12_4_entity.c → src/world/area_arn/arn_12/entity.c
diff --git a/src/world/area_arn/arn_12/arn_12_2_main.c → src/world/area_arn/arn_12/main.c b/src/world/area_arn/arn_12/arn_12_2_main.c → src/world/area_arn/arn_12/main.c
diff --git a/src/world/area_arn/arn_12/arn_12_1_music.c → src/world/area_arn/arn_12/music.c b/src/world/area_arn/arn_12/arn_12_1_music.c → src/world/area_arn/arn_12/music.c
diff --git a/src/world/area_arn/arn_12/arn_12_3_npc.c → src/world/area_arn/arn_12/npc.c b/src/world/area_arn/arn_12/arn_12_3_npc.c → src/world/area_arn/arn_12/npc.c
diff --git a/src/world/area_arn/arn_12/arn_12_0_header.c → src/world/area_arn/arn_12/settings.c b/src/world/area_arn/arn_12/arn_12_0_header.c → src/world/area_arn/arn_12/settings.c
diff --git a/src/world/area_arn/arn_13/arn_13_4_entity.c → src/world/area_arn/arn_13/entity.c b/src/world/area_arn/arn_13/arn_13_4_entity.c → src/world/area_arn/arn_13/entity.c
diff --git a/src/world/area_arn/arn_13/arn_13_2_main.c → src/world/area_arn/arn_13/main.c b/src/world/area_arn/arn_13/arn_13_2_main.c → src/world/area_arn/arn_13/main.c
diff --git a/src/world/area_arn/arn_13/arn_13_1_music.c → src/world/area_arn/arn_13/music.c b/src/world/area_arn/arn_13/arn_13_1_music.c → src/world/area_arn/arn_13/music.c
diff --git a/src/world/area_arn/arn_13/arn_13_3_npc.c → src/world/area_arn/arn_13/npc.c b/src/world/area_arn/arn_13/arn_13_3_npc.c → src/world/area_arn/arn_13/npc.c
diff --git a/src/world/area_arn/arn_13/arn_13_0_header.c → src/world/area_arn/arn_13/settings.c b/src/world/area_arn/arn_13/arn_13_0_header.c → src/world/area_arn/arn_13/settings.c
diff --git a/src/world/area_dgb/dgb_00/dgb_00_4_entity.c → src/world/area_dgb/dgb_00/entity.c b/src/world/area_dgb/dgb_00/dgb_00_4_entity.c → src/world/area_dgb/dgb_00/entity.c
diff --git a/src/world/area_dgb/dgb_00/dgb_00_2_main.c → src/world/area_dgb/dgb_00/main.c b/src/world/area_dgb/dgb_00/dgb_00_2_main.c → src/world/area_dgb/dgb_00/main.c
diff --git a/src/world/area_dgb/dgb_00/dgb_00_1_music.c → src/world/area_dgb/dgb_00/music.c b/src/world/area_dgb/dgb_00/dgb_00_1_music.c → src/world/area_dgb/dgb_00/music.c
diff --git a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c → src/world/area_dgb/dgb_00/npc.c b/src/world/area_dgb/dgb_00/dgb_00_3_npc.c → src/world/area_dgb/dgb_00/npc.c
diff --git a/src/world/area_dgb/dgb_00/dgb_00_0_header.c → src/world/area_dgb/dgb_00/settings.c b/src/world/area_dgb/dgb_00/dgb_00_0_header.c → src/world/area_dgb/dgb_00/settings.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c → src/world/area_dgb/dgb_01/bridges.c b/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c → src/world/area_dgb/dgb_01/bridges.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_4_entity.c → src/world/area_dgb/dgb_01/entity.c b/src/world/area_dgb/dgb_01/dgb_01_4_entity.c → src/world/area_dgb/dgb_01/entity.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_7.c → src/world/area_dgb/dgb_01/gfx.c b/src/world/area_dgb/dgb_01/dgb_01_7.c → src/world/area_dgb/dgb_01/gfx.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img0.c → src/world/area_dgb/dgb_01/img0.c b/src/world/area_dgb/dgb_01/dgb_01_6_img0.c → src/world/area_dgb/dgb_01/img0.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img1.c → src/world/area_dgb/dgb_01/img1.c b/src/world/area_dgb/dgb_01/dgb_01_6_img1.c → src/world/area_dgb/dgb_01/img1.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img2.c → src/world/area_dgb/dgb_01/img2.c b/src/world/area_dgb/dgb_01/dgb_01_6_img2.c → src/world/area_dgb/dgb_01/img2.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img3.c → src/world/area_dgb/dgb_01/img3.c b/src/world/area_dgb/dgb_01/dgb_01_6_img3.c → src/world/area_dgb/dgb_01/img3.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img4.c → src/world/area_dgb/dgb_01/img4.c b/src/world/area_dgb/dgb_01/dgb_01_6_img4.c → src/world/area_dgb/dgb_01/img4.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img5.c → src/world/area_dgb/dgb_01/img5.c b/src/world/area_dgb/dgb_01/dgb_01_6_img5.c → src/world/area_dgb/dgb_01/img5.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img6.c → src/world/area_dgb/dgb_01/img6.c b/src/world/area_dgb/dgb_01/dgb_01_6_img6.c → src/world/area_dgb/dgb_01/img6.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img7.c → src/world/area_dgb/dgb_01/img7.c b/src/world/area_dgb/dgb_01/dgb_01_6_img7.c → src/world/area_dgb/dgb_01/img7.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_2_main.c → src/world/area_dgb/dgb_01/main.c b/src/world/area_dgb/dgb_01/dgb_01_2_main.c → src/world/area_dgb/dgb_01/main.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_1_music.c → src/world/area_dgb/dgb_01/music.c b/src/world/area_dgb/dgb_01/dgb_01_1_music.c → src/world/area_dgb/dgb_01/music.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c → src/world/area_dgb/dgb_01/npc.c b/src/world/area_dgb/dgb_01/dgb_01_5_npc.c → src/world/area_dgb/dgb_01/npc.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_0_header.c → src/world/area_dgb/dgb_01/settings.c b/src/world/area_dgb/dgb_01/dgb_01_0_header.c → src/world/area_dgb/dgb_01/settings.c
diff --git a/src/world/area_dgb/dgb_02/dgb_02_2_main.c → src/world/area_dgb/dgb_02/main.c b/src/world/area_dgb/dgb_02/dgb_02_2_main.c → src/world/area_dgb/dgb_02/main.c
diff --git a/src/world/area_dgb/dgb_02/dgb_02_1_music.c → src/world/area_dgb/dgb_02/music.c b/src/world/area_dgb/dgb_02/dgb_02_1_music.c → src/world/area_dgb/dgb_02/music.c
diff --git a/src/world/area_dgb/dgb_02/dgb_02_3_npc.c → src/world/area_dgb/dgb_02/npc.c b/src/world/area_dgb/dgb_02/dgb_02_3_npc.c → src/world/area_dgb/dgb_02/npc.c
diff --git a/src/world/area_dgb/dgb_02/dgb_02_0_header.c → src/world/area_dgb/dgb_02/settings.c b/src/world/area_dgb/dgb_02/dgb_02_0_header.c → src/world/area_dgb/dgb_02/settings.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_3_clock.c → src/world/area_dgb/dgb_03/clock.c b/src/world/area_dgb/dgb_03/dgb_03_3_clock.c → src/world/area_dgb/dgb_03/clock.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_4_entity.c → src/world/area_dgb/dgb_03/entity.c b/src/world/area_dgb/dgb_03/dgb_03_4_entity.c → src/world/area_dgb/dgb_03/entity.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_2_main.c → src/world/area_dgb/dgb_03/main.c b/src/world/area_dgb/dgb_03/dgb_03_2_main.c → src/world/area_dgb/dgb_03/main.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_1_music.c → src/world/area_dgb/dgb_03/music.c b/src/world/area_dgb/dgb_03/dgb_03_1_music.c → src/world/area_dgb/dgb_03/music.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_5_npc.c → src/world/area_dgb/dgb_03/npc.c b/src/world/area_dgb/dgb_03/dgb_03_5_npc.c → src/world/area_dgb/dgb_03/npc.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_0_header.c → src/world/area_dgb/dgb_03/settings.c b/src/world/area_dgb/dgb_03/dgb_03_0_header.c → src/world/area_dgb/dgb_03/settings.c
diff --git a/src/world/area_dgb/dgb_04/dgb_04_4_entity.c → src/world/area_dgb/dgb_04/entity.c b/src/world/area_dgb/dgb_04/dgb_04_4_entity.c → src/world/area_dgb/dgb_04/entity.c
diff --git a/src/world/area_dgb/dgb_04/dgb_04_2_main.c → src/world/area_dgb/dgb_04/main.c b/src/world/area_dgb/dgb_04/dgb_04_2_main.c → src/world/area_dgb/dgb_04/main.c
diff --git a/src/world/area_dgb/dgb_04/dgb_04_1_music.c → src/world/area_dgb/dgb_04/music.c b/src/world/area_dgb/dgb_04/dgb_04_1_music.c → src/world/area_dgb/dgb_04/music.c
diff --git a/src/world/area_dgb/dgb_04/dgb_04_3_npc.c → src/world/area_dgb/dgb_04/npc.c b/src/world/area_dgb/dgb_04/dgb_04_3_npc.c → src/world/area_dgb/dgb_04/npc.c
diff --git a/src/world/area_dgb/dgb_04/dgb_04_0_header.c → src/world/area_dgb/dgb_04/settings.c b/src/world/area_dgb/dgb_04/dgb_04_0_header.c → src/world/area_dgb/dgb_04/settings.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_4_entity.c → src/world/area_dgb/dgb_05/entity.c b/src/world/area_dgb/dgb_05/dgb_05_4_entity.c → src/world/area_dgb/dgb_05/entity.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_3_hole.c → src/world/area_dgb/dgb_05/hole.c b/src/world/area_dgb/dgb_05/dgb_05_3_hole.c → src/world/area_dgb/dgb_05/hole.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_2_main.c → src/world/area_dgb/dgb_05/main.c b/src/world/area_dgb/dgb_05/dgb_05_2_main.c → src/world/area_dgb/dgb_05/main.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_1_music.c → src/world/area_dgb/dgb_05/music.c b/src/world/area_dgb/dgb_05/dgb_05_1_music.c → src/world/area_dgb/dgb_05/music.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_5_npc.c → src/world/area_dgb/dgb_05/npc.c b/src/world/area_dgb/dgb_05/dgb_05_5_npc.c → src/world/area_dgb/dgb_05/npc.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_0_header.c → src/world/area_dgb/dgb_05/settings.c b/src/world/area_dgb/dgb_05/dgb_05_0_header.c → src/world/area_dgb/dgb_05/settings.c
diff --git a/src/world/area_dgb/dgb_06/dgb_06_3_entity.c → src/world/area_dgb/dgb_06/entity.c b/src/world/area_dgb/dgb_06/dgb_06_3_entity.c → src/world/area_dgb/dgb_06/entity.c
diff --git a/src/world/area_dgb/dgb_06/dgb_06_2_main.c → src/world/area_dgb/dgb_06/main.c b/src/world/area_dgb/dgb_06/dgb_06_2_main.c → src/world/area_dgb/dgb_06/main.c
diff --git a/src/world/area_dgb/dgb_06/dgb_06_1_music.c → src/world/area_dgb/dgb_06/music.c b/src/world/area_dgb/dgb_06/dgb_06_1_music.c → src/world/area_dgb/dgb_06/music.c
diff --git a/src/world/area_dgb/dgb_06/dgb_06_4_npc.c → src/world/area_dgb/dgb_06/npc.c b/src/world/area_dgb/dgb_06/dgb_06_4_npc.c → src/world/area_dgb/dgb_06/npc.c
diff --git a/src/world/area_dgb/dgb_06/dgb_06_0_header.c → src/world/area_dgb/dgb_06/settings.c b/src/world/area_dgb/dgb_06/dgb_06_0_header.c → src/world/area_dgb/dgb_06/settings.c
diff --git a/src/world/area_dgb/dgb_07/dgb_07_3_entity.c → src/world/area_dgb/dgb_07/entity.c b/src/world/area_dgb/dgb_07/dgb_07_3_entity.c → src/world/area_dgb/dgb_07/entity.c
diff --git a/src/world/area_dgb/dgb_07/dgb_07_2_main.c → src/world/area_dgb/dgb_07/main.c b/src/world/area_dgb/dgb_07/dgb_07_2_main.c → src/world/area_dgb/dgb_07/main.c
diff --git a/src/world/area_dgb/dgb_07/dgb_07_1_music.c → src/world/area_dgb/dgb_07/music.c b/src/world/area_dgb/dgb_07/dgb_07_1_music.c → src/world/area_dgb/dgb_07/music.c
diff --git a/src/world/area_dgb/dgb_07/dgb_07_4_npc.c → src/world/area_dgb/dgb_07/npc.c b/src/world/area_dgb/dgb_07/dgb_07_4_npc.c → src/world/area_dgb/dgb_07/npc.c
diff --git a/src/world/area_dgb/dgb_07/dgb_07_0_header.c → src/world/area_dgb/dgb_07/settings.c b/src/world/area_dgb/dgb_07/dgb_07_0_header.c → src/world/area_dgb/dgb_07/settings.c
diff --git a/src/world/area_dgb/dgb_08/dgb_08_4_entity.c → src/world/area_dgb/dgb_08/entity.c b/src/world/area_dgb/dgb_08/dgb_08_4_entity.c → src/world/area_dgb/dgb_08/entity.c
diff --git a/src/world/area_dgb/dgb_08/dgb_08_2_main.c → src/world/area_dgb/dgb_08/main.c b/src/world/area_dgb/dgb_08/dgb_08_2_main.c → src/world/area_dgb/dgb_08/main.c
diff --git a/src/world/area_dgb/dgb_08/dgb_08_1_music.c → src/world/area_dgb/dgb_08/music.c b/src/world/area_dgb/dgb_08/dgb_08_1_music.c → src/world/area_dgb/dgb_08/music.c
diff --git a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c → src/world/area_dgb/dgb_08/npc.c b/src/world/area_dgb/dgb_08/dgb_08_3_npc.c → src/world/area_dgb/dgb_08/npc.c
diff --git a/src/world/area_dgb/dgb_08/dgb_08_0_header.c → src/world/area_dgb/dgb_08/settings.c b/src/world/area_dgb/dgb_08/dgb_08_0_header.c → src/world/area_dgb/dgb_08/settings.c
diff --git a/...orld/area_dgb/dgb_09/dgb_09_3_breakable.c → src/world/area_dgb/dgb_09/breakable.c b/...orld/area_dgb/dgb_09/dgb_09_3_breakable.c → src/world/area_dgb/dgb_09/breakable.c
diff --git a/src/world/area_dgb/dgb_09/dgb_09_2_main.c → src/world/area_dgb/dgb_09/main.c b/src/world/area_dgb/dgb_09/dgb_09_2_main.c → src/world/area_dgb/dgb_09/main.c
diff --git a/src/world/area_dgb/dgb_09/dgb_09_1_music.c → src/world/area_dgb/dgb_09/music.c b/src/world/area_dgb/dgb_09/dgb_09_1_music.c → src/world/area_dgb/dgb_09/music.c
diff --git a/src/world/area_dgb/dgb_09/dgb_09_4_npc.c → src/world/area_dgb/dgb_09/npc.c b/src/world/area_dgb/dgb_09/dgb_09_4_npc.c → src/world/area_dgb/dgb_09/npc.c
diff --git a/src/world/area_dgb/dgb_09/dgb_09_0_header.c → src/world/area_dgb/dgb_09/settings.c b/src/world/area_dgb/dgb_09/dgb_09_0_header.c → src/world/area_dgb/dgb_09/settings.c
diff --git a/src/world/area_dgb/dgb_10/dgb_10_4_entity.c → src/world/area_dgb/dgb_10/entity.c b/src/world/area_dgb/dgb_10/dgb_10_4_entity.c → src/world/area_dgb/dgb_10/entity.c
diff --git a/src/world/area_dgb/dgb_10/dgb_10_3_hole.c → src/world/area_dgb/dgb_10/hole.c b/src/world/area_dgb/dgb_10/dgb_10_3_hole.c → src/world/area_dgb/dgb_10/hole.c
diff --git a/src/world/area_dgb/dgb_10/dgb_10_2_main.c → src/world/area_dgb/dgb_10/main.c b/src/world/area_dgb/dgb_10/dgb_10_2_main.c → src/world/area_dgb/dgb_10/main.c
diff --git a/src/world/area_dgb/dgb_10/dgb_10_1_music.c → src/world/area_dgb/dgb_10/music.c b/src/world/area_dgb/dgb_10/dgb_10_1_music.c → src/world/area_dgb/dgb_10/music.c
diff --git a/src/world/area_dgb/dgb_10/dgb_10_0_header.c → src/world/area_dgb/dgb_10/settings.c b/src/world/area_dgb/dgb_10/dgb_10_0_header.c → src/world/area_dgb/dgb_10/settings.c
diff --git a/src/world/area_dgb/dgb_11/dgb_11_3_entity.c → src/world/area_dgb/dgb_11/entity.c b/src/world/area_dgb/dgb_11/dgb_11_3_entity.c → src/world/area_dgb/dgb_11/entity.c
diff --git a/src/world/area_dgb/dgb_11/dgb_11_2_main.c → src/world/area_dgb/dgb_11/main.c b/src/world/area_dgb/dgb_11/dgb_11_2_main.c → src/world/area_dgb/dgb_11/main.c
diff --git a/src/world/area_dgb/dgb_11/dgb_11_1_music.c → src/world/area_dgb/dgb_11/music.c b/src/world/area_dgb/dgb_11/dgb_11_1_music.c → src/world/area_dgb/dgb_11/music.c
diff --git a/src/world/area_dgb/dgb_11/dgb_11_0_header.c → src/world/area_dgb/dgb_11/settings.c b/src/world/area_dgb/dgb_11/dgb_11_0_header.c → src/world/area_dgb/dgb_11/settings.c
diff --git a/src/world/area_dgb/dgb_12/dgb_12_4_entity.c → src/world/area_dgb/dgb_12/entity.c b/src/world/area_dgb/dgb_12/dgb_12_4_entity.c → src/world/area_dgb/dgb_12/entity.c
diff --git a/src/world/area_dgb/dgb_12/dgb_12_2_main.c → src/world/area_dgb/dgb_12/main.c b/src/world/area_dgb/dgb_12/dgb_12_2_main.c → src/world/area_dgb/dgb_12/main.c
diff --git a/src/world/area_dgb/dgb_12/dgb_12_1_music.c → src/world/area_dgb/dgb_12/music.c b/src/world/area_dgb/dgb_12/dgb_12_1_music.c → src/world/area_dgb/dgb_12/music.c
diff --git a/src/world/area_dgb/dgb_12/dgb_12_0_header.c → src/world/area_dgb/dgb_12/settings.c b/src/world/area_dgb/dgb_12/dgb_12_0_header.c → src/world/area_dgb/dgb_12/settings.c
diff --git a/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c → src/world/area_dgb/dgb_12/spikes.c b/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c → src/world/area_dgb/dgb_12/spikes.c
diff --git a/src/world/area_dgb/dgb_13/dgb_13_4_drawer.c → src/world/area_dgb/dgb_13/drawer.c b/src/world/area_dgb/dgb_13/dgb_13_4_drawer.c → src/world/area_dgb/dgb_13/drawer.c
diff --git a/src/world/area_dgb/dgb_13/dgb_13_3_entity.c → src/world/area_dgb/dgb_13/entity.c b/src/world/area_dgb/dgb_13/dgb_13_3_entity.c → src/world/area_dgb/dgb_13/entity.c
diff --git a/src/world/area_dgb/dgb_13/dgb_13_2_main.c → src/world/area_dgb/dgb_13/main.c b/src/world/area_dgb/dgb_13/dgb_13_2_main.c → src/world/area_dgb/dgb_13/main.c
diff --git a/src/world/area_dgb/dgb_13/dgb_13_1_music.c → src/world/area_dgb/dgb_13/music.c b/src/world/area_dgb/dgb_13/dgb_13_1_music.c → src/world/area_dgb/dgb_13/music.c
diff --git a/src/world/area_dgb/dgb_13/dgb_13_0_header.c → src/world/area_dgb/dgb_13/settings.c b/src/world/area_dgb/dgb_13/dgb_13_0_header.c → src/world/area_dgb/dgb_13/settings.c
diff --git a/src/world/area_dgb/dgb_14/dgb_14_3_entity.c → src/world/area_dgb/dgb_14/entity.c b/src/world/area_dgb/dgb_14/dgb_14_3_entity.c → src/world/area_dgb/dgb_14/entity.c
diff --git a/src/world/area_dgb/dgb_14/dgb_14_2_main.c → src/world/area_dgb/dgb_14/main.c b/src/world/area_dgb/dgb_14/dgb_14_2_main.c → src/world/area_dgb/dgb_14/main.c
diff --git a/src/world/area_dgb/dgb_14/dgb_14_1_music.c → src/world/area_dgb/dgb_14/music.c b/src/world/area_dgb/dgb_14/dgb_14_1_music.c → src/world/area_dgb/dgb_14/music.c
diff --git a/src/world/area_dgb/dgb_14/dgb_14_0_header.c → src/world/area_dgb/dgb_14/settings.c b/src/world/area_dgb/dgb_14/dgb_14_0_header.c → src/world/area_dgb/dgb_14/settings.c
diff --git a/src/world/area_dgb/dgb_15/dgb_15_4_entity.c → src/world/area_dgb/dgb_15/entity.c b/src/world/area_dgb/dgb_15/dgb_15_4_entity.c → src/world/area_dgb/dgb_15/entity.c
diff --git a/src/world/area_dgb/dgb_15/dgb_15_2_main.c → src/world/area_dgb/dgb_15/main.c b/src/world/area_dgb/dgb_15/dgb_15_2_main.c → src/world/area_dgb/dgb_15/main.c
diff --git a/src/world/area_dgb/dgb_15/dgb_15_1_music.c → src/world/area_dgb/dgb_15/music.c b/src/world/area_dgb/dgb_15/dgb_15_1_music.c → src/world/area_dgb/dgb_15/music.c
diff --git a/src/world/area_dgb/dgb_15/dgb_15_3_npc.c → src/world/area_dgb/dgb_15/npc.c b/src/world/area_dgb/dgb_15/dgb_15_3_npc.c → src/world/area_dgb/dgb_15/npc.c
diff --git a/src/world/area_dgb/dgb_15/dgb_15_0_header.c → src/world/area_dgb/dgb_15/settings.c b/src/world/area_dgb/dgb_15/dgb_15_0_header.c → src/world/area_dgb/dgb_15/settings.c
diff --git a/src/world/area_dgb/dgb_16/dgb_16_3_entity.c → src/world/area_dgb/dgb_16/entity.c b/src/world/area_dgb/dgb_16/dgb_16_3_entity.c → src/world/area_dgb/dgb_16/entity.c
diff --git a/src/world/area_dgb/dgb_16/dgb_16_2_main.c → src/world/area_dgb/dgb_16/main.c b/src/world/area_dgb/dgb_16/dgb_16_2_main.c → src/world/area_dgb/dgb_16/main.c
diff --git a/src/world/area_dgb/dgb_16/dgb_16_1_music.c → src/world/area_dgb/dgb_16/music.c b/src/world/area_dgb/dgb_16/dgb_16_1_music.c → src/world/area_dgb/dgb_16/music.c
diff --git a/src/world/area_dgb/dgb_16/dgb_16_4_npc.c → src/world/area_dgb/dgb_16/npc.c b/src/world/area_dgb/dgb_16/dgb_16_4_npc.c → src/world/area_dgb/dgb_16/npc.c
diff --git a/src/world/area_dgb/dgb_16/dgb_16_0_header.c → src/world/area_dgb/dgb_16/settings.c b/src/world/area_dgb/dgb_16/dgb_16_0_header.c → src/world/area_dgb/dgb_16/settings.c
diff --git a/src/world/area_dgb/dgb_17/dgb_17_3_entity.c → src/world/area_dgb/dgb_17/entity.c b/src/world/area_dgb/dgb_17/dgb_17_3_entity.c → src/world/area_dgb/dgb_17/entity.c
diff --git a/src/world/area_dgb/dgb_17/dgb_17_2_main.c → src/world/area_dgb/dgb_17/main.c b/src/world/area_dgb/dgb_17/dgb_17_2_main.c → src/world/area_dgb/dgb_17/main.c
diff --git a/src/world/area_dgb/dgb_17/dgb_17_1_music.c → src/world/area_dgb/dgb_17/music.c b/src/world/area_dgb/dgb_17/dgb_17_1_music.c → src/world/area_dgb/dgb_17/music.c
diff --git a/src/world/area_dgb/dgb_17/dgb_17_0_header.c → src/world/area_dgb/dgb_17/settings.c b/src/world/area_dgb/dgb_17/dgb_17_0_header.c → src/world/area_dgb/dgb_17/settings.c
diff --git a/src/world/area_dgb/dgb_18/dgb_18_4_entity.c → src/world/area_dgb/dgb_18/entity.c b/src/world/area_dgb/dgb_18/dgb_18_4_entity.c → src/world/area_dgb/dgb_18/entity.c
diff --git a/src/world/area_dgb/dgb_18/dgb_18_2_main.c → src/world/area_dgb/dgb_18/main.c b/src/world/area_dgb/dgb_18/dgb_18_2_main.c → src/world/area_dgb/dgb_18/main.c
diff --git a/src/world/area_dgb/dgb_18/dgb_18_1_music.c → src/world/area_dgb/dgb_18/music.c b/src/world/area_dgb/dgb_18/dgb_18_1_music.c → src/world/area_dgb/dgb_18/music.c
diff --git a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c → src/world/area_dgb/dgb_18/npc.c b/src/world/area_dgb/dgb_18/dgb_18_3_npc.c → src/world/area_dgb/dgb_18/npc.c
diff --git a/src/world/area_dgb/dgb_18/dgb_18_0_header.c → src/world/area_dgb/dgb_18/settings.c b/src/world/area_dgb/dgb_18/dgb_18_0_header.c → src/world/area_dgb/dgb_18/settings.c
diff --git a/src/world/area_dgb/dgb_01_smash_bridges.c → src/world/area_dgb/smash_bridges.c b/src/world/area_dgb/dgb_01_smash_bridges.c → src/world/area_dgb/smash_bridges.c
diff --git a/src/world/area_dro/dro_01/dro_01_6_entity.c → src/world/area_dro/dro_01/entity.c b/src/world/area_dro/dro_01/dro_01_6_entity.c → src/world/area_dro/dro_01/entity.c
diff --git a/src/world/area_dro/dro_01/dro_01_7_foliage.c → src/world/area_dro/dro_01/foliage.c b/src/world/area_dro/dro_01/dro_01_7_foliage.c → src/world/area_dro/dro_01/foliage.c
diff --git a/src/world/area_dro/dro_01/dro_01_2_main.c → src/world/area_dro/dro_01/main.c b/src/world/area_dro/dro_01/dro_01_2_main.c → src/world/area_dro/dro_01/main.c
diff --git a/src/world/area_dro/dro_01/dro_01_1_music.c → src/world/area_dro/dro_01/music.c b/src/world/area_dro/dro_01/dro_01_1_music.c → src/world/area_dro/dro_01/music.c
diff --git a/src/world/area_dro/dro_01/dro_01_3_npc.c → src/world/area_dro/dro_01/npc.c b/src/world/area_dro/dro_01/dro_01_3_npc.c → src/world/area_dro/dro_01/npc.c
diff --git a/src/world/area_dro/dro_01/dro_01_5_rooms.c → src/world/area_dro/dro_01/rooms.c b/src/world/area_dro/dro_01/dro_01_5_rooms.c → src/world/area_dro/dro_01/rooms.c
diff --git a/src/world/area_dro/dro_01/dro_01_0_header.c → src/world/area_dro/dro_01/settings.c b/src/world/area_dro/dro_01/dro_01_0_header.c → src/world/area_dro/dro_01/settings.c
diff --git a/src/world/area_dro/dro_01/dro_01_4_shop.c → src/world/area_dro/dro_01/shop.c b/src/world/area_dro/dro_01/dro_01_4_shop.c → src/world/area_dro/dro_01/shop.c
diff --git a/src/world/area_dro/dro_02/dro_02_2_entity.c → src/world/area_dro/dro_02/entity.c b/src/world/area_dro/dro_02/dro_02_2_entity.c → src/world/area_dro/dro_02/entity.c
diff --git a/src/world/area_dro/dro_02/dro_02_3_main.c → src/world/area_dro/dro_02/main.c b/src/world/area_dro/dro_02/dro_02_3_main.c → src/world/area_dro/dro_02/main.c
diff --git a/src/world/area_dro/dro_02/dro_02_1_music.c → src/world/area_dro/dro_02/music.c b/src/world/area_dro/dro_02/dro_02_1_music.c → src/world/area_dro/dro_02/music.c
diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c → src/world/area_dro/dro_02/npc.c b/src/world/area_dro/dro_02/dro_02_5_npc.c → src/world/area_dro/dro_02/npc.c
diff --git a/src/world/area_dro/dro_02/dro_02_4_rooms.c → src/world/area_dro/dro_02/rooms.c b/src/world/area_dro/dro_02/dro_02_4_rooms.c → src/world/area_dro/dro_02/rooms.c
diff --git a/src/world/area_dro/dro_02/dro_02_0_header.c → src/world/area_dro/dro_02/settings.c b/src/world/area_dro/dro_02/dro_02_0_header.c → src/world/area_dro/dro_02/settings.c
diff --git a/src/world/area_end/end_00/end_00_4_allies.c → src/world/area_end/end_00/allies.c b/src/world/area_end/end_00/end_00_4_allies.c → src/world/area_end/end_00/allies.c
diff --git a/src/world/area_end/end_00/end_00_7_boos.c → src/world/area_end/end_00/boos.c b/src/world/area_end/end_00/end_00_7_boos.c → src/world/area_end/end_00/boos.c
diff --git a/src/world/area_end/end_00/end_00_B_bowser.c → src/world/area_end/end_00/bowser.c b/src/world/area_end/end_00/end_00_B_bowser.c → src/world/area_end/end_00/bowser.c
diff --git a/src/world/area_end/end_00/end_00_6_caravan.c → src/world/area_end/end_00/caravan.c b/src/world/area_end/end_00/end_00_6_caravan.c → src/world/area_end/end_00/caravan.c
diff --git a/src/world/area_end/end_00/end_00_2_credits.c → src/world/area_end/end_00/credits.c b/src/world/area_end/end_00/end_00_2_credits.c → src/world/area_end/end_00/credits.c
diff --git a/...d/area_end/end_00/end_00_A_crystal_king.c → src/world/area_end/end_00/crystal_king.c b/...d/area_end/end_00/end_00_A_crystal_king.c → src/world/area_end/end_00/crystal_king.c
diff --git a/...ld/area_end/end_00/end_00_9_huff_n_puff.c → src/world/area_end/end_00/huff_n_puff.c b/...ld/area_end/end_00/end_00_9_huff_n_puff.c → src/world/area_end/end_00/huff_n_puff.c
diff --git a/src/world/area_end/end_00/end_00_5_koopas.c → src/world/area_end/end_00/koopas.c b/src/world/area_end/end_00/end_00_5_koopas.c → src/world/area_end/end_00/koopas.c
diff --git a/src/world/area_end/end_00/end_00_1_main.c → src/world/area_end/end_00/main.c b/src/world/area_end/end_00/end_00_1_main.c → src/world/area_end/end_00/main.c
diff --git a/...d/area_end/end_00/end_00_3_parade_setup.c → src/world/area_end/end_00/parade_setup.c b/...d/area_end/end_00/end_00_3_parade_setup.c → src/world/area_end/end_00/parade_setup.c
diff --git a/src/world/area_end/end_00/end_00_0_header.c → src/world/area_end/end_00/settings.c b/src/world/area_end/end_00/end_00_0_header.c → src/world/area_end/end_00/settings.c
diff --git a/src/world/area_end/end_00/end_00_8_yoshis.c → src/world/area_end/end_00/yoshis.c b/src/world/area_end/end_00/end_00_8_yoshis.c → src/world/area_end/end_00/yoshis.c
diff --git a/src/world/area_end/end_01/end_01_2_credits.c → src/world/area_end/end_01/credits.c b/src/world/area_end/end_01/end_01_2_credits.c → src/world/area_end/end_01/credits.c
diff --git a/...d/area_end/end_01/end_01_5_flower_float.c → src/world/area_end/end_01/flower_float.c b/...d/area_end/end_01/end_01_5_flower_float.c → src/world/area_end/end_01/flower_float.c
diff --git a/src/world/area_end/end_01/end_01_1_main.c → src/world/area_end/end_01/main.c b/src/world/area_end/end_01/end_01_1_main.c → src/world/area_end/end_01/main.c
diff --git a/...ld/area_end/end_01/end_01_4_opera_float.c → src/world/area_end/end_01/opera_float.c b/...ld/area_end/end_01/end_01_4_opera_float.c → src/world/area_end/end_01/opera_float.c
diff --git a/...d/area_end/end_01/end_01_3_parade_setup.c → src/world/area_end/end_01/parade_setup.c b/...d/area_end/end_01/end_01_3_parade_setup.c → src/world/area_end/end_01/parade_setup.c
diff --git a/...ld/area_end/end_01/end_01_7_peach_float.c → src/world/area_end/end_01/peach_float.c b/...ld/area_end/end_01/end_01_7_peach_float.c → src/world/area_end/end_01/peach_float.c
diff --git a/src/world/area_end/end_01/end_01_0_header.c → src/world/area_end/end_01/settings.c b/src/world/area_end/end_01/end_01_0_header.c → src/world/area_end/end_01/settings.c
diff --git a/...d/area_end/end_01/end_01_6_shyguy_float.c → src/world/area_end/end_01/shyguy_float.c b/...d/area_end/end_01/end_01_6_shyguy_float.c → src/world/area_end/end_01/shyguy_float.c
diff --git a/...orld/area_flo/flo_00/flo_00_5_beanstalk.c → src/world/area_flo/flo_00/beanstalk.c b/...orld/area_flo/flo_00/flo_00_5_beanstalk.c → src/world/area_flo/flo_00/beanstalk.c
diff --git a/src/world/area_flo/flo_00/flo_00_6_entity.c → src/world/area_flo/flo_00/entity.c b/src/world/area_flo/flo_00/flo_00_6_entity.c → src/world/area_flo/flo_00/entity.c
diff --git a/...world/area_flo/flo_00/flo_00_4_epilogue.c → src/world/area_flo/flo_00/epilogue.c b/...world/area_flo/flo_00/flo_00_4_epilogue.c → src/world/area_flo/flo_00/epilogue.c
diff --git a/src/world/area_flo/flo_00/flo_00_2_main.c → src/world/area_flo/flo_00/main.c b/src/world/area_flo/flo_00/flo_00_2_main.c → src/world/area_flo/flo_00/main.c
diff --git a/src/world/area_flo/flo_00/flo_00_1_music.c → src/world/area_flo/flo_00/music.c b/src/world/area_flo/flo_00/flo_00_1_music.c → src/world/area_flo/flo_00/music.c
diff --git a/src/world/area_flo/flo_00/flo_00_3_npc.c → src/world/area_flo/flo_00/npc.c b/src/world/area_flo/flo_00/flo_00_3_npc.c → src/world/area_flo/flo_00/npc.c
diff --git a/src/world/area_flo/flo_00/flo_00_0_header.c → src/world/area_flo/flo_00/settings.c b/src/world/area_flo/flo_00/flo_00_0_header.c → src/world/area_flo/flo_00/settings.c
diff --git a/src/world/area_flo/flo_03/flo_03_5_entity.c → src/world/area_flo/flo_03/entity.c b/src/world/area_flo/flo_03/flo_03_5_entity.c → src/world/area_flo/flo_03/entity.c
diff --git a/src/world/area_flo/flo_03/flo_03_4_foliage.c → src/world/area_flo/flo_03/foliage.c b/src/world/area_flo/flo_03/flo_03_4_foliage.c → src/world/area_flo/flo_03/foliage.c
diff --git a/src/world/area_flo/flo_03/flo_03_2_main.c → src/world/area_flo/flo_03/main.c b/src/world/area_flo/flo_03/flo_03_2_main.c → src/world/area_flo/flo_03/main.c
diff --git a/src/world/area_flo/flo_03/flo_03_1_music.c → src/world/area_flo/flo_03/music.c b/src/world/area_flo/flo_03/flo_03_1_music.c → src/world/area_flo/flo_03/music.c
diff --git a/src/world/area_flo/flo_03/flo_03_3_npc.c → src/world/area_flo/flo_03/npc.c b/src/world/area_flo/flo_03/flo_03_3_npc.c → src/world/area_flo/flo_03/npc.c
diff --git a/src/world/area_flo/flo_03/flo_03_0_header.c → src/world/area_flo/flo_03/settings.c b/src/world/area_flo/flo_03/flo_03_0_header.c → src/world/area_flo/flo_03/settings.c
diff --git a/src/world/area_flo/flo_07/flo_07_2_main.c → src/world/area_flo/flo_07/main.c b/src/world/area_flo/flo_07/flo_07_2_main.c → src/world/area_flo/flo_07/main.c
diff --git a/src/world/area_flo/flo_07/flo_07_1_music.c → src/world/area_flo/flo_07/music.c b/src/world/area_flo/flo_07/flo_07_1_music.c → src/world/area_flo/flo_07/music.c
diff --git a/src/world/area_flo/flo_07/flo_07_3_npc.c → src/world/area_flo/flo_07/npc.c b/src/world/area_flo/flo_07/flo_07_3_npc.c → src/world/area_flo/flo_07/npc.c
diff --git a/src/world/area_flo/flo_07/flo_07_0_header.c → src/world/area_flo/flo_07/settings.c b/src/world/area_flo/flo_07/flo_07_0_header.c → src/world/area_flo/flo_07/settings.c
diff --git a/src/world/area_flo/flo_08/flo_08_2_entity.c → src/world/area_flo/flo_08/entity.c b/src/world/area_flo/flo_08/flo_08_2_entity.c → src/world/area_flo/flo_08/entity.c
diff --git a/src/world/area_flo/flo_08/flo_08_5_foliage.c → src/world/area_flo/flo_08/foliage.c b/src/world/area_flo/flo_08/flo_08_5_foliage.c → src/world/area_flo/flo_08/foliage.c
diff --git a/src/world/area_flo/flo_08/flo_08_3_main.c → src/world/area_flo/flo_08/main.c b/src/world/area_flo/flo_08/flo_08_3_main.c → src/world/area_flo/flo_08/main.c
diff --git a/src/world/area_flo/flo_08/flo_08_1_music.c → src/world/area_flo/flo_08/music.c b/src/world/area_flo/flo_08/flo_08_1_music.c → src/world/area_flo/flo_08/music.c
diff --git a/src/world/area_flo/flo_08/flo_08_4_npc.c → src/world/area_flo/flo_08/npc.c b/src/world/area_flo/flo_08/flo_08_4_npc.c → src/world/area_flo/flo_08/npc.c
diff --git a/src/world/area_flo/flo_08/flo_08_0_header.c → src/world/area_flo/flo_08/settings.c b/src/world/area_flo/flo_08/flo_08_0_header.c → src/world/area_flo/flo_08/settings.c
diff --git a/src/world/area_flo/flo_08/flo_08_6_vines.c → src/world/area_flo/flo_08/vines.c b/src/world/area_flo/flo_08/flo_08_6_vines.c → src/world/area_flo/flo_08/vines.c
diff --git a/src/world/area_flo/flo_09/flo_09_4_foliage.c → src/world/area_flo/flo_09/foliage.c b/src/world/area_flo/flo_09/flo_09_4_foliage.c → src/world/area_flo/flo_09/foliage.c
diff --git a/src/world/area_flo/flo_09/flo_09_2_main.c → src/world/area_flo/flo_09/main.c b/src/world/area_flo/flo_09/flo_09_2_main.c → src/world/area_flo/flo_09/main.c
diff --git a/src/world/area_flo/flo_09/flo_09_1_music.c → src/world/area_flo/flo_09/music.c b/src/world/area_flo/flo_09/flo_09_1_music.c → src/world/area_flo/flo_09/music.c
diff --git a/src/world/area_flo/flo_09/flo_09_5_npc.c → src/world/area_flo/flo_09/npc.c b/src/world/area_flo/flo_09/flo_09_5_npc.c → src/world/area_flo/flo_09/npc.c
diff --git a/src/world/area_flo/flo_09/flo_09_0_header.c → src/world/area_flo/flo_09/settings.c b/src/world/area_flo/flo_09/flo_09_0_header.c → src/world/area_flo/flo_09/settings.c
diff --git a/src/world/area_flo/flo_09/flo_09_3_vines.c → src/world/area_flo/flo_09/vines.c b/src/world/area_flo/flo_09/flo_09_3_vines.c → src/world/area_flo/flo_09/vines.c
diff --git a/src/world/area_flo/flo_10/flo_10_2_entity.c → src/world/area_flo/flo_10/entity.c b/src/world/area_flo/flo_10/flo_10_2_entity.c → src/world/area_flo/flo_10/entity.c
diff --git a/src/world/area_flo/flo_10/flo_10_7_foliage.c → src/world/area_flo/flo_10/foliage.c b/src/world/area_flo/flo_10/flo_10_7_foliage.c → src/world/area_flo/flo_10/foliage.c
diff --git a/...world/area_flo/flo_10/flo_10_4_fountain.c → src/world/area_flo/flo_10/fountain.c b/...world/area_flo/flo_10/flo_10_4_fountain.c → src/world/area_flo/flo_10/fountain.c
diff --git a/src/world/area_flo/flo_10/flo_10_3_main.c → src/world/area_flo/flo_10/main.c b/src/world/area_flo/flo_10/flo_10_3_main.c → src/world/area_flo/flo_10/main.c
diff --git a/src/world/area_flo/flo_10/flo_10_1_music.c → src/world/area_flo/flo_10/music.c b/src/world/area_flo/flo_10/flo_10_1_music.c → src/world/area_flo/flo_10/music.c
diff --git a/src/world/area_flo/flo_10/flo_10_5_npc.c → src/world/area_flo/flo_10/npc.c b/src/world/area_flo/flo_10/flo_10_5_npc.c → src/world/area_flo/flo_10/npc.c
diff --git a/src/world/area_flo/flo_10/flo_10_0_header.c → src/world/area_flo/flo_10/settings.c b/src/world/area_flo/flo_10/flo_10_0_header.c → src/world/area_flo/flo_10/settings.c
diff --git a/src/world/area_flo/flo_10/flo_10_6_waterfx.c → src/world/area_flo/flo_10/waterfx.c b/src/world/area_flo/flo_10/flo_10_6_waterfx.c → src/world/area_flo/flo_10/waterfx.c
diff --git a/src/world/area_flo/flo_11/flo_11_4_entity.c → src/world/area_flo/flo_11/entity.c b/src/world/area_flo/flo_11/flo_11_4_entity.c → src/world/area_flo/flo_11/entity.c
diff --git a/src/world/area_flo/flo_11/flo_11_2_main.c → src/world/area_flo/flo_11/main.c b/src/world/area_flo/flo_11/flo_11_2_main.c → src/world/area_flo/flo_11/main.c
diff --git a/src/world/area_flo/flo_11/flo_11_1_music.c → src/world/area_flo/flo_11/music.c b/src/world/area_flo/flo_11/flo_11_1_music.c → src/world/area_flo/flo_11/music.c
diff --git a/src/world/area_flo/flo_11/flo_11_3_npc.c → src/world/area_flo/flo_11/npc.c b/src/world/area_flo/flo_11/flo_11_3_npc.c → src/world/area_flo/flo_11/npc.c
diff --git a/src/world/area_flo/flo_11/flo_11_0_header.c → src/world/area_flo/flo_11/settings.c b/src/world/area_flo/flo_11/flo_11_0_header.c → src/world/area_flo/flo_11/settings.c
diff --git a/src/world/area_flo/flo_12/flo_12_2_main.c → src/world/area_flo/flo_12/main.c b/src/world/area_flo/flo_12/flo_12_2_main.c → src/world/area_flo/flo_12/main.c
diff --git a/src/world/area_flo/flo_12/flo_12_1_music.c → src/world/area_flo/flo_12/music.c b/src/world/area_flo/flo_12/flo_12_1_music.c → src/world/area_flo/flo_12/music.c
diff --git a/src/world/area_flo/flo_12/flo_12_3_npc.c → src/world/area_flo/flo_12/npc.c b/src/world/area_flo/flo_12/flo_12_3_npc.c → src/world/area_flo/flo_12/npc.c
diff --git a/src/world/area_flo/flo_12/flo_12_0_header.c → src/world/area_flo/flo_12/settings.c b/src/world/area_flo/flo_12/flo_12_0_header.c → src/world/area_flo/flo_12/settings.c
diff --git a/src/world/area_flo/flo_13/flo_13_2_entity.c → src/world/area_flo/flo_13/entity.c b/src/world/area_flo/flo_13/flo_13_2_entity.c → src/world/area_flo/flo_13/entity.c
diff --git a/src/world/area_flo/flo_13/flo_13_3_main.c → src/world/area_flo/flo_13/main.c b/src/world/area_flo/flo_13/flo_13_3_main.c → src/world/area_flo/flo_13/main.c
diff --git a/src/world/area_flo/flo_13/flo_13_1_music.c → src/world/area_flo/flo_13/music.c b/src/world/area_flo/flo_13/flo_13_1_music.c → src/world/area_flo/flo_13/music.c
diff --git a/...ld/area_flo/flo_13/flo_13_5_new_partner.c → src/world/area_flo/flo_13/new_partner.c b/...ld/area_flo/flo_13/flo_13_5_new_partner.c → src/world/area_flo/flo_13/new_partner.c
diff --git a/src/world/area_flo/flo_13/flo_13_4_npc.c → src/world/area_flo/flo_13/npc.c b/src/world/area_flo/flo_13/flo_13_4_npc.c → src/world/area_flo/flo_13/npc.c
diff --git a/src/world/area_flo/flo_13/flo_13_0_header.c → src/world/area_flo/flo_13/settings.c b/src/world/area_flo/flo_13/flo_13_0_header.c → src/world/area_flo/flo_13/settings.c
diff --git a/src/world/area_flo/flo_14/flo_14_3_bubbles.c → src/world/area_flo/flo_14/bubbles.c b/src/world/area_flo/flo_14/flo_14_3_bubbles.c → src/world/area_flo/flo_14/bubbles.c
diff --git a/src/world/area_flo/flo_14/flo_14_5_entity.c → src/world/area_flo/flo_14/entity.c b/src/world/area_flo/flo_14/flo_14_5_entity.c → src/world/area_flo/flo_14/entity.c
diff --git a/src/world/area_flo/flo_14/flo_14_6_logs.c → src/world/area_flo/flo_14/logs.c b/src/world/area_flo/flo_14/flo_14_6_logs.c → src/world/area_flo/flo_14/logs.c
diff --git a/src/world/area_flo/flo_14/flo_14_2_main.c → src/world/area_flo/flo_14/main.c b/src/world/area_flo/flo_14/flo_14_2_main.c → src/world/area_flo/flo_14/main.c
diff --git a/src/world/area_flo/flo_14/flo_14_1_music.c → src/world/area_flo/flo_14/music.c b/src/world/area_flo/flo_14/flo_14_1_music.c → src/world/area_flo/flo_14/music.c
diff --git a/src/world/area_flo/flo_14/flo_14_4_npc.c → src/world/area_flo/flo_14/npc.c b/src/world/area_flo/flo_14/flo_14_4_npc.c → src/world/area_flo/flo_14/npc.c
diff --git a/src/world/area_flo/flo_14/flo_14_0_header.c → src/world/area_flo/flo_14/settings.c b/src/world/area_flo/flo_14/flo_14_0_header.c → src/world/area_flo/flo_14/settings.c
diff --git a/src/world/area_flo/flo_15/flo_15_4_entity.c → src/world/area_flo/flo_15/entity.c b/src/world/area_flo/flo_15/flo_15_4_entity.c → src/world/area_flo/flo_15/entity.c
diff --git a/src/world/area_flo/flo_15/flo_15_2_main.c → src/world/area_flo/flo_15/main.c b/src/world/area_flo/flo_15/flo_15_2_main.c → src/world/area_flo/flo_15/main.c
diff --git a/src/world/area_flo/flo_15/flo_15_1_music.c → src/world/area_flo/flo_15/music.c b/src/world/area_flo/flo_15/flo_15_1_music.c → src/world/area_flo/flo_15/music.c
diff --git a/src/world/area_flo/flo_15/flo_15_3_npc.c → src/world/area_flo/flo_15/npc.c b/src/world/area_flo/flo_15/flo_15_3_npc.c → src/world/area_flo/flo_15/npc.c
diff --git a/src/world/area_flo/flo_15/flo_15_0_header.c → src/world/area_flo/flo_15/settings.c b/src/world/area_flo/flo_15/flo_15_0_header.c → src/world/area_flo/flo_15/settings.c
diff --git a/src/world/area_flo/flo_15/flo_15_5_stairs.c → src/world/area_flo/flo_15/stairs.c b/src/world/area_flo/flo_15/flo_15_5_stairs.c → src/world/area_flo/flo_15/stairs.c
diff --git a/src/world/area_flo/flo_16/flo_16_4_entity.c → src/world/area_flo/flo_16/entity.c b/src/world/area_flo/flo_16/flo_16_4_entity.c → src/world/area_flo/flo_16/entity.c
diff --git a/src/world/area_flo/flo_16/flo_16_2_main.c → src/world/area_flo/flo_16/main.c b/src/world/area_flo/flo_16/flo_16_2_main.c → src/world/area_flo/flo_16/main.c
diff --git a/src/world/area_flo/flo_16/flo_16_1_music.c → src/world/area_flo/flo_16/music.c b/src/world/area_flo/flo_16/flo_16_1_music.c → src/world/area_flo/flo_16/music.c
diff --git a/src/world/area_flo/flo_16/flo_16_5_npc.c → src/world/area_flo/flo_16/npc.c b/src/world/area_flo/flo_16/flo_16_5_npc.c → src/world/area_flo/flo_16/npc.c
diff --git a/src/world/area_flo/flo_16/flo_16_6_puzzle.c → src/world/area_flo/flo_16/puzzle.c b/src/world/area_flo/flo_16/flo_16_6_puzzle.c → src/world/area_flo/flo_16/puzzle.c
diff --git a/src/world/area_flo/flo_16/flo_16_0_header.c → src/world/area_flo/flo_16/settings.c b/src/world/area_flo/flo_16/flo_16_0_header.c → src/world/area_flo/flo_16/settings.c
diff --git a/src/world/area_flo/flo_16/flo_16_3_vines.c → src/world/area_flo/flo_16/vines.c b/src/world/area_flo/flo_16/flo_16_3_vines.c → src/world/area_flo/flo_16/vines.c
diff --git a/src/world/area_flo/flo_17/flo_17_5_entity.c → src/world/area_flo/flo_17/entity.c b/src/world/area_flo/flo_17/flo_17_5_entity.c → src/world/area_flo/flo_17/entity.c
diff --git a/src/world/area_flo/flo_17/flo_17_3_logs.c → src/world/area_flo/flo_17/logs.c b/src/world/area_flo/flo_17/flo_17_3_logs.c → src/world/area_flo/flo_17/logs.c
diff --git a/src/world/area_flo/flo_17/flo_17_2_main.c → src/world/area_flo/flo_17/main.c b/src/world/area_flo/flo_17/flo_17_2_main.c → src/world/area_flo/flo_17/main.c
diff --git a/src/world/area_flo/flo_17/flo_17_1_music.c → src/world/area_flo/flo_17/music.c b/src/world/area_flo/flo_17/flo_17_1_music.c → src/world/area_flo/flo_17/music.c
diff --git a/src/world/area_flo/flo_17/flo_17_4_npc.c → src/world/area_flo/flo_17/npc.c b/src/world/area_flo/flo_17/flo_17_4_npc.c → src/world/area_flo/flo_17/npc.c
diff --git a/src/world/area_flo/flo_17/flo_17_0_header.c → src/world/area_flo/flo_17/settings.c b/src/world/area_flo/flo_17/flo_17_0_header.c → src/world/area_flo/flo_17/settings.c
diff --git a/src/world/area_flo/flo_18/flo_18_5_foliage.c → src/world/area_flo/flo_18/foliage.c b/src/world/area_flo/flo_18/flo_18_5_foliage.c → src/world/area_flo/flo_18/foliage.c
diff --git a/src/world/area_flo/flo_18/flo_18_3_machine.c → src/world/area_flo/flo_18/machine.c b/src/world/area_flo/flo_18/flo_18_3_machine.c → src/world/area_flo/flo_18/machine.c
diff --git a/src/world/area_flo/flo_18/flo_18_2_main.c → src/world/area_flo/flo_18/main.c b/src/world/area_flo/flo_18/flo_18_2_main.c → src/world/area_flo/flo_18/main.c
diff --git a/src/world/area_flo/flo_18/flo_18_1_music.c → src/world/area_flo/flo_18/music.c b/src/world/area_flo/flo_18/flo_18_1_music.c → src/world/area_flo/flo_18/music.c
diff --git a/src/world/area_flo/flo_18/flo_18_4_npc.c → src/world/area_flo/flo_18/npc.c b/src/world/area_flo/flo_18/flo_18_4_npc.c → src/world/area_flo/flo_18/npc.c
diff --git a/src/world/area_flo/flo_18/flo_18_0_header.c → src/world/area_flo/flo_18/settings.c b/src/world/area_flo/flo_18/flo_18_0_header.c → src/world/area_flo/flo_18/settings.c
diff --git a/...orld/area_flo/flo_19/flo_19_5_beanstalk.c → src/world/area_flo/flo_19/beanstalk.c b/...orld/area_flo/flo_19/flo_19_5_beanstalk.c → src/world/area_flo/flo_19/beanstalk.c
diff --git a/src/world/area_flo/flo_19/flo_19_4_clouds.c → src/world/area_flo/flo_19/clouds.c b/src/world/area_flo/flo_19/flo_19_4_clouds.c → src/world/area_flo/flo_19/clouds.c
diff --git a/src/world/area_flo/flo_19/flo_19_2_entity.c → src/world/area_flo/flo_19/entity.c b/src/world/area_flo/flo_19/flo_19_2_entity.c → src/world/area_flo/flo_19/entity.c
diff --git a/src/world/area_flo/flo_19/flo_19_3_main.c → src/world/area_flo/flo_19/main.c b/src/world/area_flo/flo_19/flo_19_3_main.c → src/world/area_flo/flo_19/main.c
diff --git a/src/world/area_flo/flo_19/flo_19_1_music.c → src/world/area_flo/flo_19/music.c b/src/world/area_flo/flo_19/flo_19_1_music.c → src/world/area_flo/flo_19/music.c
diff --git a/src/world/area_flo/flo_19/flo_19_0_header.c → src/world/area_flo/flo_19/settings.c b/src/world/area_flo/flo_19/flo_19_0_header.c → src/world/area_flo/flo_19/settings.c
diff --git a/src/world/area_flo/flo_21/flo_21_3_clouds.c → src/world/area_flo/flo_21/clouds.c b/src/world/area_flo/flo_21/flo_21_3_clouds.c → src/world/area_flo/flo_21/clouds.c
diff --git a/src/world/area_flo/flo_21/flo_21_2_main.c → src/world/area_flo/flo_21/main.c b/src/world/area_flo/flo_21/flo_21_2_main.c → src/world/area_flo/flo_21/main.c
diff --git a/src/world/area_flo/flo_21/flo_21_1_music.c → src/world/area_flo/flo_21/music.c b/src/world/area_flo/flo_21/flo_21_1_music.c → src/world/area_flo/flo_21/music.c
diff --git a/src/world/area_flo/flo_21/flo_21_4_npc.c → src/world/area_flo/flo_21/npc.c b/src/world/area_flo/flo_21/flo_21_4_npc.c → src/world/area_flo/flo_21/npc.c
diff --git a/src/world/area_flo/flo_21/flo_21_0_header.c → src/world/area_flo/flo_21/settings.c b/src/world/area_flo/flo_21/flo_21_0_header.c → src/world/area_flo/flo_21/settings.c
diff --git a/src/world/area_flo/flo_22/flo_22_5_foliage.c → src/world/area_flo/flo_22/foliage.c b/src/world/area_flo/flo_22/flo_22_5_foliage.c → src/world/area_flo/flo_22/foliage.c
diff --git a/src/world/area_flo/flo_22/flo_22_2_main.c → src/world/area_flo/flo_22/main.c b/src/world/area_flo/flo_22/flo_22_2_main.c → src/world/area_flo/flo_22/main.c
diff --git a/src/world/area_flo/flo_22/flo_22_1_music.c → src/world/area_flo/flo_22/music.c b/src/world/area_flo/flo_22/flo_22_1_music.c → src/world/area_flo/flo_22/music.c
diff --git a/src/world/area_flo/flo_22/flo_22_3_npc.c → src/world/area_flo/flo_22/npc.c b/src/world/area_flo/flo_22/flo_22_3_npc.c → src/world/area_flo/flo_22/npc.c
diff --git a/src/world/area_flo/flo_22/flo_22_0_header.c → src/world/area_flo/flo_22/settings.c b/src/world/area_flo/flo_22/flo_22_0_header.c → src/world/area_flo/flo_22/settings.c
diff --git a/src/world/area_flo/flo_22/flo_22_4_well.c → src/world/area_flo/flo_22/well.c b/src/world/area_flo/flo_22/flo_22_4_well.c → src/world/area_flo/flo_22/well.c