Match 4 functions for VS mode + link ifstatus & generator

config/GALE01/symbols.txt

@@ -27,20 +27,20 @@ _bss_init_info = .init:0x800054F4; // type:object size:0x18 scope:global data:4b
 @etb_80005570 = extab:0x80005570; // type:object size:0x8 scope:local hidden
 @etb_80005578 = extab:0x80005578; // type:object size:0x8 scope:local hidden
 @etb_80005580 = extab:0x80005580; // type:object size:0x8 scope:local hidden
-@etb_80005588 = extab:0x80005588; // type:object size:0x8 scope:local hidden
-@etb_80005590 = extab:0x80005590; // type:object size:0x8 scope:local hidden
-@etb_80005598 = extab:0x80005598; // type:object size:0x8 scope:local hidden
-@etb_800055A0 = extab:0x800055A0; // type:object size:0x8 scope:local hidden
-@etb_800055A8 = extab:0x800055A8; // type:object size:0x8 scope:local hidden
-@etb_800055B0 = extab:0x800055B0; // type:object size:0x8 scope:local hidden
-@etb_800055B8 = extab:0x800055B8; // type:object size:0x8 scope:local hidden
-@etb_800055C0 = extab:0x800055C0; // type:object size:0x8 scope:local hidden
-@etb_800055C8 = extab:0x800055C8; // type:object size:0x8 scope:local hidden
-@etb_800055D0 = extab:0x800055D0; // type:object size:0x8 scope:local hidden
-@etb_800055D8 = extab:0x800055D8; // type:object size:0x8 scope:local hidden
-@etb_800055E0 = extab:0x800055E0; // type:object size:0x8 scope:local hidden
-@etb_800055E8 = extab:0x800055E8; // type:object size:0x8 scope:local hidden
-@etb_800055F0 = extab:0x800055F0; // type:object size:0x8 scope:local hidden
+@225 = extab:0x80005588; // type:object size:0x8 scope:local hidden
+@228 = extab:0x80005590; // type:object size:0x8 scope:local hidden
+@258 = extab:0x80005598; // type:object size:0x8 scope:local hidden
+@283 = extab:0x800055A0; // type:object size:0x8 scope:local hidden
+@294 = extab:0x800055A8; // type:object size:0x8 scope:local hidden
+@317 = extab:0x800055B0; // type:object size:0x8 scope:local hidden
+@332 = extab:0x800055B8; // type:object size:0x8 scope:local hidden
+@369 = extab:0x800055C0; // type:object size:0x8 scope:local hidden
+@395 = extab:0x800055C8; // type:object size:0x8 scope:local hidden
+@740 = extab:0x800055D0; // type:object size:0x8 scope:local hidden
+@774 = extab:0x800055D8; // type:object size:0x8 scope:local hidden
+@793 = extab:0x800055E0; // type:object size:0x8 scope:local hidden
+@912 = extab:0x800055E8; // type:object size:0x8 scope:local hidden
+@929 = extab:0x800055F0; // type:object size:0x8 scope:local hidden
 @etb_800055F8 = extab:0x800055F8; // type:object size:0x8 scope:local hidden
 @etb_80005600 = extab:0x80005600; // type:object size:0x8 scope:local hidden
 @etb_80005608 = extab:0x80005608; // type:object size:0x8 scope:local hidden
@@ -77,20 +77,20 @@ _bss_init_info = .init:0x800054F4; // type:object size:0x18 scope:global data:4b
 @eti_80005738 = extabindex:0x80005738; // type:object size:0xC scope:local hidden
 @eti_80005744 = extabindex:0x80005744; // type:object size:0xC scope:local hidden
 @eti_80005750 = extabindex:0x80005750; // type:object size:0xC scope:local hidden
