add compatibility hooks back

2025-10-05 23:52:43 +02:00 · 2022-09-13 18:29:18 -04:00
parent dcb32ea0b4
commit 1a0b1e49bd
5 changed files with 31 additions and 391 deletions
--- a/Binary/m-ex.bin
+++ b/Binary/m-ex.bin
--- a/Common/CompatibilityHooks/WithMexBase/GetFighterNum.asm
+++ b/Common/CompatibilityHooks/WithMexBase/GetFighterNum.asm
--- a/Output/Netplay/GALE01r2.ini
+++ b/Output/Netplay/GALE01r2.ini
@@ -5913,9 +5913,23 @@ C209E090 00000011 #Common/FastForward/DynamicsFix.asm
 8001001C 38210018
 7C0803A6 4E800020
 BB010028 00000000
-C200569C 00000002 #Common/CompatibilityHooks/WithMexBase/GetFighterNum.asm
+C200569C 00000002 #Common/CompatibilityHooks/GetFighterNum.asm
 38600021 4E800020
 60000000 00000000
+C20056A0 00000007 #Common/CompatibilityHooks/GetSSMIndex.asm
+2C030001 41820018
+3C60803B 6063B3C0
+1C840010 7C6320AE
+48000018 3C60803B
+6063B6B0 1C840003
+7C6320AE 48000004
+4E800020 00000000
+C20056A8 00000005 #Common/CompatibilityHooks/RequestSSMLoad.asm
+2C030037 41820018
+3D808043 618C37C4
+38800001 1C630004
+7C83612E 4E800020
+60000000 00000000
 C23753B4 0000005C #m-ex codeset generated from https://github.com/JLaferri/m-ex/tree/support%2Fslippi
 7C0802A6 90010004
 9421FF00 BE810008
@@ -6917,13 +6931,6 @@ C23D707C 0000000A
 80010104 38210100
 7C0803A6 4E800020
 60000000 00000000
-C20056A0 00000006
-2C030001 41820014
-80620020 1C840010
-7C6320AE 48000014
-80620108 1C840003
-7C6320AE 48000004
-4E800020 00000000
 C23D7058 00000021
 7C0802A6 90010004
 9421FF00 BE810008
@@ -6958,193 +6965,6 @@ C23D7058 00000021
 80010104 38210100
 7C0803A6 4E800020
 60000000 00000000
