diff --git a/Data/PlaybackGeckoCodes/GALE01r2.ini b/Data/PlaybackGeckoCodes/GALE01r2.ini index 6c46242364..fa37357852 100644 --- a/Data/PlaybackGeckoCodes/GALE01r2.ini +++ b/Data/PlaybackGeckoCodes/GALE01r2.ini @@ -1142,4 +1142,4 @@ C21CBB90 00000005 #Lagless FoD 041CBF54 60000000 04390838 60000000 041CD250 60000000 -041CCDCC 480000B4 \ No newline at end of file +041CCDCC 480000B4 diff --git a/Data/PlaybackGeckoCodes/GALJ01r2.ini b/Data/PlaybackGeckoCodes/GALJ01r2.ini index 2740d41047..335d5ef74c 100644 --- a/Data/PlaybackGeckoCodes/GALJ01r2.ini +++ b/Data/PlaybackGeckoCodes/GALJ01r2.ini @@ -62,7 +62,7 @@ C213C388 0000000A #Common/CostumeBoundCheck/PuffCostume.asm 809C002C 00000000 C216DED4 00000039 #Common/CostumeBoundCheck/main.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3BE00000 7FE3FB78 3D808003 618C241C 7D8903A6 4E800421 @@ -114,43 +114,56 @@ C216DED4 00000039 #Common/CostumeBoundCheck/main.asm 4E800421 3B7B0001 2C1B0006 4180FF68 3BFF0001 2C1F0006 -4180FEF4 BA810008 -800100B4 382100B0 +4180FEF4 BA8100B0 +800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 -$Required: Slippi Playback [Fizzi, UnclePunch, Achilles, tauKhan] +$Required: Slippi Playback [Fizzi, UnclePunch, Achilles, tauKhan, Krohnos] *Used to play back a .slp file *Will play replay configured in playback.txt -C216E9E4 00000010 #Playback/Core/CleanDynamicGeckos.asm +C216E9E4 0000001D #Playback/Core/CleanDynamicGeckos.asm 3BC30000 7C0802A6 -90010004 9421FF50 -BE810008 83CDB64C -83BE0010 807D0000 -2C030000 41820044 -389D0008 80BD0004 -3D808000 618C31F4 -7D8903A6 4E800421 -807D0000 809D0004 -3D808032 618C8F50 -7D8903A6 4E800421 +90010004 9421FF20 +BE8100B0 83CDB64C +83BE0010 3B800000 +807D0000 2C030000 +41820018 3B9C0001 807D0004 7FBD1A14 -3BBD0008 4BFFFFB8 -BA810008 800100B4 -382100B0 7C0803A6 -60000000 00000000 +3BBD0008 4BFFFFE4 +1C7C0004 3D808037 +618CF1E4 7D8903A6 +4E800421 7C7B1B78 +83BE0010 3B400000 +807D0000 2C030000 +4182001C 7FBBD12E +3B5A0004 807D0004 +7FBD1A14 3BBD0008 +4BFFFFE0 387CFFFF +1F430004 2C1A0000 +41800044 7FBBD02E +807D0000 389D0008 +80BD0004 3D808000 +618C31F4 7D8903A6 +4E800421 807D0000 +809D0004 3D808032 +618C8F50 7D8903A6 +4E800421 3B5AFFFC +4BFFFFBC BA8100B0 +800100E4 382100E0 +7C0803A6 00000000 C216D298 00000016 #Playback/Core/FetchGameFrame.asm 881F0008 2C000000 408200A0 7C0802A6 -90010004 9421FF50 -BE810008 806DB64C +90010004 9421FF20 +BE8100B0 806DB64C 83630000 38600076 987B0000 806DB654 907B0001 7F63DB78 38800005 38A00001 3D808000 618C55F0 7D8903A6 4E800421 -7F63DB78 3880018F +7F63DB78 38800197 38A00000 3D808000 618C55F0 7D8903A6 4E800421 887B0000 @@ -159,12 +172,12 @@ BE810008 806DB64C 7D8903A6 4E800421 3C60804C 38000000 98031F7B 4BFFFF90 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 881F0008 00000000 -C206B0DC 00000046 #Playback/Core/RestoreGameFrame.asm +C206B0DC 00000049 #Playback/Core/RestoreGameFrame.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 8BBF000C 7FA3EB78 3D808003 618C1724 7D8903A6 4E800421 @@ -172,11 +185,12 @@ C206B0DC 00000046 #Playback/Core/RestoreGameFrame.asm 83790000 7FE3FB78 3D808000 618C55F8 7D8903A6 4E800421 -7C741B78 389B0007 -88BF000C 1CA50062 -7C842A14 1CB40031 -7F442A14 3C80804D -807A0000 90645F90 +7C741B78 2C140000 +41820010 8879056F +2C030000 418201D4 +389B0007 88BF000C +1CA50064 7C842A14 +1CB40032 7F442A14 807A0004 907F0620 807A0008 907F0624 807A000C 907F0638 @@ -184,58 +198,60 @@ C206B0DC 00000046 #Playback/Core/RestoreGameFrame.asm 807A0014 907F0650 807A0018 907F065C 8879056F 2C030000 -41820024 807A001C -907F00B0 807A0020 -907F00B4 807A0024 -907F002C 807A0028 -907F0010 3C608046 -6063B108 3C80804C -60841F78 88840001 -3884FFFF 2C040000 -40A00008 38840005 -1C840030 7C632214 -889F0618 1C84000C -7E832214 887A002C -98740002 8879056F -2C030000 4182004C -807A002D 2C03FFFF -41820040 90610040 -C0210040 C05F1830 -EC211028 C0429500 -FC011040 41820024 -7FE3FB78 C0210040 +41820030 3C80804D +807A0000 90645F90 +807A001C 907F00B0 +807A0020 907F00B4 +807A0024 907F002C +807A0028 907F0010 +3C608046 6063B108 +3C80804C 60841F78 +88840001 3884FFFF +2C040000 40A00008 +38840005 1C840030 +7C632214 889F0618 +1C84000C 7E832214 +887A002C 98740002 +887A002D 98740003 +8879056F 2C030000 +4182004C 807A002E +2C03FFFF 41820040 +90610040 C0210040 C05F1830 EC211028 -3D808006 618CCC7C +C0429500 FC011040 +41820024 7FE3FB78 +C0210040 C05F1830 +EC211028 3D808006 +618CCC7C 7D8903A6 +4E800421 806DB654 +2C03FF85 408200AC +7FE3FB78 38800000 +C0228874 3D808007 +618C592C 7D8903A6 +4E800421 807F00B0 +907F06F4 907F070C +807F00B4 907F06F8 +907F0710 807F00B8 +907F06FC 907F0714 +C03F00B4 D03F2344 +806DAE0C 907F0728 +887F000C 889F221F +5484EFFE 38BF00B0 +3D808003 618C2828 7D8903A6 4E800421 -806DB654 2C03FF85 -408200AC 7FE3FB78 -38800000 C0228874 -3D808007 618C592C +7FC3F378 3D808007 +618C61C8 7D8903A6 +4E800421 807F0890 +C0230040 D023002C +C0230044 D0230030 +3D808002 618CF3AC 7D8903A6 4E800421 -807F00B0 907F06F4 -907F070C 807F00B4 -907F06F8 907F0710 -807F00B8 907F06FC -907F0714 C03F00B4 -D03F2344 806DAE0C -907F0728 887F000C -889F221F 5484EFFE -38BF00B0 3D808003 -618C2828 7D8903A6 -4E800421 7FC3F378 -3D808007 618C61C8 -7D8903A6 4E800421 -807F0890 C0230040 -D023002C C0230044 -D0230030 3D808002 -618CF3AC 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 -7C0803A6 881F2219 -60000000 00000000 +BA8100B0 800100E4 +382100E0 7C0803A6 +881F2219 00000000 C216E74C 0000009E #Playback/Core/RestoreGameInfo.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 386005EC 3D808037 618CF1E4 7D8903A6 4E800421 7C7C1B78 @@ -335,8 +351,8 @@ C216E74C 0000009E #Playback/Core/RestoreGameInfo.asm 9066000C 4E800020 4E800021 2C050000 41820108 7C0802A6 -90010004 9421FF50 -BE810008 7C9E2378 +90010004 9421FF20 +BE8100B0 7C9E2378 7CBB2B78 80BE0000 54A501FE 64BD8000 834DB64C 833A0014 @@ -365,8 +381,8 @@ BE810008 7C9E2378 7FA3EB78 7F64DB78 3D808032 618C8F50 7D8903A6 4E800421 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 38600000 809C0014 90640000 7FA3EB78 809E021D @@ -381,15 +397,15 @@ BA810008 800100B4 7D8903A6 4E800421 4800004C 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 806DB64C 83A30000 887D0002 2C030000 41820010 807D0003 3C80804D 90645F90 -BA810008 800100B4 -382100B0 7C0803A6 -4E800020 BA810008 -800100B4 382100B0 +BA8100B0 800100E4 +382100E0 7C0803A6 +4E800020 BA8100B0 +800100E4 382100E0 7C0803A6 3C608017 60000000 00000000 C216D304 00000009 #Playback/Core/RestoreLRAStart.asm @@ -443,8 +459,8 @@ C21A501C 0000002A #Playback/Core/FastForward/FastForward.asm 7D8903A6 4E800421 4800000D 2C0300FF 480000A8 7C0802A6 -90010004 9421FF50 -BE810008 3D808003 +90010004 9421FF20 +BE8100B0 3D808003 618C0A50 7D8903A6 4E800421 3D808002 618CA4AC 7D8903A6 @@ -460,8 +476,8 @@ BE810008 3D808003 3D808008 618C6A8C 7D8903A6 4E800421 82940008 2C140000 -4082FFD4 BA810008 -800100B4 382100B0 +4082FFD4 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C2377544 00000002 #Playback/Core/FastForward/IncrementPadIndex.asm @@ -488,8 +504,8 @@ C21A6348 000000AB #Playback/Core/Scene/SceneThink_Playback.asm 618CFD54 7D8903A6 4E800421 480004F0 4E800021 7C0802A6 -90010004 9421FF50 -BE810008 48000461 +90010004 9421FF20 +BE8100B0 48000461 7FC802A6 38600000 3880FFFF 3D80803A 618C6754 7D8903A6 @@ -642,8 +658,8 @@ C33E0000 00000000 2E2E0000 2E2E2E00 4E800021 736C6970 70692E67 67000000 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 4E800020 3D80801A 618C6368 7D8903A6 4E800420 807F0000 @@ -655,7 +671,7 @@ C238D224 00000015 #Playback/Core/Sounds/AssignSoundInstanceId.asm 80639D30 5463443E 2C03010E 40820090 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 83EDB64C 3BDF001C 8B9E0000 3C608048 80639D60 809F056B @@ -669,8 +685,8 @@ C238D224 00000015 #Playback/Core/Sounds/AssignSoundInstanceId.asm 88660000 3863FFFF 1C630006 38A60001 7CA51A14 807D000C -90650002 BA810008 -800100B4 382100B0 +90650002 BA8100B0 +800100E4 382100E0 7C0803A6 00000000 C21A5014 00000032 #Playback/Core/Sounds/HandleFrameSoundLog.asm 41A20014 3D80801A @@ -679,7 +695,7 @@ C21A5014 00000032 #Playback/Core/Sounds/HandleFrameSoundLog.asm 80639D30 5463443E 2C03010E 40820168 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3D808034 618C7364 7D8903A6 4E800421 7C7D1B78 83EDB64C @@ -699,7 +715,7 @@ A0630001 1C870006 7C862214 A0840001 7C032000 41820030 38E70001 88660000 -2C070003 4180FFD4 +7C071800 4180FFD4 1C790006 7C651A14 80630003 3D808002 618C36B8 7D8903A6 @@ -720,15 +736,15 @@ A0630001 1C870006 3B9CFFF9 9B9E0000 7FA3EB78 3D808034 618C738C 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 00000000 C2088224 0000001D #Playback/Core/Sounds/NoDestroyVoice.asm 3C608048 80639D30 5463443E 2C03010E 408200CC 7C0802A6 -90010004 9421FF50 -BE810008 83EDB64C +90010004 9421FF20 +BE8100B0 83EDB64C 3BBF001C 57DE043E 8B9D0000 3C608048 80639D60 809F056B @@ -745,20 +761,20 @@ BE810008 83EDB64C 7C1E1800 41820018 39080001 88660000 7C081800 4180FFDC -48000024 BA810008 -800100B4 382100B0 +48000024 BA8100B0 +800100E4 382100E0 7C0803A6 3D808008 618C8244 7D8903A6 -4E800420 BA810008 -800100B4 382100B0 +4E800420 BA8100B0 +800100E4 382100E0 7C0803A6 387F0000 60000000 00000000 C20882B0 0000001D #Playback/Core/Sounds/NoDestroyVoice2.asm 3C608048 80639D30 5463443E 2C03010E 408200CC 7C0802A6 -90010004 9421FF50 -BE810008 83EDB64C +90010004 9421FF20 +BE8100B0 83EDB64C 3BBF001C 57DE043E 8B9D0000 3C608048 80639D60 809F056B @@ -775,20 +791,20 @@ BE810008 83EDB64C 7C1E1800 41820018 39080001 88660000 7C081800 4180FFDC -48000024 BA810008 -800100B4 382100B0 +48000024 BA8100B0 +800100E4 382100E0 7C0803A6 3D808008 618C82D0 7D8903A6 -4E800420 BA810008 -800100B4 382100B0 +4E800420 BA8100B0 +800100E4 382100E0 7C0803A6 387F0000 60000000 00000000 C238D0B0 00000027 #Playback/Core/Sounds/PreventDuplicateSounds.asm 3C608048 80639D30 5463443E 2C03010E 40820120 7C0802A6 -90010004 9421FF50 -BE810008 83EDB64C +90010004 9421FF20 +BE8100B0 83EDB64C 3BDF001C 3BA00000 3B400000 56FB043E 8B9E0000 3C608048 @@ -816,19 +832,22 @@ B3650000 93450002 88660000 38630001 98660000 2C1D0000 41820028 7F43D378 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 3D808038 618CD2A0 7D8903A6 4E800420 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 2C1A0000 00000000 -C200569C 00000002 #Common/GetFighterNum.asm -38600021 4E800020 -60000000 00000000 +C216E8C8 00000005 #Playback/Core/Stadium/Enable Home Run Contest Distance.asm +3D808046 618CDB77 +898C0000 2C0C0054 +4182000C 819F0044 +4800000C 3D808018 +618C1998 00000000 C20055F8 0000000F #Common/GetIsFollower.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7E1B78 3BE00000 887E221F 5460EFFF 41820038 887E000C @@ -838,18 +857,10 @@ C20055F8 0000000F #Common/GetIsFollower.asm 1C030003 7C640214 88030002 2C000000 40820008 3BE00001 -7FE3FB78 BA810008 -800100B4 382100B0 +7FE3FB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 -C20056A0 00000007 #Common/GetSSMIndex.asm -2C030001 41820018 -3C60803B 6063B3C0 -1C840010 7C6320AE -48000018 3C60803B -6063B6B0 1C840003 -7C6320AE 48000004 -4E800020 00000000 C216D294 00000006 #Common/IncrementFrameIndex.asm 987F0008 3C608048 80639D58 2C030000 @@ -857,154 +868,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 -C20056A8 00000005 #Common/RequestSSMLoad.asm -2C030037 41820018 -3D808043 618C37C4 -38800001 1C630004 -7C83612E 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 @@ -1035,6 +898,23 @@ C209E090 00000011 #Common/FastForward/DynamicsFix.asm 8001001C 38210018 7C0803A6 4E800020 BB010028 00000000 +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 $Optional: Show Player Names [Fizzi, UnclePunch, Enzyme, jmlee337] *Show players' Slippi Online display names as HUD elements when available @@ -1048,16 +928,16 @@ C1C07AE1 3C6F34D7 43160000 3F0A3D71 00000000 4E800021 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7F1B78 880DB6CC 2C000001 41820018 7FE3FB78 3D808039 618C10D8 7D8903A6 -4E800421 BA810008 -800100B4 382100B0 +4E800421 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 3C60804D 60636D5C 80630000 3C80803F 608494D0 3D808038 @@ -1190,8 +1070,8 @@ C8210080 EC211028 C05C0014 EC2100B2 D036002C 3A940001 2C140006 4180FCD8 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 8001001C 00000000 $Optional: Game Music OFF [UnclePunch] @@ -1224,6 +1104,8 @@ C0030000 4800000C 4E800021 40DC7AE1 60000000 00000000 044DDB84 3E89FEFA #External/Widescreen/Nametag Fixes/Adjust Nametag Text X Scale.asm +043761EC 4800001C #Normal Lag Reduction [Hannes Mann] +04376238 48000018 $Optional: Disable Screen Shake [Achilles1515] *Disables all screen shaking