-@eti_8000575C = extabindex:0x8000575C; // type:object size:0xC scope:local hidden
-@eti_80005768 = extabindex:0x80005768; // type:object size:0xC scope:local hidden
-@eti_80005774 = extabindex:0x80005774; // type:object size:0xC scope:local hidden
-@eti_80005780 = extabindex:0x80005780; // type:object size:0xC scope:local hidden
-@eti_8000578C = extabindex:0x8000578C; // type:object size:0xC scope:local hidden
-@eti_80005798 = extabindex:0x80005798; // type:object size:0xC scope:local hidden
-@eti_800057A4 = extabindex:0x800057A4; // type:object size:0xC scope:local hidden
-@eti_800057B0 = extabindex:0x800057B0; // type:object size:0xC scope:local hidden
-@eti_800057BC = extabindex:0x800057BC; // type:object size:0xC scope:local hidden
-@eti_800057C8 = extabindex:0x800057C8; // type:object size:0xC scope:local hidden
-@eti_800057D4 = extabindex:0x800057D4; // type:object size:0xC scope:local hidden
-@eti_800057E0 = extabindex:0x800057E0; // type:object size:0xC scope:local hidden
-@eti_800057EC = extabindex:0x800057EC; // type:object size:0xC scope:local hidden
-@eti_800057F8 = extabindex:0x800057F8; // type:object size:0xC scope:local hidden
+@226 = extabindex:0x8000575C; // type:object size:0xC scope:local hidden
+@229 = extabindex:0x80005768; // type:object size:0xC scope:local hidden
+@259 = extabindex:0x80005774; // type:object size:0xC scope:local hidden
+@284 = extabindex:0x80005780; // type:object size:0xC scope:local hidden
+@295 = extabindex:0x8000578C; // type:object size:0xC scope:local hidden
+@318 = extabindex:0x80005798; // type:object size:0xC scope:local hidden
+@333 = extabindex:0x800057A4; // type:object size:0xC scope:local hidden
+@370 = extabindex:0x800057B0; // type:object size:0xC scope:local hidden
+@396 = extabindex:0x800057BC; // type:object size:0xC scope:local hidden
+@741 = extabindex:0x800057C8; // type:object size:0xC scope:local hidden
+@775 = extabindex:0x800057D4; // type:object size:0xC scope:local hidden
+@794 = extabindex:0x800057E0; // type:object size:0xC scope:local hidden
+@913 = extabindex:0x800057EC; // type:object size:0xC scope:local hidden
+@930 = extabindex:0x800057F8; // type:object size:0xC scope:local hidden
 @eti_80005804 = extabindex:0x80005804; // type:object size:0xC scope:local hidden
 @eti_80005810 = extabindex:0x80005810; // type:object size:0xC scope:local hidden
 @eti_8000581C = extabindex:0x8000581C; // type:object size:0xC scope:local hidden
@@ -17269,7 +17269,7 @@ ifTime_Reset = .text:0x802F480C; // type:function size:0x30 scope:global
 ifTime_FreeTimers = .text:0x802F483C; // type:function size:0x5C scope:global
 ifTime_IsTimerHidden = .text:0x802F4898; // type:function size:0x78 scope:global
 ifStatus_GetHUDInfo = .text:0x802F4910; // type:function size:0xC scope:global
-ifStatus_PercentOnDeathAnimationThink = .text:0x802F491C; // type:function size:0x268 scope:global
+ifStatus_PercentOnDeathAnimationThink = .text:0x802F491C; // type:function size:0x268 scope:local
 ifStatus_802F4B84 = .text:0x802F4B84; // type:function size:0x358 scope:global
 ifStatus_802F4EDC = .text:0x802F4EDC; // type:function size:0xC6C scope:global
 ifStatus_802F5B48 = .text:0x802F5B48; // type:function size:0x298 scope:global
@@ -24247,12 +24247,13 @@ it_803F94A0 = .data:0x803F94A0; // type:object size:0x30 scope:global
 @263 = .data:0x803F953C; // type:object size:0xA scope:local data:string
 @309 = .data:0x803F9548; // type:object size:0x25 scope:local data:string
 @310 = .data:0x803F9570; // type:object size:0x25 scope:local data:string
-ifStatus_803F9598 = .data:0x803F9598; // type:object size:0x14 scope:global data:string
-ifStatus_803F95AC = .data:0x803F95AC; // type:object size:0x14 scope:global data:string
-lbl_803F95C0 = .data:0x803F95C0; // type:object size:0xA data:string
-lbl_803F95CC = .data:0x803F95CC; // type:object size:0x25 data:string
-lbl_803F95F4 = .data:0x803F95F4; // type:object size:0xB data:string
-lbl_803F9600 = .data:0x803F9600; // type:object size:0x25 data:string
+num_models_name = .data:0x803F9598; // type:object size:0x14 scope:global data:string
+...data.0 = .data:0x803F9598; // type:label scope:local
+mrk_models_name = .data:0x803F95AC; // type:object size:0x14 scope:global data:string
+@692 = .data:0x803F95C0; // type:object size:0xA scope:local data:string
+@754 = .data:0x803F95CC; // type:object size:0x25 scope:local data:string
+@755 = .data:0x803F95F4; // type:object size:0xB scope:local data:string
+@757 = .data:0x803F9600; // type:object size:0x25 scope:local data:string
 ifStatus_803F9628 = .data:0x803F9628; // type:object size:0x140 scope:global data:4byte
 ...data.0 = .data:0x803F9628; // type:label scope:local
 @234 = .data:0x803F9768; // type:object size:0x16 scope:local data:string
