From e59c265cfcb304a057a9decabd79aab7cdc0818d Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 9 Jan 2021 21:21:46 +0900
Subject: [PATCH] fixing rodata

---
 src/battle/battle.c | 86 +++++++++++++++++++++++++++++++++++++++++++++
 tools/splat.yaml    |  2 +-
 2 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/src/battle/battle.c b/src/battle/battle.c
index f1f514a58c..4d2100273e 100644
--- a/src/battle/battle.c
+++ b/src/battle/battle.c
@@ -18,6 +18,82 @@ typedef struct BattleArea {
     .dmaEnd = &code_##id##_ROM_END, \
     .dmaDest = &code_##id##_VRAM
 
+const s32 D_80099E40[] = {
+    /* 0x75240 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
+    /* 0x75250 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
+    /* 0x75260 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
+    /* 0x75270 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
+    /* 0x75280 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x75290 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x752A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x752B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x752C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x752D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x752E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x752F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75300 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75310 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75320 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75330 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+};
+
+const s32 D_80099F40[] = {
+    /* 0x75340 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
+    /* 0x75350 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
+    /* 0x75360 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
+    /* 0x75370 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
+    /* 0x75380 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x75390 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x753A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x753B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x753C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x753D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x753E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x753F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75400 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75410 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75420 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75430 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+};
+
+const s32 D_8009A040[] = {
+    /* 0x75440 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
+    /* 0x75450 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
+    /* 0x75460 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
+    /* 0x75470 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
+    /* 0x75480 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x75490 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x754A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x754B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x754C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x754D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x754E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x754F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75500 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75510 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75520 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75530 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+};
+
+const s32 D_8009A140[] = {
+    /* 0x75540 */ 0x00010202, 0x03030303, 0x04040404, 0x04040404,
+    /* 0x75550 */ 0x05050505, 0x05050505, 0x05050505, 0x05050505,
+    /* 0x75560 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
+    /* 0x75570 */ 0x06060606, 0x06060606, 0x06060606, 0x06060606,
+    /* 0x75580 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x75590 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x755A0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x755B0 */ 0x07070707, 0x07070707, 0x07070707, 0x07070707,
+    /* 0x755C0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x755D0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x755E0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x755F0 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75600 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75610 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75620 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+    /* 0x75630 */ 0x08080808, 0x08080808, 0x08080808, 0x08080808,
+};
+
 BattleList area_kmr_part_1_battles;
 StageList area_kmr_part_1_stages;
 
@@ -290,3 +366,13 @@ BattleArea gBattleAreas[0x30] = {
     },
     {},
 };
+
+// possibly a jump table
+const s32 D_8009A578[] = {
+    0x80072F38, 0x80072F4C, 0x80072F64, 0x80072F90, 0x80072FA8, 0x00000000,
+};
+
+// possibly a jump table
+const s32 D_8009A590[] = {
+    0x8007301C, 0x80073070, 0x80073094, 0x800730CC, 0x800730F8,
+};
diff --git a/tools/splat.yaml b/tools/splat.yaml
index 9db9c5d5c1..594f07dc84 100644
--- a/tools/splat.yaml
+++ b/tools/splat.yaml
@@ -218,7 +218,7 @@ segments:
     - [0x71430, bin]
     - [0x73DA0, .rodata, world/world]
     - [0x74EA0, bin]
-    - [0x75240, rodata, battle/battle] # ram 80099E40
+    - [0x75240, .rodata, battle/battle] # ram 80099E40
   - type: code
     start: 0x759B0
     vram: 0x800DC500