decode battle data (wip rodata)

src/battle/battle.c

@@ -0,0 +1,301 @@
+#include "common.h"
+#include "ld_addrs.h"
+
+typedef struct BattleArea {
+    /* 0x00 */ char* name; ///< JP debug name.
+    /* 0x04 */ s32 dmaStart;
+    /* 0x08 */ s32 dmaEnd;
+    /* 0x0C */ void* dmaDest;
+    /* 0x10 */ void* formations;
+    /* 0x14 */ void* stages;
+    /* 0x18 */ s32 unused_18;
+    /* 0x1C */ void* dmaTable;
+} BattleArea; // size = 0x20
+
+#define AREA(id) \
+    .dmaStart = &code_##id##_ROM_START, \
+    .dmaEnd = &code_##id##_ROM_END, \
+    .dmaDest = &code_##id##_VRAM
+
+// help
+const s32 lol[] = {
+    0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    0x08080808, 0x08080808, 0x08080808, 0x08080808,
+
+    0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    0x08080808, 0x08080808, 0x08080808, 0x08080808,
+};
+
+BattleArea gBattleAreas[] = {
+    {
+        AREA(section_0),
+        .name = "エリア ＫＭＲ その１",
+        .formations = 0x802194D4,
+        .stages = 0x802195D8,
+    },
+    {
+        AREA(section_1),
+        .name = "エリア ＫＭＲ その２",
+        .formations = 0x80219840,
+        .stages = 0x8021987C,
+    },
+    {
+        AREA(section_2),
+        .name = "エリア ＫＭＲ その３",
+        .formations = 0x8021A2AC,
+        .stages = 0x8021A360,
+    },
+    {
+        AREA(section_3),
+        .name = 0x8009A520,
+        .formations = 0x80232A5C,
+        .stages = 0x80232AD4,
+    },
+    {
+        AREA(section_4),
+        .name = 0x8009A510,
+        .formations = 0x80225F24,
+        .stages = 0x80225F88,
+    },
+    {
+        AREA(section_5),
+        .name = 0x8009A500,
+        .formations = 0x80219520,
+        .stages = 0x80219728,
+    },
+    {
+        AREA(section_6),
+        .name = 0x8009A4E8,
+        .formations = 0x80218CB0,
+        .stages = 0x80218EE0,
+    },
+    {
+        AREA(section_7),
+        .name = 0x8009A4D0,
+        .formations = 0x8021A5DC,
+        .stages = 0x8021A604,
+    },
+    {
+        AREA(section_8),
+        .name = 0x8009A4B8,
+        .formations = 0x8021823C,
+        .stages = 0x80218264,
+    },
+    {
+        AREA(section_9),
+        .name = 0x8009A4A8,
+        .formations = 0x802185B8,
+        .stages = 0x802186E4,
+    },
+    {
+        AREA(section_10),
+        .name = 0x8009A498,
+        .formations = 0x8021FE80,
+        .stages = 0x8021FFE8,
+    },
+    {
+        AREA(section_11),
+        .name = 0x8009A480,
+        .formations = 0x80224700,
+        .stages = 0x802248A4,
+    },
+    {
+        AREA(section_12),
+        .name = 0x8009A468,
+        .formations = 0x80220448,
+        .stages = 0x80220470,
+    },
+    {
+        AREA(section_13),
+        .name = 0x8009A458,
+        .formations = 0x8021EA70,
+        .stages = 0x8021EBEC,
+    },
+    {
+        AREA(section_14),
+        .name = 0x8009A448,
+        .formations = 0x80228110,
+        .stages = 0x80228278,
+    },
+    {
+        AREA(section_15),
+        .name = 0x8009A438,
+        .formations = 0x8021B38C,
+        .stages = 0x8021B418,
+    },
+    {
+        AREA(section_16),
+        .name = 0x8009A428,
+        .formations = 0x80230730,
+        .stages = 0x80230AC8,
+    },
+    {
+        AREA(section_17),
+        .name = 0x8009A418,
+        .formations = 0x8022FBF4,
+        .stages = 0x8022FC1C,
+    },
+    {
+        AREA(section_18),
+        .name = 0x8009A408,
+        .formations = 0x8022EA2C,
+        .stages = 0x8022EB1C,
+    },
+    {
+        AREA(section_19),
+        .name = 0x8009A3F8,
+        .formations = 0x8021D5FC,
+        .stages = 0x8021D624,
+    },
+    {
+        AREA(section_20),
+        .name = 0x8009A3E8,
+        .formations = 0x80228AF8,
+        .stages = 0x80228C60,
+    },
+    {
+        AREA(section_21),
+        .name = 0x8009A3D8,
+        .formations = 0x8021F6C8,
+        .stages = 0x8021F72C,
+    },
+    {
+        AREA(section_22),
+        .name = 0x8009A3C8,
+        .formations = 0x80229E74,
+        .stages = 0x8022A02C,
+    },
+    {
+        AREA(section_23),
+        .name = 0x8009A3B8,
+        .formations = 0x8022AA08,
+        .stages = 0x8022AA44,
+        .dmaTable = 0x8022AA84,
+    },
+    {
+        AREA(section_24),
+        .name = 0x8009A3A8,
+        .formations = 0x80234574,
+        .stages = 0x8023486C,
+    },
+    {
+        AREA(section_25),
+        .name = 0x8009A398,
+        .formations = 0x802356FC,
+        .stages = 0x80235788,
+    },
+    {
+        AREA(section_26),
+        .name = 0x8009A388,
+        .formations = 0x802340B4,
+        .stages = 0x802342BC,
+    },
+    {
+        AREA(section_27),
+        .name = 0x8009A378,
+        .formations = 0x80227A90,
+        .stages = 0x80227AE0,
+    },
+    {
+        AREA(section_28),
+        .name = 0x8009A368,
+        .formations = 0x802232E8,
+        .stages = 0x8022334C,
+    },
+    {
+        AREA(section_29),
+        .name = 0x8009A358,
+        .formations = 0x80231164,
+        .stages = 0x80231290,
+    },
+    {
+        AREA(section_30),
+        .name = 0x8009A348,
+        .formations = 0x802234F0,
+        .stages = 0x8022352C,
+    },
+    {
+        AREA(section_31),
+        .name = 0x8009A338,
+        .formations = 0x8022F4D4,
+        .stages = 0x8022F614,
+    },
+    {
+        AREA(section_32),
+        .name = 0x8009A328,
+        .formations = 0x802215A0,
+        .stages = 0x802215C8,
+    },
+    {
+        AREA(section_33),
+        .name = 0x8009A318,
+        .formations = 0x80232888,
+        .stages = 0x8023298C,
+    },
+    {
+        AREA(section_34),
+        .name = 0x8009A308,
+        .formations = 0x80231A64,
+        .stages = 0x80231ED8,
+    },
+    {
+        AREA(section_35),
+        .name = 0x8009A2F8,
+        .formations = 0x802346A8,
+        .stages = 0x80234720,
+    },
+    {
+        AREA(section_36),
+        .name = 0x8009A2E8,
+        .formations = 0x8022839C,
+        .stages = 0x802283EC,
+    },
+    {
+        AREA(section_37),
+        .name = 0x8009A2D8,
+        .formations = 0x80227910,
+        .stages = 0x80227988,
+    },
+    {
+        AREA(section_38),
+        .name = 0x8009A2C8,
+        .formations = 0x802185BC,
+        .stages = 0x802185E4,
+    },
+    {
+        AREA(section_39),
+        .name = 0x8009A2B8,
+        .formations = 0x8022A7C4,
+        .stages = 0x8022A83C,
+    },
+    {},
+    {
+        AREA(section_41),
+        .name = 0x8009A2A4,
+    },
+    {
+        AREA(section_42),
+        .name = 0x8009A290,
+    },
+    {
+        AREA(section_43),
+        .name = 0x8009A27C,
+    },
+    {
+        AREA(section_44),
+        .name = 0x8009A268,
+    },
+    {
+        AREA(section_45),
+        .name = 0x8009A254,
+    },
+    {
+        AREA(section_46),
+        .name = 0x8009A240,
+    },
+    {},
+};

