Merge branch 'master' into debug/follower-desync

2025-10-05 23:52:43 +02:00 · 2021-12-16 16:06:20 -05:00
parent 10b3faa227 5b904835bc
commit 5d1238082c
11 changed files with 284 additions and 710 deletions
--- a/Online/Static/IntToFloat.asm
+++ b/Online/Static/IntToFloat.asm
--- a/Online/Static/LoadPremadeText.asm
+++ b/Online/Static/LoadPremadeText.asm
--- a/Online/Static/MultiplyRWithF.asm
+++ b/Online/Static/MultiplyRWithF.asm
--- a/Online/Static/SubtextFunctions.asm
+++ b/Online/Static/SubtextFunctions.asm
--- a/Output/Console/GALE01r2.ini
+++ b/Output/Console/GALE01r2.ini
@@ -485,148 +485,6 @@ C216D294 00000006 #Common/IncrementFrameIndex.asm
 906DB654 48000010
 806DB654 38630001
 906DB654 00000000
-C20055F4 00000007 #Common/IntToFloat.asm
-9421FF00 D0410008
-3C004330 C84298A8
-6C638000 900100F0
-906100F4 C82100F0
-EC211028 C0410008
-38210100 4E800020
-60000000 00000000
-C20056A4 00000022 #Common/LoadPremadeText.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7F1B78 7C9E2378
-3B800004 7F83E378
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7D1B78 7F84E378
-3D808000 618CC160
-7D8903A6 4E800421
-386000E1 48000055
-839D0000 7FA3EB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-7F83E378 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7D1B78
-386000E2 4800001D
-7FA3EB78 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF50 BE810008
-987D0000 9BFD0001
-9BDD0002 7FA3EB78
-38800003 38A00001
-3D808000 618C55F0
-7D8903A6 4E800421
-7FA3EB78 7F84E378
-38A00000 3D808000
-618C55F0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
-C20055EC 00000008 #Common/MultiplyRWithF.asm
-7C0802A6 90010004
-9421FF50 BE810008
-3D808000 618C55F4
-7D8903A6 4E800421
-EC2100B2 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
-C20056B4 00000059 #Common/SubtextFunctions.asm
-2C050002 418201F8
-7C0802A6 90010004
-9421FF50 BE810008
-7C751B78 7C962378
-7CB82B78 7CD93378
-90E10038 9101003C
-91210040 91410044
-91610048 9181004C
-FEA00890 FEC01090
-FEE01890 FF202890
-FF403090 2C180001
-418000FC 39E00004
-FC20B090 FC40B890
-2C0F0001 41820020
-2C0F0002 41820020
-2C0F0003 41820020
-2C0F0004 41820020
-48000024 EC21D028
-4800001C EC21D02A
-48000014 EC42D028
-4800000C EC42D02A
-48000004 7EA3AB78
-80810038 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-3D80803A 618C7548
-7D8903A6 4E800421
-7F25CB78 2C0F0000
-40820008 7EC5B378
-7EA3AB78 7EE4BB78
-3D80803A 618C74F0
-7D8903A6 4E800421
-7EA3AB78 7EE4BB78
-80A10038 80C1003C
-80E10040 81010044
-81210048 8141004C
-3D80803A 618C70A0
-7D8903A6 4E800421
-2C0F0000 4182000C
-39EFFFFF 4BFFFF14
-48000094 7EA3AB78
-80810038 FC20B090
-FC40B890 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-3D80803A 618C7548
-7D8903A6 4E800421
-7EA3AB78 7EE4BB78
-7EC5B378 3D80803A
-618C74F0 7D8903A6
-4E800421 7EA3AB78
-7EE4BB78 80A10038
-80C1003C 80E10040
-81010044 81210048
-8141004C 3D80803A
-618C70A0 7D8903A6
-4E800421 7EE3BB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 7C7D1B78
-7C9C2378 7CDB3378
-FEC00890 FEE01090
-FF001890 FEA02090
-4800008D 7F4802A6
-38600000 7F64DB78
-C01A0000 FC20B090
-FC40B890 FC60C090
-C09A0004 C0BA0008
-3D80803A 618C5ACC
-7D8903A6 4E800421
-7C751B78 2C1C0000
-41820010 38600001
-986DAFEC 7F86E378
-7EA3AB78 7FA4EB78
-FC00A890 D0030024
-D0030028 3D80803A
-618C6368 7D8903A6
-4E800421 7EA3AB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 4E800021
-41100000 44160000
-41A00000 00000000
 041D460C 809F00EC #Common/Preload Stadium Transformations/Core/GetPreloadedTransition.asm
 C21D14C8 00000002 #Common/Preload Stadium Transformations/Core/Init isLoaded Bool.asm
 38600000 987F00F0