@@ -25953,13 +25954,13 @@ lbl_8040BFEC = .data:0x8040BFEC; // type:object size:0x22 scope:local data:strin
 lbl_8040C010 = .data:0x8040C010; // type:object size:0x9 scope:local data:string
 lbl_8040C01C = .data:0x8040C01C; // type:object size:0x27 scope:local data:string
 jumptable_8040C044 = .data:0x8040C044; // type:object size:0x200 scope:local
-lbl_8040C248 = .data:0x8040C248; // type:object size:0xC scope:local data:string
-lbl_8040C254 = .data:0x8040C254; // type:object size:0x9 scope:local data:string
-jumptable_8040C260 = .data:0x8040C260; // type:object size:0x20 scope:local
-jumptable_8040C280 = .data:0x8040C280; // type:object size:0x24 scope:local
-lbl_8040C2A4 = .data:0x8040C2A4; // type:object size:0x9 scope:local data:string
-lbl_8040C2B0 = .data:0x8040C2B0; // type:object size:0x27 scope:local data:string
-jumptable_8040C2D8 = .data:0x8040C2D8; // type:object size:0x24 scope:local
+@722 = .data:0x8040C248; // type:object size:0xC scope:local data:string
+@723 = .data:0x8040C254; // type:object size:0x9 scope:local data:string
+@738 = .data:0x8040C260; // type:object size:0x20 scope:local
+@737 = .data:0x8040C280; // type:object size:0x24 scope:local
+@791 = .data:0x8040C2A4; // type:object size:0x9 scope:local data:string
+@792 = .data:0x8040C2B0; // type:object size:0x27 scope:local data:string
+@911 = .data:0x8040C2D8; // type:object size:0x24 scope:local
 HSD_PSDisp_8040C300 = .data:0x8040C300; // type:object size:0x9 scope:local data:string
 HSD_PSDisp_8040C30C = .data:0x8040C30C; // type:object size:0x27 scope:local data:string
 HSD_PSDisp_8040C334 = .data:0x8040C334; // type:object size:0xC scope:local
@@ -26383,6 +26384,7 @@ ifTime_data = .bss:0x804A1078; // type:object size:0x3C scope:local data:4byte
 ...bss.0 = .bss:0x804A1078; // type:label scope:local
 ifTime_match_timer_models = .bss:0x804A10B4; // type:object size:0x10 scope:local data:4byte
 ifStatus_HudInfo = .bss:0x804A10C8; // type:object size:0x278 scope:global data:4byte
+...bss.0 = .bss:0x804A10C8; // type:label scope:local
 lbl_804A1340 = .bss:0x804A1340; // type:object size:0x34 data:4byte
 ...bss.0 = .bss:0x804A1340; // type:label scope:local
 ifStock_804A1378 = .bss:0x804A1378; // type:object size:0x3FC scope:global data:4byte
@@ -27874,9 +27876,9 @@ it_804D5518$198 = .sdata:0x804D5518; // type:object size:0x8 scope:local
 @262 = .sdata:0x804D579C; // type:object size:0x5 scope:local data:string
 ifStatus_804D57A8 = .sdata:0x804D57A8; // type:object size:0x4 scope:global data:byte
 ifStatus_804D57AC = .sdata:0x804D57AC; // type:object size:0x4 scope:global data:byte
-ifStatus_804D57B0 = .sdata:0x804D57B0; // type:object size:0x7 scope:global data:string
-ifStatus_804D57B8 = .sdata:0x804D57B8; // type:object size:0x5 scope:global data:string
-ifStatus_804D57C0 = .sdata:0x804D57C0; // type:object size:0x2 scope:global data:string
+@283 = .sdata:0x804D57B0; // type:object size:0x7 scope:local data:string
+@284 = .sdata:0x804D57B8; // type:object size:0x5 scope:local data:string
+@756 = .sdata:0x804D57C0; // type:object size:0x2 scope:local data:string
 @307 = .sdata:0x804D57C8; // type:object size:0x7 scope:local data:string
 @308 = .sdata:0x804D57D0; // type:object size:0x5 scope:local data:string
 ifStock_804D57D8 = .sdata:0x804D57D8; // type:object size:0x7 scope:global data:string