src/world/world.c

@@ -657,5 +657,5 @@ Area gAreas[] = {
     AREA(mgm, "ミニゲーム"),  // minige-mu [Minigames]
     AREA(gv, "ゲームオーバー"),  // ge-mu o-ba- [Game Over]
     AREA(tst, "テストマップ"),  // tesuto mappu [Test map]
-    0, 0, 0, 0,
+    {},
 };

tools/sjis.py

@@ -0,0 +1,45 @@
+#! /usr/bin/python3
+
+def decode(data):
+    length = 0
+    is_dbl_char = False
+    for byte in data:
+        if byte == 0 and not is_dbl_char:
+            break
+
+        # ignore null terminator when reading double-byte char
+        is_dbl_char = False
+        if byte & 0xF0 == 0x80:
+            is_dbl_char = True
+        if byte & 0xF0 == 0x90:
+            is_dbl_char = True
+        if byte & 0xF0 == 0xE0:
+            is_dbl_char = True
+        if byte & 0xF0 == 0xF0:
+            is_dbl_char = True
+
+        length += 1
+
+    return data[:length].decode('shift-jis')
+
+if __name__ == "__main__":
+    import sys
+
+    if len(sys.argv) <= 1:
+        print("usage: ./sjis.py <bytes...>")
+        print("decodes zero-terminated SJIS from arbitrary hex bytes.")
+        print("e.g.")
+        print("    ./sjis.py 80072F64 80072F90 80072FA8 00000000")
+        print("    エリア ＫＭＲ その１")
+        exit(1)
+
+    s = "".join(sys.argv[1:])
+
+    data = bytearray()
+    for i in range(0, len(s), 2):
+        byte = eval(f"0x{s[i]}{s[i + 1]}")
+        data.append(byte)
+
+    print(data)
+
+    print(decode(data))

tools/splat.yaml

@@ -207,10 +207,11 @@ segments:
     - [0x52D50, bin]
     - [0x6B450, .data, world/world]
     - [0x6EAC0, bin] # has scripts
-    - [0x70E30, bin, battle/battle]
+    - [0x70E30, .data, battle/battle]
     - [0x71430, bin]
     - [0x73DA0, .rodata, world/world]
     - [0x74EA0, bin]
+    - [0x75570, .rodata, battle/battle] # help
   - type: code
     start: 0x759B0
     vram: 0x800DC500