--- a/Output/Console/g_core.bin
+++ b/Output/Console/g_core.bin
--- a/Output/Console/g_core_porta.bin
+++ b/Output/Console/g_core_porta.bin
--- a/Output/Netplay/GALE01r2.ini
+++ b/Output/Netplay/GALE01r2.ini
@@ -994,148 +994,6 @@ C216D294 00000006 #Common/IncrementFrameIndex.asm
 906DB654 48000010
 806DB654 38630001
 906DB654 00000000
-C20055F4 00000007 #Common/IntToFloat.asm
-9421FF00 D0410008
-3C004330 C84298A8
-6C638000 900100F0
-906100F4 C82100F0
-EC211028 C0410008
-38210100 4E800020
-60000000 00000000
-C20056A4 00000022 #Common/LoadPremadeText.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7F1B78 7C9E2378
-3B800004 7F83E378
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7D1B78 7F84E378
-3D808000 618CC160
-7D8903A6 4E800421
-386000E1 48000055
-839D0000 7FA3EB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-7F83E378 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7D1B78
-386000E2 4800001D
-7FA3EB78 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF50 BE810008
-987D0000 9BFD0001
-9BDD0002 7FA3EB78
-38800003 38A00001
-3D808000 618C55F0
-7D8903A6 4E800421
-7FA3EB78 7F84E378
-38A00000 3D808000
-618C55F0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
-C20055EC 00000008 #Common/MultiplyRWithF.asm
-7C0802A6 90010004
-9421FF50 BE810008
-3D808000 618C55F4
-7D8903A6 4E800421
-EC2100B2 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
-C20056B4 00000059 #Common/SubtextFunctions.asm
-2C050002 418201F8
-7C0802A6 90010004
-9421FF50 BE810008
-7C751B78 7C962378
-7CB82B78 7CD93378
-90E10038 9101003C
-91210040 91410044
-91610048 9181004C
-FEA00890 FEC01090
-FEE01890 FF202890
-FF403090 2C180001
-418000FC 39E00004
-FC20B090 FC40B890
-2C0F0001 41820020
-2C0F0002 41820020
-2C0F0003 41820020
-2C0F0004 41820020
-48000024 EC21D028
-4800001C EC21D02A
-48000014 EC42D028
-4800000C EC42D02A
-48000004 7EA3AB78
-80810038 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-3D80803A 618C7548
-7D8903A6 4E800421
-7F25CB78 2C0F0000
-40820008 7EC5B378
-7EA3AB78 7EE4BB78
-3D80803A 618C74F0
-7D8903A6 4E800421
-7EA3AB78 7EE4BB78
-80A10038 80C1003C
-80E10040 81010044
-81210048 8141004C
-3D80803A 618C70A0
-7D8903A6 4E800421
-2C0F0000 4182000C
-39EFFFFF 4BFFFF14
-48000094 7EA3AB78
-80810038 FC20B090
-FC40B890 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-3D80803A 618C7548
-7D8903A6 4E800421
-7EA3AB78 7EE4BB78
-7EC5B378 3D80803A
-618C74F0 7D8903A6
-4E800421 7EA3AB78
-7EE4BB78 80A10038
-80C1003C 80E10040
-81010044 81210048
-8141004C 3D80803A
-618C70A0 7D8903A6
-4E800421 7EE3BB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 7C7D1B78
-7C9C2378 7CDB3378
-FEC00890 FEE01090
-FF001890 FEA02090
-4800008D 7F4802A6
-38600000 7F64DB78
-C01A0000 FC20B090
-FC40B890 FC60C090
-C09A0004 C0BA0008
-3D80803A 618C5ACC
-7D8903A6 4E800421
-7C751B78 2C1C0000
-41820010 38600001
-986DAFEC 7F86E378
-7EA3AB78 7FA4EB78
-FC00A890 D0030024
-D0030028 3D80803A
-618C6368 7D8903A6
-4E800421 7EA3AB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 4E800021
-41100000 44160000
-41A00000 00000000
 041D460C 809F00EC #Common/Preload Stadium Transformations/Core/GetPreloadedTransition.asm
 C21D14C8 00000002 #Common/Preload Stadium Transformations/Core/Init isLoaded Bool.asm
 38600000 987F00F0
