diff --git a/Data/PlaybackGeckoCodes/GALE01r2.ini b/Data/PlaybackGeckoCodes/GALE01r2.ini index fa37357852..bad30343dd 100644 --- a/Data/PlaybackGeckoCodes/GALE01r2.ini +++ b/Data/PlaybackGeckoCodes/GALE01r2.ini @@ -846,6 +846,11 @@ C216E8C8 00000005 #Playback/Core/Stadium/Enable Home Run Contest Distance.asm 4182000C 819F0044 4800000C 3D808018 618C1998 00000000 +C21A4CB4 00000004 #Common/AllocBuffer.asm +38600080 3D808037 +618CF1E4 7D8903A6 +4E800421 906DAFC4 +38000000 00000000 C20055F8 0000000F #Common/GetIsFollower.asm 7C0802A6 90010004 9421FF20 BE8100B0 diff --git a/Data/PlaybackGeckoCodes/GALJ01r2.ini b/Data/PlaybackGeckoCodes/GALJ01r2.ini index 335d5ef74c..d3d3f783a5 100644 --- a/Data/PlaybackGeckoCodes/GALJ01r2.ini +++ b/Data/PlaybackGeckoCodes/GALJ01r2.ini @@ -845,6 +845,11 @@ C216E8C8 00000005 #Playback/Core/Stadium/Enable Home Run Contest Distance.asm 4182000C 819F0044 4800000C 3D808018 618C1998 00000000 +C21A4CB4 00000004 #Common/AllocBuffer.asm +38600080 3D808037 +618CF1E4 7D8903A6 +4E800421 906DAFC4 +38000000 00000000 C20055F8 0000000F #Common/GetIsFollower.asm 7C0802A6 90010004 9421FF20 BE8100B0 diff --git a/Data/Sys/GameSettings/GALE01r2.ini b/Data/Sys/GameSettings/GALE01r2.ini index d377db37bc..62972ab173 100644 --- a/Data/Sys/GameSettings/GALE01r2.ini +++ b/Data/Sys/GameSettings/GALE01r2.ini @@ -635,19 +635,19 @@ C216D884 00000030 #Recording/SendGameEnd.asm BA8100B0 800100E4 382100E0 7C0803A6 819F2514 00000000 -C216E74C 00000109 #Recording/SendGameInfo.asm +C216E74C 0000010A #Recording/SendGameInfo.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 4182080C +2C030000 41820814 38600005 3D808037 618CF1E4 7D8903A6 4E800421 7C7B1B78 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600732 3D808037 +38600770 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -663,13 +663,13 @@ C216E74C 00000109 #Recording/SendGameInfo.asm B07E0003 38600037 987E0005 38600040 B07E0006 38600038 -987E0008 38600050 +987E0008 38600054 B07E0009 38600039 987E000B 38600006 B07E000C 3860003A 987E000E 3860000C B07E000F 3860003B -987E0011 3860002A +987E0011 3860002C B07E0012 3860003C 987E0014 38600008 B07E0015 3860003D @@ -677,7 +677,7 @@ B07E0015 3860003D 38600010 987E001A 38600204 B07E001B 38600036 987E001D -3C60030F 60630000 +3C600310 60630000 907E001E 387E0022 7FE4FB78 38A00138 3D808000 618C31F4 @@ -861,16 +861,16 @@ BA8100B0 800100E4 48000021 7C8802A6 38A0000F 3D808038 618CFD54 7D8903A6 -4E800421 48000124 +4E800421 4800012C 4E800021 7C0802A6 90010004 9421FF20 BE8100B0 806DB64C 83E30000 83CDB650 7FFFF214 3B600000 806DC18C 83A30024 -2C1D0000 418200D8 +2C1D0000 418200E0 3B7B0001 2C1B000F -418100CC 839D002C +418100D4 839D002C 3860003B 987F0000 806DB654 907F0001 807C0010 B07F0005 @@ -892,23 +892,24 @@ BE8100B0 806DB64C 2C030000 4182000C 8863000C 48000008 3860FFFF 987F002A -83CDB650 3BDE002B -93CDB650 3BFF002B +A07C0DA8 B07F002B +83CDB650 3BDE002D +93CDB650 3BFF002D 83BD0008 2C1D0000 -4082FF30 BA8100B0 +4082FF28 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 BA8100B0 800100E4 382100E0 7C0803A6 3C608017 00000000 -C206DA34 00000036 #Recording/SendGamePostFrame.asm +C206DA34 00000038 #Recording/SendGamePostFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820170 +2C030000 41820180 887F221F 546306F7 -40820164 8B7F000C +40820174 8B7F000C 806DB64C 83A30000 838DB650 7FBDE214 38600038 987D0000 @@ -951,7 +952,9 @@ B07D0030 887F1968 807F00EC 907D0045 807F195C 907D0049 807F0014 907D004D -838DB650 3B9C0051 +A07F18EC B07D0051 +A07F2088 B07D0053 +838DB650 3B9C0055 938DB650 BA8100B0 800100E4 382100E0 7C0803A6 8001001C @@ -3116,7 +3119,7 @@ C22600A8 0000000B #Online/Menus/CSS/PreventColorChange.asm 618C028C 7D8903A6 4E800420 3C60803F 60000000 00000000 -C226699C 00000029 #Online/Menus/CSS/SceneLoadCSS.asm +C226699C 00000028 #Online/Menus/CSS/SceneLoadCSS.asm 4800002C 4E800021 C2E00000 41A00000 00000000 3DCCCCCD @@ -3125,7 +3128,7 @@ C2E00000 41A00000 53000000 900DB638 3C608048 80639D30 5463443E 2C030008 -40820100 7C0802A6 +408200F8 7C0802A6 90010004 9421FF20 BE8100B0 4BFFFFB1 7FC802A6 3D808000 @@ -3143,11 +3146,10 @@ BE8100B0 4BFFFFB1 3D808037 618CF1E4 7D8903A6 4E800421 907F0000 886DAFA0 -2C030003 40820030 +2C030003 40820028 3C608026 606352F4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 88630008 987F001A 387E0010 3D808001 618C6BE0 @@ -3158,7 +3160,7 @@ BE8100B0 4BFFFFB1 BA8100B0 800100E4 382100E0 7C0803A6 60000000 00000000 -C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm +C2264118 0000001B #Online/Menus/CSS/SkipReturnToCssSound.asm 7C0802A6 90010004 9421FF00 BC610008 886DAFA3 2C030000 @@ -3168,12 +3170,11 @@ C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm 8BC30001 3D808037 618CF1B0 7D8903A6 4E800421 2C1E0000 -40820060 4800007C +40820058 48000074 38600000 986DAFA3 3C608023 6063CCA4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 83E3000C 807F0006 3D808037 618CF1B0 7D8903A6 @@ -3586,16 +3587,15 @@ BA8100B0 800100E4 7D8903A6 4E800420 60000000 00000000 0423CF9C 2C1B0008 #Online/Menus/CSS/TextEntryScreen/Display8Characters.asm -C223CF80 0000000E #Online/Menus/CSS/TextEntryScreen/HandleAutocompleteText.asm +C223CF80 0000000D #Online/Menus/CSS/TextEntryScreen/HandleAutocompleteText.asm 48000010 4E800021 00000000 8E9196FF 88CDAFA3 2C060000 -4182004C 4BFFFFE9 +41820044 4BFFFFE9 7CC802A6 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7CE32214 +5485302E 38800040 +7C8523D6 7CE32214 80E7000C 88E70004 7C1B3800 4180000C 3BA60004 48000008 @@ -3609,16 +3609,15 @@ C223B3D0 00000006 #Online/Menus/CSS/TextEntryScreen/HandleDescriptionText.asm 48000008 7FE4FB78 60000000 00000000 0423C6C0 4800004C #Online/Menus/CSS/TextEntryScreen/HandleJpSpace.asm -C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm +C223E994 00000026 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 886DAFA3 2C030000 -41820128 38600001 +41820120 38600001 986DAFCB 48000004 7C0802A6 90010004 9421FF20 BE8100B0 3C608023 6063CCA4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7F232214 3860000A 3D808037 618CF1E4 7D8903A6 4E800421 @@ -3649,26 +3648,24 @@ C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 800100E4 382100E0 7C0803A6 48000004 38600000 00000000 -C223C588 0000000C #Online/Menus/CSS/TextEntryScreen/NameEntryThinkOneShot.asm +C223C588 0000000B #Online/Menus/CSS/TextEntryScreen/NameEntryThinkOneShot.asm 886DAFA3 2C030000 -41820050 3C608023 +41820048 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7CC32214 +5485302E 38800040 +7C8523D6 7CC32214 80E6000C 88670005 2C030000 4082001C 38600001 98670005 38660008 7C6903A6 38600003 4E800421 886DB56C 00000000 -C223CD74 00000011 #Online/Menus/CSS/TextEntryScreen/OnBPressAutoComplete.asm +C223CD74 00000010 #Online/Menus/CSS/TextEntryScreen/OnBPressAutoComplete.asm 886DAFA3 2C030000 -41820074 3C608023 +4182006C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050000 40810030 38A5FFFF 98A40004 @@ -3684,15 +3681,14 @@ C223CA50 00000003 #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonAPress.asm 3D808023 618CCC14 7D8903A6 4E800420 60000000 00000000 -C223CC14 0000001D #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonHandler.asm +C223CC14 0000001C #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonHandler.asm 886DAFA3 2C030000 -418200D8 7C0802A6 +418200D0 7C0802A6 90010004 9421FF20 BE8100B0 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 83E3000C 887F0004 2C030000 40820038 38600003 3D808002 @@ -3714,13 +3710,12 @@ BA8100B0 800100E4 3D808023 618CCC80 7D8903A6 4E800420 38000000 00000000 -C223C33C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm +C223C33C 0000000D #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm 886DAFA3 2C030000 -41820054 3C608023 +4182004C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050008 4080000C 38A50001 98A40004 @@ -3729,13 +3724,12 @@ C223C33C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm 48000014 3D808023 618CCE4C 7D8903A6 4E800421 00000000 -C223C72C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterText.asm +C223C72C 0000000D #Online/Menus/CSS/TextEntryScreen/OnEnterText.asm 886DAFA3 2C030000 -41820054 3C608023 +4182004C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050008 4080000C 38A50001 98A40004 @@ -3748,37 +3742,34 @@ C223C81C 00000003 #Online/Menus/CSS/TextEntryScreen/OnErasePress.asm 3D808023 618CCD3C 7D8903A6 4E800420 60000000 00000000 -C223CCBC 0000000B #Online/Menus/CSS/TextEntryScreen/OnLPress.asm +C223CCBC 0000000A #Online/Menus/CSS/TextEntryScreen/OnLPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 38630008 7C6903A6 38600001 4E800421 3D808023 618CCE38 7D8903A6 4E800420 887C0050 00000000 -C223CCE0 0000000B #Online/Menus/CSS/TextEntryScreen/OnRPress.asm +C223CCE0 0000000A #Online/Menus/CSS/TextEntryScreen/OnRPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 38630008 7C6903A6 38600002 4E800421 3D808023 618CCE38 7D8903A6 4E800420 887C0050 00000000 -C223C928 0000000D #Online/Menus/CSS/TextEntryScreen/OnRandomPress.asm +C223C928 0000000C #Online/Menus/CSS/TextEntryScreen/OnRandomPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 9BA40004 9BBC0058 38830008 7C8903A6 38600003 @@ -6652,25 +6643,24 @@ $Recommended: Normal Lag Reduction [Hannes Mann] $Recommended: Apply Delay to all In-Game Scenes [Fizzi] *Applies online delay to all in-game scenes. *Dolphin netplay is no longer necessary for local practice -C2376A24 00000027 #Common/UseInGameDelay/ApplyInGameDelay.asm +C2376A24 00000026 #Common/UseInGameDelay/ApplyInGameDelay.asm 3D808034 618CDA00 7D8903A6 4E800421 3D808000 618C561C 7D8903A6 4E800421 2C030002 41820014 2C030003 4182000C -2C030004 408200FC +2C030004 408200F4 3C608048 88639D30 -2C030008 418200EC +2C030008 418200E4 3C608047 60639D64 80630000 2C030000 -408200D8 7C0802A6 +408200D0 7C0802A6 90010004 9421FF20 BE8100B0 83A10000 3C60802F 6063666C -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 83E30008 887F0000 2C030000 40810080 38610008 diff --git a/Data/Sys/GameSettings/GALJ01r2.ini b/Data/Sys/GameSettings/GALJ01r2.ini index 7cfef3f365..d4f4dfa299 100644 --- a/Data/Sys/GameSettings/GALJ01r2.ini +++ b/Data/Sys/GameSettings/GALJ01r2.ini @@ -634,19 +634,19 @@ C216D884 00000030 #Recording/SendGameEnd.asm BA8100B0 800100E4 382100E0 7C0803A6 819F2514 00000000 -C216E74C 00000109 #Recording/SendGameInfo.asm +C216E74C 0000010A #Recording/SendGameInfo.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 4182080C +2C030000 41820814 38600005 3D808037 618CF1E4 7D8903A6 4E800421 7C7B1B78 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600732 3D808037 +38600770 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -662,13 +662,13 @@ C216E74C 00000109 #Recording/SendGameInfo.asm B07E0003 38600037 987E0005 38600040 B07E0006 38600038 -987E0008 38600050 +987E0008 38600054 B07E0009 38600039 987E000B 38600006 B07E000C 3860003A 987E000E 3860000C B07E000F 3860003B -987E0011 3860002A +987E0011 3860002C B07E0012 3860003C 987E0014 38600008 B07E0015 3860003D @@ -676,7 +676,7 @@ B07E0015 3860003D 38600010 987E001A 38600204 B07E001B 38600036 987E001D -3C60030F 60630000 +3C600310 60630000 907E001E 387E0022 7FE4FB78 38A00138 3D808000 618C31F4 @@ -860,16 +860,16 @@ BA8100B0 800100E4 48000021 7C8802A6 38A0000F 3D808038 618CFD54 7D8903A6 -4E800421 48000124 +4E800421 4800012C 4E800021 7C0802A6 90010004 9421FF20 BE8100B0 806DB64C 83E30000 83CDB650 7FFFF214 3B600000 806DC18C 83A30024 -2C1D0000 418200D8 +2C1D0000 418200E0 3B7B0001 2C1B000F -418100CC 839D002C +418100D4 839D002C 3860003B 987F0000 806DB654 907F0001 807C0010 B07F0005 @@ -891,23 +891,24 @@ BE8100B0 806DB64C 2C030000 4182000C 8863000C 48000008 3860FFFF 987F002A -83CDB650 3BDE002B -93CDB650 3BFF002B +A07C0DA8 B07F002B +83CDB650 3BDE002D +93CDB650 3BFF002D 83BD0008 2C1D0000 -4082FF30 BA8100B0 +4082FF28 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 BA8100B0 800100E4 382100E0 7C0803A6 3C608017 00000000 -C206DA34 00000036 #Recording/SendGamePostFrame.asm +C206DA34 00000038 #Recording/SendGamePostFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820170 +2C030000 41820180 887F221F 546306F7 -40820164 8B7F000C +40820174 8B7F000C 806DB64C 83A30000 838DB650 7FBDE214 38600038 987D0000 @@ -950,7 +951,9 @@ B07D0030 887F1968 807F00EC 907D0045 807F195C 907D0049 807F0014 907D004D -838DB650 3B9C0051 +A07F18EC B07D0051 +A07F2088 B07D0053 +838DB650 3B9C0055 938DB650 BA8100B0 800100E4 382100E0 7C0803A6 8001001C @@ -3115,7 +3118,7 @@ C22600A8 0000000B #Online/Menus/CSS/PreventColorChange.asm 618C028C 7D8903A6 4E800420 3C60803F 60000000 00000000 -C226699C 00000029 #Online/Menus/CSS/SceneLoadCSS.asm +C226699C 00000028 #Online/Menus/CSS/SceneLoadCSS.asm 4800002C 4E800021 C2E00000 41A00000 00000000 3DCCCCCD @@ -3124,7 +3127,7 @@ C2E00000 41A00000 53000000 900DB638 3C608048 80639D30 5463443E 2C030008 -40820100 7C0802A6 +408200F8 7C0802A6 90010004 9421FF20 BE8100B0 4BFFFFB1 7FC802A6 3D808000 @@ -3142,11 +3145,10 @@ BE8100B0 4BFFFFB1 3D808037 618CF1E4 7D8903A6 4E800421 907F0000 886DAFA0 -2C030003 40820030 +2C030003 40820028 3C608026 606352F4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 88630008 987F001A 387E0010 3D808001 618C6BE0 @@ -3157,7 +3159,7 @@ BE8100B0 4BFFFFB1 BA8100B0 800100E4 382100E0 7C0803A6 60000000 00000000 -C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm +C2264118 0000001B #Online/Menus/CSS/SkipReturnToCssSound.asm 7C0802A6 90010004 9421FF00 BC610008 886DAFA3 2C030000 @@ -3167,12 +3169,11 @@ C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm 8BC30001 3D808037 618CF1B0 7D8903A6 4E800421 2C1E0000 -40820060 4800007C +40820058 48000074 38600000 986DAFA3 3C608023 6063CCA4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 83E3000C 807F0006 3D808037 618CF1B0 7D8903A6 @@ -3585,16 +3586,15 @@ BA8100B0 800100E4 7D8903A6 4E800420 60000000 00000000 0423CF9C 2C1B0008 #Online/Menus/CSS/TextEntryScreen/Display8Characters.asm -C223CF80 0000000E #Online/Menus/CSS/TextEntryScreen/HandleAutocompleteText.asm +C223CF80 0000000D #Online/Menus/CSS/TextEntryScreen/HandleAutocompleteText.asm 48000010 4E800021 00000000 8E9196FF 88CDAFA3 2C060000 -4182004C 4BFFFFE9 +41820044 4BFFFFE9 7CC802A6 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7CE32214 +5485302E 38800040 +7C8523D6 7CE32214 80E7000C 88E70004 7C1B3800 4180000C 3BA60004 48000008 @@ -3608,16 +3608,15 @@ C223B3D0 00000006 #Online/Menus/CSS/TextEntryScreen/HandleDescriptionText.asm 48000008 7FE4FB78 60000000 00000000 0423C6C0 4800004C #Online/Menus/CSS/TextEntryScreen/HandleJpSpace.asm -C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm +C223E994 00000026 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 886DAFA3 2C030000 -41820128 38600001 +41820120 38600001 986DAFCB 48000004 7C0802A6 90010004 9421FF20 BE8100B0 3C608023 6063CCA4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7F232214 3860000A 3D808037 618CF1E4 7D8903A6 4E800421 @@ -3648,26 +3647,24 @@ C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 800100E4 382100E0 7C0803A6 48000004 38600000 00000000 -C223C588 0000000C #Online/Menus/CSS/TextEntryScreen/NameEntryThinkOneShot.asm +C223C588 0000000B #Online/Menus/CSS/TextEntryScreen/NameEntryThinkOneShot.asm 886DAFA3 2C030000 -41820050 3C608023 +41820048 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7CC32214 +5485302E 38800040 +7C8523D6 7CC32214 80E6000C 88670005 2C030000 4082001C 38600001 98670005 38660008 7C6903A6 38600003 4E800421 886DB56C 00000000 -C223CD74 00000011 #Online/Menus/CSS/TextEntryScreen/OnBPressAutoComplete.asm +C223CD74 00000010 #Online/Menus/CSS/TextEntryScreen/OnBPressAutoComplete.asm 886DAFA3 2C030000 -41820074 3C608023 +4182006C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050000 40810030 38A5FFFF 98A40004 @@ -3683,15 +3680,14 @@ C223CA50 00000003 #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonAPress.asm 3D808023 618CCC14 7D8903A6 4E800420 60000000 00000000 -C223CC14 0000001D #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonHandler.asm +C223CC14 0000001C #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonHandler.asm 886DAFA3 2C030000 -418200D8 7C0802A6 +418200D0 7C0802A6 90010004 9421FF20 BE8100B0 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 83E3000C 887F0004 2C030000 40820038 38600003 3D808002 @@ -3713,13 +3709,12 @@ BA8100B0 800100E4 3D808023 618CCC80 7D8903A6 4E800420 38000000 00000000 -C223C33C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm +C223C33C 0000000D #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm 886DAFA3 2C030000 -41820054 3C608023 +4182004C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050008 4080000C 38A50001 98A40004 @@ -3728,13 +3723,12 @@ C223C33C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm 48000014 3D808023 618CCE4C 7D8903A6 4E800421 00000000 -C223C72C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterText.asm +C223C72C 0000000D #Online/Menus/CSS/TextEntryScreen/OnEnterText.asm 886DAFA3 2C030000 -41820054 3C608023 +4182004C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050008 4080000C 38A50001 98A40004 @@ -3747,37 +3741,34 @@ C223C81C 00000003 #Online/Menus/CSS/TextEntryScreen/OnErasePress.asm 3D808023 618CCD3C 7D8903A6 4E800420 60000000 00000000 -C223CCBC 0000000B #Online/Menus/CSS/TextEntryScreen/OnLPress.asm +C223CCBC 0000000A #Online/Menus/CSS/TextEntryScreen/OnLPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 38630008 7C6903A6 38600001 4E800421 3D808023 618CCE38 7D8903A6 4E800420 887C0050 00000000 -C223CCE0 0000000B #Online/Menus/CSS/TextEntryScreen/OnRPress.asm +C223CCE0 0000000A #Online/Menus/CSS/TextEntryScreen/OnRPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 38630008 7C6903A6 38600002 4E800421 3D808023 618CCE38 7D8903A6 4E800420 887C0050 00000000 -C223C928 0000000D #Online/Menus/CSS/TextEntryScreen/OnRandomPress.asm +C223C928 0000000C #Online/Menus/CSS/TextEntryScreen/OnRandomPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 9BA40004 9BBC0058 38830008 7C8903A6 38600003 @@ -6651,25 +6642,24 @@ $Recommended: Normal Lag Reduction [Hannes Mann] $Recommended: Apply Delay to all In-Game Scenes [Fizzi] *Applies online delay to all in-game scenes. *Dolphin netplay is no longer necessary for local practice -C2376A24 00000027 #Common/UseInGameDelay/ApplyInGameDelay.asm +C2376A24 00000026 #Common/UseInGameDelay/ApplyInGameDelay.asm 3D808034 618CDA00 7D8903A6 4E800421 3D808000 618C561C 7D8903A6 4E800421 2C030002 41820014 2C030003 4182000C -2C030004 408200FC +2C030004 408200F4 3C608048 88639D30 -2C030008 418200EC +2C030008 418200E4 3C608047 60639D64 80630000 2C030000 -408200D8 7C0802A6 +408200D0 7C0802A6 90010004 9421FF20 BE8100B0 83A10000 3C60802F 6063666C -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 83E30008 887F0000 2C030000 40810080 38610008 diff --git a/Data/Sys/GameSettings/Netplay/GALE01r2.ini b/Data/Sys/GameSettings/Netplay/GALE01r2.ini index d377db37bc..62972ab173 100644 --- a/Data/Sys/GameSettings/Netplay/GALE01r2.ini +++ b/Data/Sys/GameSettings/Netplay/GALE01r2.ini @@ -635,19 +635,19 @@ C216D884 00000030 #Recording/SendGameEnd.asm BA8100B0 800100E4 382100E0 7C0803A6 819F2514 00000000 -C216E74C 00000109 #Recording/SendGameInfo.asm +C216E74C 0000010A #Recording/SendGameInfo.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 4182080C +2C030000 41820814 38600005 3D808037 618CF1E4 7D8903A6 4E800421 7C7B1B78 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600732 3D808037 +38600770 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -663,13 +663,13 @@ C216E74C 00000109 #Recording/SendGameInfo.asm B07E0003 38600037 987E0005 38600040 B07E0006 38600038 -987E0008 38600050 +987E0008 38600054 B07E0009 38600039 987E000B 38600006 B07E000C 3860003A 987E000E 3860000C B07E000F 3860003B -987E0011 3860002A +987E0011 3860002C B07E0012 3860003C 987E0014 38600008 B07E0015 3860003D @@ -677,7 +677,7 @@ B07E0015 3860003D 38600010 987E001A 38600204 B07E001B 38600036 987E001D -3C60030F 60630000 +3C600310 60630000 907E001E 387E0022 7FE4FB78 38A00138 3D808000 618C31F4 @@ -861,16 +861,16 @@ BA8100B0 800100E4 48000021 7C8802A6 38A0000F 3D808038 618CFD54 7D8903A6 -4E800421 48000124 +4E800421 4800012C 4E800021 7C0802A6 90010004 9421FF20 BE8100B0 806DB64C 83E30000 83CDB650 7FFFF214 3B600000 806DC18C 83A30024 -2C1D0000 418200D8 +2C1D0000 418200E0 3B7B0001 2C1B000F -418100CC 839D002C +418100D4 839D002C 3860003B 987F0000 806DB654 907F0001 807C0010 B07F0005 @@ -892,23 +892,24 @@ BE8100B0 806DB64C 2C030000 4182000C 8863000C 48000008 3860FFFF 987F002A -83CDB650 3BDE002B -93CDB650 3BFF002B +A07C0DA8 B07F002B +83CDB650 3BDE002D +93CDB650 3BFF002D 83BD0008 2C1D0000 -4082FF30 BA8100B0 +4082FF28 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 BA8100B0 800100E4 382100E0 7C0803A6 3C608017 00000000 -C206DA34 00000036 #Recording/SendGamePostFrame.asm +C206DA34 00000038 #Recording/SendGamePostFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820170 +2C030000 41820180 887F221F 546306F7 -40820164 8B7F000C +40820174 8B7F000C 806DB64C 83A30000 838DB650 7FBDE214 38600038 987D0000 @@ -951,7 +952,9 @@ B07D0030 887F1968 807F00EC 907D0045 807F195C 907D0049 807F0014 907D004D -838DB650 3B9C0051 +A07F18EC B07D0051 +A07F2088 B07D0053 +838DB650 3B9C0055 938DB650 BA8100B0 800100E4 382100E0 7C0803A6 8001001C @@ -3116,7 +3119,7 @@ C22600A8 0000000B #Online/Menus/CSS/PreventColorChange.asm 618C028C 7D8903A6 4E800420 3C60803F 60000000 00000000 -C226699C 00000029 #Online/Menus/CSS/SceneLoadCSS.asm +C226699C 00000028 #Online/Menus/CSS/SceneLoadCSS.asm 4800002C 4E800021 C2E00000 41A00000 00000000 3DCCCCCD @@ -3125,7 +3128,7 @@ C2E00000 41A00000 53000000 900DB638 3C608048 80639D30 5463443E 2C030008 -40820100 7C0802A6 +408200F8 7C0802A6 90010004 9421FF20 BE8100B0 4BFFFFB1 7FC802A6 3D808000 @@ -3143,11 +3146,10 @@ BE8100B0 4BFFFFB1 3D808037 618CF1E4 7D8903A6 4E800421 907F0000 886DAFA0 -2C030003 40820030 +2C030003 40820028 3C608026 606352F4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 88630008 987F001A 387E0010 3D808001 618C6BE0 @@ -3158,7 +3160,7 @@ BE8100B0 4BFFFFB1 BA8100B0 800100E4 382100E0 7C0803A6 60000000 00000000 -C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm +C2264118 0000001B #Online/Menus/CSS/SkipReturnToCssSound.asm 7C0802A6 90010004 9421FF00 BC610008 886DAFA3 2C030000 @@ -3168,12 +3170,11 @@ C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm 8BC30001 3D808037 618CF1B0 7D8903A6 4E800421 2C1E0000 -40820060 4800007C +40820058 48000074 38600000 986DAFA3 3C608023 6063CCA4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 83E3000C 807F0006 3D808037 618CF1B0 7D8903A6 @@ -3586,16 +3587,15 @@ BA8100B0 800100E4 7D8903A6 4E800420 60000000 00000000 0423CF9C 2C1B0008 #Online/Menus/CSS/TextEntryScreen/Display8Characters.asm -C223CF80 0000000E #Online/Menus/CSS/TextEntryScreen/HandleAutocompleteText.asm +C223CF80 0000000D #Online/Menus/CSS/TextEntryScreen/HandleAutocompleteText.asm 48000010 4E800021 00000000 8E9196FF 88CDAFA3 2C060000 -4182004C 4BFFFFE9 +41820044 4BFFFFE9 7CC802A6 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7CE32214 +5485302E 38800040 +7C8523D6 7CE32214 80E7000C 88E70004 7C1B3800 4180000C 3BA60004 48000008 @@ -3609,16 +3609,15 @@ C223B3D0 00000006 #Online/Menus/CSS/TextEntryScreen/HandleDescriptionText.asm 48000008 7FE4FB78 60000000 00000000 0423C6C0 4800004C #Online/Menus/CSS/TextEntryScreen/HandleJpSpace.asm -C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm +C223E994 00000026 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 886DAFA3 2C030000 -41820128 38600001 +41820120 38600001 986DAFCB 48000004 7C0802A6 90010004 9421FF20 BE8100B0 3C608023 6063CCA4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7F232214 3860000A 3D808037 618CF1E4 7D8903A6 4E800421 @@ -3649,26 +3648,24 @@ C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 800100E4 382100E0 7C0803A6 48000004 38600000 00000000 -C223C588 0000000C #Online/Menus/CSS/TextEntryScreen/NameEntryThinkOneShot.asm +C223C588 0000000B #Online/Menus/CSS/TextEntryScreen/NameEntryThinkOneShot.asm 886DAFA3 2C030000 -41820050 3C608023 +41820048 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7CC32214 +5485302E 38800040 +7C8523D6 7CC32214 80E6000C 88670005 2C030000 4082001C 38600001 98670005 38660008 7C6903A6 38600003 4E800421 886DB56C 00000000 -C223CD74 00000011 #Online/Menus/CSS/TextEntryScreen/OnBPressAutoComplete.asm +C223CD74 00000010 #Online/Menus/CSS/TextEntryScreen/OnBPressAutoComplete.asm 886DAFA3 2C030000 -41820074 3C608023 +4182006C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050000 40810030 38A5FFFF 98A40004 @@ -3684,15 +3681,14 @@ C223CA50 00000003 #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonAPress.asm 3D808023 618CCC14 7D8903A6 4E800420 60000000 00000000 -C223CC14 0000001D #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonHandler.asm +C223CC14 0000001C #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonHandler.asm 886DAFA3 2C030000 -418200D8 7C0802A6 +418200D0 7C0802A6 90010004 9421FF20 BE8100B0 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 83E3000C 887F0004 2C030000 40820038 38600003 3D808002 @@ -3714,13 +3710,12 @@ BA8100B0 800100E4 3D808023 618CCC80 7D8903A6 4E800420 38000000 00000000 -C223C33C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm +C223C33C 0000000D #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm 886DAFA3 2C030000 -41820054 3C608023 +4182004C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050008 4080000C 38A50001 98A40004 @@ -3729,13 +3724,12 @@ C223C33C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm 48000014 3D808023 618CCE4C 7D8903A6 4E800421 00000000 -C223C72C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterText.asm +C223C72C 0000000D #Online/Menus/CSS/TextEntryScreen/OnEnterText.asm 886DAFA3 2C030000 -41820054 3C608023 +4182004C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050008 4080000C 38A50001 98A40004 @@ -3748,37 +3742,34 @@ C223C81C 00000003 #Online/Menus/CSS/TextEntryScreen/OnErasePress.asm 3D808023 618CCD3C 7D8903A6 4E800420 60000000 00000000 -C223CCBC 0000000B #Online/Menus/CSS/TextEntryScreen/OnLPress.asm +C223CCBC 0000000A #Online/Menus/CSS/TextEntryScreen/OnLPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 38630008 7C6903A6 38600001 4E800421 3D808023 618CCE38 7D8903A6 4E800420 887C0050 00000000 -C223CCE0 0000000B #Online/Menus/CSS/TextEntryScreen/OnRPress.asm +C223CCE0 0000000A #Online/Menus/CSS/TextEntryScreen/OnRPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 38630008 7C6903A6 38600002 4E800421 3D808023 618CCE38 7D8903A6 4E800420 887C0050 00000000 -C223C928 0000000D #Online/Menus/CSS/TextEntryScreen/OnRandomPress.asm +C223C928 0000000C #Online/Menus/CSS/TextEntryScreen/OnRandomPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 9BA40004 9BBC0058 38830008 7C8903A6 38600003 @@ -6652,25 +6643,24 @@ $Recommended: Normal Lag Reduction [Hannes Mann] $Recommended: Apply Delay to all In-Game Scenes [Fizzi] *Applies online delay to all in-game scenes. *Dolphin netplay is no longer necessary for local practice -C2376A24 00000027 #Common/UseInGameDelay/ApplyInGameDelay.asm +C2376A24 00000026 #Common/UseInGameDelay/ApplyInGameDelay.asm 3D808034 618CDA00 7D8903A6 4E800421 3D808000 618C561C 7D8903A6 4E800421 2C030002 41820014 2C030003 4182000C -2C030004 408200FC +2C030004 408200F4 3C608048 88639D30 -2C030008 418200EC +2C030008 418200E4 3C608047 60639D64 80630000 2C030000 -408200D8 7C0802A6 +408200D0 7C0802A6 90010004 9421FF20 BE8100B0 83A10000 3C60802F 6063666C -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 83E30008 887F0000 2C030000 40810080 38610008 diff --git a/Data/Sys/GameSettings/Netplay/GALJ01r2.ini b/Data/Sys/GameSettings/Netplay/GALJ01r2.ini index 7cfef3f365..d4f4dfa299 100644 --- a/Data/Sys/GameSettings/Netplay/GALJ01r2.ini +++ b/Data/Sys/GameSettings/Netplay/GALJ01r2.ini @@ -634,19 +634,19 @@ C216D884 00000030 #Recording/SendGameEnd.asm BA8100B0 800100E4 382100E0 7C0803A6 819F2514 00000000 -C216E74C 00000109 #Recording/SendGameInfo.asm +C216E74C 0000010A #Recording/SendGameInfo.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 4182080C +2C030000 41820814 38600005 3D808037 618CF1E4 7D8903A6 4E800421 7C7B1B78 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600732 3D808037 +38600770 3D808037 618CF1E4 7D8903A6 4E800421 7C7E1B78 93DB0000 38600000 @@ -662,13 +662,13 @@ C216E74C 00000109 #Recording/SendGameInfo.asm B07E0003 38600037 987E0005 38600040 B07E0006 38600038 -987E0008 38600050 +987E0008 38600054 B07E0009 38600039 987E000B 38600006 B07E000C 3860003A 987E000E 3860000C B07E000F 3860003B -987E0011 3860002A +987E0011 3860002C B07E0012 3860003C 987E0014 38600008 B07E0015 3860003D @@ -676,7 +676,7 @@ B07E0015 3860003D 38600010 987E001A 38600204 B07E001B 38600036 987E001D -3C60030F 60630000 +3C600310 60630000 907E001E 387E0022 7FE4FB78 38A00138 3D808000 618C31F4 @@ -860,16 +860,16 @@ BA8100B0 800100E4 48000021 7C8802A6 38A0000F 3D808038 618CFD54 7D8903A6 -4E800421 48000124 +4E800421 4800012C 4E800021 7C0802A6 90010004 9421FF20 BE8100B0 806DB64C 83E30000 83CDB650 7FFFF214 3B600000 806DC18C 83A30024 -2C1D0000 418200D8 +2C1D0000 418200E0 3B7B0001 2C1B000F -418100CC 839D002C +418100D4 839D002C 3860003B 987F0000 806DB654 907F0001 807C0010 B07F0005 @@ -891,23 +891,24 @@ BE8100B0 806DB64C 2C030000 4182000C 8863000C 48000008 3860FFFF 987F002A -83CDB650 3BDE002B -93CDB650 3BFF002B +A07C0DA8 B07F002B +83CDB650 3BDE002D +93CDB650 3BFF002D 83BD0008 2C1D0000 -4082FF30 BA8100B0 +4082FF28 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 BA8100B0 800100E4 382100E0 7C0803A6 3C608017 00000000 -C206DA34 00000036 #Recording/SendGamePostFrame.asm +C206DA34 00000038 #Recording/SendGamePostFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820170 +2C030000 41820180 887F221F 546306F7 -40820164 8B7F000C +40820174 8B7F000C 806DB64C 83A30000 838DB650 7FBDE214 38600038 987D0000 @@ -950,7 +951,9 @@ B07D0030 887F1968 807F00EC 907D0045 807F195C 907D0049 807F0014 907D004D -838DB650 3B9C0051 +A07F18EC B07D0051 +A07F2088 B07D0053 +838DB650 3B9C0055 938DB650 BA8100B0 800100E4 382100E0 7C0803A6 8001001C @@ -3115,7 +3118,7 @@ C22600A8 0000000B #Online/Menus/CSS/PreventColorChange.asm 618C028C 7D8903A6 4E800420 3C60803F 60000000 00000000 -C226699C 00000029 #Online/Menus/CSS/SceneLoadCSS.asm +C226699C 00000028 #Online/Menus/CSS/SceneLoadCSS.asm 4800002C 4E800021 C2E00000 41A00000 00000000 3DCCCCCD @@ -3124,7 +3127,7 @@ C2E00000 41A00000 53000000 900DB638 3C608048 80639D30 5463443E 2C030008 -40820100 7C0802A6 +408200F8 7C0802A6 90010004 9421FF20 BE8100B0 4BFFFFB1 7FC802A6 3D808000 @@ -3142,11 +3145,10 @@ BE8100B0 4BFFFFB1 3D808037 618CF1E4 7D8903A6 4E800421 907F0000 886DAFA0 -2C030003 40820030 +2C030003 40820028 3C608026 606352F4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 88630008 987F001A 387E0010 3D808001 618C6BE0 @@ -3157,7 +3159,7 @@ BE8100B0 4BFFFFB1 BA8100B0 800100E4 382100E0 7C0803A6 60000000 00000000 -C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm +C2264118 0000001B #Online/Menus/CSS/SkipReturnToCssSound.asm 7C0802A6 90010004 9421FF00 BC610008 886DAFA3 2C030000 @@ -3167,12 +3169,11 @@ C2264118 0000001C #Online/Menus/CSS/SkipReturnToCssSound.asm 8BC30001 3D808037 618CF1B0 7D8903A6 4E800421 2C1E0000 -40820060 4800007C +40820058 48000074 38600000 986DAFA3 3C608023 6063CCA4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 83E3000C 807F0006 3D808037 618CF1B0 7D8903A6 @@ -3585,16 +3586,15 @@ BA8100B0 800100E4 7D8903A6 4E800420 60000000 00000000 0423CF9C 2C1B0008 #Online/Menus/CSS/TextEntryScreen/Display8Characters.asm -C223CF80 0000000E #Online/Menus/CSS/TextEntryScreen/HandleAutocompleteText.asm +C223CF80 0000000D #Online/Menus/CSS/TextEntryScreen/HandleAutocompleteText.asm 48000010 4E800021 00000000 8E9196FF 88CDAFA3 2C060000 -4182004C 4BFFFFE9 +41820044 4BFFFFE9 7CC802A6 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7CE32214 +5485302E 38800040 +7C8523D6 7CE32214 80E7000C 88E70004 7C1B3800 4180000C 3BA60004 48000008 @@ -3608,16 +3608,15 @@ C223B3D0 00000006 #Online/Menus/CSS/TextEntryScreen/HandleDescriptionText.asm 48000008 7FE4FB78 60000000 00000000 0423C6C0 4800004C #Online/Menus/CSS/TextEntryScreen/HandleJpSpace.asm -C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm +C223E994 00000026 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 886DAFA3 2C030000 -41820128 38600001 +41820120 38600001 986DAFCB 48000004 7C0802A6 90010004 9421FF20 BE8100B0 3C608023 6063CCA4 -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7F232214 3860000A 3D808037 618CF1E4 7D8903A6 4E800421 @@ -3648,26 +3647,24 @@ C223E994 00000027 #Online/Menus/CSS/TextEntryScreen/InitNameEntry.asm 800100E4 382100E0 7C0803A6 48000004 38600000 00000000 -C223C588 0000000C #Online/Menus/CSS/TextEntryScreen/NameEntryThinkOneShot.asm +C223C588 0000000B #Online/Menus/CSS/TextEntryScreen/NameEntryThinkOneShot.asm 886DAFA3 2C030000 -41820050 3C608023 +41820048 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7CC32214 +5485302E 38800040 +7C8523D6 7CC32214 80E6000C 88670005 2C030000 4082001C 38600001 98670005 38660008 7C6903A6 38600003 4E800421 886DB56C 00000000 -C223CD74 00000011 #Online/Menus/CSS/TextEntryScreen/OnBPressAutoComplete.asm +C223CD74 00000010 #Online/Menus/CSS/TextEntryScreen/OnBPressAutoComplete.asm 886DAFA3 2C030000 -41820074 3C608023 +4182006C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050000 40810030 38A5FFFF 98A40004 @@ -3683,15 +3680,14 @@ C223CA50 00000003 #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonAPress.asm 3D808023 618CCC14 7D8903A6 4E800420 60000000 00000000 -C223CC14 0000001D #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonHandler.asm +C223CC14 0000001C #Online/Menus/CSS/TextEntryScreen/OnConfirmButtonHandler.asm 886DAFA3 2C030000 -418200D8 7C0802A6 +418200D0 7C0802A6 90010004 9421FF20 BE8100B0 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 83E3000C 887F0004 2C030000 40820038 38600003 3D808002 @@ -3713,13 +3709,12 @@ BA8100B0 800100E4 3D808023 618CCC80 7D8903A6 4E800420 38000000 00000000 -C223C33C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm +C223C33C 0000000D #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm 886DAFA3 2C030000 -41820054 3C608023 +4182004C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050008 4080000C 38A50001 98A40004 @@ -3728,13 +3723,12 @@ C223C33C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterJpText.asm 48000014 3D808023 618CCE4C 7D8903A6 4E800421 00000000 -C223C72C 0000000E #Online/Menus/CSS/TextEntryScreen/OnEnterText.asm +C223C72C 0000000D #Online/Menus/CSS/TextEntryScreen/OnEnterText.asm 886DAFA3 2C030000 -41820054 3C608023 +4182004C 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 88A40004 2C050008 4080000C 38A50001 98A40004 @@ -3747,37 +3741,34 @@ C223C81C 00000003 #Online/Menus/CSS/TextEntryScreen/OnErasePress.asm 3D808023 618CCD3C 7D8903A6 4E800420 60000000 00000000 -C223CCBC 0000000B #Online/Menus/CSS/TextEntryScreen/OnLPress.asm +C223CCBC 0000000A #Online/Menus/CSS/TextEntryScreen/OnLPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 38630008 7C6903A6 38600001 4E800421 3D808023 618CCE38 7D8903A6 4E800420 887C0050 00000000 -C223CCE0 0000000B #Online/Menus/CSS/TextEntryScreen/OnRPress.asm +C223CCE0 0000000A #Online/Menus/CSS/TextEntryScreen/OnRPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 38630008 7C6903A6 38600002 4E800421 3D808023 618CCE38 7D8903A6 4E800420 887C0050 00000000 -C223C928 0000000D #Online/Menus/CSS/TextEntryScreen/OnRandomPress.asm +C223C928 0000000C #Online/Menus/CSS/TextEntryScreen/OnRandomPress.asm 886DAFA3 2C030000 -41820048 3C608023 +41820040 3C608023 6063CCA4 80830000 -5485863E 7CA50774 -54A5801E 5484043A -7C842B78 7C632214 +5485302E 38800040 +7C8523D6 7C632214 8083000C 9BA40004 9BBC0058 38830008 7C8903A6 38600003 @@ -6651,25 +6642,24 @@ $Recommended: Normal Lag Reduction [Hannes Mann] $Recommended: Apply Delay to all In-Game Scenes [Fizzi] *Applies online delay to all in-game scenes. *Dolphin netplay is no longer necessary for local practice -C2376A24 00000027 #Common/UseInGameDelay/ApplyInGameDelay.asm +C2376A24 00000026 #Common/UseInGameDelay/ApplyInGameDelay.asm 3D808034 618CDA00 7D8903A6 4E800421 3D808000 618C561C 7D8903A6 4E800421 2C030002 41820014 2C030003 4182000C -2C030004 408200FC +2C030004 408200F4 3C608048 88639D30 -2C030008 418200EC +2C030008 418200E4 3C608047 60639D64 80630000 2C030000 -408200D8 7C0802A6 +408200D0 7C0802A6 90010004 9421FF20 BE8100B0 83A10000 3C60802F 6063666C -80830000 5485863E -7CA50774 54A5801E -5484043A 7C842B78 +80830000 5485302E +38800040 7C8523D6 7C632214 83E30008 887F0000 2C030000 40810080 38610008 diff --git a/Data/Sys/GameSettings/Playback/GALE01r2.ini b/Data/Sys/GameSettings/Playback/GALE01r2.ini index 6c46242364..bad30343dd 100644 --- a/Data/Sys/GameSettings/Playback/GALE01r2.ini +++ b/Data/Sys/GameSettings/Playback/GALE01r2.ini @@ -846,6 +846,11 @@ C216E8C8 00000005 #Playback/Core/Stadium/Enable Home Run Contest Distance.asm 4182000C 819F0044 4800000C 3D808018 618C1998 00000000 +C21A4CB4 00000004 #Common/AllocBuffer.asm +38600080 3D808037 +618CF1E4 7D8903A6 +4E800421 906DAFC4 +38000000 00000000 C20055F8 0000000F #Common/GetIsFollower.asm 7C0802A6 90010004 9421FF20 BE8100B0 @@ -1142,4 +1147,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/Sys/GameSettings/Playback/GALJ01r2.ini b/Data/Sys/GameSettings/Playback/GALJ01r2.ini index efa443222b..d3d3f783a5 100644 --- a/Data/Sys/GameSettings/Playback/GALJ01r2.ini +++ b/Data/Sys/GameSettings/Playback/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,8 +114,8 @@ C216DED4 00000039 #Common/CostumeBoundCheck/main.asm 4E800421 3B7B0001 2C1B0006 4180FF68 3BFF0001 2C1F0006 -4180FEF4 BA810008 -800100B4 382100B0 +4180FEF4 BA8100B0 +800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 @@ -124,8 +124,8 @@ $Required: Slippi Playback [Fizzi, UnclePunch, Achilles, tauKhan, Krohnos] *Will play replay configured in playback.txt C216E9E4 0000001D #Playback/Core/CleanDynamicGeckos.asm 3BC30000 7C0802A6 -90010004 9421FF50 -BE810008 83CDB64C +90010004 9421FF20 +BE8100B0 83CDB64C 83BE0010 3B800000 807D0000 2C030000 41820018 3B9C0001 @@ -149,21 +149,21 @@ BE810008 83CDB64C 809D0004 3D808032 618C8F50 7D8903A6 4E800421 3B5AFFFC -4BFFFFBC BA810008 -800100B4 382100B0 +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 @@ -172,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 @@ -185,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 @@ -197,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 @@ -348,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 @@ -378,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 @@ -394,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 @@ -456,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 @@ -473,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 @@ -501,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 @@ -655,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 @@ -668,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 @@ -682,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 @@ -692,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 @@ -712,7 +715,7 @@ A0630001 1C870006 7C862214 A0840001 7C032000 41820030 38E70001 88660000 -2C070003 4180FFD4 +7C071800 4180FFD4 1C790006 7C651A14 80630003 3D808002 618C36B8 7D8903A6 @@ -733,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 @@ -758,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 @@ -788,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 @@ -829,12 +832,12 @@ 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 C216E8C8 00000005 #Playback/Core/Stadium/Enable Home Run Contest Distance.asm 3D808046 618CDB77 @@ -842,9 +845,14 @@ C216E8C8 00000005 #Playback/Core/Stadium/Enable Home Run Contest Distance.asm 4182000C 819F0044 4800000C 3D808018 618C1998 00000000 +C21A4CB4 00000004 #Common/AllocBuffer.asm +38600080 3D808037 +618CF1E4 7D8903A6 +4E800421 906DAFC4 +38000000 00000000 C20055F8 0000000F #Common/GetIsFollower.asm 7C0802A6 90010004 -9421FF50 BE810008 +9421FF20 BE8100B0 7C7E1B78 3BE00000 887E221F 5460EFFF 41820038 887E000C @@ -854,8 +862,8 @@ C20055F8 0000000F #Common/GetIsFollower.asm 1C030003 7C640214 88030002 2C000000 40820008 3BE00001 -7FE3FB78 BA810008 -800100B4 382100B0 +7FE3FB78 BA8100B0 +800100E4 382100E0 7C0803A6 4E800020 60000000 00000000 C216D294 00000006 #Common/IncrementFrameIndex.asm @@ -925,16 +933,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 @@ -1067,8 +1075,8 @@ C8210080 EC211028 C05C0014 EC2100B2 D036002C 3A940001 2C140006 4180FCD8 -BA810008 800100B4 -382100B0 7C0803A6 +BA8100B0 800100E4 +382100E0 7C0803A6 8001001C 00000000 $Optional: Game Music OFF [UnclePunch] @@ -1101,6 +1109,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