-C23D7070 00000050
-7C0802A6 90010004
-9421FF00 BE810008
-7C9F2378 7CBE2B78
-480000C5 7C8802A6
-3D808038 618C0358
-7D8903A6 4E800421
-7C7D1B79 418200A0
-829D0000 3AA00000
-2C140000 41820090
-387D0004 1C950004
-7EC3202E 2C160000
-41820068 7EC3B378
-3D80803D 618C7074
-7D8903A6 4E800421
-7FE3FB78 7FC4F378
-7EA5AB78 48000071
-7C691B78 8176000C
-81560000 39000000
-48000024 1C880008
-7CA45A14 80650004
-7C635214 80850000
-1C840004 7C64492E
-39080001 80760010
-7C081800 4180FFD8
-3AB50001 7C15A000
-4180FF80 38600001
-48000194 38600000
-4800018C 4E800021
-69744675 6E637469
-6F6E0000 7C6B1B78
-7C8A2378 7CAC2B78
-2C0A0001 41820014
-80620178 80630008
-8063004C 48000014
-80620178 80630028
-8063000C 48000004
-1C8B0008 7C632214
-80630004 2C030000
-41820078 1C8C0002
-7C63222E 80820088
-2C03002B 41800020
-2C0300A1 41800020
-2C0300D0 41800024
-2C0300ED 41800028
-48000030 80840000
-48000034 3863FFD5
-80840004 48000028
-3863FF5F 80840008
-4800001C 3863FF30
-8084000C 48000010
-3863FF13 80840010
-48000004 1C63003C
-7C632214 4E800020
-2C0A0001 41820010
-4800009D 7C8802A6
-48000010 4800009D
-7C8802A6 48000004
-4800004D 7C6802A6
-7D655B78 3D808034
-618C56A8 7D8903A6
-4E800421 48000025
-7C6802A6 38800000
-3CA0804D 60A53940
-3D808038 618C8220
-7D8903A6 4E800421
-4E800021 6D2D6578
-00000000 4E800021
-6572726F 723A204D
-78447420 646F6573
-206E6F74 20636F6E
-7461696E 20616E79
-20697465 6D732066
-6F722025 73202564
-0A000000 4E800021
-66696768 74657200
-4E800021 73746167
-65000000 BA810008
-80010104 38210100
-7C0803A6 4E800020
-60000000 00000000
-C23D7080 00000069
-7C0802A6 90010004
-9421FF00 BE810008
-D3C10080 D3A10084
-D3C10088 7C7F1B78
-7C9E2378 FFE00890
-FFC01090 FFA01890
-83BF002C 807D0004
-2C030004 40820270
-835D2238 80620144
-1C9A0004 7C63202E
-2C030000 41820148
-1C9E0020 7F832214
-80620128 1C9A0004
-7C63202E 2C030000
-4182018C 809C0000
-1C840018 7F632214
-7FE3FB78 388000EF
-3CA02000 38C00000
-FC20F890 FC40F090
-FC60E890 3D808006
-618C93AC 7D8903A6
-4E800421 38600000
-907D0014 387E0190
-907D0010 3860FFFF
-907D05A4 807B0004
-2C030000 4182017C
-907D0590 807B0010
-907D0594 807B000C
-907D03EC 807D0590
-7FE3FB78 FC20F890
-FC40F090 FC60E890
-3D808006 618CEBE8
-7D8903A6 4E800421
-38600000 907D03E4
-7FE3FB78 3D808006
-618CE9B4 7D8903A6
-4E800421 C0028874
-FC00F840 40820030
-7FE3FB78 3D80800C
-618C0408 7D8903A6
-4E800421 7FE3FB78
-3D808007 618C3240
-7D8903A6 4E800421
-48000018 7FE3FB78
-3D808007 618C3354
-7D8903A6 4E800421
-807C000C 907D21A0
-807C0010 907D219C
-807C0014 907D21A4
-807C0018 907D21A8
-807C001C 907D21AC
-4800018C 48000029
-7C6802A6 80820114
-1CBA0008 7C84282E
-3D808034 618C56A8
-7D8903A6 4E800421
-48000130 4E800021
-6572726F 723A206B
-6266756E 6374696F
-6E20696E 20257320
-6D697373 696E6720
-6D6F7665 5F6C6F67
-69632074 61626C65
-0A000000 48000029
-7C6802A6 80820114
-1CBA0008 7C84282E
-3D808034 618C56A8
-7D8903A6 4E800421
-480000D0 4E800021
-6572726F 723A2025
-73206D69 7373696E
-67206674 636D6420
-73796D62 6F6C0A00
-4800002D 7C6802A6
-80820114 1CBA0008
-7C84282E 7FC5F378
-3D808034 618C56A8
-7D8903A6 4E800421
-48000080 4E800021
-6572726F 723A2066
-74636D64 20696E20
-2573206D 69737369
-6E672061 6E696D61
-74696F6E 20666F72
-20737461 74652025
-640A0000 48000021
-7C6802A6 809D0004
-3D808034 618C56A8
-7D8903A6 4E800421
-48000028 4E800021
-6572726F 723A2066
-69676874 65722025
-64206973 206E6F74
-206B6972 62790A00
-48000025 7C6802A6
-38800000 3CA0804D
-60A53940 3D808038
-618C8220 7D8903A6
-4E800421 4E800021
-6D2D6578 00000000
-48000000 C3C10080
-C3A10084 C3C10088
-BA810008 80010104
-38210100 7C0803A6
-4E800020 00000000
 C23D709C 0000001E
 7C0802A6 90010004
 9421FF00 BE810008