@@ -5198,6 +5056,14 @@ C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
+C20055F4 00000007 #Online/Static/IntToFloat.asm
+9421FF00 D0410008
+3C004330 C84298A8
+6C638000 900100F0
+906100F4 C82100F0
+EC211028 C0410008
+38210100 4E800020
+60000000 00000000
 C2005610 00000012 #Online/Static/LoadMatchState.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -5217,6 +5083,41 @@ C2005610 00000012 #Online/Static/LoadMatchState.asm
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
+C20056A4 00000022 #Online/Static/LoadPremadeText.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C7F1B78 7C9E2378
+3B800004 7F83E378
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C7D1B78 7F84E378
+3D808000 618CC160
+7D8903A6 4E800421
+386000E1 48000055
+839D0000 7FA3EB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+7F83E378 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7D1B78
+386000E2 4800001D
+7FA3EB78 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+987D0000 9BFD0001
+9BDD0002 7FA3EB78
+38800003 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+7FA3EB78 7F84E378
+38A00000 3D808000
+618C55F0 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
 C200560C 00000016 #Online/Static/LoadState.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -5240,6 +5141,15 @@ C200560C 00000016 #Online/Static/LoadState.asm
 BA810008 800100B4
 382100B0 7C0803A6
 4E800020 00000000
+C20055EC 00000008 #Online/Static/MultiplyRWithF.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3D808000 618C55F4
+7D8903A6 4E800421
+EC2100B2 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
 C2005608 00000016 #Online/Static/SaveState.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -5263,6 +5173,96 @@ C2005608 00000016 #Online/Static/SaveState.asm
 BA810008 800100B4
 382100B0 7C0803A6
 4E800020 00000000