@@ -28316,8 +28318,8 @@ lbl_804D6350 = .sdata:0x804D6350; // type:object size:0x8 scope:local
 lbl_804D6358 = .sdata:0x804D6358; // type:object size:0x7 scope:local data:string
 lbl_804D6360 = .sdata:0x804D6360; // type:object size:0x5 scope:local data:string
 lbl_804D6368 = .sdata:0x804D6368; // type:object size:0x2 scope:local data:2byte
-lbl_804D636C = .sdata:0x804D636C; // type:object size:0x7 scope:local data:string
-lbl_804D6374 = .sdata:0x804D6374; // type:object size:0x5 scope:local data:string
+@223 = .sdata:0x804D636C; // type:object size:0x7 scope:local data:string
+@224 = .sdata:0x804D6374; // type:object size:0x5 scope:local data:string
 psFrameNum = .sdata:0x804D6380; // type:object size:0x1 scope:global data:byte
 HSD_PSDisp_804D6384 = .sdata:0x804D6384; // type:object size:0x2 scope:global data:string
 @104 = .sdata:0x804D6388; // type:object size:0x5 scope:local data:string
@@ -35039,23 +35041,23 @@ lbl_804DE98C = .sdata2:0x804DE98C; // type:object size:0x4 scope:local align:4 d
 lbl_804DE990 = .sdata2:0x804DE990; // type:object size:0x4 scope:local align:4 data:float
 lbl_804DE998 = .sdata2:0x804DE998; // type:object size:0x8 scope:local align:8 data:double
 lbl_804DE9A0 = .sdata2:0x804DE9A0; // type:object size:0x8 scope:local align:8 data:double
-lbl_804DE9A8 = .sdata2:0x804DE9A8; // type:object size:0x4 scope:local align:4 data:float
-lbl_804DE9AC = .sdata2:0x804DE9AC; // type:object size:0x4 scope:local align:4 data:float
-lbl_804DE9B0 = .sdata2:0x804DE9B0; // type:object size:0x8 scope:local align:8 data:double
-lbl_804DE9B8 = .sdata2:0x804DE9B8; // type:object size:0x8 scope:local align:8 data:double
-lbl_804DE9C0 = .sdata2:0x804DE9C0; // type:object size:0x4 scope:local align:4 data:float
-lbl_804DE9C4 = .sdata2:0x804DE9C4; // type:object size:0x4 scope:local align:4 data:float
-lbl_804DE9C8 = .sdata2:0x804DE9C8; // type:object size:0x4 scope:local align:4 data:float
-lbl_804DE9CC = .sdata2:0x804DE9CC; // type:object size:0x4 scope:local align:4 data:float
-lbl_804DE9D0 = .sdata2:0x804DE9D0; // type:object size:0x8 scope:local align:8 data:double
-lbl_804DE9D8 = .sdata2:0x804DE9D8; // type:object size:0x8 scope:local align:8 data:double
-lbl_804DE9E0 = .sdata2:0x804DE9E0; // type:object size:0x8 scope:local align:8 data:double
-lbl_804DE9E8 = .sdata2:0x804DE9E8; // type:object size:0x8 scope:local align:8 data:double
-lbl_804DE9F0 = .sdata2:0x804DE9F0; // type:object size:0x4 scope:local align:4 data:float
-lbl_804DE9F8 = .sdata2:0x804DE9F8; // type:object size:0x8 scope:local align:8 data:double
-lbl_804DEA00 = .sdata2:0x804DEA00; // type:object size:0x8 scope:local align:8 data:double
-lbl_804DEA08 = .sdata2:0x804DEA08; // type:object size:0x4 scope:local align:4 data:float
-lbl_804DEA0C = .sdata2:0x804DEA0C; // type:object size:0x4 scope:local align:4 data:float
+@257 = .sdata2:0x804DE9A8; // type:object size:0x4 scope:local align:4 data:float
+@719 = .sdata2:0x804DE9AC; // type:object size:0x4 scope:local align:4 data:float
+@720 = .sdata2:0x804DE9B0; // type:object size:0x8 scope:local align:8 data:double
+@721 = .sdata2:0x804DE9B8; // type:object size:0x8 scope:local align:8 data:double
+@724 = .sdata2:0x804DE9C0; // type:object size:0x4 scope:local align:4 data:float
+@725 = .sdata2:0x804DE9C4; // type:object size:0x4 scope:local align:4 data:float
+@726 = .sdata2:0x804DE9C8; // type:object size:0x4 scope:local align:4 data:float
+@727 = .sdata2:0x804DE9CC; // type:object size:0x4 scope:local align:4 data:float
+@728 = .sdata2:0x804DE9D0; // type:object size:0x8 scope:local align:8 data:double
+@729 = .sdata2:0x804DE9D8; // type:object size:0x8 scope:local align:8 data:double
+@730 = .sdata2:0x804DE9E0; // type:object size:0x8 scope:local align:8 data:double
+@731 = .sdata2:0x804DE9E8; // type:object size:0x8 scope:local align:8 data:double
+@732 = .sdata2:0x804DE9F0; // type:object size:0x4 scope:local align:4 data:float
+@733 = .sdata2:0x804DE9F8; // type:object size:0x8 scope:local align:8 data:double
+@736 = .sdata2:0x804DEA00; // type:object size:0x8 scope:local align:8 data:double
+@909 = .sdata2:0x804DEA08; // type:object size:0x4 scope:local align:4 data:float
+@910 = .sdata2:0x804DEA0C; // type:object size:0x4 scope:local align:4 data:float
 HSD_PSDisp_804DEA10 = .sdata2:0x804DEA10; // type:object size:0x4 scope:global align:4 data:float
 HSD_PSDisp_804DEA14 = .sdata2:0x804DEA14; // type:object size:0x4 scope:global align:4 data:float
 HSD_PSDisp_804DEA18 = .sdata2:0x804DEA18; // type:object size:0x4 scope:global align:4 data:float

