Clean up d_msg_unit, misc fixes for PAL and JPN (#2848)

5 files changed, 35 insertions, 20 deletions

diff --git a/config/GZ2J01/rels/d_a_e_hp/symbols.txt b/config/GZ2J01/rels/d_a_e_hp/symbols.txt
index 14c65d2ff6..2259904b4f 100644
--- a/config/GZ2J01/rels/d_a_e_hp/symbols.txt
+++ b/config/GZ2J01/rels/d_a_e_hp/symbols.txt
@@ -121,6 +121,6 @@ __vt__12dBgS_ObjAcch = .data:0x000001B8; // type:object size:0x24 scope:global
 __vt__8cM3dGPla = .data:0x000001DC; // type:object size:0xC scope:global
 __vt__12daE_HP_HIO_c = .data:0x000001E8; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_200_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
 @3921 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x14 scope:global data:byte
diff --git a/config/GZ2J01/rels/d_a_grass/symbols.txt b/config/GZ2J01/rels/d_a_grass/symbols.txt
index b0bd8c6d1d..598ce5af48 100644
--- a/config/GZ2J01/rels/d_a_grass/symbols.txt
+++ b/config/GZ2J01/rels/d_a_grass/symbols.txt
@@ -230,13 +230,18 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
 @1012 = .bss:0x0000003C; // type:object size:0x1 scope:local
 @1010 = .bss:0x00000040; // type:object size:0x1 scope:local
 @1009 = .bss:0x00000044; // type:object size:0x1 scope:local
+data_8052790d = .bss:0x00000045; // type:object size:0x1 scope:local
 @4293 = .bss:0x00000048; // type:object size:0xC scope:local
+init$4294 = .bss:0x00000054; // type:object size:0x1 scope:local
 ang$4292 = .bss:0x00000058; // type:object size:0x6 scope:local
 exec_count_dammy$4868 = .bss:0x0000005E; // type:object size:0x2 scope:local
+init$4869 = .bss:0x00000060; // type:object size:0x1 scope:local
 exec_count_dammy2$4871 = .bss:0x00000062; // type:object size:0x2 scope:local
+init$4872 = .bss:0x00000064; // type:object size:0x1 scope:local
 mAngleZ$5046 = .bss:0x00000068; // type:object size:0xBB8 scope:local
 data_805284E8 = .bss:0x00000C20; // type:object size:0x1 scope:local data:byte
 @5442 = .bss:0x00000C24; // type:object size:0xC scope:local
+init$5443 = .bss:0x00000C30; // type:object size:0x1 scope:local
 ang$5441 = .bss:0x00000C34; // type:object size:0x6 scope:local
 @6340 = .bss:0x00000C3C; // type:object size:0xC scope:local
 @6342 = .bss:0x00000C48; // type:object size:0xC scope:local
@@ -325,15 +330,15 @@ sInstance__32JASGlobalInstance<11Z2FxLineMgr> = .bss:0x00000F78; // type:object
 sInstance__31JASGlobalInstance<10Z2EnvSeMgr> = .bss:0x00000F7C; // type:object size:0x4 scope:global
 sInstance__32JASGlobalInstance<11Z2SpeechMgr> = .bss:0x00000F80; // type:object size:0x4 scope:global
 sInstance__34JASGlobalInstance<13Z2WolfHowlMgr> = .bss:0x00000F84; // type:object size:0x4 scope:global
-lbl_73_bss_F88 = .bss:0x00000F88; // type:object size:0x1 data:byte
-l_setType0$localstatic3$create__9daGrass_cFv = .bss:0x00000F8C; // type:object size:0x2A scope:local data:2byte
-lbl_73_bss_FB6 = .bss:0x00000FB6; // type:object size:0x1 data:byte
-l_setType1$localstatic5$create__9daGrass_cFv = .bss:0x00000FB8; // type:object size:0x7E scope:local data:2byte
-lbl_73_bss_1036 = .bss:0x00001036; // type:object size:0x1 data:byte
-l_setType2$localstatic7$create__9daGrass_cFv = .bss:0x00001038; // type:object size:0x12 scope:local data:2byte
-lbl_73_bss_104A = .bss:0x0000104A; // type:object size:0x1 data:byte
-l_setType3$localstatic9$create__9daGrass_cFv = .bss:0x0000104C; // type:object size:0x2A scope:local data:2byte
-lbl_73_bss_1076 = .bss:0x00001076; // type:object size:0x1 data:byte
-l_setType4$localstatic11$create__9daGrass_cFv = .bss:0x00001078; // type:object size:0x66 scope:local data:2byte
-lbl_73_bss_10DE = .bss:0x000010DE; // type:object size:0x1 data:byte
+init$localstatic4$create__9daGrass_cFv = .bss:0x00000F88; // type:object size:0x1 scope:global data:byte
+l_setType0$localstatic3$create__9daGrass_cFv = .bss:0x00000F8C; // type:object size:0x2A scope:global data:2byte
+init$localstatic6$create__9daGrass_cFv = .bss:0x00000FB6; // type:object size:0x1 scope:global data:byte
+l_setType1$localstatic5$create__9daGrass_cFv = .bss:0x00000FB8; // type:object size:0x7E scope:global data:2byte
+init$localstatic8$create__9daGrass_cFv = .bss:0x00001036; // type:object size:0x1 scope:global data:byte
+l_setType2$localstatic7$create__9daGrass_cFv = .bss:0x00001038; // type:object size:0x12 scope:global data:2byte
+init$localstatic10$create__9daGrass_cFv = .bss:0x0000104A; // type:object size:0x1 scope:global data:byte
+l_setType3$localstatic9$create__9daGrass_cFv = .bss:0x0000104C; // type:object size:0x2A scope:global data:2byte
+init$localstatic12$create__9daGrass_cFv = .bss:0x00001076; // type:object size:0x1 scope:global data:byte
+l_setType4$localstatic11$create__9daGrass_cFv = .bss:0x00001078; // type:object size:0x66 scope:global data:2byte
+init$localstatic14$create__9daGrass_cFv = .bss:0x000010DE; // type:object size:0x1 scope:global data:byte
 l_setType5$localstatic13$create__9daGrass_cFv = .bss:0x000010E0; // type:object size:0x2A scope:local data:2byte
diff --git a/config/GZ2J01/rels/d_a_mg_rod/symbols.txt b/config/GZ2J01/rels/d_a_mg_rod/symbols.txt
index 9d1fb1761b..98c7715408 100644
--- a/config/GZ2J01/rels/d_a_mg_rod/symbols.txt
+++ b/config/GZ2J01/rels/d_a_mg_rod/symbols.txt
@@ -293,6 +293,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @11348 = .rodata:0x000002F4; // type:object size:0x4 scope:local
 @11462 = .rodata:0x000002F8; // type:object size:0x4 scope:local
 @stringBase0 = .rodata:0x000002FC; // type:object size:0x1D scope:local data:string_table
+...data.0 = .data:0x00000000; // type:label scope:local
 cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
 @1787 = .data:0x0000000C; // type:object size:0x4 scope:local
 lbl_50_data_10 = .data:0x00000010; // type:object size:0x10
@@ -361,19 +362,23 @@ __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:globa
 @1010 = .bss:0x00000040; // type:object size:0x1 scope:local
 @1009 = .bss:0x00000044; // type:object size:0x1 scope:local
 henna = .bss:0x00000048; // type:object size:0x4 scope:global data:4byte
-lbl_50_bss_4C = .bss:0x0000004C; // type:object size:0x1 data:byte
-lbl_50_bss_4D = .bss:0x0000004D; // type:object size:0x1 data:byte
+data_804BBBD4 = .bss:0x0000004C; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x0000004D; // type:object size:0x1 data:byte
 @4280 = .bss:0x00000050; // type:object size:0xC scope:local
 l_HIO = .bss:0x0000005C; // type:object size:0x28 scope:global data:byte
 @4921 = .bss:0x00000084; // type:object size:0xC scope:local
 old_line_pos = .bss:0x00000090; // type:object size:0x4B0 scope:global
 @5446 = .bss:0x00000540; // type:object size:0xC scope:local
+init$5447 = .bss:0x0000054C; // type:object size:0x1 scope:local data:byte
 sc$5445 = .bss:0x00000550; // type:object size:0xC scope:local
 @8906 = .bss:0x0000055C; // type:object size:0xC scope:local
+init$8907 = .bss:0x00000568; // type:object size:0x1 scope:local data:byte
 @8909 = .bss:0x0000056C; // type:object size:0xC scope:local
 sp_pos$8905 = .bss:0x00000578; // type:object size:0x18 scope:local
 old_stick_x$9448 = .bss:0x00000590; // type:object size:0x4 scope:local
+init$9449 = .bss:0x00000594; // type:object size:0x1 scope:local data:byte
 old_stick_sx$9451 = .bss:0x00000598; // type:object size:0x4 scope:local
+init$9452 = .bss:0x0000059C; // type:object size:0x1 scope:local data:byte
 sInstance__40JASGlobalInstance<19JASDefaultBankTable> = .bss:0x000005A0; // type:object size:0x4 scope:global
 sInstance__35JASGlobalInstance<14JASAudioThread> = .bss:0x000005A4; // type:object size:0x4 scope:global
 sInstance__27JASGlobalInstance<7Z2SeMgr> = .bss:0x000005A8; // type:object size:0x4 scope:global
diff --git a/config/GZ2J01/rels/d_a_obj_iceleaf/symbols.txt b/config/GZ2J01/rels/d_a_obj_iceleaf/symbols.txt
index fc27141a7e..4e26d78eba 100644
--- a/config/GZ2J01/rels/d_a_obj_iceleaf/symbols.txt
+++ b/config/GZ2J01/rels/d_a_obj_iceleaf/symbols.txt
@@ -52,6 +52,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @4094 = .rodata:0x00000038; // type:object size:0x4 scope:local
 @4095 = .rodata:0x0000003C; // type:object size:0x4 scope:local align:4 data:float
 @stringBase0 = .rodata:0x00000040; // type:object size:0xA scope:local data:string_table
+...data.0 = .data:0x00000000; // type:label scope:local
 cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
 @1787 = .data:0x0000000C; // type:object size:0x4 scope:local
 lbl_482_data_10 = .data:0x00000010; // type:object size:0x10
@@ -76,5 +77,5 @@ __vt__8cM3dGCyl = .data:0x0000019C; // type:object size:0xC scope:global
 __vt__8cM3dGAab = .data:0x000001A8; // type:object size:0xC scope:global
 __vt__12dBgS_ObjAcch = .data:0x000001B4; // type:object size:0x24 scope:global
 __vt__12J3DFrameCtrl = .data:0x000001D8; // type:object size:0xC scope:global
-lbl_482_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
-lbl_482_bss_1 = .bss:0x00000001; // type:object size:0x1 data:byte
+init$1997 = .bss:0x00000000; // type:object size:0x1 data:byte
+init$2129 = .bss:0x00000001; // type:object size:0x1 data:byte
diff --git a/config/GZ2J01/splits.txt b/config/GZ2J01/splits.txt
index c124b19d78..3ed377a92b 100644
--- a/config/GZ2J01/splits.txt
+++ b/config/GZ2J01/splits.txt
@@ -280,7 +280,7 @@ f_pc/f_pc_layer.cpp:
 f_pc/f_pc_leaf.cpp:
 	.text       start:0x80021A00 end:0x80021B88
 	.data       start:0x8039DB48 end:0x8039DB60
-	.sbss       start:0x8044AE70 end:0x8044AE80
+	.sbss       start:0x8044AE70 end:0x8044AE78
 
 f_pc/f_pc_layer_iter.cpp:
 	.text       start:0x80021B88 end:0x80021CD4
@@ -300,6 +300,7 @@ f_pc/f_pc_load.cpp:
 f_pc/f_pc_manager.cpp:
 	.text       start:0x800220A0 end:0x80022428
 	.bss        start:0x803EEEF0 end:0x803EEF98
+	.sbss       start:0x8044AE78 end:0x8044AE80
 
 f_pc/f_pc_method.cpp:
 	.text       start:0x80022428 end:0x800224F0
@@ -590,13 +591,14 @@ d/d_bg_plc.cpp:
 d/d_bg_s.cpp:
 	.text       start:0x80074134 end:0x80075EEC
 	.data       start:0x803A5768 end:0x803A57A0
-	.sbss       start:0x8044B0A0 end:0x8044B0B0
+	.sbss       start:0x8044B0A0 end:0x8044B0A8
 	.sdata2     start:0x8044C7F8 end:0x8044C800
 
 d/d_bg_s_acch.cpp:
 	.text       start:0x80075EEC end:0x800774DC
 	.data       start:0x803A57A0 end:0x803A57D0
 	.bss        start:0x8041EC60 end:0x8041ECC0
+	.sbss       start:0x8044B0A8 end:0x8044B0B0
 	.sdata2     start:0x8044C800 end:0x8044C828
 
 d/d_bg_s_chk.cpp:
@@ -1395,7 +1397,7 @@ SSystem/SComponent/c_API.cpp:
 
 SSystem/SComponent/c_malloc.cpp:
 	.text       start:0x80265650 end:0x802656BC
-	.sbss       start:0x8044B290 end:0x8044B2A0
+	.sbss       start:0x8044B290 end:0x8044B298
 
 SSystem/SComponent/c_API_controller_pad.cpp:
 	.text       start:0x802656BC end:0x802656F8
@@ -1415,6 +1417,7 @@ SSystem/SComponent/c_cc_s.cpp:
 	.text       start:0x80266E9C end:0x8026824C
 	.data       start:0x803BD888 end:0x803BD8B8
 	.bss        start:0x8042AE00 end:0x8042AE18
+	.sbss       start:0x8044B298 end:0x8044B2A0
 	.sdata2     start:0x8044F158 end:0x8044F190
 
 SSystem/SComponent/c_counter.cpp:
@@ -3560,13 +3563,14 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/dolphin_trk_glue.c:
 	.text       start:0x80374084 end:0x803745DC
 	.rodata     start:0x8039CD68 end:0x8039CE70
 	.data       start:0x803CD3E8 end:0x803CD410
-	.bss        start:0x80449960 end:0x80449970
+	.bss        start:0x80449960 end:0x80449968
 
 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/targcont.c:
 	.text       start:0x803745DC end:0x80374610
 
 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c:
 	.text       start:0x80374610 end:0x8037462C
+	.bss        start:0x80449968 end:0x80449970
 
 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Export/mslsupp.c:
 	.text       start:0x8037462C end:0x803747A4