+C20056B4 00000059 #Online/Static/SubtextFunctions.asm
+2C050002 418201F8
+7C0802A6 90010004
+9421FF50 BE810008
+7C751B78 7C962378
+7CB82B78 7CD93378
+90E10038 9101003C
+91210040 91410044
+91610048 9181004C
+FEA00890 FEC01090
+FEE01890 FF202890
+FF403090 2C180001
+418000FC 39E00004
+FC20B090 FC40B890
+2C0F0001 41820020
+2C0F0002 41820020
+2C0F0003 41820020
+2C0F0004 41820020
+48000024 EC21D028
+4800001C EC21D02A
+48000014 EC42D028
+4800000C EC42D02A
+48000004 7EA3AB78
+80810038 3D80803A
+618C6B98 7D8903A6
+4E800421 7C771B78
+7EA3AB78 7EE4BB78
+FC20A890 FC40A890
+3D80803A 618C7548
+7D8903A6 4E800421
+7F25CB78 2C0F0000
+40820008 7EC5B378
+7EA3AB78 7EE4BB78
+3D80803A 618C74F0
+7D8903A6 4E800421
+7EA3AB78 7EE4BB78
+80A10038 80C1003C
+80E10040 81010044
+81210048 8141004C
+3D80803A 618C70A0
+7D8903A6 4E800421
+2C0F0000 4182000C
+39EFFFFF 4BFFFF14
+48000094 7EA3AB78
+80810038 FC20B090
+FC40B890 3D80803A
+618C6B98 7D8903A6
+4E800421 7C771B78
+7EA3AB78 7EE4BB78
+FC20A890 FC40A890
+3D80803A 618C7548
+7D8903A6 4E800421
+7EA3AB78 7EE4BB78
+7EC5B378 3D80803A
+618C74F0 7D8903A6
+4E800421 7EA3AB78
+7EE4BB78 80A10038
+80C1003C 80E10040
+81010044 81210048
+8141004C 3D80803A
+618C70A0 7D8903A6
+4E800421 7EE3BB78
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 7C7D1B78
+7C9C2378 7CDB3378
+FEC00890 FEE01090
+FF001890 FEA02090
+4800008D 7F4802A6
+38600000 7F64DB78
+C01A0000 FC20B090
+FC40B890 FC60C090
+C09A0004 C0BA0008
+3D80803A 618C5ACC
+7D8903A6 4E800421
+7C751B78 2C1C0000
+41820010 38600001
+986DAFEC 7F86E378
+7EA3AB78 7FA4EB78
+FC00A890 D0030024
+D0030028 3D80803A
+618C6368 7D8903A6
+4E800421 7EA3AB78
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+41100000 44160000
+41A00000 00000000
 C2005618 00000095 #Online/Static/UserDisplayFunctions.asm
 4E800021 4800004C
 480001E0 480002F4
--- a/Output/Netplay/GALJ01r2.ini
+++ b/Output/Netplay/GALJ01r2.ini
@@ -994,148 +994,6 @@ C216D294 00000006 #Common/IncrementFrameIndex.asm
 906DB654 48000010
 806DB654 38630001
 906DB654 00000000
-C20055F4 00000007 #Common/IntToFloat.asm
-9421FF00 D0410008
-3C004330 C84298A8
-6C638000 900100F0
-906100F4 C82100F0
-EC211028 C0410008
-38210100 4E800020
-60000000 00000000
-C20056A4 00000022 #Common/LoadPremadeText.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7F1B78 7C9E2378
-3B800004 7F83E378
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7D1B78 7F84E378
-3D808000 618CC160
-7D8903A6 4E800421
-386000E1 48000055
-839D0000 7FA3EB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-7F83E378 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7D1B78
-386000E2 4800001D
-7FA3EB78 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF50 BE810008
-987D0000 9BFD0001
-9BDD0002 7FA3EB78
-38800003 38A00001
-3D808000 618C55F0
-7D8903A6 4E800421
-7FA3EB78 7F84E378
-38A00000 3D808000
-618C55F0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
-C20055EC 00000008 #Common/MultiplyRWithF.asm
-7C0802A6 90010004
-9421FF50 BE810008
-3D808000 618C55F4
-7D8903A6 4E800421
-EC2100B2 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
-C20056B4 00000059 #Common/SubtextFunctions.asm
-2C050002 418201F8
-7C0802A6 90010004
-9421FF50 BE810008
-7C751B78 7C962378
-7CB82B78 7CD93378
-90E10038 9101003C
-91210040 91410044
-91610048 9181004C
-FEA00890 FEC01090
-FEE01890 FF202890
-FF403090 2C180001
-418000FC 39E00004
-FC20B090 FC40B890
-2C0F0001 41820020
-2C0F0002 41820020
-2C0F0003 41820020
-2C0F0004 41820020
-48000024 EC21D028
-4800001C EC21D02A
-48000014 EC42D028
-4800000C EC42D02A
-48000004 7EA3AB78
-80810038 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-3D80803A 618C7548
-7D8903A6 4E800421
-7F25CB78 2C0F0000
-40820008 7EC5B378
-7EA3AB78 7EE4BB78
-3D80803A 618C74F0
-7D8903A6 4E800421
-7EA3AB78 7EE4BB78
-80A10038 80C1003C
-80E10040 81010044
-81210048 8141004C
-3D80803A 618C70A0
-7D8903A6 4E800421
-2C0F0000 4182000C
-39EFFFFF 4BFFFF14
-48000094 7EA3AB78
-80810038 FC20B090
-FC40B890 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-3D80803A 618C7548
-7D8903A6 4E800421
-7EA3AB78 7EE4BB78
-7EC5B378 3D80803A
-618C74F0 7D8903A6
-4E800421 7EA3AB78
-7EE4BB78 80A10038
-80C1003C 80E10040
-81010044 81210048
-8141004C 3D80803A
-618C70A0 7D8903A6
-4E800421 7EE3BB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 7C7D1B78
-7C9C2378 7CDB3378
-FEC00890 FEE01090
-FF001890 FEA02090
-4800008D 7F4802A6
-38600000 7F64DB78
-C01A0000 FC20B090
-FC40B890 FC60C090
-C09A0004 C0BA0008
-3D80803A 618C5ACC
-7D8903A6 4E800421
-7C751B78 2C1C0000
-41820010 38600001
-986DAFEC 7F86E378
-7EA3AB78 7FA4EB78
-FC00A890 D0030024
-D0030028 3D80803A
-618C6368 7D8903A6
-4E800421 7EA3AB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 4E800021
-41100000 44160000
-41A00000 00000000
 041D460C 809F00EC #Common/Preload Stadium Transformations/Core/GetPreloadedTransition.asm
 C21D14C8 00000002 #Common/Preload Stadium Transformations/Core/Init isLoaded Bool.asm
 38600000 987F00F0
