From c3226494cddf440e44a723e1363c75c2f1956e48 Mon Sep 17 00:00:00 2001
From: Larry <kholdfuzion@gmail.com>
Date: Sat, 6 May 2017 17:17:06 -0500
Subject: [PATCH] more work on rodata

Former-commit-id: 541cdeb1de2a1ce4ad729e2679748b652370ef69 [formerly 5d3ee235c2cb2fc74b4c3bfc7dd4d5676fb48db4]
Former-commit-id: 62f7c58d4b521bbfa819b61fc855d5f932564585
---
 disassembly/GE007.rom.asm                    |  2 +-
 disassembly/rodata/rodata.asm                | 13 ++++++++++++-
 disassembly/rodata/rodata.bin.REMOVED.git-id |  1 +
 disassembly/rodata/rodata.inc                |  8 --------
 disassembly/rodata/rodata.rz.asm             |  8 ++++++++
 disassembly/rodata/rodata.sym                |  3 +++
 6 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 disassembly/rodata/rodata.bin.REMOVED.git-id
 create mode 100644 disassembly/rodata/rodata.rz.asm

diff --git a/disassembly/GE007.rom.asm b/disassembly/GE007.rom.asm
index 6c0a07e..1dbeabc 100644
--- a/disassembly/GE007.rom.asm
+++ b/disassembly/GE007.rom.asm
@@ -7,7 +7,7 @@ origin $00000000
 
 include "rom/romheader.asm"
 include "code/boot.asm"
-include "rodata/rodata.inc"
+include "rodata/rodata.rz.asm"
 include "code/rarezip.asm"
 include "code/tlb_code.asm"
 include "unk/unknown.asm"
diff --git a/disassembly/rodata/rodata.asm b/disassembly/rodata/rodata.asm
index e5787d3..f454e4a 100644
--- a/disassembly/rodata/rodata.asm
+++ b/disassembly/rodata/rodata.asm
@@ -27,7 +27,18 @@ dw sp_shed, aShed
 dw sp_main, aMain
 dw sp_audi, aAudi
 
-insert rodata.bin_filler, "021990.bin", origin(), ($800283D0 - $8002307C)
+dword_8002307C:
+dw $00
+
+dw $00, $00, $00, $00, $00
+
+display_stderror:
+dw $00
+
+stderr_event_enabled:
+dw $00
+
+insert rodata.bin_filler, "021990.bin", origin(), ($800283D0 - $8002309C)
 
 base $800283D0
 aBoot:
diff --git a/disassembly/rodata/rodata.bin.REMOVED.git-id b/disassembly/rodata/rodata.bin.REMOVED.git-id
new file mode 100644
index 0000000..c473cda
--- /dev/null
+++ b/disassembly/rodata/rodata.bin.REMOVED.git-id
@@ -0,0 +1 @@
+15dbcce479f33fa19157b68ee0c3e0d890f3e33f
\ No newline at end of file
diff --git a/disassembly/rodata/rodata.inc b/disassembly/rodata/rodata.inc
index 51c0753..af89010 100644
--- a/disassembly/rodata/rodata.inc
+++ b/disassembly/rodata/rodata.inc
@@ -1,7 +1,3 @@
-
-base origin()
-rodata_rom_offset:
-
 base $80020D90
 rodata_start:
 
@@ -17,9 +13,5 @@ dword_80023044:
 base $80023048
 cart_hw_address:
 
-insert rodata_rz, "021990.rz"
 base $8005D2E0
 rodata_end:
-
-insert padding,"pad_to_33590"
-
diff --git a/disassembly/rodata/rodata.rz.asm b/disassembly/rodata/rodata.rz.asm
new file mode 100644
index 0000000..a4fef18
--- /dev/null
+++ b/disassembly/rodata/rodata.rz.asm
@@ -0,0 +1,8 @@
+base origin()
+rodata_rom_offset:
+
+include "rodata.inc"
+insert rodata_rz, "021990.rz"
+
+insert padding,"pad_to_33590"
+
diff --git a/disassembly/rodata/rodata.sym b/disassembly/rodata/rodata.sym
index c6ace36..6d64e61 100644
--- a/disassembly/rodata/rodata.sym
+++ b/disassembly/rodata/rodata.sym
@@ -11,6 +11,9 @@
 80023044 dword_80023044
 80023048 cart_hw_address
 8002304c debug_handler_table
+8002307c dword_8002307C
+80023094 display_stderror
+80023098 stderr_event_enabled
 800283d0 aBoot
 800283d8 aRmon
 800283e0 aIdle