f_op work (zeldaret#3008)

* f_op debug 1

* f_op debug 2

* f_op debug 3

* f_op debug 4

* f_op debug 5

* f_op_debug fix build

* f_op linking

* remove goto in fopac_create

* fix regressions

* fix regressions

* pr comments

* f_op debug 6

* f_op debug 7

* f_op debug 8

* f_op debug 9

* f_op debug 10

* f_op work, linking, symbols, heap

* regressions 1

* regressions 2

* pr comments

Author: ItsNiklas

config/RZDE01_00/symbols.txt

@@ -28144,10 +28144,10 @@ cDyl_Initialized = .sbss:0x8053A8FC; // type:object size:0x4 scope:global align:
 cDyl_DVD = .sbss:0x8053A900; // type:object size:0x4 scope:global align:4 data:4byte
 g_fopAc_type = .sbss:0x8053A908; // type:object size:0x4 scope:global align:4 data:4byte
 stopStatus__10fopAc_ac_c = .sbss:0x8053A90C; // type:object size:0x4 scope:global align:4 data:4byte
-lbl_8053A910 = .sbss:0x8053A910; // type:object size:0x1 data:byte
-lbl_8053A911 = .sbss:0x8053A911; // type:object size:0x1 data:byte
-lbl_8053A912 = .sbss:0x8053A912; // type:object size:0x1
-lbl_8053A913 = .sbss:0x8053A913; // type:object size:0x1
+HeapAdjustEntry__6fopAcM = .sbss:0x8053A910; // type:object size:0x1 data:byte
+HeapAdjustUnk__6fopAcM = .sbss:0x8053A911; // type:object size:0x1 data:byte
+l_hio = .sbss:0x8053A912; // type:object size:0x1
+l_actorLC = .sbss:0x8053A913; // type:object size:0x1
 mGroundY__11fopAcM_gc_c = .sbss:0x8053A914; // type:object size:0x4 scope:global align:4 data:float
 mRoofY__11fopAcM_rc_c = .sbss:0x8053A918; // type:object size:0x4 scope:global align:4 data:float
 mWaterY__11fopAcM_wt_c = .sbss:0x8053A91C; // type:object size:0x4 scope:global align:4 data:float

config/RZDE01_02/symbols.txt

@@ -27694,10 +27694,10 @@ cDyl_Initialized = .sbss:0x80520904; // type:object size:0x4 scope:global align:
 cDyl_DVD = .sbss:0x80520908; // type:object size:0x4 scope:global align:4 data:4byte
 g_fopAc_type = .sbss:0x80520910; // type:object size:0x4 scope:global align:4 data:4byte
 stopStatus__10fopAc_ac_c = .sbss:0x80520914; // type:object size:0x4 scope:global align:4 data:4byte
-lbl_80520918 = .sbss:0x80520918; // type:object size:0x1 data:byte
-lbl_80520919 = .sbss:0x80520919; // type:object size:0x1 data:byte
-lbl_8052091A = .sbss:0x8052091A; // type:object size:0x1
-lbl_8052091B = .sbss:0x8052091B; // type:object size:0x1
+HeapAdjustEntry__6fopAcM = .sbss:0x80520918; // type:object size:0x1 data:byte
+HeapAdjustUnk__6fopAcM = .sbss:0x80520919; // type:object size:0x1 data:byte
+l_hio = .sbss:0x8052091A; // type:object size:0x1
+l_actorLC = .sbss:0x8052091B; // type:object size:0x1
 mGroundY__11fopAcM_gc_c = .sbss:0x8052091C; // type:object size:0x4 scope:global align:4 data:float
 mRoofY__11fopAcM_rc_c = .sbss:0x80520920; // type:object size:0x4 scope:global align:4 data:float
 mWaterY__11fopAcM_wt_c = .sbss:0x80520924; // type:object size:0x4 scope:global align:4 data:float

config/RZDJ01/symbols.txt

@@ -27700,10 +27700,10 @@ cDyl_Initialized = .sbss:0x8051E784; // type:object size:0x4 scope:global align:
 cDyl_DVD = .sbss:0x8051E788; // type:object size:0x4 scope:global align:4 data:4byte
 g_fopAc_type = .sbss:0x8051E790; // type:object size:0x4 scope:global align:4 data:4byte
 stopStatus__10fopAc_ac_c = .sbss:0x8051E794; // type:object size:0x4 scope:global align:4 data:4byte
-lbl_8051E798 = .sbss:0x8051E798; // type:object size:0x1 data:byte
-lbl_8051E799 = .sbss:0x8051E799; // type:object size:0x1 data:byte
-lbl_8051E79A = .sbss:0x8051E79A; // type:object size:0x1
-lbl_8051E79B = .sbss:0x8051E79B; // type:object size:0x1
+HeapAdjustEntry__6fopAcM = .sbss:0x8051E798; // type:object size:0x1 data:byte
+HeapAdjustUnk__6fopAcM = .sbss:0x8051E799; // type:object size:0x1 data:byte
+l_hio = .sbss:0x8051E79A; // type:object size:0x1
+l_actorLC = .sbss:0x8051E79B; // type:object size:0x1
 mGroundY__11fopAcM_gc_c = .sbss:0x8051E79C; // type:object size:0x4 scope:global align:4 data:float
 mRoofY__11fopAcM_rc_c = .sbss:0x8051E7A0; // type:object size:0x4 scope:global align:4 data:float
 mWaterY__11fopAcM_wt_c = .sbss:0x8051E7A4; // type:object size:0x4 scope:global align:4 data:float

config/RZDP01/symbols.txt

@@ -27585,10 +27585,10 @@ cDyl_Initialized = .sbss:0x805210C4; // type:object size:0x4 scope:global align:
 cDyl_DVD = .sbss:0x805210C8; // type:object size:0x4 scope:global align:4 data:4byte
 g_fopAc_type = .sbss:0x805210D0; // type:object size:0x4 scope:global align:4 data:4byte
 stopStatus__10fopAc_ac_c = .sbss:0x805210D4; // type:object size:0x4 scope:global align:4 data:4byte
-lbl_805210D8 = .sbss:0x805210D8; // type:object size:0x1 data:byte
-lbl_805210D9 = .sbss:0x805210D9; // type:object size:0x1 data:byte
-lbl_805210DA = .sbss:0x805210DA; // type:object size:0x1
-lbl_805210DB = .sbss:0x805210DB; // type:object size:0x1
+HeapAdjustEntry__6fopAcM = .sbss:0x805210D8; // type:object size:0x1 data:byte
+HeapAdjustUnk__6fopAcM = .sbss:0x805210D9; // type:object size:0x1 data:byte
+l_hio = .sbss:0x805210DA; // type:object size:0x1
+l_actorLC = .sbss:0x805210DB; // type:object size:0x1
 mGroundY__11fopAcM_gc_c = .sbss:0x805210DC; // type:object size:0x4 scope:global align:4 data:float
 mRoofY__11fopAcM_rc_c = .sbss:0x805210E0; // type:object size:0x4 scope:global align:4 data:float
 mWaterY__11fopAcM_wt_c = .sbss:0x805210E4; // type:object size:0x4 scope:global align:4 data:float
@@ -27608,7 +27608,7 @@ request_id$46742 = .sbss:0x80521140; // type:object size:0x4 scope:local align:4
 g_fpcPf_ProfileList_p = .sbss:0x80521148; // type:object size:0x4 scope:global align:4 data:4byte
 lbl_80521150 = .sbss:0x80521150; // type:object size:0x8
 mProcID__20dStage_roomControl_c = .sbss:0x80521158; // type:object size:0x4 scope:global align:4 data:4byte
-lbl_8052115C = .sbss:0x8052115C; // type:object size:0x1 data:byte
+mStayNo__20dStage_roomControl_c = .sbss:0x8052115C; // type:object size:0x1 data:byte
 lbl_8052115D = .sbss:0x8052115D; // type:object size:0x1 data:byte
 lbl_8052115E = .sbss:0x8052115E; // type:object size:0x1 data:byte
 lbl_8052115F = .sbss:0x8052115F; // type:object size:0x1 data:byte

config/Shield/symbols.txt

@@ -25252,8 +25252,8 @@ cDyl_Initialized = .sbss:0x80508ACC; // type:object size:0x4 scope:global data:4
 cDyl_DVD = .sbss:0x80508AD0; // type:object size:0x4 scope:global data:4byte hash:0x12A4A3DE
 g_fopAc_type = .sbss:0x80508AD8; // type:object size:0x4 scope:global data:4byte hash:0x79729021
 stopStatus__10fopAc_ac_c = .sbss:0x80508ADC; // type:object size:0x4 scope:global data:4byte hash:0xD4489812 dhash:0xA7560FD3
-lbl_80508AE0 = .sbss:0x80508AE0; // type:object size:0x1 data:byte hash:0x112A0F50 dhash:0xD993AE06
-lbl_80508AE1 = .sbss:0x80508AE1; // type:object size:0x1 data:byte hash:0x16A8A2FA dhash:0x6C7BE12C
+HeapAdjustEntry__6fopAcM = .sbss:0x80508AE0; // type:object size:0x1 data:byte hash:0x112A0F50 dhash:0xD993AE06
+HeapAdjustUnk__6fopAcM = .sbss:0x80508AE1; // type:object size:0x1 data:byte hash:0x16A8A2FA dhash:0x6C7BE12C
 l_hio = .sbss:0x80508AE4; // type:object size:0x1 scope:global hash:0x0A6CFFF8
 mGroundY__11fopAcM_gc_c = .sbss:0x80508AE8; // type:object size:0x4 scope:global align:4 data:float hash:0x43B2A105 dhash:0x6F39B9E5
 mRoofY__11fopAcM_rc_c = .sbss:0x80508AEC; // type:object size:0x4 scope:global align:4 data:float hash:0x062D9541 dhash:0xBEBFC081
@@ -25274,7 +25274,7 @@ g_fpcNd_type = .sbss:0x80508B48; // type:object size:0x4 scope:global data:4byte
 g_fpcPf_ProfileList_p = .sbss:0x80508B58; // type:object size:0x4 scope:global data:4byte hash:0x2CADF2C7
 @LOCAL@dStage_getName__FsSc@tmp_name = .sbss:0x80508B60; // type:object size:0x8 scope:local hash:0xDC907C52 dhash:0x0B811DD9
 mProcID__20dStage_roomControl_c = .sbss:0x80508B68; // type:object size:0x4 scope:global data:4byte hash:0x24C2F7B2 dhash:0xBF1DEEF0
-lbl_80508B6C = .sbss:0x80508B6C; // type:object size:0x1 data:byte hash:0x87058A4F dhash:0xB3B700CD
+mStayNo__20dStage_roomControl_c = .sbss:0x80508B6C; // type:object size:0x1 data:byte hash:0x87058A4F dhash:0xB3B700CD
 lbl_80508B6D = .sbss:0x80508B6D; // type:object size:0x1 data:byte hash:0x5AF37248 dhash:0x1A945A6A
 lbl_80508B6E = .sbss:0x80508B6E; // type:object size:0x1 data:byte hash:0xE957ED68 dhash:0x66C51F6A
 lbl_80508B6F = .sbss:0x80508B6F; // type:object size:0x1 data:byte hash:0x88D929D5 dhash:0xB0689D17

config/ShieldD/symbols.txt

@@ -25711,7 +25711,7 @@ getSDevice__12JUTAssertionFv = .text:0x80522C80; // type:function size:0x8 scope
 setConfirmMessage__12JUTAssertionFUlPcibPCc = .text:0x80522C90; // type:function size:0xF4 scope:global align:16 hash:0x81E1CAAB dhash:0x4A96C3A5
 showAssert_f_va = .text:0x80522D90; // type:function size:0x23C scope:global align:16 hash:0xF0EFDC15
 showAssert_f__12JUTAssertionFUlPCciPCce = .text:0x80522FD0; // type:function size:0xAC scope:global align:16 hash:0x281C1DAC dhash:0x542AA36D
-setWarningMessage_f_va = .text:0x80523080; // type:function size:0x110 scope:global align:16 hash:0xD1C7AD17
+setWarningMessage_f_va__FUlPCciPCcP16__va_list_struct = .text:0x80523080; // type:function size:0x110 scope:global align:16 hash:0xD1C7AD17
 setWarningMessage_f__12JUTAssertionFUlPciPCce = .text:0x80523190; // type:function size:0xAC scope:global align:16 hash:0xB2CDC6ED dhash:0xC8D660CA
 setLogMessage_f_va = .text:0x80523240; // type:function size:0x10C scope:global align:16 hash:0x72144599
 setLogMessage_f__12JUTAssertionFUlPciPCce = .text:0x80523350; // type:function size:0xAC scope:global align:16 hash:0x2FDEA7A3 dhash:0xDE10A904
@@ -64188,8 +64188,8 @@ lbl_8074C3AB = .sbss:0x8074C3AB; // type:object size:0x1 data:byte hash:0x15E8B5
 @LOCAL@exceptionNNGCReadPad__FPUlPUl@l_oldButton@0 = .sbss:0x8074C3AC; // type:object size:0x4 scope:local data:4byte hash:0x50F85B88 dhash:0x8D7B3DDD
 mDoMtx_stack = .sbss:0x8074C3B0; // type:object size:0x1 scope:global hash:0x2AB168B3
 lbl_8074C3B8 = .sbss:0x8074C3B8; // type:object size:0x1 data:byte hash:0x60980213 dhash:0x3EBAE505
-lbl_8074C3B9 = .sbss:0x8074C3B9; // type:object size:0x1 data:byte hash:0xDD10CA27 dhash:0x25FFD851
-lbl_8074C3BA = .sbss:0x8074C3BA; // type:object size:0x2 hash:0x364A3DE1 dhash:0xAED09ED7
+HeapAdjustVerbose__6mDoExt = .sbss:0x8074C3B9; // type:object size:0x1 data:byte hash:0xDD10CA27 dhash:0x25FFD851
+HeapAdjustQuiet__6mDoExt = .sbss:0x8074C3BA; // type:object size:0x2 hash:0x364A3DE1 dhash:0xAED09ED7
 AssertHeap = .sbss:0x8074C3BC; // type:object size:0x4 scope:global data:4byte hash:0x0726E63B
 DbPrintHeap = .sbss:0x8074C3C0; // type:object size:0x4 scope:global data:4byte hash:0x114A8B4E
 gameHeap = .sbss:0x8074C3C4; // type:object size:0x4 scope:global data:4byte hash:0x31D7CBD7
@@ -64266,12 +64266,12 @@ stopStatus__10fopAc_ac_c = .sbss:0x8074C4B4; // type:object size:0x4 scope:globa
 @LOCAL@fopAc_Draw__FPv@l_name@0 = .sbss:0x8074C4C0; // type:object size:0x8 scope:local hash:0xD2949688 dhash:0x486AE47F
 @LOCAL@fopAc_Execute__FPv@l_name = .sbss:0x8074C4C8; // type:object size:0x8 scope:local hash:0xB39E0987 dhash:0x018DD2A0
 @LOCAL@fopAc_Execute__FPv@l_name@0 = .sbss:0x8074C4D0; // type:object size:0x8 scope:local hash:0x13467F37 dhash:0x018DD2A0
-lbl_8074C4D8 = .sbss:0x8074C4D8; // type:object size:0x1 data:byte hash:0x112A0F50 dhash:0xD993AE06
-lbl_8074C4D9 = .sbss:0x8074C4D9; // type:object size:0x1 data:byte hash:0x16A8A2FA dhash:0x6C7BE12C
-lbl_8074C4DA = .sbss:0x8074C4DA; // type:object size:0x1 data:byte hash:0xFD0599DE dhash:0x91983648
-lbl_8074C4DB = .sbss:0x8074C4DB; // type:object size:0x1 data:byte hash:0x3B1C7C18 dhash:0xD83275CE
-lbl_8074C4DC = .sbss:0x8074C4DC; // type:object size:0x1 data:byte hash:0xCE781BD5 dhash:0x9D3A7FA3
-lbl_8074C4DD = .sbss:0x8074C4DD; // type:object size:0x1 data:byte hash:0x26832D44 dhash:0xBFAD0F52
+HeapAdjustEntry__6fopAcM = .sbss:0x8074C4D8; // type:object size:0x1 data:byte hash:0x112A0F50 dhash:0xD993AE06
+HeapSkipMargin__6fopAcM = .sbss:0x8074C4D9; // type:object size:0x1 data:byte hash:0x16A8A2FA dhash:0x6C7BE12C
+HeapAdjustVerbose__6fopAcM = .sbss:0x8074C4DA; // type:object size:0x1 data:byte hash:0xFD0599DE dhash:0x91983648
+HeapAdjustQuiet__6fopAcM = .sbss:0x8074C4DB; // type:object size:0x1 data:byte hash:0x3B1C7C18 dhash:0xD83275CE
+HeapDummyCreate__6fopAcM = .sbss:0x8074C4DC; // type:object size:0x1 data:byte hash:0xCE781BD5 dhash:0x9D3A7FA3
+HeapDummyCheck__6fopAcM = .sbss:0x8074C4DD; // type:object size:0x1 data:byte hash:0x26832D44 dhash:0xBFAD0F52
 l_hio = .sbss:0x8074C4E0; // type:object size:0x8 scope:global hash:0x0A6CFFF8
 l_actorLC = .sbss:0x8074C4E8; // type:object size:0x1 scope:global hash:0xCFE549D2
 mGroundY__11fopAcM_gc_c = .sbss:0x8074C4EC; // type:object size:0x4 scope:global align:4 data:float hash:0x43B2A105 dhash:0x6F39B9E5

configure.py

@@ -604,29 +604,29 @@ def MatchingFor(*versions) -> bool:
             Object(MatchingFor(ALL_GCN), "f_ap/f_ap_game.cpp"),
 
             # f_op
-            Object(MatchingFor(ALL_GCN), "f_op/f_op_actor.cpp"),
-            Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_actor_iter.cpp"),
-            Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_actor_tag.cpp"),
-            Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_camera.cpp"),
-            Object(NonMatching, "f_op/f_op_actor_map.cpp"),
+            Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_actor.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_actor_iter.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_actor_tag.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_camera.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_actor_map.cpp"),
             Object(MatchingFor(ALL_GCN), "f_op/f_op_actor_mng.cpp"),
-            Object(MatchingFor(ALL_GCN), "f_op/f_op_camera_mng.cpp"),
-            Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_overlap.cpp"),
-            Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_overlap_mng.cpp"),
-            Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_overlap_req.cpp"),
-            Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_scene.cpp"),
+            Object(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "f_op/f_op_camera_mng.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_overlap.cpp"),
+            Object(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "f_op/f_op_overlap_mng.cpp"),
+            Object(MatchingFor(ALL_GCN, ALL_WII, "ShieldD"), "f_op/f_op_overlap_req.cpp"),
+            Object(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "f_op/f_op_scene.cpp"),
             Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_scene_iter.cpp"),
-            Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_scene_mng.cpp"),
-            Object(MatchingFor(ALL_GCN, "Shield"), "f_op/f_op_scene_req.cpp"),
-            Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_scene_tag.cpp"),
-            Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_view.cpp"),
-            Object(MatchingFor(ALL_GCN, "ShieldD"), "f_op/f_op_kankyo.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_scene_mng.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_scene_req.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_scene_tag.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_view.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_kankyo.cpp"),
             Object(MatchingFor(ALL), "f_op/f_op_msg.cpp"),
-            Object(MatchingFor(ALL_GCN), "f_op/f_op_kankyo_mng.cpp"),
+            Object(MatchingFor(ALL_GCN, ALL_WII, "Shield"), "f_op/f_op_kankyo_mng.cpp"),
             Object(MatchingFor(ALL_GCN), "f_op/f_op_msg_mng.cpp"),
-            Object(MatchingFor(ALL_GCN), "f_op/f_op_draw_iter.cpp"),
-            Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_draw_tag.cpp"),
-            Object(MatchingFor(ALL_GCN, ALL_SHIELD), "f_op/f_op_scene_pause.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_draw_iter.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_draw_tag.cpp"),
+            Object(MatchingFor(ALL), "f_op/f_op_scene_pause.cpp"),
 
             # f_pc
             Object(MatchingFor(ALL_GCN), "f_pc/f_pc_base.cpp"),

include/JSystem/J2DGraph/J2DPane.h

@@ -86,7 +86,9 @@ class J2DPane {
     /* vt 0x18 */ virtual void resize(f32 x, f32 y);
     /* vt 0x1C */ virtual void setCullBack(bool cull);
     /* vt 0x20 */ virtual void setCullBack(_GXCullMode cmode);
-    /* vt 0x24 */ virtual void setAlpha(u8);
+    /* vt 0x24 */ virtual void setAlpha(u8 alpha) {
+        mAlpha = alpha;
+    };
     /* vt 0x28 */ virtual bool setConnectParent(bool connected);
     /* vt 0x2C */ virtual void calcMtx() {
         if (mPaneTree.getParent() != NULL) {

include/JSystem/JKernel/JKRExpHeap.h

@@ -63,6 +63,7 @@ class JKRExpHeap : public JKRHeap {
     void joinTwoBlocks(CMemBlock* block);
 
 public:
+    s32 isEmpty();
     s32 getUsedSize(u8 groupId) const;
     s32 getTotalUsedSize(void) const;
 

include/JSystem/JUtility/JUTAssert.h

@@ -63,10 +63,12 @@ namespace JUTAssertion {
 
     u32 getSDevice();
     void showAssert_f(u32 device, const char* file, int line, const char* msg, ...);
+    void showAssert_f_va(u32 device, const char* file, int line, const char* msg, __va_list args);
     void setWarningMessage_f(u32 device, char * file, int line, const char * fmt, ...);
+    void setWarningMessage_f_va(u32 device, const char* file, int line, const char* msg, va_list args);
     void setLogMessage_f(u32 device, char* file, int line, const char* fmt, ...);
     void setConfirmMessage(u32 param_1, char* file, int line, bool param_4, const char* msg);
-
+    
     inline void showAssert(u32 device, const char* file, int line, const char* msg) {
         showAssert_f(device, file, line, "%s", msg);
     }
@@ -76,6 +78,7 @@ namespace JUTAssertion {
     }
 };
 
+
 extern bool sAssertVisible;
 
 #endif /* JUTASSERT_H */