@@ -5198,6 +5056,14 @@ C20056B0 00000011 #Online/Static/GetTeamCostumeIndex.asm
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
+C20055F4 00000007 #Online/Static/IntToFloat.asm
+9421FF00 D0410008
+3C004330 C84298A8
+6C638000 900100F0
+906100F4 C82100F0
+EC211028 C0410008
+38210100 4E800020
+60000000 00000000
 C2005610 00000012 #Online/Static/LoadMatchState.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -5217,6 +5083,41 @@ C2005610 00000012 #Online/Static/LoadMatchState.asm
 800100B4 382100B0
 7C0803A6 4E800020
 60000000 00000000
+C20056A4 00000022 #Online/Static/LoadPremadeText.asm
+7C0802A6 90010004
+9421FF50 BE810008
+7C7F1B78 7C9E2378
+3B800004 7F83E378
+3D808037 618CF1E4
+7D8903A6 4E800421
+7C7D1B78 7F84E378
+3D808000 618CC160
+7D8903A6 4E800421
+386000E1 48000055
+839D0000 7FA3EB78
+3D808037 618CF1B0
+7D8903A6 4E800421
+7F83E378 3D808037
+618CF1E4 7D8903A6
+4E800421 7C7D1B78
+386000E2 4800001D
+7FA3EB78 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+7C0802A6 90010004
+9421FF50 BE810008
+987D0000 9BFD0001
+9BDD0002 7FA3EB78
+38800003 38A00001
+3D808000 618C55F0
+7D8903A6 4E800421
+7FA3EB78 7F84E378
+38A00000 3D808000
+618C55F0 7D8903A6
+4E800421 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
 C200560C 00000016 #Online/Static/LoadState.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -5240,6 +5141,15 @@ C200560C 00000016 #Online/Static/LoadState.asm
 BA810008 800100B4
 382100B0 7C0803A6
 4E800020 00000000
+C20055EC 00000008 #Online/Static/MultiplyRWithF.asm
+7C0802A6 90010004
+9421FF50 BE810008
+3D808000 618C55F4
+7D8903A6 4E800421
+EC2100B2 BA810008
+800100B4 382100B0
+7C0803A6 4E800020
+60000000 00000000
 C2005608 00000016 #Online/Static/SaveState.asm
 7C0802A6 90010004
 9421FF50 BE810008
