From dd9df5438d488fe6a60da78d45723b503c42bbbb Mon Sep 17 00:00:00 2001
From: Alex Bates <16batesa@gmail.com>
Date: Wed, 2 Dec 2020 15:37:24 +0000
Subject: [PATCH] use area_xxx names for battle section dirs

---
 src/battle/battle.c | 94 ++++++++++++++++++++++-----------------------
 tools/splat.yaml    | 92 ++++++++++++++++++++++----------------------
 2 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/src/battle/battle.c b/src/battle/battle.c
index 2ecfcb24ff..9ac3ea1aa9 100644
--- a/src/battle/battle.c
+++ b/src/battle/battle.c
@@ -32,269 +32,269 @@ const s32 lol[] = {
 
 BattleArea gBattleAreas[] = {
     {
-        AREA(section_0),
+        AREA(area_kmr_part_1),
         .name = "エリア ＫＭＲ その１",
         .formations = 0x802194D4,
         .stages = 0x802195D8,
     },
     {
-        AREA(section_1),
+        AREA(area_kmr_part_2),
         .name = "エリア ＫＭＲ その２",
         .formations = 0x80219840,
         .stages = 0x8021987C,
     },
     {
-        AREA(section_2),
+        AREA(area_kmr_part_3),
         .name = "エリア ＫＭＲ その３",
         .formations = 0x8021A2AC,
         .stages = 0x8021A360,
     },
     {
-        AREA(section_3),
+        AREA(area_mac),
         .name = "エリア ＭＡＣ",
         .formations = 0x80232A5C,
         .stages = 0x80232AD4,
     },
     {
-        AREA(section_4),
+        AREA(area_hos),
         .name = "エリア ＨＯＳ",
         .formations = 0x80225F24,
         .stages = 0x80225F88,
     },
     {
-        AREA(section_5),
+        AREA(area_nok),
         .name = "エリア ＮＯＫ",
         .formations = 0x80219520,
         .stages = 0x80219728,
     },
     {
-        AREA(section_6),
+        AREA(area_trd_part_1),
         .name = "エリア ＴＲＤ その１",
         .formations = 0x80218CB0,
         .stages = 0x80218EE0,
     },
     {
-        AREA(section_7),
+        AREA(area_trd_part_2),
         .name = "エリア ＴＲＤ その２",
         .formations = 0x8021A5DC,
         .stages = 0x8021A604,
     },
     {
-        AREA(section_8),
+        AREA(area_trd_part_3),
         .name = "エリア ＴＲＤ その３",
         .formations = 0x8021823C,
         .stages = 0x80218264,
     },
     {
-        AREA(section_9),
+        AREA(area_iwa),
         .name = "エリア ＩＷＡ",
         .formations = 0x802185B8,
         .stages = 0x802186E4,
     },
     {
-        AREA(section_10),
+        AREA(area_sbk),
         .name = "エリア ＳＢＫ",
         .formations = 0x8021FE80,
         .stages = 0x8021FFE8,
     },
     {
-        AREA(section_11),
+        AREA(area_isk_part_1),
         .name = "エリア ＩＳＫ その１",
         .formations = 0x80224700,
         .stages = 0x802248A4,
     },
     {
-        AREA(section_12),
+        AREA(area_isk_part_2),
         .name = "エリア ＩＳＫ その２",
         .formations = 0x80220448,
         .stages = 0x80220470,
     },
     {
-        AREA(section_13),
+        AREA(area_mim),
         .name = "エリア ＭＩＭ",
         .formations = 0x8021EA70,
         .stages = 0x8021EBEC,
     },
     {
-        AREA(section_14),
+        AREA(area_arn),
         .name = "エリア ＡＲＮ",
         .formations = 0x80228110,
         .stages = 0x80228278,
     },
     {
-        AREA(section_15),
-        .name = "0x8009A438",
+        AREA(area_dgb),
+        .name = "エリア ＤＧＢ",
         .formations = 0x8021B38C,
         .stages = 0x8021B418,
     },
     {
-        AREA(section_16),
+        AREA(area_omo),
         .name = "エリア ＯＭＯ",
         .formations = 0x80230730,
         .stages = 0x80230AC8,
     },
     {
-        AREA(section_17),
+        AREA(area_omo2),
         .name = "エリア ＯＭＯ２",
         .formations = 0x8022FBF4,
         .stages = 0x8022FC1C,
     },
     {
-        AREA(section_18),
+        AREA(area_omo3),
         .name = "エリア ＯＭＯ３",
         .formations = 0x8022EA2C,
         .stages = 0x8022EB1C,
     },
     {
-        AREA(section_19),
+        AREA(area_kgr),
         .name = "エリア ＫＧＲ",
         .formations = 0x8021D5FC,
         .stages = 0x8021D624,
     },
     {
-        AREA(section_20),
+        AREA(area_jan),
         .name = "エリア ＪＡＮ",
         .formations = 0x80228AF8,
         .stages = 0x80228C60,
     },
     {
-        AREA(section_21),
+        AREA(area_jan2),
         .name = "エリア ＪＡＮ２",
         .formations = 0x8021F6C8,
         .stages = 0x8021F72C,
     },
     {
-        AREA(section_22),
+        AREA(area_kzn),
         .name = "エリア ＫＺＮ",
         .formations = 0x80229E74,
         .stages = 0x8022A02C,
     },
     {
-        AREA(section_23),
+        AREA(area_kzn2),
         .name = "エリア ＫＺＮ２",
         .formations = 0x8022AA08,
         .stages = 0x8022AA44,
         .dmaTable = 0x8022AA84,
     },
     {
-        AREA(section_24),
+        AREA(area_flo),
         .name = "エリア ＦＬＯ",
         .formations = 0x80234574,
         .stages = 0x8023486C,
     },
     {
-        AREA(section_25),
+        AREA(area_flo2),
         .name = "エリア ＦＬＯ２",
         .formations = 0x802356FC,
         .stages = 0x80235788,
     },
     {
-        AREA(section_26),
+        AREA(area_tik),
         .name = "エリア ＴＩＫ",
         .formations = 0x802340B4,
         .stages = 0x802342BC,
     },
     {
-        AREA(section_27),
+        AREA(area_tik2),
         .name = "エリア ＴＩＫ２",
         .formations = 0x80227A90,
         .stages = 0x80227AE0,
     },
     {
-        AREA(section_28),
+        AREA(area_tik3),
         .name = "エリア ＴＩＫ３",
         .formations = 0x802232E8,
         .stages = 0x8022334C,
     },
     {
-        AREA(section_29),
+        AREA(area_sam),
         .name = "エリア ＳＡＭ",
         .formations = 0x80231164,
         .stages = 0x80231290,
     },
     {
-        AREA(section_30),
+        AREA(area_sam2),
         .name = "エリア ＳＡＭ２",
         .formations = 0x802234F0,
         .stages = 0x8022352C,
     },
     {
-        AREA(section_31),
+        AREA(area_pra),
         .name = "エリア ＰＲＡ",
         .formations = 0x8022F4D4,
         .stages = 0x8022F614,
     },
     {
-        AREA(section_32),
+        AREA(area_pra2),
         .name = "エリア ＰＲＡ２",
         .formations = 0x802215A0,
         .stages = 0x802215C8,
     },
     {
-        AREA(section_33),
+        AREA(area_pra3),
         .name = "エリア ＰＲＡ３",
         .formations = 0x80232888,
         .stages = 0x8023298C,
     },
     {
-        AREA(section_34),
+        AREA(area_kpa),
         .name = "エリア ＫＰＡ",
         .formations = 0x80231A64,
         .stages = 0x80231ED8,
     },
     {
-        AREA(section_35),
+        AREA(area_kpa2),
         .name = "エリア ＫＰＡ２",
         .formations = 0x802346A8,
         .stages = 0x80234720,
     },
     {
-        AREA(section_36),
+        AREA(area_kpa3),
         .name = "エリア ＫＰＡ３",
         .formations = 0x8022839C,
         .stages = 0x802283EC,
     },
     {
-        AREA(section_37),
+        AREA(area_kpa4),
         .name = "エリア ＫＰＡ４",
         .formations = 0x80227910,
         .stages = 0x80227988,
     },
     {
-        AREA(section_38),
+        AREA(area_kkj),
         .name = "エリア ＫＫＪ",
         .formations = 0x802185BC,
         .stages = 0x802185E4,
     },
     {
-        AREA(section_39),
+        AREA(area_dig),
         .name = "エリア ＤＩＧ",
         .formations = 0x8022A7C4,
         .stages = 0x8022A83C,
     },
     {},
     {
-        AREA(section_41),
+        AREA(area_omo2_1),
         .name = "エリア ＯＭＯ２＿１",
     },
     {
-        AREA(section_42),
+        AREA(area_omo2_2),
         .name = "エリア ＯＭＯ２＿２",
     },
     {
-        AREA(section_43),
+        AREA(area_omo2_3),
         .name = "エリア ＯＭＯ２＿３",
     },
     {
-        AREA(section_44),
+        AREA(area_omo2_4),
         .name = "エリア ＯＭＯ２＿４",
     },
     {
-        AREA(section_45),
+        AREA(area_omo2_5),
         .name = "エリア ＯＭＯ２＿５",
     },
     {
-        AREA(section_46),
+        AREA(area_omo2_6),
         .name = "エリア ＯＭＯ２＿６",
     },
     {},
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 8538194a8d..7bc1203387 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -899,277 +899,277 @@ segments:
     files:
     - [0x415D90, c]
   - [0x4200C0, bin] # todo split this further
-  - name: battle/section_0/
+  - name: battle/area_kmr_part_1/
     type: code
     start: 0x4309A0
     vram: 0x80218000
     files:
     - [0x4309A0, bin]
-  - name: battle/section_1/
+  - name: battle/area_kmr_part_2/
     type: code
     start: 0x439A90
     vram: 0x80218000
     files:
     - [0x439A90, bin]
-  - name: battle/section_2/
+  - name: battle/area_kmr_part_3/
     type: code
     start: 0x447440
     vram: 0x80218000
     files:
     - [0x447440, bin]
-  - name: battle/section_3/
+  - name: battle/area_mac/
     type: code
     start: 0x464490
     vram: 0x80218000
     files:
     - [0x464490, bin]
-  - name: battle/section_4/
+  - name: battle/area_hos/
     type: code
     start: 0x47F0B0
     vram: 0x80218000
     files:
     - [0x47F0B0, bin]
-  - name: battle/section_5/
+  - name: battle/area_nok/
     type: code
     start: 0x48D1A0
     vram: 0x80218000
     files:
     - [0x48D1A0, bin]
-  - name: battle/section_6/
+  - name: battle/area_trd_part_1/
     type: code
     start: 0x4A10A0
     vram: 0x80218000
     files:
     - [0x4A10A0, bin]
-  - name: battle/section_7/
+  - name: battle/area_trd_part_2/
     type: code
     start: 0x4B11F0
     vram: 0x80218000
     files:
     - [0x4B11F0, bin]
-  - name: battle/section_8/
+  - name: battle/area_trd_part_3/
     type: code
     start: 0x4CF1B0
     vram: 0x80218000
     files:
     - [0x4CF1B0, bin]
-  - name: battle/section_9/
+  - name: battle/area_iwa/
     type: code
     start: 0x4D01F0
     vram: 0x80218000
     files:
     - [0x4D01F0, bin]
-  - name: battle/section_10/
+  - name: battle/area_sbk/
     type: code
     start: 0x4DA5E0
     vram: 0x80218000
     files:
     - [0x4DA5E0, bin]
-  - name: battle/section_11/
+  - name: battle/area_isk_part_1/
     type: code
     start: 0x4E2740
     vram: 0x80218000
     files:
     - [0x4E2740, bin]
-  - name: battle/section_12/
+  - name: battle/area_isk_part_2/
     type: code
     start: 0x4EF4A0
     vram: 0x80218000
     files:
     - [0x4EF4A0, bin]
-  - name: battle/section_13/
+  - name: battle/area_mim/
     type: code
     start: 0x4F7BE0
     vram: 0x80218000
     files:
     - [0x4F7BE0, bin]
-  - name: battle/section_14/
+  - name: battle/area_arn/
     type: code
     start: 0x4FEA50
     vram: 0x80218000
     files:
     - [0x4FEA50, bin]
-  - name: battle/section_15/
+  - name: battle/area_dgb/
     type: code
     start: 0x50F020
     vram: 0x80218000
     files:
     - [0x50F020, bin]
-  - name: battle/section_16/
+  - name: battle/area_omo/
     type: code
     start: 0x5125D0
     vram: 0x80218000
     files:
     - [0x5125D0, bin]
-  - name: battle/section_17/
+  - name: battle/area_omo2/
     type: code
     start: 0x52B6A0
     vram: 0x80218000
     files:
     - [0x52B6A0, bin]
-  - name: battle/section_41/
+  - name: battle/area_omo2_1/
     type: code
     start: 0x543570
     vram: 0x80231000
     files:
     - [0x543570, bin]
-  - name: battle/section_42/
+  - name: battle/area_omo2_2/
     type: code
     start: 0x5483E0
     vram: 0x80231000
     files:
     - [0x5483E0, bin]
-  - name: battle/section_43/
+  - name: battle/area_omo2_3/
     type: code
     start: 0x54CC70
     vram: 0x80231000
     files:
     - [0x54CC70, bin]
-  - name: battle/section_44/
+  - name: battle/area_omo2_4/
     type: code
     start: 0x552440
     vram: 0x80231000
     files:
     - [0x552440, bin]
-  - name: battle/section_45/
+  - name: battle/area_omo2_5/
     type: code
     start: 0x552BB0
     vram: 0x80231000
     files:
     - [0x552BB0, bin]
-  - name: battle/section_46/
+  - name: battle/area_omo2_6/
     type: code
     start: 0x556C90
     vram: 0x80231000
     files:
     - [0x556C90, bin]
-  - name: battle/section_18/
+  - name: battle/area_omo3/
     type: code
     start: 0x5573E0
     vram: 0x80218000
     files:
     - [0x5573E0, bin]
-  - name: battle/section_19/
+  - name: battle/area_kgr/
     type: code
     start: 0x56E2A0
     vram: 0x80218000
     files:
     - [0x56E2A0, bin]
-  - name: battle/section_20/
+  - name: battle/area_jan/
     type: code
     start: 0x573920
     vram: 0x80218000
     files:
     - [0x573920, bin]
-  - name: battle/section_21/
+  - name: battle/area_jan2/
     type: code
     start: 0x584940
     vram: 0x80218000
     files:
     - [0x584940, bin]
-  - name: battle/section_22/
+  - name: battle/area_kzn/
     type: code
     start: 0x58C2F0
     vram: 0x80218000
     files:
     - [0x58C2F0, bin]
-  - name: battle/section_23/
+  - name: battle/area_kzn2/
     type: code
     start: 0x59E6E0
     vram: 0x80218000
     files:
     - [0x59E6E0, bin]
-  - name: battle/section_24/
+  - name: battle/area_flo/
     type: code
     start: 0x5B14B0
     vram: 0x80218000
     files:
     - [0x5B14B0, bin]
-  - name: battle/section_25/
+  - name: battle/area_flo2/
     type: code
     start: 0x5CE690
     vram: 0x80218000
     files:
     - [0x5CE690, bin]
-  - name: battle/section_26/
+  - name: battle/area_tik/
     type: code
     start: 0x5EC490
     vram: 0x80218000
     files:
     - [0x5EC490, bin]
-  - name: battle/section_27/
+  - name: battle/area_tik2/
     type: code
     start: 0x608AB0
     vram: 0x80218000
     files:
     - [0x608AB0, bin]
-  - name: battle/section_28/
+  - name: battle/area_tik3/
     type: code
     start: 0x6186F0
     vram: 0x80218000
     files:
     - [0x6186F0, bin]
-  - name: battle/section_29/
+  - name: battle/area_sam/
     type: code
     start: 0x623BA0
     vram: 0x80218000
     files:
     - [0x623BA0, bin]
-  - name: battle/section_30/
+  - name: battle/area_sam2/
     type: code
     start: 0x63D1E0
     vram: 0x80218000
     files:
     - [0x63D1E0, bin]
-  - name: battle/section_31/
+  - name: battle/area_pra/
     type: code
     start: 0x648E10
     vram: 0x80218000
     files:
     - [0x648E10, bin]
-  - name: battle/section_32/
+  - name: battle/area_pra2/
     type: code
     start: 0x660750
     vram: 0x80218000
     files:
     - [0x660750, bin]
-  - name: battle/section_33/
+  - name: battle/area_pra3/
     type: code
     start: 0x669D80
     vram: 0x80218000
     files:
     - [0x669D80, bin]
-  - name: battle/section_34/
+  - name: battle/area_kpa/
     type: code
     start: 0x684A30
     vram: 0x80218000
     files:
     - [0x684A30, bin]
-  - name: battle/section_35/
+  - name: battle/area_kpa2/
     type: code
     start: 0x69F200
     vram: 0x80218000
     files:
     - [0x69F200, bin]
-  - name: battle/section_36/
+  - name: battle/area_kpa3/
     type: code
     start: 0x6BBB90
     vram: 0x80218000
     files:
     - [0x6BBB90, bin]
-  - name: battle/section_37/
+  - name: battle/area_kpa4/
     type: code
     start: 0x6CC070
     vram: 0x80218000
     files:
     - [0x6CC070, bin]
-  - name: battle/section_38/
+  - name: battle/area_kkj/
     type: code
     start: 0x6DBDA0
     vram: 0x80218000
     files:
     - [0x6DBDA0, bin]
-  - name: battle/section_39/
+  - name: battle/area_dig/
     type: code
     start: 0x6DDDC0
     vram: 0x80218000