configure.py

@@ -1552,7 +1552,7 @@ def MatchingFor(*versions):
         [
             Object(Matching, "melee/if/ifall.c"),
             Object(Matching, "melee/if/iftime.c"),
-            Object(Linkable, "melee/if/ifstatus.c"),
+            Object(Matching, "melee/if/ifstatus.c"),
             Object(Matching, "melee/if/if_2F6E.c"),
             Object(Matching, "melee/if/if_2F72.c"),
             Object(Linkable, "melee/if/ifstock.c"),
@@ -1926,7 +1926,7 @@ def MatchingFor(*versions):
                 extra_cflags=["-Cpp_exceptions on"],
             ),
             Object(
-                Linkable,
+                Matching,
                 "sysdolphin/baselib/generator.c",
                 extra_cflags=["-Cpp_exceptions on"],
             ),

src/melee/ef/eflib.c

@@ -1050,20 +1050,16 @@ void (*lbl_803BF810[0x03])(HSD_Particle* particle) = { efLib_Cb_ParticleRender,
 // parent joint.
 void efLib_Cb_PtclAppSRTHook(HSD_Generator* gen)
 {
-    if (gen->cmdList == ((HSD_PSCmdList*) ptclref_804D0E5C[0][0x96])->cmdList)
-    {
+    if (gen->cmdList == ptclref_804D0E5C[0][0x96]->cmdList) {
         hsd_8039D1E4(gen, lbl_803BF810);
     }
-    if (gen->cmdList == ((HSD_PSCmdList*) ptclref_804D0E5C[0][0x97])->cmdList)
-    {
+    if (gen->cmdList == ptclref_804D0E5C[0][0x97]->cmdList) {
         hsd_8039D1E4(gen, lbl_803BF810);
     }
-    if (gen->cmdList == ((HSD_PSCmdList*) ptclref_804D0E5C[0][0x98])->cmdList)
-    {
+    if (gen->cmdList == ptclref_804D0E5C[0][0x98]->cmdList) {
         hsd_8039D1E4(gen, lbl_803BF810);
     }
-    if (gen->cmdList == ((HSD_PSCmdList*) ptclref_804D0E5C[0][0x21B])->cmdList)
-    {
+    if (gen->cmdList == ptclref_804D0E5C[0][0x21B]->cmdList) {
         hsd_8039D1E4(gen, lbl_803BF810);
     }
 }