moved strings + decompile simple store functions

1 files changed, 41 insertions, 46 deletions

diff --git a/libs/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/J2DGraph/J2DWindowEx.cpp
index 08da980614..7439f7eb7d 100644
--- a/libs/JSystem/J2DGraph/J2DWindowEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DWindowEx.cpp
@@ -43,42 +43,24 @@ struct JGeometry {
 
 struct J2DAnmTexPattern {};
 
-struct J2DAnmVtxColor {
-    /* 8030363C */ void getColor(u8, u16, _GXColor*) const;
-};
-
-struct J2DWindow {
-    struct TMaterial {};
-
-    /* 802F9A7C */ J2DWindow();
-    /* 802FA880 */ ~J2DWindow();
-    /* 802FB000 */ void resize(f32, f32);
-    /* 802FB1D8 */ void drawSelf(f32, f32);
-    /* 802FBF98 */ s32 getTypeID() const;
+struct J2DAnmVisibilityFull {
+    /* 8030C048 */ void getVisibility(u16, u8*) const;
 };
 
-struct J2DAnmTextureSRTKey {};
-
 struct J2DAnmColor {};
 
+struct J2DAnmBase {};
+
 struct J2DAnmTevRegKey {};
 
-struct J2DMaterial {
-    /* 802EA38C */ void setGX();
-    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
-    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
-    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
-    /* 802EA89C */ void setAnimation(J2DAnmColor*);
-};
+struct J2DAnmTextureSRTKey {};
 
-struct J2DAnmVisibilityFull {
-    /* 8030C048 */ void getVisibility(u16, u8*) const;
+struct J2DAnmVtxColor {
+    /* 8030363C */ void getColor(u8, u16, _GXColor*) const;
 };
 
 struct J2DAnmTransform {};
 
-struct J2DAnmBase {};
-
 struct J2DPane {
     /* 80053BC0 */ void calcMtx();
     /* 80053C00 */ void makeMatrix(f32, f32);
@@ -107,6 +89,24 @@ struct J2DPane {
 
 struct J2DTevStage {};
 
+struct J2DMaterial {
+    /* 802EA38C */ void setGX();
+    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
+    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
+    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
+    /* 802EA89C */ void setAnimation(J2DAnmColor*);
+};
+
+struct J2DWindow {
+    struct TMaterial {};
+
+    /* 802F9A7C */ J2DWindow();
+    /* 802FA880 */ ~J2DWindow();
+    /* 802FB000 */ void resize(f32, f32);
+    /* 802FB1D8 */ void drawSelf(f32, f32);
+    /* 802FBF98 */ s32 getTypeID() const;
+};
+
 struct J2DWindowEx {
     struct stage_enum {};
 
@@ -280,7 +280,7 @@ extern "C" void _restgpr_29();
 SECTION_RODATA static u8 const lit_1508[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(803A1C60, &lit_1508);
+COMPILER_STRIP_GATE(0x803A1C60, &lit_1508);
 
 /* 803CD3E8-803CD4B8 02A508 00CC+04 2/2 0/0 0/0 .data            __vt__11J2DWindowEx */
 SECTION_DATA extern void* __vt__11J2DWindowEx[51 + 1 /* padding */] = {
@@ -686,16 +686,11 @@ asm void J2DWindowEx::isNeedSetAnm(u8 param_0) {
 }
 #pragma pop
 
-/* 80303274-8030327C 2FDBB4 0008+00 1/0 0/0 0/0 .text
+/* 80303274-8030327C -00001 0008+00 0/0 0/0 0/0 .text
  * setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull          */
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void J2DWindowEx::setAnimation(J2DAnmVisibilityFull* param_0) {
-    nofralloc
-#include "asm/JSystem/J2DGraph/J2DWindowEx/setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull.s"
+void J2DWindowEx::setAnimation(J2DAnmVisibilityFull* param_0) {
+    *(u32*)(((u8*)this) + 372) /* this->field_0x174 */ = (u32)(param_0);
 }
-#pragma pop
 
 /* 8030327C-80303370 2FDBBC 00F4+00 1/0 0/0 0/0 .text
  * setAnimation__11J2DWindowExFP14J2DAnmVtxColor                */
@@ -715,7 +710,7 @@ asm void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) {
 SECTION_RODATA static u8 const lit_1557[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(803A1C70, &lit_1557);
+COMPILER_STRIP_GATE(0x803A1C70, &lit_1557);
 #pragma pop
 
 /* 803A1C80-803A1C90 02E2E0 0010+00 0/0 0/0 0/0 .rodata          @1566 */
@@ -724,7 +719,7 @@ COMPILER_STRIP_GATE(803A1C70, &lit_1557);
 SECTION_RODATA static u8 const lit_1566[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(803A1C80, &lit_1566);
+COMPILER_STRIP_GATE(0x803A1C80, &lit_1566);
 #pragma pop
 
 /* 803A1C90-803A1CA0 02E2F0 0010+00 0/0 0/0 0/0 .rodata          @1575 */
@@ -733,7 +728,7 @@ COMPILER_STRIP_GATE(803A1C80, &lit_1566);
 SECTION_RODATA static u8 const lit_1575[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(803A1C90, &lit_1575);
+COMPILER_STRIP_GATE(0x803A1C90, &lit_1575);
 #pragma pop
 
 /* 803A1CA0-803A1CB0 02E300 0010+00 0/0 0/0 0/0 .rodata          @1581 */
@@ -742,7 +737,7 @@ COMPILER_STRIP_GATE(803A1C90, &lit_1575);
 SECTION_RODATA static u8 const lit_1581[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(803A1CA0, &lit_1581);
+COMPILER_STRIP_GATE(0x803A1CA0, &lit_1581);
 #pragma pop
 
 /* 803A1CB0-803A1CC0 02E310 0010+00 0/0 0/0 0/0 .rodata          @1587 */
@@ -751,7 +746,7 @@ COMPILER_STRIP_GATE(803A1CA0, &lit_1581);
 SECTION_RODATA static u8 const lit_1587[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(803A1CB0, &lit_1587);
+COMPILER_STRIP_GATE(0x803A1CB0, &lit_1587);
 #pragma pop
 
 /* 803A1CC0-803A1CD0 02E320 0010+00 0/0 0/0 0/0 .rodata          @1596 */
@@ -760,7 +755,7 @@ COMPILER_STRIP_GATE(803A1CB0, &lit_1587);
 SECTION_RODATA static u8 const lit_1596[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(803A1CC0, &lit_1596);
+COMPILER_STRIP_GATE(0x803A1CC0, &lit_1596);
 #pragma pop
 
 /* 803A1CD0-803A1CE0 02E330 0010+00 0/0 0/0 0/0 .rodata          @1605 */
@@ -769,7 +764,7 @@ COMPILER_STRIP_GATE(803A1CC0, &lit_1596);
 SECTION_RODATA static u8 const lit_1605[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(803A1CD0, &lit_1605);
+COMPILER_STRIP_GATE(0x803A1CD0, &lit_1605);
 #pragma pop
 
 /* 803A1CE0-803A1CF0 02E340 0010+00 0/0 0/0 0/0 .rodata          @1612 */
@@ -778,7 +773,7 @@ COMPILER_STRIP_GATE(803A1CD0, &lit_1605);
 SECTION_RODATA static u8 const lit_1612[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(803A1CE0, &lit_1612);
+COMPILER_STRIP_GATE(0x803A1CE0, &lit_1612);
 #pragma pop
 
 /* 803A1CF0-803A1D08 02E350 0018+00 0/0 0/0 0/0 .rodata          @2530 */
@@ -788,7 +783,7 @@ SECTION_RODATA static u8 const lit_2530[24] = {
     0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x08, 0x0A, 0x0F, 0x0F, 0x0A, 0x00, 0x0F,
     0x02, 0x04, 0x08, 0x0F, 0x02, 0x04, 0x08, 0x0F, 0x0F, 0x0F, 0x0F, 0x0A,
 };
-COMPILER_STRIP_GATE(803A1CF0, &lit_2530);
+COMPILER_STRIP_GATE(0x803A1CF0, &lit_2530);
 #pragma pop
 
 /* 803A1D08-803A1D20 02E368 0018+00 0/0 0/0 0/0 .rodata          @2531 */
@@ -798,7 +793,7 @@ SECTION_RODATA static u8 const lit_2531[24] = {
     0x07, 0x04, 0x05, 0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x05, 0x00, 0x07,
     0x01, 0x02, 0x04, 0x07, 0x07, 0x07, 0x07, 0x02, 0x07, 0x07, 0x07, 0x05,
 };
-COMPILER_STRIP_GATE(803A1D08, &lit_2531);
+COMPILER_STRIP_GATE(0x803A1D08, &lit_2531);
 #pragma pop
 
 /* 803A1D20-803A1D40 02E380 001E+02 0/0 0/0 0/0 .rodata          @2532 */
@@ -839,14 +834,14 @@ SECTION_RODATA static u8 const lit_2532[30 + 2 /* padding */] = {
     0x00,
     0x00,
 };
-COMPILER_STRIP_GATE(803A1D20, &lit_2532);
+COMPILER_STRIP_GATE(0x803A1D20, &lit_2532);
 #pragma pop
 
 /* 803A1D40-803A1D50 02E3A0 0010+00 1/1 0/0 0/0 .rodata          @3089 */
 SECTION_RODATA static u8 const lit_3089[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(803A1D40, &lit_3089);
+COMPILER_STRIP_GATE(0x803A1D40, &lit_3089);
 
 /* 80303370-80303510 2FDCB0 01A0+00 1/0 0/0 0/0 .text
  * animationPane__11J2DWindowExFPC15J2DAnmTransform             */