--- a/Output/Netplay/GALJ01r2.ini
+++ b/Output/Netplay/GALJ01r2.ini
@@ -5913,9 +5913,23 @@ C209E090 00000011 #Common/FastForward/DynamicsFix.asm
 8001001C 38210018
 7C0803A6 4E800020
 BB010028 00000000
-C200569C 00000002 #Common/CompatibilityHooks/WithMexBase/GetFighterNum.asm
+C200569C 00000002 #Common/CompatibilityHooks/GetFighterNum.asm
 38600021 4E800020
 60000000 00000000
+C20056A0 00000007 #Common/CompatibilityHooks/GetSSMIndex.asm
+2C030001 41820018
+3C60803B 6063B3C0
+1C840010 7C6320AE
+48000018 3C60803B
+6063B6B0 1C840003
+7C6320AE 48000004
+4E800020 00000000
+C20056A8 00000005 #Common/CompatibilityHooks/RequestSSMLoad.asm
+2C030037 41820018
+3D808043 618C37C4
+38800001 1C630004
+7C83612E 4E800020
+60000000 00000000
 C23753B4 0000005C #m-ex codeset generated from https://github.com/JLaferri/m-ex/tree/support%2Fslippi
 7C0802A6 90010004
 9421FF00 BE810008
@@ -6917,13 +6931,6 @@ C23D707C 0000000A
 80010104 38210100
 7C0803A6 4E800020
 60000000 00000000
-C20056A0 00000006
-2C030001 41820014
-80620020 1C840010
-7C6320AE 48000014
-80620108 1C840003
-7C6320AE 48000004
-4E800020 00000000
 C23D7058 00000021
 7C0802A6 90010004
 9421FF00 BE810008
@@ -6958,193 +6965,6 @@ C23D7058 00000021
 80010104 38210100
 7C0803A6 4E800020
 60000000 00000000
-C23D7070 00000050
-7C0802A6 90010004
-9421FF00 BE810008
-7C9F2378 7CBE2B78
-480000C5 7C8802A6
-3D808038 618C0358
-7D8903A6 4E800421
-7C7D1B79 418200A0
-829D0000 3AA00000
-2C140000 41820090
-387D0004 1C950004
-7EC3202E 2C160000
-41820068 7EC3B378
-3D80803D 618C7074
-7D8903A6 4E800421
-7FE3FB78 7FC4F378
-7EA5AB78 48000071
-7C691B78 8176000C
-81560000 39000000
-48000024 1C880008
-7CA45A14 80650004
-7C635214 80850000
-1C840004 7C64492E
-39080001 80760010
-7C081800 4180FFD8
-3AB50001 7C15A000
-4180FF80 38600001
-48000194 38600000
-4800018C 4E800021
-69744675 6E637469
-6F6E0000 7C6B1B78
-7C8A2378 7CAC2B78
-2C0A0001 41820014
-80620178 80630008
-8063004C 48000014
-80620178 80630028
-8063000C 48000004
-1C8B0008 7C632214
-80630004 2C030000
-41820078 1C8C0002
-7C63222E 80820088
-2C03002B 41800020
-2C0300A1 41800020
-2C0300D0 41800024
-2C0300ED 41800028
-48000030 80840000
-48000034 3863FFD5
-80840004 48000028
-3863FF5F 80840008
-4800001C 3863FF30
-8084000C 48000010
-3863FF13 80840010
-48000004 1C63003C
-7C632214 4E800020
-2C0A0001 41820010
-4800009D 7C8802A6
-48000010 4800009D
-7C8802A6 48000004
-4800004D 7C6802A6
-7D655B78 3D808034
-618C56A8 7D8903A6
-4E800421 48000025
-7C6802A6 38800000
-3CA0804D 60A53940
-3D808038 618C8220
-7D8903A6 4E800421
-4E800021 6D2D6578
-00000000 4E800021
-6572726F 723A204D
-78447420 646F6573
-206E6F74 20636F6E
-7461696E 20616E79
-20697465 6D732066
-6F722025 73202564
-0A000000 4E800021
-66696768 74657200
-4E800021 73746167
-65000000 BA810008
-80010104 38210100
-7C0803A6 4E800020
-60000000 00000000
-C23D7080 00000069
-7C0802A6 90010004
-9421FF00 BE810008
-D3C10080 D3A10084
-D3C10088 7C7F1B78
-7C9E2378 FFE00890
-FFC01090 FFA01890
-83BF002C 807D0004
-2C030004 40820270
-835D2238 80620144
-1C9A0004 7C63202E
-2C030000 41820148
-1C9E0020 7F832214
-80620128 1C9A0004
-7C63202E 2C030000
-4182018C 809C0000
-1C840018 7F632214
-7FE3FB78 388000EF
-3CA02000 38C00000
-FC20F890 FC40F090
-FC60E890 3D808006
-618C93AC 7D8903A6
-4E800421 38600000
-907D0014 387E0190
-907D0010 3860FFFF
-907D05A4 807B0004
-2C030000 4182017C
-907D0590 807B0010
-907D0594 807B000C
-907D03EC 807D0590
-7FE3FB78 FC20F890
-FC40F090 FC60E890
-3D808006 618CEBE8
-7D8903A6 4E800421
-38600000 907D03E4
-7FE3FB78 3D808006
-618CE9B4 7D8903A6
-4E800421 C0028874
-FC00F840 40820030
-7FE3FB78 3D80800C
-618C0408 7D8903A6
-4E800421 7FE3FB78
-3D808007 618C3240
-7D8903A6 4E800421
-48000018 7FE3FB78
-3D808007 618C3354
-7D8903A6 4E800421
-807C000C 907D21A0
-807C0010 907D219C
-807C0014 907D21A4
-807C0018 907D21A8
-807C001C 907D21AC
-4800018C 48000029
-7C6802A6 80820114
-1CBA0008 7C84282E
-3D808034 618C56A8
-7D8903A6 4E800421
-48000130 4E800021
-6572726F 723A206B
-6266756E 6374696F
-6E20696E 20257320
-6D697373 696E6720
-6D6F7665 5F6C6F67
-69632074 61626C65
-0A000000 48000029
-7C6802A6 80820114
-1CBA0008 7C84282E
-3D808034 618C56A8
-7D8903A6 4E800421
-480000D0 4E800021
-6572726F 723A2025
-73206D69 7373696E
-67206674 636D6420
-73796D62 6F6C0A00
-4800002D 7C6802A6
-80820114 1CBA0008
-7C84282E 7FC5F378
-3D808034 618C56A8
-7D8903A6 4E800421
-48000080 4E800021
-6572726F 723A2066
-74636D64 20696E20
-2573206D 69737369
-6E672061 6E696D61
-74696F6E 20666F72
-20737461 74652025
-640A0000 48000021
-7C6802A6 809D0004
-3D808034 618C56A8
-7D8903A6 4E800421
-48000028 4E800021
-6572726F 723A2066
-69676874 65722025
-64206973 206E6F74
-206B6972 62790A00
-48000025 7C6802A6
-38800000 3CA0804D
-60A53940 3D808038
-618C8220 7D8903A6
-4E800421 4E800021
-6D2D6578 00000000
-48000000 C3C10080
-C3A10084 C3C10088
-BA810008 80010104
-38210100 7C0803A6
-4E800020 00000000
 C23D709C 0000001E
 7C0802A6 90010004
 9421FF00 BE810008
--- a/netplay.json
+++ b/netplay.json
@@ -339,7 +339,7 @@
        },
        {
          "type": "injectFolder",
-          "sourceFolder": "Common/CompatibilityHooks/WithMexBase",
+          "sourceFolder": "Common/CompatibilityHooks",
          "isRecursive": true,
          "annotation": "Our m-ex binary does not include these hooks, so we have to"
        },