@@ -5263,6 +5173,96 @@ C2005608 00000016 #Online/Static/SaveState.asm
 BA810008 800100B4
 382100B0 7C0803A6
 4E800020 00000000
+C20056B4 00000059 #Online/Static/SubtextFunctions.asm
+2C050002 418201F8
+7C0802A6 90010004
+9421FF50 BE810008
+7C751B78 7C962378
+7CB82B78 7CD93378
+90E10038 9101003C
+91210040 91410044
+91610048 9181004C
+FEA00890 FEC01090
+FEE01890 FF202890
+FF403090 2C180001
+418000FC 39E00004
+FC20B090 FC40B890
+2C0F0001 41820020
+2C0F0002 41820020
+2C0F0003 41820020
+2C0F0004 41820020
+48000024 EC21D028
+4800001C EC21D02A
+48000014 EC42D028
+4800000C EC42D02A
+48000004 7EA3AB78
+80810038 3D80803A
+618C6B98 7D8903A6
+4E800421 7C771B78
+7EA3AB78 7EE4BB78
+FC20A890 FC40A890
+3D80803A 618C7548
+7D8903A6 4E800421
+7F25CB78 2C0F0000
+40820008 7EC5B378
+7EA3AB78 7EE4BB78
+3D80803A 618C74F0
+7D8903A6 4E800421
+7EA3AB78 7EE4BB78
+80A10038 80C1003C
+80E10040 81010044
+81210048 8141004C
+3D80803A 618C70A0
+7D8903A6 4E800421
+2C0F0000 4182000C
+39EFFFFF 4BFFFF14
+48000094 7EA3AB78
+80810038 FC20B090
+FC40B890 3D80803A
+618C6B98 7D8903A6
+4E800421 7C771B78
+7EA3AB78 7EE4BB78
+FC20A890 FC40A890
+3D80803A 618C7548
+7D8903A6 4E800421
+7EA3AB78 7EE4BB78
+7EC5B378 3D80803A
+618C74F0 7D8903A6
+4E800421 7EA3AB78
+7EE4BB78 80A10038
+80C1003C 80E10040
+81010044 81210048
+8141004C 3D80803A
+618C70A0 7D8903A6
+4E800421 7EE3BB78
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 7C0802A6
+90010004 9421FF50
+BE810008 7C7D1B78
+7C9C2378 7CDB3378
+FEC00890 FEE01090
+FF001890 FEA02090
+4800008D 7F4802A6
+38600000 7F64DB78
+C01A0000 FC20B090
+FC40B890 FC60C090
+C09A0004 C0BA0008
+3D80803A 618C5ACC
+7D8903A6 4E800421
+7C751B78 2C1C0000
+41820010 38600001
+986DAFEC 7F86E378
+7EA3AB78 7FA4EB78
+FC00A890 D0030024
+D0030028 3D80803A
+618C6368 7D8903A6
+4E800421 7EA3AB78
+BA810008 800100B4
+382100B0 7C0803A6
+4E800020 4E800021
+41100000 44160000
+41A00000 00000000
 C2005618 00000095 #Online/Static/UserDisplayFunctions.asm
 4E800021 4800004C
 480001E0 480002F4
--- a/Output/Playback/GALE01r2.ini
+++ b/Output/Playback/GALE01r2.ini
@@ -859,148 +859,6 @@ C216D294 00000006 #Common/IncrementFrameIndex.asm
 906DB654 48000010
 806DB654 38630001
 906DB654 00000000
-C20055F4 00000007 #Common/IntToFloat.asm
-9421FF00 D0410008
-3C004330 C84298A8
-6C638000 900100F0
-906100F4 C82100F0
-EC211028 C0410008
-38210100 4E800020
-60000000 00000000
-C20056A4 00000022 #Common/LoadPremadeText.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7F1B78 7C9E2378
-3B800004 7F83E378
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7D1B78 7F84E378
-3D808000 618CC160
-7D8903A6 4E800421
-386000E1 48000055
-839D0000 7FA3EB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-7F83E378 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7D1B78
-386000E2 4800001D
-7FA3EB78 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF50 BE810008
-987D0000 9BFD0001
-9BDD0002 7FA3EB78
-38800003 38A00001
-3D808000 618C55F0
-7D8903A6 4E800421
-7FA3EB78 7F84E378
-38A00000 3D808000
-618C55F0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
-C20055EC 00000008 #Common/MultiplyRWithF.asm
-7C0802A6 90010004
-9421FF50 BE810008
-3D808000 618C55F4
-7D8903A6 4E800421
-EC2100B2 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
-C20056B4 00000059 #Common/SubtextFunctions.asm
-2C050002 418201F8
-7C0802A6 90010004
-9421FF50 BE810008
-7C751B78 7C962378
-7CB82B78 7CD93378
-90E10038 9101003C
-91210040 91410044
-91610048 9181004C
-FEA00890 FEC01090
-FEE01890 FF202890
-FF403090 2C180001
-418000FC 39E00004
-FC20B090 FC40B890
-2C0F0001 41820020
-2C0F0002 41820020
-2C0F0003 41820020
-2C0F0004 41820020
-48000024 EC21D028
-4800001C EC21D02A
-48000014 EC42D028
-4800000C EC42D02A
-48000004 7EA3AB78
-80810038 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-3D80803A 618C7548
-7D8903A6 4E800421
-7F25CB78 2C0F0000
-40820008 7EC5B378
-7EA3AB78 7EE4BB78
-3D80803A 618C74F0
-7D8903A6 4E800421
-7EA3AB78 7EE4BB78
-80A10038 80C1003C
-80E10040 81010044
-81210048 8141004C
-3D80803A 618C70A0
-7D8903A6 4E800421
-2C0F0000 4182000C
-39EFFFFF 4BFFFF14
-48000094 7EA3AB78
-80810038 FC20B090
-FC40B890 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-3D80803A 618C7548
-7D8903A6 4E800421
-7EA3AB78 7EE4BB78
-7EC5B378 3D80803A
-618C74F0 7D8903A6
-4E800421 7EA3AB78
-7EE4BB78 80A10038
-80C1003C 80E10040
-81010044 81210048
-8141004C 3D80803A
-618C70A0 7D8903A6
-4E800421 7EE3BB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 7C7D1B78
-7C9C2378 7CDB3378
-FEC00890 FEE01090
-FF001890 FEA02090
-4800008D 7F4802A6
-38600000 7F64DB78
-C01A0000 FC20B090
-FC40B890 FC60C090
-C09A0004 C0BA0008
-3D80803A 618C5ACC
-7D8903A6 4E800421
-7C751B78 2C1C0000
-41820010 38600001
-986DAFEC 7F86E378
-7EA3AB78 7FA4EB78
-FC00A890 D0030024
-D0030028 3D80803A
-618C6368 7D8903A6
-4E800421 7EA3AB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 4E800021
-41100000 44160000
-41A00000 00000000
 C21C154C 00000004 #Common/Initialize Stage Data/Init Stage Data.asm
 38800204 3D808000
 618CC160 7D8903A6
--- a/Output/Playback/GALJ01r2.ini
+++ b/Output/Playback/GALJ01r2.ini
@@ -859,148 +859,6 @@ C216D294 00000006 #Common/IncrementFrameIndex.asm
 906DB654 48000010
 806DB654 38630001
 906DB654 00000000
-C20055F4 00000007 #Common/IntToFloat.asm
-9421FF00 D0410008
-3C004330 C84298A8
-6C638000 900100F0
-906100F4 C82100F0
-EC211028 C0410008
-38210100 4E800020
-60000000 00000000
-C20056A4 00000022 #Common/LoadPremadeText.asm
-7C0802A6 90010004
-9421FF50 BE810008
-7C7F1B78 7C9E2378
-3B800004 7F83E378
-3D808037 618CF1E4
-7D8903A6 4E800421
-7C7D1B78 7F84E378
-3D808000 618CC160
-7D8903A6 4E800421
-386000E1 48000055
-839D0000 7FA3EB78
-3D808037 618CF1B0
-7D8903A6 4E800421
-7F83E378 3D808037
-618CF1E4 7D8903A6
-4E800421 7C7D1B78
-386000E2 4800001D
-7FA3EB78 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-7C0802A6 90010004
-9421FF50 BE810008
-987D0000 9BFD0001
-9BDD0002 7FA3EB78
-38800003 38A00001
-3D808000 618C55F0
-7D8903A6 4E800421
-7FA3EB78 7F84E378
-38A00000 3D808000
-618C55F0 7D8903A6
-4E800421 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
-C20055EC 00000008 #Common/MultiplyRWithF.asm
-7C0802A6 90010004
-9421FF50 BE810008
-3D808000 618C55F4
-7D8903A6 4E800421
-EC2100B2 BA810008
-800100B4 382100B0
-7C0803A6 4E800020
-60000000 00000000
-C20056B4 00000059 #Common/SubtextFunctions.asm
-2C050002 418201F8
-7C0802A6 90010004
-9421FF50 BE810008
-7C751B78 7C962378
-7CB82B78 7CD93378
-90E10038 9101003C
-91210040 91410044
-91610048 9181004C
-FEA00890 FEC01090
-FEE01890 FF202890
-FF403090 2C180001
-418000FC 39E00004
-FC20B090 FC40B890
-2C0F0001 41820020
-2C0F0002 41820020
-2C0F0003 41820020
-2C0F0004 41820020
-48000024 EC21D028
-4800001C EC21D02A
-48000014 EC42D028
-4800000C EC42D02A
-48000004 7EA3AB78
-80810038 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-3D80803A 618C7548
-7D8903A6 4E800421
-7F25CB78 2C0F0000
-40820008 7EC5B378
-7EA3AB78 7EE4BB78
-3D80803A 618C74F0
-7D8903A6 4E800421
-7EA3AB78 7EE4BB78
-80A10038 80C1003C
-80E10040 81010044
-81210048 8141004C
-3D80803A 618C70A0
-7D8903A6 4E800421
-2C0F0000 4182000C
-39EFFFFF 4BFFFF14
-48000094 7EA3AB78
-80810038 FC20B090
-FC40B890 3D80803A
-618C6B98 7D8903A6
-4E800421 7C771B78
-7EA3AB78 7EE4BB78
-FC20A890 FC40A890
-3D80803A 618C7548
-7D8903A6 4E800421
-7EA3AB78 7EE4BB78
-7EC5B378 3D80803A
-618C74F0 7D8903A6
-4E800421 7EA3AB78
-7EE4BB78 80A10038
-80C1003C 80E10040
-81010044 81210048
-8141004C 3D80803A
-618C70A0 7D8903A6
-4E800421 7EE3BB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 7C0802A6
-90010004 9421FF50
-BE810008 7C7D1B78
-7C9C2378 7CDB3378
-FEC00890 FEE01090
-FF001890 FEA02090
-4800008D 7F4802A6
-38600000 7F64DB78
-C01A0000 FC20B090
-FC40B890 FC60C090
-C09A0004 C0BA0008
-3D80803A 618C5ACC
-7D8903A6 4E800421
-7C751B78 2C1C0000
-41820010 38600001
-986DAFEC 7F86E378
-7EA3AB78 7FA4EB78
-FC00A890 D0030024
-D0030028 3D80803A
-618C6368 7D8903A6
-4E800421 7EA3AB78
-BA810008 800100B4
-382100B0 7C0803A6
-4E800020 4E800021
-41100000 44160000
-41A00000 00000000
 C21C154C 00000004 #Common/Initialize Stage Data/Init Stage Data.asm
 38800204 3D808000
 618CC160 7D8903A6