moved strings + decompile simple store functions

2026-07-11 06:18:46 -07:00 · 2021-04-10 07:02:38 +02:00
parent 2661db6aaa
commit 0ad6ebe7b4
1299 changed files with 51830 additions and 43634 deletions
@@ -49,13 +49,13 @@ struct mDoExt_baseAnm {
    /* 8000D428 */ void play();
 };

-struct J3DAnmTransform {};
+struct mDoExt_McaMorfCallBack2_c {};

 struct mDoExt_McaMorfCallBack1_c {};

-struct J3DModelData {};
+struct J3DAnmTransform {};

-struct mDoExt_McaMorfCallBack2_c {};
+struct J3DModelData {};

 struct Z2Creature {
    /* 802C03C8 */ Z2Creature();
@@ -414,11 +414,11 @@ extern "C" void __register_global_object();
 /* ############################################################################################## */
 /* 80BA5408-80BA540C 000000 0004+00 8/8 0/0 0/0 .rodata          @3776 */
 SECTION_RODATA static f32 const lit_3776 = 1.5f;
-COMPILER_STRIP_GATE(80BA5408, &lit_3776);
+COMPILER_STRIP_GATE(0x80BA5408, &lit_3776);

 /* 80BA540C-80BA5410 000004 0004+00 1/2 0/0 0/0 .rodata          @3777 */
 SECTION_RODATA static f32 const lit_3777 = 2.0f;
-COMPILER_STRIP_GATE(80BA540C, &lit_3777);
+COMPILER_STRIP_GATE(0x80BA540C, &lit_3777);

 /* 80BA551C-80BA553C -00001 0020+00 1/0 0/0 0/0 .data            l_daObjARI_Method */
 SECTION_DATA static void* l_daObjARI_Method[8] = {
@@ -514,7 +514,7 @@ SECTION_RODATA static u16 const l_ari_itemno[1 + 1 /* padding */] = {
    /* padding */
    0x0000,
 };
-COMPILER_STRIP_GATE(80BA5410, &l_ari_itemno);
+COMPILER_STRIP_GATE(0x80BA5410, &l_ari_itemno);

 /* 80BA5414-80BA5454 00000C 0040+00 1/1 0/0 0/0 .rodata          ccSphSrc$3781 */
 SECTION_RODATA static u8 const ccSphSrc[64] = {
@@ -523,7 +523,7 @@ SECTION_RODATA static u8 const ccSphSrc[64] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0xA0, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80BA5414, &ccSphSrc);
+COMPILER_STRIP_GATE(0x80BA5414, &ccSphSrc);

 /* 80BA26BC-80BA2728 00011C 006C+00 1/1 0/0 0/0 .text            InitCcSph__10daObjARI_cFv */
 #pragma push
@@ -538,7 +538,7 @@ asm void daObjARI_c::InitCcSph() {
 /* ############################################################################################## */
 /* 80BA5454-80BA5458 00004C 0004+00 1/1 0/0 0/0 .rodata          @3790 */
 SECTION_RODATA static f32 const lit_3790 = 40.0f;
-COMPILER_STRIP_GATE(80BA5454, &lit_3790);
+COMPILER_STRIP_GATE(0x80BA5454, &lit_3790);

 /* 80BA2728-80BA2780 000188 0058+00 1/1 0/0 0/0 .text            SetCcSph__10daObjARI_cFv */
 #pragma push
@@ -557,13 +557,13 @@ SECTION_RODATA static f32 const lit_3814[1 + 1 /* padding */] = {
    /* padding */
    0.0f,
 };
-COMPILER_STRIP_GATE(80BA5458, &lit_3814);
+COMPILER_STRIP_GATE(0x80BA5458, &lit_3814);

 /* 80BA5460-80BA5468 000058 0008+00 1/2 0/0 0/0 .rodata          @3816 */
 SECTION_RODATA static u8 const lit_3816[8] = {
    0x43, 0x30, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80BA5460, &lit_3816);
+COMPILER_STRIP_GATE(0x80BA5460, &lit_3816);

 /* 80BA2780-80BA2854 0001E0 00D4+00 1/1 0/0 0/0 .text ctrlJoint__10daObjARI_cFP8J3DJointP8J3DModel
 */
@@ -599,11 +599,17 @@ static asm void useHeapInit(fopAc_ac_c* param_0) {
 /* ############################################################################################## */
 /* 80BA5468-80BA546C 000060 0004+00 1/2 0/0 0/0 .rodata          @3933 */
 SECTION_RODATA static f32 const lit_3933 = 0.5f;
-COMPILER_STRIP_GATE(80BA5468, &lit_3933);
+COMPILER_STRIP_GATE(0x80BA5468, &lit_3933);

 /* 80BA546C-80BA5470 000064 0004+00 2/5 0/0 0/0 .rodata          @3934 */
 SECTION_RODATA static f32 const lit_3934 = 1.0f;
-COMPILER_STRIP_GATE(80BA546C, &lit_3934);
+COMPILER_STRIP_GATE(0x80BA546C, &lit_3934);
+
+/* 80BA550C-80BA550C 000104 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80BA550C = "I_Ari";
+#pragma pop

 /* 80BA28C0-80BA2C18 000320 0358+00 1/1 0/0 0/0 .text            CreateHeap__10daObjARI_cFv */
 #pragma push
@@ -650,7 +656,7 @@ static asm void daObjARI_Delete(daObjARI_c* param_0) {
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_3968 = 4.0f / 5.0f;
-COMPILER_STRIP_GATE(80BA5470, &lit_3968);
+COMPILER_STRIP_GATE(0x80BA5470, &lit_3968);
 #pragma pop

 /* 80BA5474-80BA5478 00006C 0004+00 2/8 0/0 0/0 .rodata          @3969 */
@@ -660,48 +666,48 @@ SECTION_RODATA static u8 const lit_3969[4] = {
    0x00,
    0x00,
 };
-COMPILER_STRIP_GATE(80BA5474, &lit_3969);
+COMPILER_STRIP_GATE(0x80BA5474, &lit_3969);

 /* 80BA5478-80BA547C 000070 0004+00 0/0 0/0 0/0 .rodata          @3970 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_3970 = 2.0f / 5.0f;
-COMPILER_STRIP_GATE(80BA5478, &lit_3970);
+COMPILER_STRIP_GATE(0x80BA5478, &lit_3970);
 #pragma pop

 /* 80BA547C-80BA5480 000074 0004+00 0/1 0/0 0/0 .rodata          @3971 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_3971 = 10.0f;
-COMPILER_STRIP_GATE(80BA547C, &lit_3971);
+COMPILER_STRIP_GATE(0x80BA547C, &lit_3971);
 #pragma pop

 /* 80BA5480-80BA5484 000078 0004+00 0/0 0/0 0/0 .rodata          @3972 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_3972 = 1.0f / 50.0f;
-COMPILER_STRIP_GATE(80BA5480, &lit_3972);
+COMPILER_STRIP_GATE(0x80BA5480, &lit_3972);
 #pragma pop

 /* 80BA5484-80BA5488 00007C 0004+00 0/2 0/0 0/0 .rodata          @4110 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4110 = -50.0f;
-COMPILER_STRIP_GATE(80BA5484, &lit_4110);
+COMPILER_STRIP_GATE(0x80BA5484, &lit_4110);
 #pragma pop

 /* 80BA5488-80BA548C 000080 0004+00 0/3 0/0 0/0 .rodata          @4111 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4111 = 50.0f;
-COMPILER_STRIP_GATE(80BA5488, &lit_4111);
+COMPILER_STRIP_GATE(0x80BA5488, &lit_4111);
 #pragma pop

 /* 80BA548C-80BA5490 000084 0004+00 0/1 0/0 0/0 .rodata          @4112 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4112 = 3.0f / 10.0f;
-COMPILER_STRIP_GATE(80BA548C, &lit_4112);
+COMPILER_STRIP_GATE(0x80BA548C, &lit_4112);
 #pragma pop

 /* 80BA5490-80BA5498 000088 0008+00 0/5 0/0 0/0 .rodata          @4113 */
@@ -710,7 +716,7 @@ COMPILER_STRIP_GATE(80BA548C, &lit_4112);
 SECTION_RODATA static u8 const lit_4113[8] = {
    0x3F, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80BA5490, &lit_4113);
+COMPILER_STRIP_GATE(0x80BA5490, &lit_4113);
 #pragma pop

 /* 80BA5498-80BA54A0 000090 0008+00 0/5 0/0 0/0 .rodata          @4114 */
@@ -719,7 +725,7 @@ COMPILER_STRIP_GATE(80BA5490, &lit_4113);
 SECTION_RODATA static u8 const lit_4114[8] = {
    0x40, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80BA5498, &lit_4114);
+COMPILER_STRIP_GATE(0x80BA5498, &lit_4114);
 #pragma pop

 /* 80BA54A0-80BA54A8 000098 0008+00 0/5 0/0 0/0 .rodata          @4115 */
@@ -728,7 +734,7 @@ COMPILER_STRIP_GATE(80BA5498, &lit_4114);
 SECTION_RODATA static u8 const lit_4115[8] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80BA54A0, &lit_4115);
+COMPILER_STRIP_GATE(0x80BA54A0, &lit_4115);
 #pragma pop

 /* 80BA2CA4-80BA3228 000704 0584+00 1/1 0/0 0/0 .text            WallWalk__10daObjARI_cFv */
@@ -756,21 +762,21 @@ asm cM3dGPla::~cM3dGPla() {
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4138 = 1050.0f;
-COMPILER_STRIP_GATE(80BA54A8, &lit_4138);
+COMPILER_STRIP_GATE(0x80BA54A8, &lit_4138);
 #pragma pop

 /* 80BA54AC-80BA54B0 0000A4 0004+00 0/1 0/0 0/0 .rodata          @4139 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4139 = 400.0f;
-COMPILER_STRIP_GATE(80BA54AC, &lit_4139);
+COMPILER_STRIP_GATE(0x80BA54AC, &lit_4139);
 #pragma pop

 /* 80BA54B0-80BA54B4 0000A8 0004+00 0/1 0/0 0/0 .rodata          @4140 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4140 = 3.0f / 5.0f;
-COMPILER_STRIP_GATE(80BA54B0, &lit_4140);
+COMPILER_STRIP_GATE(0x80BA54B0, &lit_4140);
 #pragma pop

 /* 80BA3270-80BA337C 000CD0 010C+00 2/2 0/0 0/0 .text            MoveAction__10daObjARI_cFv */
@@ -786,7 +792,7 @@ asm void daObjARI_c::MoveAction() {
 /* ############################################################################################## */
 /* 80BA54B4-80BA54B8 0000AC 0004+00 1/1 0/0 0/0 .rodata          @4152 */
 SECTION_RODATA static f32 const lit_4152 = 1500.0f;
-COMPILER_STRIP_GATE(80BA54B4, &lit_4152);
+COMPILER_STRIP_GATE(0x80BA54B4, &lit_4152);

 /* 80BA337C-80BA33F8 000DDC 007C+00 1/1 0/0 0/0 .text            Action__10daObjARI_cFv */
 #pragma push
@@ -825,7 +831,7 @@ SECTION_RODATA static f32 const lit_4215[1 + 1 /* padding */] = {
    /* padding */
    0.0f,
 };
-COMPILER_STRIP_GATE(80BA54B8, &lit_4215);
+COMPILER_STRIP_GATE(0x80BA54B8, &lit_4215);

 /* 80BA3638-80BA36CC 001098 0094+00 1/1 0/0 0/0 .text            B_MoveAction__10daObjARI_cFv */
 #pragma push
@@ -852,7 +858,7 @@ asm void daObjARI_c::FallAction() {
 SECTION_RODATA static u8 const lit_4257[8] = {
    0x43, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(80BA54C0, &lit_4257);
+COMPILER_STRIP_GATE(0x80BA54C0, &lit_4257);

 /* 80BA3700-80BA3824 001160 0124+00 1/1 0/0 0/0 .text            ParticleSet__10daObjARI_cFv */
 #pragma push
@@ -869,14 +875,14 @@ asm void daObjARI_c::ParticleSet() {
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4287 = 100.0f;
-COMPILER_STRIP_GATE(80BA54C8, &lit_4287);
+COMPILER_STRIP_GATE(0x80BA54C8, &lit_4287);
 #pragma pop

 /* 80BA54CC-80BA54D0 0000C4 0004+00 0/1 0/0 0/0 .rodata          @4360 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4360 = 150.0f;
-COMPILER_STRIP_GATE(80BA54CC, &lit_4360);
+COMPILER_STRIP_GATE(0x80BA54CC, &lit_4360);
 #pragma pop

 /* 80BA3824-80BA3B38 001284 0314+00 1/1 0/0 0/0 .text            BoomChk__10daObjARI_cFv */
@@ -904,28 +910,28 @@ asm void daObjARI_c::ObjHit() {
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4583 = 10000.0f;
-COMPILER_STRIP_GATE(80BA54D0, &lit_4583);
+COMPILER_STRIP_GATE(0x80BA54D0, &lit_4583);
 #pragma pop

 /* 80BA54D4-80BA54D8 0000CC 0004+00 0/1 0/0 0/0 .rodata          @4584 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4584 = 200.0f;
-COMPILER_STRIP_GATE(80BA54D4, &lit_4584);
+COMPILER_STRIP_GATE(0x80BA54D4, &lit_4584);
 #pragma pop

 /* 80BA54D8-80BA54DC 0000D0 0004+00 0/1 0/0 0/0 .rodata          @4585 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4585 = 4000.0f;
-COMPILER_STRIP_GATE(80BA54D8, &lit_4585);
+COMPILER_STRIP_GATE(0x80BA54D8, &lit_4585);
 #pragma pop

 /* 80BA54DC-80BA54E0 0000D4 0004+00 0/1 0/0 0/0 .rodata          @4586 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4586 = 160000.0f;
-COMPILER_STRIP_GATE(80BA54DC, &lit_4586);
+COMPILER_STRIP_GATE(0x80BA54DC, &lit_4586);
 #pragma pop

 /* 80BA3C38-80BA44F0 001698 08B8+00 1/1 0/0 0/0 .text            Execute__10daObjARI_cFv */
@@ -943,28 +949,28 @@ asm void daObjARI_c::Execute() {
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4625 = 20.0f;
-COMPILER_STRIP_GATE(80BA54E0, &lit_4625);
+COMPILER_STRIP_GATE(0x80BA54E0, &lit_4625);
 #pragma pop

 /* 80BA54E4-80BA54E8 0000DC 0004+00 0/1 0/0 0/0 .rodata          @4626 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4626 = 608.0f;
-COMPILER_STRIP_GATE(80BA54E4, &lit_4626);
+COMPILER_STRIP_GATE(0x80BA54E4, &lit_4626);
 #pragma pop

 /* 80BA54E8-80BA54EC 0000E0 0004+00 0/1 0/0 0/0 .rodata          @4627 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4627 = 448.0f;
-COMPILER_STRIP_GATE(80BA54E8, &lit_4627);
+COMPILER_STRIP_GATE(0x80BA54E8, &lit_4627);
 #pragma pop

 /* 80BA54EC-80BA54F0 0000E4 0004+00 0/1 0/0 0/0 .rodata          @4628 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4628 = 16777215.0f;
-COMPILER_STRIP_GATE(80BA54EC, &lit_4628);
+COMPILER_STRIP_GATE(0x80BA54EC, &lit_4628);
 #pragma pop

 /* 80BA44F0-80BA466C 001F50 017C+00 1/1 0/0 0/0 .text            Z_BufferChk__10daObjARI_cFv */
@@ -1004,11 +1010,11 @@ asm void daObjARI_c::setBaseMtx() {
 /* ############################################################################################## */
 /* 80BA54F0-80BA54F4 0000E8 0004+00 1/1 0/0 0/0 .rodata          @4693 */
 SECTION_RODATA static f32 const lit_4693 = 15.0f;
-COMPILER_STRIP_GATE(80BA54F0, &lit_4693);
+COMPILER_STRIP_GATE(0x80BA54F0, &lit_4693);

 /* 80BA54F4-80BA54F8 0000EC 0004+00 1/1 0/0 0/0 .rodata          @4694 */
 SECTION_RODATA static f32 const lit_4694 = -3.0f / 5.0f;
-COMPILER_STRIP_GATE(80BA54F4, &lit_4694);
+COMPILER_STRIP_GATE(0x80BA54F4, &lit_4694);

 /* 80BA473C-80BA481C 00219C 00E0+00 1/0 0/0 0/0 .text            daObjARI_Draw__FP10daObjARI_c */
 #pragma push
@@ -1033,7 +1039,13 @@ static asm void daObjARI_Execute(daObjARI_c* param_0) {
 /* ############################################################################################## */
 /* 80BA54F8-80BA54FC 0000F0 0004+00 1/2 0/0 0/0 .rodata          l_musiya_num */
 SECTION_RODATA static u32 const l_musiya_num = 0x01A501A6;
-COMPILER_STRIP_GATE(80BA54F8, &l_musiya_num);
+COMPILER_STRIP_GATE(0x80BA54F8, &l_musiya_num);
+
+/* 80BA550C-80BA550C 000104 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */
+#pragma push
+#pragma force_active on
+SECTION_DEAD static char const* const stringBase_80BA5512 = "R_SP160";
+#pragma pop

 /* 80BA483C-80BA49E8 00229C 01AC+00 1/1 0/0 0/0 .text            CreateChk__10daObjARI_cFv */
 #pragma push
@@ -1050,28 +1062,28 @@ asm void daObjARI_c::CreateChk() {
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_4999 = 11.0f / 10.0f;
-COMPILER_STRIP_GATE(80BA54FC, &lit_4999);
+COMPILER_STRIP_GATE(0x80BA54FC, &lit_4999);
 #pragma pop

 /* 80BA5500-80BA5504 0000F8 0004+00 0/1 0/0 0/0 .rodata          @5000 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_5000 = 500.0f;
-COMPILER_STRIP_GATE(80BA5500, &lit_5000);
+COMPILER_STRIP_GATE(0x80BA5500, &lit_5000);
 #pragma pop

 /* 80BA5504-80BA5508 0000FC 0004+00 0/1 0/0 0/0 .rodata          @5001 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_5001 = -200.0f;
-COMPILER_STRIP_GATE(80BA5504, &lit_5001);
+COMPILER_STRIP_GATE(0x80BA5504, &lit_5001);
 #pragma pop

 /* 80BA5508-80BA550C 000100 0004+00 0/1 0/0 0/0 .rodata          @5002 */
 #pragma push
 #pragma force_active on
 SECTION_RODATA static f32 const lit_5002 = -1000.0f;
-COMPILER_STRIP_GATE(80BA5508, &lit_5002);
+COMPILER_STRIP_GATE(0x80BA5508, &lit_5002);
 #pragma pop

 /* 80BA55E4-80BA55F0 00000C 000C+00 1/1 0/0 0/0 .bss             @3771 */
@@ -1148,7 +1160,7 @@ asm void __sinit_d_a_obj_ari_cpp() {

 #pragma push
 #pragma force_active on
-SECTION_CTORS void* const _ctors_80BA53A8 = (void*)__sinit_d_a_obj_ari_cpp;
+REGISTER_CTORS(0x80BA53A8, __sinit_d_a_obj_ari_cpp);
 #pragma pop

 /* 80BA53E4-80BA53EC 002E44 0008+00 1/0 0/0 0/0 .text            @36@__dt__12dBgS_ObjAcchFv */
@@ -1171,10 +1183,4 @@ static asm void func_80BA53EC() {
 }
 #pragma pop

-/* 80BA550C-80BA551A 000104 000E+00 4/4 0/0 0/0 .rodata          @stringBase0 */
-#pragma push
-#pragma force_active on
-#pragma section ".dead"
-SECTION_DEAD static char const* const stringBase_80BA550C = "I_Ari";
-SECTION_DEAD static char const* const stringBase_80BA5512 = "R_SP160";
-#pragma pop
+/* 80BA550C-80BA550C 000104 0000+00 0/0 0/0 0/0 .rodata          @stringBase0 */