moved strings + decompile simple store functions

13 files changed, 179 insertions, 161 deletions

diff --git a/src/msg/scrn/d_msg_scrn_3select.cpp b/src/msg/scrn/d_msg_scrn_3select.cpp
index d53557e3c0..3e64c33f5e 100644
--- a/src/msg/scrn/d_msg_scrn_3select.cpp
+++ b/src/msg/scrn/d_msg_scrn_3select.cpp
@@ -207,7 +207,19 @@ SECTION_RODATA static u8 const tag_name[288] = {
     0x77, 0x5F, 0x79, 0x65, 0x73, 0x5F, 0x31, 0x34, 0x73, 0x65, 0x6C, 0x5F, 0x70, 0x6F, 0x30, 0x32,
     0x00, 0x63, 0x5F, 0x6B, 0x61, 0x68, 0x65, 0x6E, 0x63, 0x5F, 0x63, 0x75, 0x72, 0x73, 0x6F, 0x72,
 };
-COMPILER_STRIP_GATE(80399708, &tag_name);
+COMPILER_STRIP_GATE(0x80399708, &tag_name);
+
+/* 80399840-80399840 025EA0 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399840 = "zelda_window_3menu.blo";
+SECTION_DEAD static char const* const stringBase_80399857 = "zelda_window_3menu.bck";
+SECTION_DEAD static char const* const stringBase_8039986E = "zelda_window_3menu.bpk";
+SECTION_DEAD static char const* const stringBase_80399885 = "zelda_window_3menu.btk";
+SECTION_DEAD static char const* const stringBase_8039989C = "";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_8039989D = "\0\0";
+#pragma pop
 
 /* 803C0C00-803C0C0C 01DD20 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
 SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
@@ -675,7 +687,7 @@ asm void dMsgScrn3Select_c::getTextBoxGlobalPosY(int param_0) {
 SECTION_RODATA static u8 const lit_4497[12] = {
     0x43, 0x4C, 0x00, 0x00, 0x43, 0x98, 0x00, 0x00, 0x43, 0xCA, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80399828, &lit_4497);
+COMPILER_STRIP_GATE(0x80399828, &lit_4497);
 
 /* 8023AA04-8023AAF4 235344 00F0+00 1/0 0/0 0/0 .text            open1Proc__17dMsgScrn3Select_cFv */
 #pragma push
@@ -692,7 +704,7 @@ asm void dMsgScrn3Select_c::open1Proc() {
 SECTION_RODATA static u8 const lit_4520[12] = {
     0x43, 0x4C, 0x00, 0x00, 0x43, 0x98, 0x00, 0x00, 0x43, 0xCA, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80399834, &lit_4520);
+COMPILER_STRIP_GATE(0x80399834, &lit_4520);
 
 /* 8023AAF4-8023AC14 235434 0120+00 1/0 0/0 0/0 .text            open2Proc__17dMsgScrn3Select_cFv */
 #pragma push
@@ -808,18 +820,7 @@ asm void __sinit_d_msg_scrn_3select_cpp() {
 
 #pragma push
 #pragma force_active on
-SECTION_CTORS void* const _ctors_8023B914 = (void*)__sinit_d_msg_scrn_3select_cpp;
+REGISTER_CTORS(0x8023B914, __sinit_d_msg_scrn_3select_cpp);
 #pragma pop
 
-/* 80399840-803998A0 025EA0 005D+03 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399840 = "zelda_window_3menu.blo";
-SECTION_DEAD static char const* const stringBase_80399857 = "zelda_window_3menu.bck";
-SECTION_DEAD static char const* const stringBase_8039986E = "zelda_window_3menu.bpk";
-SECTION_DEAD static char const* const stringBase_80399885 = "zelda_window_3menu.btk";
-SECTION_DEAD static char const* const stringBase_8039989C = "";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_8039989D = "\0\0";
-#pragma pop
+/* 80399840-80399840 025EA0 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_arrow.cpp b/src/msg/scrn/d_msg_scrn_arrow.cpp
index 80eaf0cd79..4634e35c7c 100644
--- a/src/msg/scrn/d_msg_scrn_arrow.cpp
+++ b/src/msg/scrn/d_msg_scrn_arrow.cpp
@@ -91,6 +91,16 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384];
 //
 
 /* ############################################################################################## */
+/* 803998A0-803998A0 025F00 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_803998A0 = "zelda_window_yajirushi.blo";
+SECTION_DEAD static char const* const stringBase_803998BB = "zelda_window_yajirushi.bck";
+SECTION_DEAD static char const* const stringBase_803998D6 = "zelda_window_yajirushi.bpk";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_803998F1 = "\0\0\0\0\0\0";
+#pragma pop
+
 /* 803C0CF8-803C0D08 01DE18 000C+04 2/2 0/0 0/0 .data            __vt__15dMsgScrnArrow_c */
 SECTION_DATA extern void* __vt__15dMsgScrnArrow_c[3 + 1 /* padding */] = {
     (void*)NULL /* RTTI */,
@@ -199,13 +209,4 @@ asm void dMsgScrnArrow_c::dotAnimeMove() {
 }
 #pragma pop
 
-/* 803998A0-803998F8 025F00 0051+07 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_803998A0 = "zelda_window_yajirushi.blo";
-SECTION_DEAD static char const* const stringBase_803998BB = "zelda_window_yajirushi.bck";
-SECTION_DEAD static char const* const stringBase_803998D6 = "zelda_window_yajirushi.bpk";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_803998F1 = "\0\0\0\0\0\0";
-#pragma pop
+/* 803998A0-803998A0 025F00 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_boss.cpp b/src/msg/scrn/d_msg_scrn_boss.cpp
index 110839ba2c..e59ecf9cc2 100644
--- a/src/msg/scrn/d_msg_scrn_boss.cpp
+++ b/src/msg/scrn/d_msg_scrn_boss.cpp
@@ -127,6 +127,15 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040];
 //
 
 /* ############################################################################################## */
+/* 803998F8-803998F8 025F58 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_803998F8 = "zelda_boss_name.blo";
+SECTION_DEAD static char const* const stringBase_8039990C = "";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_8039990D = "\0\0";
+#pragma pop
+
 /* 803C0DB0-803C0DE8 01DED0 0038+00 1/1 0/0 0/0 .data            t_tag$3759 */
 SECTION_DATA static u8 t_tag[56] = {
     0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74,
@@ -238,12 +247,4 @@ void dMsgScrnBoss_c::fontAlpha(f32 param_0) {
     /* empty function */
 }
 
-/* 803998F8-80399910 025F58 0015+03 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_803998F8 = "zelda_boss_name.blo";
-SECTION_DEAD static char const* const stringBase_8039990C = "";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_8039990D = "\0\0";
-#pragma pop
+/* 803998F8-803998F8 025F58 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp
index 94a13de27e..38d8f659c8 100644
--- a/src/msg/scrn/d_msg_scrn_explain.cpp
+++ b/src/msg/scrn/d_msg_scrn_explain.cpp
@@ -73,10 +73,6 @@ struct dMsgScrn3Select_c {
     /* 8023A97C */ void getCharSpace();
 };
 
-struct COutFont_c {
-    /* 80225C94 */ COutFont_c(u8);
-};
-
 struct J2DTextBox {
     /* 80300658 */ void getStringPtr() const;
     /* 8030074C */ void setString(s16, char const*, ...);
@@ -84,6 +80,10 @@ struct J2DTextBox {
 
 struct JUTFont {};
 
+struct COutFont_c {
+    /* 80225C94 */ COutFont_c(u8);
+};
+
 struct dMsgObject_c {
     /* 802380F4 */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*,
                                   char*, char*, s16*);
@@ -100,10 +100,10 @@ struct Z2SpeechMgr2 {
     /* 802CBF60 */ void setTextCount(s16);
 };
 
-struct Vec {};
-
 struct JAISoundID {};
 
+struct Vec {};
+
 struct Z2SeMgr {
     /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
 };
@@ -243,6 +243,17 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 //
 
 /* ############################################################################################## */
+/* 80399910-80399910 025F70 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399910 = "zelda_message_window_new.blo";
+SECTION_DEAD static char const* const stringBase_8039992D =
+    "zelda_message_window_text_save_road.blo";
+SECTION_DEAD static char const* const stringBase_80399955 = "zelda_message_window_text.blo";
+SECTION_DEAD static char const* const stringBase_80399973 = "";
+SECTION_DEAD static char const* const stringBase_80399974 = "tt_block8x8.bti";
+#pragma pop
+
 /* 803C0E40-803C0E4C 01DF60 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
 SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -546,6 +557,16 @@ asm void dMsgScrnExplain_c::move_proc() {
 #pragma pop
 
 /* ############################################################################################## */
+/* 80399910-80399910 025F70 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399984 = ""
+                                                            "\x1B"
+                                                            "CR[%d]";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_8039998C = "\0\0\0";
+#pragma pop
+
 /* 80454BE8-80454BEC 0031E8 0004+00 1/1 0/0 0/0 .sdata2          @4294 */
 SECTION_SDATA2 static f32 lit_4294 = 0.5f;
 
@@ -652,22 +673,7 @@ asm void __sinit_d_msg_scrn_explain_cpp() {
 
 #pragma push
 #pragma force_active on
-SECTION_CTORS void* const _ctors_8023E668 = (void*)__sinit_d_msg_scrn_explain_cpp;
+REGISTER_CTORS(0x8023E668, __sinit_d_msg_scrn_explain_cpp);
 #pragma pop
 
-/* 80399910-80399990 025F70 007C+04 2/2 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399910 = "zelda_message_window_new.blo";
-SECTION_DEAD static char const* const stringBase_8039992D =
-    "zelda_message_window_text_save_road.blo";
-SECTION_DEAD static char const* const stringBase_80399955 = "zelda_message_window_text.blo";
-SECTION_DEAD static char const* const stringBase_80399973 = "";
-SECTION_DEAD static char const* const stringBase_80399974 = "tt_block8x8.bti";
-SECTION_DEAD static char const* const stringBase_80399984 = ""
-                                                            "\x1B"
-                                                            "CR[%d]";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_8039998C = "\0\0\0";
-#pragma pop
+/* 80399910-80399910 025F70 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_howl.cpp b/src/msg/scrn/d_msg_scrn_howl.cpp
index ee541d692f..97f81c6884 100644
--- a/src/msg/scrn/d_msg_scrn_howl.cpp
+++ b/src/msg/scrn/d_msg_scrn_howl.cpp
@@ -270,6 +270,19 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040];
 //
 
 /* ############################################################################################## */
+/* 80399A20-80399A20 026080 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399A20 = "zelda_wolf_howl.blo";
+SECTION_DEAD static char const* const stringBase_80399A34 = "";
+SECTION_DEAD static char const* const stringBase_80399A35 = "tt_ginnouroko_s3tc.bti";
+SECTION_DEAD static char const* const stringBase_80399A4C = "tt_black_32.bti";
+SECTION_DEAD static char const* const stringBase_80399A5C = "tt_iastarRR.bti";
+SECTION_DEAD static char const* const stringBase_80399A6C = "tt_block8x8.bti";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80399A7C = "\0\0\0";
+#pragma pop
+
 /* 803C0FD0-803C0FDC 01E0F0 000C+00 2/2 0/0 0/0 .data            cNullVec__6Z2Calc */
 SECTION_DATA static u8 cNullVec__6Z2Calc[12] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -962,19 +975,7 @@ asm void __sinit_d_msg_scrn_howl_cpp() {
 
 #pragma push
 #pragma force_active on
-SECTION_CTORS void* const _ctors_80244454 = (void*)__sinit_d_msg_scrn_howl_cpp;
+REGISTER_CTORS(0x80244454, __sinit_d_msg_scrn_howl_cpp);
 #pragma pop
 
-/* 80399A20-80399A80 026080 005C+04 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399A20 = "zelda_wolf_howl.blo";
-SECTION_DEAD static char const* const stringBase_80399A34 = "";
-SECTION_DEAD static char const* const stringBase_80399A35 = "tt_ginnouroko_s3tc.bti";
-SECTION_DEAD static char const* const stringBase_80399A4C = "tt_black_32.bti";
-SECTION_DEAD static char const* const stringBase_80399A5C = "tt_iastarRR.bti";
-SECTION_DEAD static char const* const stringBase_80399A6C = "tt_block8x8.bti";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80399A7C = "\0\0\0";
-#pragma pop
+/* 80399A20-80399A20 026080 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_item.cpp b/src/msg/scrn/d_msg_scrn_item.cpp
index 2f05a04af8..caabc904c5 100644
--- a/src/msg/scrn/d_msg_scrn_item.cpp
+++ b/src/msg/scrn/d_msg_scrn_item.cpp
@@ -16,10 +16,10 @@ struct dMsgScrnLight_c {
     /* 80245C04 */ void draw(f32*, f32, f32, f32, f32, f32, u8);
 };
 
-struct J2DAnmTextureSRTKey {};
-
 struct J2DAnmColor {};
 
+struct J2DAnmTextureSRTKey {};
+
 struct JKRExpHeap {};
 
 struct dMsgScrnItem_c {
@@ -279,6 +279,18 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040];
 //
 
 /* ############################################################################################## */
+/* 80399990-80399990 025FF0 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399990 = "zelda_item_get_window.blo";
+SECTION_DEAD static char const* const stringBase_803999AA = "zelda_item_get_window_text.blo";
+SECTION_DEAD static char const* const stringBase_803999C9 = "zelda_item_get_window.btk";
+SECTION_DEAD static char const* const stringBase_803999E3 = "zelda_item_get_window.bpk";
+SECTION_DEAD static char const* const stringBase_803999FD = "zelda_item_get_window_02.bpk";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80399A1A = "\0\0\0\0\0";
+#pragma pop
+
 /* 803C0F78-803C0FD0 01E098 0058+00 2/2 0/0 0/0 .data            __vt__14dMsgScrnItem_c */
 SECTION_DATA extern void* __vt__14dMsgScrnItem_c[22] = {
     (void*)NULL /* RTTI */,
@@ -593,15 +605,4 @@ asm void dMsgScrnItem_c::isOugiID() {
 }
 #pragma pop
 
-/* 80399990-80399A20 025FF0 008A+06 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399990 = "zelda_item_get_window.blo";
-SECTION_DEAD static char const* const stringBase_803999AA = "zelda_item_get_window_text.blo";
-SECTION_DEAD static char const* const stringBase_803999C9 = "zelda_item_get_window.btk";
-SECTION_DEAD static char const* const stringBase_803999E3 = "zelda_item_get_window.bpk";
-SECTION_DEAD static char const* const stringBase_803999FD = "zelda_item_get_window_02.bpk";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80399A1A = "\0\0\0\0\0";
-#pragma pop
+/* 80399990-80399990 025FF0 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_jimaku.cpp b/src/msg/scrn/d_msg_scrn_jimaku.cpp
index 3081038c0f..4c8e75ff92 100644
--- a/src/msg/scrn/d_msg_scrn_jimaku.cpp
+++ b/src/msg/scrn/d_msg_scrn_jimaku.cpp
@@ -151,6 +151,15 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040];
 //
 
 /* ############################################################################################## */
+/* 80399A80-80399A80 0260E0 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399A80 = "zelda_jimaku_message_text.blo";
+SECTION_DEAD static char const* const stringBase_80399A9E = "";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80399A9F = "";
+#pragma pop
+
 /* 803C11E8-803C1240 01E308 0058+00 2/2 0/0 0/0 .data            __vt__16dMsgScrnJimaku_c */
 SECTION_DATA extern void* __vt__16dMsgScrnJimaku_c[22] = {
     (void*)NULL /* RTTI */,
@@ -261,12 +270,4 @@ void dMsgScrnJimaku_c::fontAlpha(f32 param_0) {
     /* empty function */
 }
 
-/* 80399A80-80399AA0 0260E0 001F+01 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399A80 = "zelda_jimaku_message_text.blo";
-SECTION_DEAD static char const* const stringBase_80399A9E = "";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80399A9F = "";
-#pragma pop
+/* 80399A80-80399A80 0260E0 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_kanban.cpp b/src/msg/scrn/d_msg_scrn_kanban.cpp
index 42b854ad51..585cd678b3 100644
--- a/src/msg/scrn/d_msg_scrn_kanban.cpp
+++ b/src/msg/scrn/d_msg_scrn_kanban.cpp
@@ -150,7 +150,17 @@ SECTION_RODATA static u8 const t_tag[24] = {
     0x6D, 0x67, 0x5F, 0x65, 0x34, 0x6C, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00,
     0x66, 0x34, 0x5F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x74, 0x34, 0x5F, 0x73,
 };
-COMPILER_STRIP_GATE(80399AA0, &t_tag);
+COMPILER_STRIP_GATE(0x80399AA0, &t_tag);
+
+/* 80399AB8-80399AB8 026118 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399AB8 = "zelda_kanban_stone_a.blo";
+SECTION_DEAD static char const* const stringBase_80399AD1 = "zelda_kanban_stone_a.bck";
+SECTION_DEAD static char const* const stringBase_80399AEA = "zelda_kanban_stone_a.btk";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80399B03 = "\0\0\0\0";
+#pragma pop
 
 /* 803C1240-803C1298 01E360 0058+00 2/2 0/0 0/0 .data            __vt__16dMsgScrnKanban_c */
 SECTION_DATA extern void* __vt__16dMsgScrnKanban_c[22] = {
@@ -260,13 +270,4 @@ void dMsgScrnKanban_c::fukiTrans(f32 param_0, f32 param_1) {
     /* empty function */
 }
 
-/* 80399AB8-80399B08 026118 004B+05 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399AB8 = "zelda_kanban_stone_a.blo";
-SECTION_DEAD static char const* const stringBase_80399AD1 = "zelda_kanban_stone_a.bck";
-SECTION_DEAD static char const* const stringBase_80399AEA = "zelda_kanban_stone_a.btk";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80399B03 = "\0\0\0\0";
-#pragma pop
+/* 80399AB8-80399AB8 026118 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_light.cpp b/src/msg/scrn/d_msg_scrn_light.cpp
index 5d8844a80f..ea30a183f9 100644
--- a/src/msg/scrn/d_msg_scrn_light.cpp
+++ b/src/msg/scrn/d_msg_scrn_light.cpp
@@ -142,6 +142,16 @@ asm void dMsgScrnLight_HIO_c::updateColor(u8 param_0) {
 #pragma pop
 
 /* ############################################################################################## */
+/* 80399B08-80399B08 026168 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399B08 = "zelda_message_window_text_light.blo";
+SECTION_DEAD static char const* const stringBase_80399B2C = "zelda_message_window_text_light.bck";
+SECTION_DEAD static char const* const stringBase_80399B50 = "zelda_message_window_text_light.bpk";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80399B74 = "\0\0\0";
+#pragma pop
+
 /* 804306C8-804306D4 05D3E8 000C+00 1/1 0/0 0/0 .bss             @3735 */
 static u8 lit_3735[12];
 
@@ -242,16 +252,7 @@ asm void __sinit_d_msg_scrn_light_cpp() {
 
 #pragma push
 #pragma force_active on
-SECTION_CTORS void* const _ctors_80246390 = (void*)__sinit_d_msg_scrn_light_cpp;
+REGISTER_CTORS(0x80246390, __sinit_d_msg_scrn_light_cpp);
 #pragma pop
 
-/* 80399B08-80399B78 026168 006C+04 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399B08 = "zelda_message_window_text_light.blo";
-SECTION_DEAD static char const* const stringBase_80399B2C = "zelda_message_window_text_light.bck";
-SECTION_DEAD static char const* const stringBase_80399B50 = "zelda_message_window_text_light.bpk";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80399B74 = "\0\0\0";
-#pragma pop
+/* 80399B08-80399B08 026168 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_place.cpp b/src/msg/scrn/d_msg_scrn_place.cpp
index d45249914b..9bbd0669c4 100644
--- a/src/msg/scrn/d_msg_scrn_place.cpp
+++ b/src/msg/scrn/d_msg_scrn_place.cpp
@@ -128,6 +128,15 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040];
 //
 
 /* ############################################################################################## */
+/* 80399B78-80399B78 0261D8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399B78 = "zelda_stage_title_foreign.blo";
+SECTION_DEAD static char const* const stringBase_80399B96 = "";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80399B97 = "";
+#pragma pop
+
 /* 803C12B0-803C12E8 01E3D0 0038+00 1/1 0/0 0/0 .data            t_tag$3877 */
 SECTION_DATA static u8 t_tag[56] = {
     0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74, 0x62, 0x30, 0x00, 0x73, 0x66, 0x6F, 0x6E, 0x74,
@@ -245,12 +254,4 @@ void dMsgScrnPlace_c::fontAlpha(f32 param_0) {
     /* empty function */
 }
 
-/* 80399B78-80399B98 0261D8 001F+01 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399B78 = "zelda_stage_title_foreign.blo";
-SECTION_DEAD static char const* const stringBase_80399B96 = "";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80399B97 = "";
-#pragma pop
+/* 80399B78-80399B78 0261D8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_staff.cpp b/src/msg/scrn/d_msg_scrn_staff.cpp
index a6f326e740..74b4e35a29 100644
--- a/src/msg/scrn/d_msg_scrn_staff.cpp
+++ b/src/msg/scrn/d_msg_scrn_staff.cpp
@@ -123,6 +123,15 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040];
 //
 
 /* ############################################################################################## */
+/* 80399B98-80399B98 0261F8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399B98 = "zelda_staff_roll.blo";
+SECTION_DEAD static char const* const stringBase_80399BAD = "";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80399BAE = "\0";
+#pragma pop
+
 /* 803C1340-803C1370 01E460 0030+00 1/1 0/0 0/0 .data            t_tag$3752 */
 SECTION_DATA static u8 t_tag[48] = {
     0x00, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5F, 0x73, 0x00, 0x00, 0x00, 0x72, 0x69, 0x67, 0x68, 0x74,
@@ -233,12 +242,4 @@ void dMsgScrnStaff_c::fontAlpha(f32 param_0) {
     /* empty function */
 }
 
-/* 80399B98-80399BB0 0261F8 0016+02 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399B98 = "zelda_staff_roll.blo";
-SECTION_DEAD static char const* const stringBase_80399BAD = "";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80399BAE = "\0";
-#pragma pop
+/* 80399B98-80399B98 0261F8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_talk.cpp b/src/msg/scrn/d_msg_scrn_talk.cpp
index 4cb9d41294..11a91c02f1 100644
--- a/src/msg/scrn/d_msg_scrn_talk.cpp
+++ b/src/msg/scrn/d_msg_scrn_talk.cpp
@@ -241,6 +241,17 @@ extern "C" extern u8 g_MsgObject_HIO_c[1040];
 //
 
 /* ############################################################################################## */
+/* 80399BB0-80399BB0 026210 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399BB0 = "zelda_message_window_new.blo";
+SECTION_DEAD static char const* const stringBase_80399BCD = "zelda_message_window_text_seirei.blo";
+SECTION_DEAD static char const* const stringBase_80399BF2 = "zelda_message_window_text.blo";
+SECTION_DEAD static char const* const stringBase_80399C10 = "";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80399C11 = "\0\0\0\0\0\0";
+#pragma pop
+
 /* 803C13C8-803C1420 01E4E8 0058+00 2/2 0/0 0/0 .data            __vt__14dMsgScrnTalk_c */
 SECTION_DATA extern void* __vt__14dMsgScrnTalk_c[22] = {
     (void*)NULL /* RTTI */,
@@ -511,14 +522,4 @@ asm void dMsgScrnTalk_c::fukiPosCalc(u8 param_0) {
 }
 #pragma pop
 
-/* 80399BB0-80399C18 026210 0061+07 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399BB0 = "zelda_message_window_new.blo";
-SECTION_DEAD static char const* const stringBase_80399BCD = "zelda_message_window_text_seirei.blo";
-SECTION_DEAD static char const* const stringBase_80399BF2 = "zelda_message_window_text.blo";
-SECTION_DEAD static char const* const stringBase_80399C10 = "";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80399C11 = "\0\0\0\0\0\0";
-#pragma pop
+/* 80399BB0-80399BB0 026210 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
diff --git a/src/msg/scrn/d_msg_scrn_tree.cpp b/src/msg/scrn/d_msg_scrn_tree.cpp
index 7e0f55270f..1199a14a13 100644
--- a/src/msg/scrn/d_msg_scrn_tree.cpp
+++ b/src/msg/scrn/d_msg_scrn_tree.cpp
@@ -11,10 +11,10 @@
 // Types:
 //
 
-struct JKRExpHeap {};
-
 struct JUTFont {};
 
+struct JKRExpHeap {};
+
 struct dMsgScrnTree_c {
     /* 80248954 */ dMsgScrnTree_c(JUTFont*, JKRExpHeap*);
     /* 80248F14 */ ~dMsgScrnTree_c();
@@ -157,7 +157,19 @@ SECTION_RODATA static u8 const t_tag[24] = {
     0x6D, 0x67, 0x5F, 0x65, 0x34, 0x6C, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00,
     0x66, 0x34, 0x5F, 0x77, 0x00, 0x00, 0x00, 0x00, 0x74, 0x34, 0x5F, 0x73,
 };
-COMPILER_STRIP_GATE(80399C18, &t_tag);
+COMPILER_STRIP_GATE(0x80399C18, &t_tag);
+
+/* 80399C30-80399C30 026290 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80399C30 = "zelda_kanban_wood_a.blo";
+SECTION_DEAD static char const* const stringBase_80399C48 = "zelda_kanban_wood_a.bck";
+SECTION_DEAD static char const* const stringBase_80399C60 = "zelda_kanban_wood_a.btk";
+SECTION_DEAD static char const* const stringBase_80399C78 = "zelda_kanban_wood_a_02.btk";
+SECTION_DEAD static char const* const stringBase_80399C93 = "";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_80399C94 = "\0\0\0";
+#pragma pop
 
 /* 803C1420-803C1478 01E540 0058+00 2/2 0/0 0/0 .data            __vt__14dMsgScrnTree_c */
 SECTION_DATA extern void* __vt__14dMsgScrnTree_c[22] = {
@@ -268,15 +280,4 @@ void dMsgScrnTree_c::fukiTrans(f32 param_0, f32 param_1) {
     /* empty function */
 }
 
-/* 80399C30-80399C98 026290 0064+04 1/1 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80399C30 = "zelda_kanban_wood_a.blo";
-SECTION_DEAD static char const* const stringBase_80399C48 = "zelda_kanban_wood_a.bck";
-SECTION_DEAD static char const* const stringBase_80399C60 = "zelda_kanban_wood_a.btk";
-SECTION_DEAD static char const* const stringBase_80399C78 = "zelda_kanban_wood_a_02.btk";
-SECTION_DEAD static char const* const stringBase_80399C93 = "";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_80399C94 = "\0\0\0";
-#pragma pop
+/* 80399C30-80399C30 026290 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */