moved strings + decompile simple store functions

1 files changed, 110 insertions, 114 deletions

diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp
index 9594f2d92a..c76705d353 100644
--- a/libs/Z2AudioLib/Z2StatusMgr.cpp
+++ b/libs/Z2AudioLib/Z2StatusMgr.cpp
@@ -239,6 +239,112 @@ asm void Z2StatusMgr::isMovieDemo() {
 #pragma pop
 
 /* ############################################################################################## */
+/* 8039BC88-8039BC88 0282E8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_8039BC88 = "F_SP00";
+SECTION_DEAD static char const* const stringBase_8039BC8F = "F_SP103";
+SECTION_DEAD static char const* const stringBase_8039BC97 = "R_SP01";
+SECTION_DEAD static char const* const stringBase_8039BC9E = "F_SP104";
+SECTION_DEAD static char const* const stringBase_8039BCA6 = "R_SP107";
+SECTION_DEAD static char const* const stringBase_8039BCAE = "F_SP108";
+SECTION_DEAD static char const* const stringBase_8039BCB6 = "R_SP108";
+SECTION_DEAD static char const* const stringBase_8039BCBE = "F_SP117";
+SECTION_DEAD static char const* const stringBase_8039BCC6 = "F_SP109";
+SECTION_DEAD static char const* const stringBase_8039BCCE = "R_SP109";
+SECTION_DEAD static char const* const stringBase_8039BCD6 = "R_SP209";
+SECTION_DEAD static char const* const stringBase_8039BCDE = "F_SP110";
+SECTION_DEAD static char const* const stringBase_8039BCE6 = "R_SP110";
+SECTION_DEAD static char const* const stringBase_8039BCEE = "F_SP111";
+SECTION_DEAD static char const* const stringBase_8039BCF6 = "F_SP128";
+SECTION_DEAD static char const* const stringBase_8039BCFE = "R_SP128";
+SECTION_DEAD static char const* const stringBase_8039BD06 = "F_SP115";
+SECTION_DEAD static char const* const stringBase_8039BD0E = "F_SP112";
+SECTION_DEAD static char const* const stringBase_8039BD16 = "F_SP126";
+SECTION_DEAD static char const* const stringBase_8039BD1E = "F_SP127";
+SECTION_DEAD static char const* const stringBase_8039BD26 = "R_SP127";
+SECTION_DEAD static char const* const stringBase_8039BD2E = "F_SP113";
+SECTION_DEAD static char const* const stringBase_8039BD36 = "F_SP116";
+SECTION_DEAD static char const* const stringBase_8039BD3E = "R_SP116";
+SECTION_DEAD static char const* const stringBase_8039BD46 = "R_SP160";
+SECTION_DEAD static char const* const stringBase_8039BD4E = "R_SP161";
+SECTION_DEAD static char const* const stringBase_8039BD56 = "F_SP114";
+SECTION_DEAD static char const* const stringBase_8039BD5E = "F_SP118";
+SECTION_DEAD static char const* const stringBase_8039BD66 = "F_SP124";
+SECTION_DEAD static char const* const stringBase_8039BD6E = "F_SP125";
+SECTION_DEAD static char const* const stringBase_8039BD76 = "F_SP121";
+SECTION_DEAD static char const* const stringBase_8039BD7E = "F_SP122";
+SECTION_DEAD static char const* const stringBase_8039BD86 = "F_SP123";
+SECTION_DEAD static char const* const stringBase_8039BD8E = "F_SP200";
+SECTION_DEAD static char const* const stringBase_8039BD96 = "F_SP102";
+SECTION_DEAD static char const* const stringBase_8039BD9E = "";
+SECTION_DEAD static char const* const stringBase_8039BD9F = "R_SP300";
+SECTION_DEAD static char const* const stringBase_8039BDA7 = "R_SP301";
+SECTION_DEAD static char const* const stringBase_8039BDAF = "T_ENEMY";
+SECTION_DEAD static char const* const stringBase_8039BDB7 = "D_MN54";
+SECTION_DEAD static char const* const stringBase_8039BDBE = "D_MN05";
+SECTION_DEAD static char const* const stringBase_8039BDC5 = "D_MN05B";
+SECTION_DEAD static char const* const stringBase_8039BDCD = "D_MN05A";
+SECTION_DEAD static char const* const stringBase_8039BDD5 = "D_MN04";
+SECTION_DEAD static char const* const stringBase_8039BDDC = "D_MN04B";
+SECTION_DEAD static char const* const stringBase_8039BDE4 = "D_MN04A";
+SECTION_DEAD static char const* const stringBase_8039BDEC = "D_MN01";
+SECTION_DEAD static char const* const stringBase_8039BDF3 = "D_MN01B";
+SECTION_DEAD static char const* const stringBase_8039BDFB = "D_MN01A";
+SECTION_DEAD static char const* const stringBase_8039BE03 = "D_MN10";
+SECTION_DEAD static char const* const stringBase_8039BE0A = "D_MN10B";
+SECTION_DEAD static char const* const stringBase_8039BE12 = "D_MN10A";
+SECTION_DEAD static char const* const stringBase_8039BE1A = "D_MN11";
+SECTION_DEAD static char const* const stringBase_8039BE21 = "D_MN11B";
+SECTION_DEAD static char const* const stringBase_8039BE29 = "D_MN11A";
+SECTION_DEAD static char const* const stringBase_8039BE31 = "D_MN06";
+SECTION_DEAD static char const* const stringBase_8039BE38 = "D_MN06B";
+SECTION_DEAD static char const* const stringBase_8039BE40 = "D_MN06A";
+SECTION_DEAD static char const* const stringBase_8039BE48 = "D_MN07";
+SECTION_DEAD static char const* const stringBase_8039BE4F = "D_MN07B";
+SECTION_DEAD static char const* const stringBase_8039BE57 = "D_MN07A";
+SECTION_DEAD static char const* const stringBase_8039BE5F = "D_MN08";
+SECTION_DEAD static char const* const stringBase_8039BE66 = "D_MN08B";
+SECTION_DEAD static char const* const stringBase_8039BE6E = "D_MN08C";
+SECTION_DEAD static char const* const stringBase_8039BE76 = "D_MN08A";
+SECTION_DEAD static char const* const stringBase_8039BE7E = "D_MN08D";
+SECTION_DEAD static char const* const stringBase_8039BE86 = "D_MN09";
+SECTION_DEAD static char const* const stringBase_8039BE8D = "D_MN09A";
+SECTION_DEAD static char const* const stringBase_8039BE95 = "D_MN09B";
+SECTION_DEAD static char const* const stringBase_8039BE9D = "D_MN09C";
+SECTION_DEAD static char const* const stringBase_8039BEA5 = "D_SB00";
+SECTION_DEAD static char const* const stringBase_8039BEAC = "D_SB01";
+SECTION_DEAD static char const* const stringBase_8039BEB3 = "D_SB02";
+SECTION_DEAD static char const* const stringBase_8039BEBA = "D_SB03";
+SECTION_DEAD static char const* const stringBase_8039BEC1 = "D_SB04";
+SECTION_DEAD static char const* const stringBase_8039BEC8 = "D_SB05";
+SECTION_DEAD static char const* const stringBase_8039BECF = "D_SB06";
+SECTION_DEAD static char const* const stringBase_8039BED6 = "D_SB07";
+SECTION_DEAD static char const* const stringBase_8039BEDD = "D_SB08";
+SECTION_DEAD static char const* const stringBase_8039BEE4 = "D_SB09";
+SECTION_DEAD static char const* const stringBase_8039BEEB = "D_SB10";
+SECTION_DEAD static char const* const stringBase_8039BEF2 = "force_end";
+SECTION_DEAD static char const* const stringBase_8039BEFC = "SAVEREQ";
+SECTION_DEAD static char const* const stringBase_8039BF04 = "SAVEGID";
+SECTION_DEAD static char const* const stringBase_8039BF0C = "demo36_01";
+SECTION_DEAD static char const* const stringBase_8039BF16 = "demo36_02";
+SECTION_DEAD static char const* const stringBase_8039BF20 = "demo37_01";
+SECTION_DEAD static char const* const stringBase_8039BF2A = "demo31";
+SECTION_DEAD static char const* const stringBase_8039BF31 = "demo";
+SECTION_DEAD static char const* const stringBase_8039BF36 = "force_start";
+SECTION_DEAD static char const* const stringBase_8039BF42 = "KAGO_HIKARI";
+SECTION_DEAD static char const* const stringBase_8039BF4E = "KAGO_YAMI";
+SECTION_DEAD static char const* const stringBase_8039BF58 = "HYRULEOP";
+SECTION_DEAD static char const* const stringBase_8039BF61 = "R00_start";
+SECTION_DEAD static char const* const stringBase_8039BF6B = "B_W_START";
+SECTION_DEAD static char const* const stringBase_8039BF75 = "L0_rampart01";
+SECTION_DEAD static char const* const stringBase_8039BF82 = "R22-opening";
+SECTION_DEAD static char const* const stringBase_8039BF8E = "R01-start";
+SECTION_DEAD static char const* const stringBase_8039BF98 = "LV3R00OP";
+/* @stringBase0 padding */
+SECTION_DEAD static char const* const pad_8039BFA1 = "\0\0\0\0\0\0";
+#pragma pop
+
 /* 803CA508-803CA5C0 -00001 00B8+00 1/1 0/0 0/0 .data            @3732 */
 SECTION_DATA static void* lit_3732[46] = {
     (void*)(((char*)setDemoName__11Z2StatusMgrFPc) + 0x438),
@@ -322,15 +428,10 @@ asm void Z2StatusMgr::checkDayTime() {
 }
 #pragma pop
 
-/* 802B6758-802B6760 2B1098 0008+00 0/0 1/1 0/0 .text            setEventBit__11Z2StatusMgrFPv */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void Z2StatusMgr::setEventBit(void* param_0) {
-    nofralloc
-#include "asm/Z2AudioLib/Z2StatusMgr/setEventBit__11Z2StatusMgrFPv.s"
+/* 802B6758-802B6760 -00001 0008+00 0/0 0/0 0/0 .text            setEventBit__11Z2StatusMgrFPv */
+void Z2StatusMgr::setEventBit(void* param_0) {
+    *(u32*)(((u8*)this) + 8) /* this->field_0x8 */ = (u32)(param_0);
 }
-#pragma pop
 
 /* 802B6760-802B6784 2B10A0 0024+00 0/0 1/1 0/0 .text setCameraPolygonPos__11Z2StatusMgrFP3Vec */
 #pragma push
@@ -364,109 +465,4 @@ asm void Z2StatusMgr::setCameraInWaterDepth(f32 param_0) {
 }
 #pragma pop
 
-/* 8039BC88-8039BFA8 0282E8 0319+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_8039BC88 = "F_SP00";
-SECTION_DEAD static char const* const stringBase_8039BC8F = "F_SP103";
-SECTION_DEAD static char const* const stringBase_8039BC97 = "R_SP01";
-SECTION_DEAD static char const* const stringBase_8039BC9E = "F_SP104";
-SECTION_DEAD static char const* const stringBase_8039BCA6 = "R_SP107";
-SECTION_DEAD static char const* const stringBase_8039BCAE = "F_SP108";
-SECTION_DEAD static char const* const stringBase_8039BCB6 = "R_SP108";
-SECTION_DEAD static char const* const stringBase_8039BCBE = "F_SP117";
-SECTION_DEAD static char const* const stringBase_8039BCC6 = "F_SP109";
-SECTION_DEAD static char const* const stringBase_8039BCCE = "R_SP109";
-SECTION_DEAD static char const* const stringBase_8039BCD6 = "R_SP209";
-SECTION_DEAD static char const* const stringBase_8039BCDE = "F_SP110";
-SECTION_DEAD static char const* const stringBase_8039BCE6 = "R_SP110";
-SECTION_DEAD static char const* const stringBase_8039BCEE = "F_SP111";
-SECTION_DEAD static char const* const stringBase_8039BCF6 = "F_SP128";
-SECTION_DEAD static char const* const stringBase_8039BCFE = "R_SP128";
-SECTION_DEAD static char const* const stringBase_8039BD06 = "F_SP115";
-SECTION_DEAD static char const* const stringBase_8039BD0E = "F_SP112";
-SECTION_DEAD static char const* const stringBase_8039BD16 = "F_SP126";
-SECTION_DEAD static char const* const stringBase_8039BD1E = "F_SP127";
-SECTION_DEAD static char const* const stringBase_8039BD26 = "R_SP127";
-SECTION_DEAD static char const* const stringBase_8039BD2E = "F_SP113";
-SECTION_DEAD static char const* const stringBase_8039BD36 = "F_SP116";
-SECTION_DEAD static char const* const stringBase_8039BD3E = "R_SP116";
-SECTION_DEAD static char const* const stringBase_8039BD46 = "R_SP160";
-SECTION_DEAD static char const* const stringBase_8039BD4E = "R_SP161";
-SECTION_DEAD static char const* const stringBase_8039BD56 = "F_SP114";
-SECTION_DEAD static char const* const stringBase_8039BD5E = "F_SP118";
-SECTION_DEAD static char const* const stringBase_8039BD66 = "F_SP124";
-SECTION_DEAD static char const* const stringBase_8039BD6E = "F_SP125";
-SECTION_DEAD static char const* const stringBase_8039BD76 = "F_SP121";
-SECTION_DEAD static char const* const stringBase_8039BD7E = "F_SP122";
-SECTION_DEAD static char const* const stringBase_8039BD86 = "F_SP123";
-SECTION_DEAD static char const* const stringBase_8039BD8E = "F_SP200";
-SECTION_DEAD static char const* const stringBase_8039BD96 = "F_SP102";
-SECTION_DEAD static char const* const stringBase_8039BD9E = "";
-SECTION_DEAD static char const* const stringBase_8039BD9F = "R_SP300";
-SECTION_DEAD static char const* const stringBase_8039BDA7 = "R_SP301";
-SECTION_DEAD static char const* const stringBase_8039BDAF = "T_ENEMY";
-SECTION_DEAD static char const* const stringBase_8039BDB7 = "D_MN54";
-SECTION_DEAD static char const* const stringBase_8039BDBE = "D_MN05";
-SECTION_DEAD static char const* const stringBase_8039BDC5 = "D_MN05B";
-SECTION_DEAD static char const* const stringBase_8039BDCD = "D_MN05A";
-SECTION_DEAD static char const* const stringBase_8039BDD5 = "D_MN04";
-SECTION_DEAD static char const* const stringBase_8039BDDC = "D_MN04B";
-SECTION_DEAD static char const* const stringBase_8039BDE4 = "D_MN04A";
-SECTION_DEAD static char const* const stringBase_8039BDEC = "D_MN01";
-SECTION_DEAD static char const* const stringBase_8039BDF3 = "D_MN01B";
-SECTION_DEAD static char const* const stringBase_8039BDFB = "D_MN01A";
-SECTION_DEAD static char const* const stringBase_8039BE03 = "D_MN10";
-SECTION_DEAD static char const* const stringBase_8039BE0A = "D_MN10B";
-SECTION_DEAD static char const* const stringBase_8039BE12 = "D_MN10A";
-SECTION_DEAD static char const* const stringBase_8039BE1A = "D_MN11";
-SECTION_DEAD static char const* const stringBase_8039BE21 = "D_MN11B";
-SECTION_DEAD static char const* const stringBase_8039BE29 = "D_MN11A";
-SECTION_DEAD static char const* const stringBase_8039BE31 = "D_MN06";
-SECTION_DEAD static char const* const stringBase_8039BE38 = "D_MN06B";
-SECTION_DEAD static char const* const stringBase_8039BE40 = "D_MN06A";
-SECTION_DEAD static char const* const stringBase_8039BE48 = "D_MN07";
-SECTION_DEAD static char const* const stringBase_8039BE4F = "D_MN07B";
-SECTION_DEAD static char const* const stringBase_8039BE57 = "D_MN07A";
-SECTION_DEAD static char const* const stringBase_8039BE5F = "D_MN08";
-SECTION_DEAD static char const* const stringBase_8039BE66 = "D_MN08B";
-SECTION_DEAD static char const* const stringBase_8039BE6E = "D_MN08C";
-SECTION_DEAD static char const* const stringBase_8039BE76 = "D_MN08A";
-SECTION_DEAD static char const* const stringBase_8039BE7E = "D_MN08D";
-SECTION_DEAD static char const* const stringBase_8039BE86 = "D_MN09";
-SECTION_DEAD static char const* const stringBase_8039BE8D = "D_MN09A";
-SECTION_DEAD static char const* const stringBase_8039BE95 = "D_MN09B";
-SECTION_DEAD static char const* const stringBase_8039BE9D = "D_MN09C";
-SECTION_DEAD static char const* const stringBase_8039BEA5 = "D_SB00";
-SECTION_DEAD static char const* const stringBase_8039BEAC = "D_SB01";
-SECTION_DEAD static char const* const stringBase_8039BEB3 = "D_SB02";
-SECTION_DEAD static char const* const stringBase_8039BEBA = "D_SB03";
-SECTION_DEAD static char const* const stringBase_8039BEC1 = "D_SB04";
-SECTION_DEAD static char const* const stringBase_8039BEC8 = "D_SB05";
-SECTION_DEAD static char const* const stringBase_8039BECF = "D_SB06";
-SECTION_DEAD static char const* const stringBase_8039BED6 = "D_SB07";
-SECTION_DEAD static char const* const stringBase_8039BEDD = "D_SB08";
-SECTION_DEAD static char const* const stringBase_8039BEE4 = "D_SB09";
-SECTION_DEAD static char const* const stringBase_8039BEEB = "D_SB10";
-SECTION_DEAD static char const* const stringBase_8039BEF2 = "force_end";
-SECTION_DEAD static char const* const stringBase_8039BEFC = "SAVEREQ";
-SECTION_DEAD static char const* const stringBase_8039BF04 = "SAVEGID";
-SECTION_DEAD static char const* const stringBase_8039BF0C = "demo36_01";
-SECTION_DEAD static char const* const stringBase_8039BF16 = "demo36_02";
-SECTION_DEAD static char const* const stringBase_8039BF20 = "demo37_01";
-SECTION_DEAD static char const* const stringBase_8039BF2A = "demo31";
-SECTION_DEAD static char const* const stringBase_8039BF31 = "demo";
-SECTION_DEAD static char const* const stringBase_8039BF36 = "force_start";
-SECTION_DEAD static char const* const stringBase_8039BF42 = "KAGO_HIKARI";
-SECTION_DEAD static char const* const stringBase_8039BF4E = "KAGO_YAMI";
-SECTION_DEAD static char const* const stringBase_8039BF58 = "HYRULEOP";
-SECTION_DEAD static char const* const stringBase_8039BF61 = "R00_start";
-SECTION_DEAD static char const* const stringBase_8039BF6B = "B_W_START";
-SECTION_DEAD static char const* const stringBase_8039BF75 = "L0_rampart01";
-SECTION_DEAD static char const* const stringBase_8039BF82 = "R22-opening";
-SECTION_DEAD static char const* const stringBase_8039BF8E = "R01-start";
-SECTION_DEAD static char const* const stringBase_8039BF98 = "LV3R00OP";
-/* @stringBase0 padding */
-SECTION_DEAD static char const* const pad_8039BFA1 = "\0\0\0\0\0\0";
-#pragma pop
+/* 8039BC88-8039BC88 0282E8 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */