From 47ba9049850a3b8063aa1427656d50ca1e914830 Mon Sep 17 00:00:00 2001 From: Jas Laferriere Date: Wed, 3 Apr 2024 13:01:23 -0400 Subject: [PATCH] separate out bones file, untested --- Output/Console/GALE01r2.ini | 481 ++++++++++++++++++-------------- Output/Console/g_core.bin | Bin 5528 -> 5968 bytes Output/Console/g_core_porta.bin | Bin 5528 -> 5968 bytes Output/Netplay/GALE01r2.ini | 481 ++++++++++++++++++-------------- Output/Netplay/GALJ01r2.ini | 481 ++++++++++++++++++-------------- Output/Playback/GALE01r2.ini | 481 ++++++++++++++++++-------------- Output/Playback/GALJ01r2.ini | 481 ++++++++++++++++++-------------- Recording/Recording.s | 9 +- Recording/SendGameBones.asm | 159 +++++++++++ Recording/SendGameInfo.asm | 6 + Recording/SendGamePostFrame.asm | 92 +----- 11 files changed, 1513 insertions(+), 1158 deletions(-) create mode 100644 Recording/SendGameBones.asm diff --git a/Output/Console/GALE01r2.ini b/Output/Console/GALE01r2.ini index 56e4c8d6..0087e0e3 100644 --- a/Output/Console/GALE01r2.ini +++ b/Output/Console/GALE01r2.ini @@ -83,6 +83,58 @@ C23219EC 0000001D #Recording/FlushFrameBuffer.asm 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 +C206DA38 00000033 #Recording/SendGameBones.asm +7C0802A6 90010004 +9421FF20 BE8100B0 +3D808000 618C5604 +7D8903A6 4E800421 +2C030000 41820154 +887F221F 546306F7 +40820148 8B7F000C +806DB64C 83A30000 +838DB650 7FBDE214 +38600021 987D0000 +806DB654 907D0001 +9B7D0005 7FE3FB78 +3D808000 618C55F8 +7D8903A6 4E800421 +987D0006 807F0004 +987D0007 807E0028 +38800000 38BD000A +48000019 B07D0008 +838DB650 3B9C10A2 +938DB650 480000DC +7C0802A6 90010004 +9421FFE4 93E10014 +93C10010 93A1000C +7C7F1B78 7C9E2378 +7CBD2B78 807F0044 +907D0000 807F0054 +907D0004 807F0064 +907D0008 807F002C +907D000C 807F0030 +907D0010 807F0034 +907D0014 807F0038 +907D0018 807F003C +907D001C 807F0040 +907D0020 3BDE0001 +3BBD0024 807F0010 +7FC4F378 7FA5EB78 +2C030000 41820010 +4BFFFF79 7C7E1B78 +7C9D2378 807F0008 +7FC4F378 7FA5EB78 +2C030000 41820010 +4BFFFF59 7C7E1B78 +7C9D2378 7FC3F378 +7FA4EB78 83E10014 +83C10010 83A1000C +80010020 3821001C +7C0803A6 4E800020 +BA8100B0 800100E4 +382100E0 7C0803A6 +8001001C 83E10014 +60000000 00000000 C216D884 00000030 #Recording/SendGameEnd.asm 7C0802A6 90010004 9421FF20 BE8100B0 @@ -132,273 +184,276 @@ C216D884 00000030 #Recording/SendGameEnd.asm BA8100B0 800100E4 382100E0 7C0803A6 819F2514 00000000 -C216E74C 0000010A #Recording/SendGameInfo.asm +C216E74C 0000010D #Recording/SendGameInfo.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820814 +2C030000 41820828 38600005 3D808037 618CF1E4 7D8903A6 4E800421 7C7B1B78 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600770 3D808037 -618CF1E4 7D8903A6 -4E800421 7C7E1B78 -93DB0000 38600000 -906DB650 3C608000 -60635600 80630000 -38630008 38800000 -3D808000 618C55FC -7D8903A6 4E800421 -7C7C1B78 38600035 -987E0000 3860001C -987E0001 38600036 -987E0002 386002F8 -B07E0003 38600037 -987E0005 38600040 -B07E0006 38600038 -987E0008 38600054 -B07E0009 38600039 -987E000B 38600006 -B07E000C 3860003A -987E000E 3860000C -B07E000F 3860003B -987E0011 3860002C -B07E0012 3860003C -987E0014 38600008 -B07E0015 3860003D -987E0017 B39E0018 -38600010 987E001A -38600204 B07E001B -38600036 987E001D -3C600310 60630000 -907E001E 387E0022 -7FE4FB78 38A00138 -3D808000 618C31F4 -7D8903A6 4E800421 -387E0062 3880001C -3D808000 618CC160 +3C600000 60638C80 +3D808037 618CF1E4 7D8903A6 4E800421 -387E0022 3AA30060 +7C7E1B78 93DB0000 +38600000 906DB650 +3C608000 60635600 +80630000 38630008 +38800000 3D808000 +618C55FC 7D8903A6 +4E800421 7C7C1B78 +38600035 987E0000 +3860001F 987E0001 +38600036 987E0002 +386002F8 B07E0003 +38600037 987E0005 +38600040 B07E0006 +38600038 987E0008 +38600054 B07E0009 +38600039 987E000B +38600006 B07E000C +3860003A 987E000E +3860000C B07E000F +3860003B 987E0011 +3860002C B07E0012 +3860003C 987E0014 +38600008 B07E0015 +3860003D 987E0017 +B39E0018 38600010 +987E001A 38600204 +B07E001B 38600021 +987E001D 38600000 +B07E001E 38600036 +987E0020 3C600310 +60630000 907E0021 +387E0025 7FE4FB78 +38A00138 3D808000 +618C31F4 7D8903A6 +4E800421 387E0065 +3880001C 3D808000 +618CC160 7D8903A6 +4E800421 387E0025 +3AA30060 3A800000 +1ED40024 7ED6AA14 +88760001 2C030000 +40820034 88760000 +2C030012 40820028 +3C60804C 606320BC +1C940044 7C632214 +80630000 546005EF +4182000C 38600013 +98760000 3A940001 +2C140004 4180FFB4 +387E0025 3AA30060 3A800000 1ED40024 7ED6AA14 88760001 -2C030000 40820034 -88760000 2C030012 -40820028 3C60804C -606320BC 1C940044 -7C632214 80630000 -546005EF 4182000C -38600013 98760000 +2C030000 4082002C +88760000 3D808016 +618C9238 7D8903A6 +4E800421 88960003 +7C041800 4081000C +38600000 98760003 3A940001 2C140004 -4180FFB4 387E0022 -3AA30060 3A800000 +4180FFBC 3C60804D +80635F90 907E015D +3A82F228 3AA00000 +3ADE0161 1EF50008 +38600001 7C76B92E +3AF70004 7C76B92E +3AB50001 2C150004 +4180FFE4 3A800000 +3ABF0060 3AFE0181 +1F140010 7F18BA14 1ED40024 7ED6AA14 88760001 2C030000 -4082002C 88760000 -3D808016 618C9238 +40820040 8876000A +2C030078 41820034 +3D808023 618C754C 7D8903A6 4E800421 -88960003 7C041800 -4081000C 38600000 -98760003 3A940001 -2C140004 4180FFBC -3C60804D 80635F90 -907E015A 3A82F228 -3AA00000 3ADE015E -1EF50008 38600001 -7C76B92E 3AF70004 -7C76B92E 3AB50001 -2C150004 4180FFE4 -3A800000 3ABF0060 -3AFE017E 1F140010 -7F18BA14 1ED40024 +7C641B78 7F03C378 +38A00010 3D808000 +618C31F4 7D8903A6 +4E800421 4800001C +7F03C378 38800010 +3D808000 618CC160 +7D8903A6 4E800421 +3A940001 2C140004 +4180FF88 8862F234 +987E01C1 8862F23C +987E01C2 3C608048 +80639D30 5463443E +B07E01C3 3B200000 +3C608048 80639D30 +5463443E 2C030208 +4082017C 38600000 +3D808000 618C5610 +7D8903A6 4E800421 +7C791B78 3A800000 +3ABF0060 3AFE01C5 +3B590034 1C74001F +7F03BA14 1ED40024 7ED6AA14 88760001 -2C030000 40820040 -8876000A 2C030078 -41820034 3D808023 -618C754C 7D8903A6 -4E800421 7C641B78 -7F03C378 38A00010 +2C030000 40820028 +1C74001F 7C83D214 +7F03C378 38A0001F 3D808000 618C31F4 7D8903A6 4E800421 4800001C 7F03C378 -38800010 3D808000 +3880001F 3D808000 618CC160 7D8903A6 4E800421 3A940001 -2C140004 4180FF88 -8862F234 987E01BE -8862F23C 987E01BF -3C608048 80639D30 -5463443E B07E01C0 -3B200000 3C608048 -80639D30 5463443E -2C030208 4082017C -38600000 3D808000 -618C5610 7D8903A6 -4E800421 7C791B78 +2C140004 4180FFA0 3A800000 3ABF0060 -3AFE01C2 3B590034 -1C74001F 7F03BA14 +3AFE0241 3B5900CF +1C74000A 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 -40820028 1C74001F +40820028 1C74000A 7C83D214 7F03C378 -38A0001F 3D808000 +38A0000A 3D808000 618C31F4 7D8903A6 4E800421 4800001C -7F03C378 3880001F +7F03C378 3880000A 3D808000 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 3A800000 -3ABF0060 3AFE023E -3B5900CF 1C74000A +3ABF0060 3AFE0269 +3B5900F7 1C74001D 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 40820028 -1C74000A 7C83D214 -7F03C378 38A0000A +1C74001D 7C83D214 +7F03C378 38A0001D 3D808000 618C31F4 7D8903A6 4E800421 4800001C 7F03C378 -3880000A 3D808000 +3880001D 3D808000 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 -3A800000 3ABF0060 -3AFE0266 3B5900F7 -1C74001D 7F03BA14 -1ED40024 7ED6AA14 -88760001 2C030000 -40820028 1C74001D -7C83D214 7F03C378 -38A0001D 3D808000 +4800001C 387E01C5 +38800118 3D808000 +618CC160 7D8903A6 +4E800421 3D808000 +618CADF4 7D8903A6 +4E800421 987E02DD +2C190000 41820044 +387E02DE 38990394 +38A00033 3D808000 618C31F4 7D8903A6 -4E800421 4800001C -7F03C378 3880001D -3D808000 618CC160 -7D8903A6 4E800421 -3A940001 2C140004 -4180FFA0 4800001C -387E01C2 38800118 +4E800421 3C60803D +6063AD40 80630000 +81830088 A06C0001 +907E0311 886C0006 +907E0315 4800001C +387E02DE 3880003B 3D808000 618CC160 7D8903A6 4E800421 -3D808000 618CADF4 +2C190000 41820018 +7F23CB78 3D808037 +618CF1B0 7D8903A6 +4E800421 7FC3F378 +38800319 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -987E02DA 2C190000 -41820044 387E02DB -38990394 38A00033 -3D808000 618C31F4 +38600205 3D808037 +618CF1E4 7D8903A6 +4E800421 7C751B78 +3C608000 60635600 +80630000 3AE30008 +38600010 98750000 +3860003D 98750203 +38600200 B0750201 +38600000 98750204 +3AC00000 7C76E050 +2C030200 41810010 +B0750201 38600001 +98750204 38750001 +7EE4BB78 7C84B214 +A0B50201 3D808000 +618C31F4 7D8903A6 +4E800421 7EA3AB78 +38800205 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -3C60803D 6063AD40 -80630000 81830088 -A06C0001 907E030E -886C0006 907E0312 -4800001C 387E02DB -3880003B 3D808000 -618CC160 7D8903A6 -4E800421 2C190000 -41820018 7F23CB78 +3AD60200 7C16E000 +4180FFA4 7EA3AB78 3D808037 618CF1B0 7D8903A6 4E800421 -7FC3F378 38800316 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 38600205 -3D808037 618CF1E4 -7D8903A6 4E800421 -7C751B78 3C608000 -60635600 80630000 -3AE30008 38600010 -98750000 3860003D -98750203 38600200 -B0750201 38600000 -98750204 3AC00000 -7C76E050 2C030200 -41810010 B0750201 -38600001 98750204 -38750001 7EE4BB78 -7C84B214 A0B50201 -3D808000 618C31F4 +38600004 38800007 +38A00000 3D808039 +618C01F0 7D8903A6 +4E800421 48000021 +7C8802A6 38A00000 +3D808038 618CFD54 7D8903A6 4E800421 -7EA3AB78 38800205 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 3AD60200 -7C16E000 4180FFA4 -7EA3AB78 3D808037 -618CF1B0 7D8903A6 -4E800421 38600004 -38800007 38A00000 -3D808039 618C01F0 -7D8903A6 4E800421 -48000021 7C8802A6 -38A00000 3D808038 -618CFD54 7D8903A6 -4E800421 48000070 -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 806DB64C -83A30000 838DB650 -7FBDE214 3860003A -987D0000 806DB654 -907D0001 3C60804D -80635F90 907D0005 -3C608048 80639D60 -907D0009 838DB650 -3B9C000D 938DB650 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 38600004 -38800007 38A00000 -3D808039 618C01F0 -7D8903A6 4E800421 -48000021 7C8802A6 -38A0000F 3D808038 -618CFD54 7D8903A6 -4E800421 4800012C -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 806DB64C -83E30000 83CDB650 -7FFFF214 3B600000 -806DC18C 83A30024 -2C1D0000 418200E0 -3B7B0001 2C1B000F -418100D4 839D002C -3860003B 987F0000 -806DB654 907F0001 -807C0010 B07F0005 -807C0024 987F0007 -807C002C 907F0008 -807C0040 907F000C -807C0044 907F0010 -807C004C 907F0014 -807C0050 907F0018 -807C0C9C B07F001C -807C0D44 907F001E -807C001C 907F0022 -887C0DD7 987F0026 -887C0DDB 987F0027 -887C0DEB 987F0028 -887C0DEF 987F0029 -807C0518 2C030000 -41820018 8063002C -2C030000 4182000C -8863000C 48000008 -3860FFFF 987F002A -A07C0DA8 B07F002B -83CDB650 3BDE002D -93CDB650 3BFF002D -83BD0008 2C1D0000 -4082FF28 BA8100B0 +48000070 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +806DB64C 83A30000 +838DB650 7FBDE214 +3860003A 987D0000 +806DB654 907D0001 +3C60804D 80635F90 +907D0005 3C608048 +80639D60 907D0009 +838DB650 3B9C000D +938DB650 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 +38600004 38800007 +38A00000 3D808039 +618C01F0 7D8903A6 +4E800421 48000021 +7C8802A6 38A0000F +3D808038 618CFD54 +7D8903A6 4E800421 +4800012C 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +806DB64C 83E30000 +83CDB650 7FFFF214 +3B600000 806DC18C +83A30024 2C1D0000 +418200E0 3B7B0001 +2C1B000F 418100D4 +839D002C 3860003B +987F0000 806DB654 +907F0001 807C0010 +B07F0005 807C0024 +987F0007 807C002C +907F0008 807C0040 +907F000C 807C0044 +907F0010 807C004C +907F0014 807C0050 +907F0018 807C0C9C +B07F001C 807C0D44 +907F001E 807C001C +907F0022 887C0DD7 +987F0026 887C0DDB +987F0027 887C0DEB +987F0028 887C0DEF +987F0029 807C0518 +2C030000 41820018 +8063002C 2C030000 +4182000C 8863000C +48000008 3860FFFF +987F002A A07C0DA8 +B07F002B 83CDB650 +3BDE002D 93CDB650 +3BFF002D 83BD0008 +2C1D0000 4082FF28 BA8100B0 800100E4 382100E0 7C0803A6 -3C608017 00000000 +4E800020 BA8100B0 +800100E4 382100E0 +7C0803A6 3C608017 +60000000 00000000 C206DA34 00000038 #Recording/SendGamePostFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 diff --git a/Output/Console/g_core.bin b/Output/Console/g_core.bin index 009f9852812d57ea5725665b558aa74e96e9f983..4cf86fb70b301e7cb93e2099f3c8784d11364eaa 100644 GIT binary patch delta 620 zcmZvZPiPZS5XR?ax0@H6$QB|rWHni9NFYHY7G086Qph2oNWol!3R|NGLGhr66*jxu z>?LA_;0Wf>O8wV!Akc%5L#zdlIf`gN=`EgW!Gl7atq2~xyx+_>^O$+x>tu(=yJ{dP zebfNp6b>WlRJG+CO;qdBk5ZFW9y$TH%mmLq>A} zv_2fD0K~ct;C^3mRepg)(mq){u+e59K2aw-_ywXk02!Y{*mB~g^=!_x`dQO;pxkZ% z5UWIyc%8_JIbxWYC(6WmVw9*6XB`T33KU|Am@JNf75i|Ea@l$J-E>}$&71(R&;`J)evfAkdUQ(N>K&WC)eX1e*4OgYdih+}W?T4PDu%X;HJDfKK?2=i9Mi!?wt!~v zF1v}}f_K<9Ug7D;=Ui;x&a!3)M%d;jW@cKqKx*5)fq)5SFjqeSR}9)Oy0m6%qTONg>AB^*^D{{S(^lA zfrMlRh6!~Hau#(AN|X1nNlPYKG%(26HZ(9K_8d&8?POl&*TA9(mi@pM&8Rf_1Do{Z zban^cD66JV8deJ!7_9Cw#!cSBuFY6C`2l;gu?q`rcGYJnGX~Z;8N$kr6b9};Mm0AVo}F*d$J3cz93&m h4g=eSI%Xjc1_l|hXbYD)quAy>Twj?^AN$UUr diff --git a/Output/Console/g_core_porta.bin b/Output/Console/g_core_porta.bin index 0550435ff207335d7be4bc3f72aa7bcf12a07b79..f7b7995a9a809d875d36a793d53fc24556b703a7 100644 GIT binary patch delta 620 zcmZvZPiPZS5XR?ax0@H6$QB|rWHni9NFYHY7G086Qph2oNWol!3R|NGLGhr66*jxu z>?LA_;0Wf>O8wV!Akc%5L#zdlIf`gN=`EgW!Gl7atq2~xyx+_>^O$+x>tu(=yJ{dP zebfNp6b>WlRJG+CO;qdBk5ZFW9y$TH%mmLq>A} zv_2fD0K~ct;C^3mRepg)(mq){u+e59K2aw-_ywXk02!Y{*mB~g^=!_x`dQO;pxkZ% z5UWIyc%8_JIbxWYC(6WmVw9*6XB`T33KU|Am@JNf75i|Ea@l$J-E>}$&71(R&;`J)evfAkdUQ(N>K&WC)eX1e*4OgYdih+}W?T4PDu%X;HJDfKK?2=i9Mi!?wt!~v zF1v}}f_K<9Ug7D;=Ui;x&a!3)M%d;jW@cKqKx*5)fq)5SFjqeSR}9)Oy0m6%qTONg>AB^*^D{{S(^lA zfrMlRh6!~Hau#(AN|X1nNlPYKG%(26HZ(9K_8d&8?POl&*TA9(mi@pM&8Rf_1Do{Z zban^cD66JV8deJ!7_9Cw#!cSBuFY6C`2l;gu?q`rcGYJnGX~Z;8N$kr6b9};Mm0AVo}F*d$J3cz93&m h4g=eSI%Xjc1_l|hXbYD)quAy>Twj?^AN$UUr diff --git a/Output/Netplay/GALE01r2.ini b/Output/Netplay/GALE01r2.ini index b366df71..74bfde27 100644 --- a/Output/Netplay/GALE01r2.ini +++ b/Output/Netplay/GALE01r2.ini @@ -723,6 +723,58 @@ C23219EC 0000001D #Recording/FlushFrameBuffer.asm 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 +C206DA38 00000033 #Recording/SendGameBones.asm +7C0802A6 90010004 +9421FF20 BE8100B0 +3D808000 618C5604 +7D8903A6 4E800421 +2C030000 41820154 +887F221F 546306F7 +40820148 8B7F000C +806DB64C 83A30000 +838DB650 7FBDE214 +38600021 987D0000 +806DB654 907D0001 +9B7D0005 7FE3FB78 +3D808000 618C55F8 +7D8903A6 4E800421 +987D0006 807F0004 +987D0007 807E0028 +38800000 38BD000A +48000019 B07D0008 +838DB650 3B9C10A2 +938DB650 480000DC +7C0802A6 90010004 +9421FFE4 93E10014 +93C10010 93A1000C +7C7F1B78 7C9E2378 +7CBD2B78 807F0044 +907D0000 807F0054 +907D0004 807F0064 +907D0008 807F002C +907D000C 807F0030 +907D0010 807F0034 +907D0014 807F0038 +907D0018 807F003C +907D001C 807F0040 +907D0020 3BDE0001 +3BBD0024 807F0010 +7FC4F378 7FA5EB78 +2C030000 41820010 +4BFFFF79 7C7E1B78 +7C9D2378 807F0008 +7FC4F378 7FA5EB78 +2C030000 41820010 +4BFFFF59 7C7E1B78 +7C9D2378 7FC3F378 +7FA4EB78 83E10014 +83C10010 83A1000C +80010020 3821001C +7C0803A6 4E800020 +BA8100B0 800100E4 +382100E0 7C0803A6 +8001001C 83E10014 +60000000 00000000 C216D884 00000030 #Recording/SendGameEnd.asm 7C0802A6 90010004 9421FF20 BE8100B0 @@ -772,273 +824,276 @@ C216D884 00000030 #Recording/SendGameEnd.asm BA8100B0 800100E4 382100E0 7C0803A6 819F2514 00000000 -C216E74C 0000010A #Recording/SendGameInfo.asm +C216E74C 0000010D #Recording/SendGameInfo.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820814 +2C030000 41820828 38600005 3D808037 618CF1E4 7D8903A6 4E800421 7C7B1B78 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600770 3D808037 -618CF1E4 7D8903A6 -4E800421 7C7E1B78 -93DB0000 38600000 -906DB650 3C608000 -60635600 80630000 -38630008 38800000 -3D808000 618C55FC -7D8903A6 4E800421 -7C7C1B78 38600035 -987E0000 3860001C -987E0001 38600036 -987E0002 386002F8 -B07E0003 38600037 -987E0005 38600040 -B07E0006 38600038 -987E0008 38600054 -B07E0009 38600039 -987E000B 38600006 -B07E000C 3860003A -987E000E 3860000C -B07E000F 3860003B -987E0011 3860002C -B07E0012 3860003C -987E0014 38600008 -B07E0015 3860003D -987E0017 B39E0018 -38600010 987E001A -38600204 B07E001B -38600036 987E001D -3C600310 60630000 -907E001E 387E0022 -7FE4FB78 38A00138 -3D808000 618C31F4 -7D8903A6 4E800421 -387E0062 3880001C -3D808000 618CC160 +3C600000 60638C80 +3D808037 618CF1E4 7D8903A6 4E800421 -387E0022 3AA30060 +7C7E1B78 93DB0000 +38600000 906DB650 +3C608000 60635600 +80630000 38630008 +38800000 3D808000 +618C55FC 7D8903A6 +4E800421 7C7C1B78 +38600035 987E0000 +3860001F 987E0001 +38600036 987E0002 +386002F8 B07E0003 +38600037 987E0005 +38600040 B07E0006 +38600038 987E0008 +38600054 B07E0009 +38600039 987E000B +38600006 B07E000C +3860003A 987E000E +3860000C B07E000F +3860003B 987E0011 +3860002C B07E0012 +3860003C 987E0014 +38600008 B07E0015 +3860003D 987E0017 +B39E0018 38600010 +987E001A 38600204 +B07E001B 38600021 +987E001D 38600000 +B07E001E 38600036 +987E0020 3C600310 +60630000 907E0021 +387E0025 7FE4FB78 +38A00138 3D808000 +618C31F4 7D8903A6 +4E800421 387E0065 +3880001C 3D808000 +618CC160 7D8903A6 +4E800421 387E0025 +3AA30060 3A800000 +1ED40024 7ED6AA14 +88760001 2C030000 +40820034 88760000 +2C030012 40820028 +3C60804C 606320BC +1C940044 7C632214 +80630000 546005EF +4182000C 38600013 +98760000 3A940001 +2C140004 4180FFB4 +387E0025 3AA30060 3A800000 1ED40024 7ED6AA14 88760001 -2C030000 40820034 -88760000 2C030012 -40820028 3C60804C -606320BC 1C940044 -7C632214 80630000 -546005EF 4182000C -38600013 98760000 +2C030000 4082002C +88760000 3D808016 +618C9238 7D8903A6 +4E800421 88960003 +7C041800 4081000C +38600000 98760003 3A940001 2C140004 -4180FFB4 387E0022 -3AA30060 3A800000 +4180FFBC 3C60804D +80635F90 907E015D +3A82F228 3AA00000 +3ADE0161 1EF50008 +38600001 7C76B92E +3AF70004 7C76B92E +3AB50001 2C150004 +4180FFE4 3A800000 +3ABF0060 3AFE0181 +1F140010 7F18BA14 1ED40024 7ED6AA14 88760001 2C030000 -4082002C 88760000 -3D808016 618C9238 +40820040 8876000A +2C030078 41820034 +3D808023 618C754C 7D8903A6 4E800421 -88960003 7C041800 -4081000C 38600000 -98760003 3A940001 -2C140004 4180FFBC -3C60804D 80635F90 -907E015A 3A82F228 -3AA00000 3ADE015E -1EF50008 38600001 -7C76B92E 3AF70004 -7C76B92E 3AB50001 -2C150004 4180FFE4 -3A800000 3ABF0060 -3AFE017E 1F140010 -7F18BA14 1ED40024 +7C641B78 7F03C378 +38A00010 3D808000 +618C31F4 7D8903A6 +4E800421 4800001C +7F03C378 38800010 +3D808000 618CC160 +7D8903A6 4E800421 +3A940001 2C140004 +4180FF88 8862F234 +987E01C1 8862F23C +987E01C2 3C608048 +80639D30 5463443E +B07E01C3 3B200000 +3C608048 80639D30 +5463443E 2C030208 +4082017C 38600000 +3D808000 618C5610 +7D8903A6 4E800421 +7C791B78 3A800000 +3ABF0060 3AFE01C5 +3B590034 1C74001F +7F03BA14 1ED40024 7ED6AA14 88760001 -2C030000 40820040 -8876000A 2C030078 -41820034 3D808023 -618C754C 7D8903A6 -4E800421 7C641B78 -7F03C378 38A00010 +2C030000 40820028 +1C74001F 7C83D214 +7F03C378 38A0001F 3D808000 618C31F4 7D8903A6 4E800421 4800001C 7F03C378 -38800010 3D808000 +3880001F 3D808000 618CC160 7D8903A6 4E800421 3A940001 -2C140004 4180FF88 -8862F234 987E01BE -8862F23C 987E01BF -3C608048 80639D30 -5463443E B07E01C0 -3B200000 3C608048 -80639D30 5463443E -2C030208 4082017C -38600000 3D808000 -618C5610 7D8903A6 -4E800421 7C791B78 +2C140004 4180FFA0 3A800000 3ABF0060 -3AFE01C2 3B590034 -1C74001F 7F03BA14 +3AFE0241 3B5900CF +1C74000A 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 -40820028 1C74001F +40820028 1C74000A 7C83D214 7F03C378 -38A0001F 3D808000 +38A0000A 3D808000 618C31F4 7D8903A6 4E800421 4800001C -7F03C378 3880001F +7F03C378 3880000A 3D808000 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 3A800000 -3ABF0060 3AFE023E -3B5900CF 1C74000A +3ABF0060 3AFE0269 +3B5900F7 1C74001D 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 40820028 -1C74000A 7C83D214 -7F03C378 38A0000A +1C74001D 7C83D214 +7F03C378 38A0001D 3D808000 618C31F4 7D8903A6 4E800421 4800001C 7F03C378 -3880000A 3D808000 +3880001D 3D808000 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 -3A800000 3ABF0060 -3AFE0266 3B5900F7 -1C74001D 7F03BA14 -1ED40024 7ED6AA14 -88760001 2C030000 -40820028 1C74001D -7C83D214 7F03C378 -38A0001D 3D808000 +4800001C 387E01C5 +38800118 3D808000 +618CC160 7D8903A6 +4E800421 3D808000 +618CADF4 7D8903A6 +4E800421 987E02DD +2C190000 41820044 +387E02DE 38990394 +38A00033 3D808000 618C31F4 7D8903A6 -4E800421 4800001C -7F03C378 3880001D -3D808000 618CC160 -7D8903A6 4E800421 -3A940001 2C140004 -4180FFA0 4800001C -387E01C2 38800118 +4E800421 3C60803D +6063AD40 80630000 +81830088 A06C0001 +907E0311 886C0006 +907E0315 4800001C +387E02DE 3880003B 3D808000 618CC160 7D8903A6 4E800421 -3D808000 618CADF4 +2C190000 41820018 +7F23CB78 3D808037 +618CF1B0 7D8903A6 +4E800421 7FC3F378 +38800319 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -987E02DA 2C190000 -41820044 387E02DB -38990394 38A00033 -3D808000 618C31F4 +38600205 3D808037 +618CF1E4 7D8903A6 +4E800421 7C751B78 +3C608000 60635600 +80630000 3AE30008 +38600010 98750000 +3860003D 98750203 +38600200 B0750201 +38600000 98750204 +3AC00000 7C76E050 +2C030200 41810010 +B0750201 38600001 +98750204 38750001 +7EE4BB78 7C84B214 +A0B50201 3D808000 +618C31F4 7D8903A6 +4E800421 7EA3AB78 +38800205 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -3C60803D 6063AD40 -80630000 81830088 -A06C0001 907E030E -886C0006 907E0312 -4800001C 387E02DB -3880003B 3D808000 -618CC160 7D8903A6 -4E800421 2C190000 -41820018 7F23CB78 +3AD60200 7C16E000 +4180FFA4 7EA3AB78 3D808037 618CF1B0 7D8903A6 4E800421 -7FC3F378 38800316 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 38600205 -3D808037 618CF1E4 -7D8903A6 4E800421 -7C751B78 3C608000 -60635600 80630000 -3AE30008 38600010 -98750000 3860003D -98750203 38600200 -B0750201 38600000 -98750204 3AC00000 -7C76E050 2C030200 -41810010 B0750201 -38600001 98750204 -38750001 7EE4BB78 -7C84B214 A0B50201 -3D808000 618C31F4 -7D8903A6 4E800421 -7EA3AB78 38800205 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 3AD60200 -7C16E000 4180FFA4 -7EA3AB78 3D808037 -618CF1B0 7D8903A6 -4E800421 38600004 -38800007 38A00000 -3D808039 618C01F0 -7D8903A6 4E800421 -48000021 7C8802A6 -38A00000 3D808038 -618CFD54 7D8903A6 -4E800421 48000070 -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 806DB64C -83A30000 838DB650 -7FBDE214 3860003A -987D0000 806DB654 -907D0001 3C60804D -80635F90 907D0005 -3C608048 80639D60 -907D0009 838DB650 -3B9C000D 938DB650 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 38600004 -38800007 38A00000 -3D808039 618C01F0 +38600004 38800007 +38A00000 3D808039 +618C01F0 7D8903A6 +4E800421 48000021 +7C8802A6 38A00000 +3D808038 618CFD54 7D8903A6 4E800421 -48000021 7C8802A6 -38A0000F 3D808038 -618CFD54 7D8903A6 -4E800421 4800012C -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 806DB64C -83E30000 83CDB650 -7FFFF214 3B600000 -806DC18C 83A30024 -2C1D0000 418200E0 -3B7B0001 2C1B000F -418100D4 839D002C -3860003B 987F0000 -806DB654 907F0001 -807C0010 B07F0005 -807C0024 987F0007 -807C002C 907F0008 -807C0040 907F000C -807C0044 907F0010 -807C004C 907F0014 -807C0050 907F0018 -807C0C9C B07F001C -807C0D44 907F001E -807C001C 907F0022 -887C0DD7 987F0026 -887C0DDB 987F0027 -887C0DEB 987F0028 -887C0DEF 987F0029 -807C0518 2C030000 -41820018 8063002C -2C030000 4182000C -8863000C 48000008 -3860FFFF 987F002A -A07C0DA8 B07F002B -83CDB650 3BDE002D -93CDB650 3BFF002D -83BD0008 2C1D0000 -4082FF28 BA8100B0 +48000070 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +806DB64C 83A30000 +838DB650 7FBDE214 +3860003A 987D0000 +806DB654 907D0001 +3C60804D 80635F90 +907D0005 3C608048 +80639D60 907D0009 +838DB650 3B9C000D +938DB650 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 +38600004 38800007 +38A00000 3D808039 +618C01F0 7D8903A6 +4E800421 48000021 +7C8802A6 38A0000F +3D808038 618CFD54 +7D8903A6 4E800421 +4800012C 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +806DB64C 83E30000 +83CDB650 7FFFF214 +3B600000 806DC18C +83A30024 2C1D0000 +418200E0 3B7B0001 +2C1B000F 418100D4 +839D002C 3860003B +987F0000 806DB654 +907F0001 807C0010 +B07F0005 807C0024 +987F0007 807C002C +907F0008 807C0040 +907F000C 807C0044 +907F0010 807C004C +907F0014 807C0050 +907F0018 807C0C9C +B07F001C 807C0D44 +907F001E 807C001C +907F0022 887C0DD7 +987F0026 887C0DDB +987F0027 887C0DEB +987F0028 887C0DEF +987F0029 807C0518 +2C030000 41820018 +8063002C 2C030000 +4182000C 8863000C +48000008 3860FFFF +987F002A A07C0DA8 +B07F002B 83CDB650 +3BDE002D 93CDB650 +3BFF002D 83BD0008 +2C1D0000 4082FF28 BA8100B0 800100E4 382100E0 7C0803A6 -3C608017 00000000 +4E800020 BA8100B0 +800100E4 382100E0 +7C0803A6 3C608017 +60000000 00000000 C206DA34 00000038 #Recording/SendGamePostFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 diff --git a/Output/Netplay/GALJ01r2.ini b/Output/Netplay/GALJ01r2.ini index a306c554..0dbd7c5f 100644 --- a/Output/Netplay/GALJ01r2.ini +++ b/Output/Netplay/GALJ01r2.ini @@ -722,6 +722,58 @@ C23219EC 0000001D #Recording/FlushFrameBuffer.asm 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 +C206DA38 00000033 #Recording/SendGameBones.asm +7C0802A6 90010004 +9421FF20 BE8100B0 +3D808000 618C5604 +7D8903A6 4E800421 +2C030000 41820154 +887F221F 546306F7 +40820148 8B7F000C +806DB64C 83A30000 +838DB650 7FBDE214 +38600021 987D0000 +806DB654 907D0001 +9B7D0005 7FE3FB78 +3D808000 618C55F8 +7D8903A6 4E800421 +987D0006 807F0004 +987D0007 807E0028 +38800000 38BD000A +48000019 B07D0008 +838DB650 3B9C10A2 +938DB650 480000DC +7C0802A6 90010004 +9421FFE4 93E10014 +93C10010 93A1000C +7C7F1B78 7C9E2378 +7CBD2B78 807F0044 +907D0000 807F0054 +907D0004 807F0064 +907D0008 807F002C +907D000C 807F0030 +907D0010 807F0034 +907D0014 807F0038 +907D0018 807F003C +907D001C 807F0040 +907D0020 3BDE0001 +3BBD0024 807F0010 +7FC4F378 7FA5EB78 +2C030000 41820010 +4BFFFF79 7C7E1B78 +7C9D2378 807F0008 +7FC4F378 7FA5EB78 +2C030000 41820010 +4BFFFF59 7C7E1B78 +7C9D2378 7FC3F378 +7FA4EB78 83E10014 +83C10010 83A1000C +80010020 3821001C +7C0803A6 4E800020 +BA8100B0 800100E4 +382100E0 7C0803A6 +8001001C 83E10014 +60000000 00000000 C216D884 00000030 #Recording/SendGameEnd.asm 7C0802A6 90010004 9421FF20 BE8100B0 @@ -771,273 +823,276 @@ C216D884 00000030 #Recording/SendGameEnd.asm BA8100B0 800100E4 382100E0 7C0803A6 819F2514 00000000 -C216E74C 0000010A #Recording/SendGameInfo.asm +C216E74C 0000010D #Recording/SendGameInfo.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820814 +2C030000 41820828 38600005 3D808037 618CF1E4 7D8903A6 4E800421 7C7B1B78 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600770 3D808037 -618CF1E4 7D8903A6 -4E800421 7C7E1B78 -93DB0000 38600000 -906DB650 3C608000 -60635600 80630000 -38630008 38800000 -3D808000 618C55FC -7D8903A6 4E800421 -7C7C1B78 38600035 -987E0000 3860001C -987E0001 38600036 -987E0002 386002F8 -B07E0003 38600037 -987E0005 38600040 -B07E0006 38600038 -987E0008 38600054 -B07E0009 38600039 -987E000B 38600006 -B07E000C 3860003A -987E000E 3860000C -B07E000F 3860003B -987E0011 3860002C -B07E0012 3860003C -987E0014 38600008 -B07E0015 3860003D -987E0017 B39E0018 -38600010 987E001A -38600204 B07E001B -38600036 987E001D -3C600310 60630000 -907E001E 387E0022 -7FE4FB78 38A00138 -3D808000 618C31F4 -7D8903A6 4E800421 -387E0062 3880001C -3D808000 618CC160 +3C600000 60638C80 +3D808037 618CF1E4 7D8903A6 4E800421 -387E0022 3AA30060 +7C7E1B78 93DB0000 +38600000 906DB650 +3C608000 60635600 +80630000 38630008 +38800000 3D808000 +618C55FC 7D8903A6 +4E800421 7C7C1B78 +38600035 987E0000 +3860001F 987E0001 +38600036 987E0002 +386002F8 B07E0003 +38600037 987E0005 +38600040 B07E0006 +38600038 987E0008 +38600054 B07E0009 +38600039 987E000B +38600006 B07E000C +3860003A 987E000E +3860000C B07E000F +3860003B 987E0011 +3860002C B07E0012 +3860003C 987E0014 +38600008 B07E0015 +3860003D 987E0017 +B39E0018 38600010 +987E001A 38600204 +B07E001B 38600021 +987E001D 38600000 +B07E001E 38600036 +987E0020 3C600310 +60630000 907E0021 +387E0025 7FE4FB78 +38A00138 3D808000 +618C31F4 7D8903A6 +4E800421 387E0065 +3880001C 3D808000 +618CC160 7D8903A6 +4E800421 387E0025 +3AA30060 3A800000 +1ED40024 7ED6AA14 +88760001 2C030000 +40820034 88760000 +2C030012 40820028 +3C60804C 606320BC +1C940044 7C632214 +80630000 546005EF +4182000C 38600013 +98760000 3A940001 +2C140004 4180FFB4 +387E0025 3AA30060 3A800000 1ED40024 7ED6AA14 88760001 -2C030000 40820034 -88760000 2C030012 -40820028 3C60804C -606320BC 1C940044 -7C632214 80630000 -546005EF 4182000C -38600013 98760000 +2C030000 4082002C +88760000 3D808016 +618C9238 7D8903A6 +4E800421 88960003 +7C041800 4081000C +38600000 98760003 3A940001 2C140004 -4180FFB4 387E0022 -3AA30060 3A800000 +4180FFBC 3C60804D +80635F90 907E015D +3A82F228 3AA00000 +3ADE0161 1EF50008 +38600001 7C76B92E +3AF70004 7C76B92E +3AB50001 2C150004 +4180FFE4 3A800000 +3ABF0060 3AFE0181 +1F140010 7F18BA14 1ED40024 7ED6AA14 88760001 2C030000 -4082002C 88760000 -3D808016 618C9238 +40820040 8876000A +2C030078 41820034 +3D808023 618C754C 7D8903A6 4E800421 -88960003 7C041800 -4081000C 38600000 -98760003 3A940001 -2C140004 4180FFBC -3C60804D 80635F90 -907E015A 3A82F228 -3AA00000 3ADE015E -1EF50008 38600001 -7C76B92E 3AF70004 -7C76B92E 3AB50001 -2C150004 4180FFE4 -3A800000 3ABF0060 -3AFE017E 1F140010 -7F18BA14 1ED40024 +7C641B78 7F03C378 +38A00010 3D808000 +618C31F4 7D8903A6 +4E800421 4800001C +7F03C378 38800010 +3D808000 618CC160 +7D8903A6 4E800421 +3A940001 2C140004 +4180FF88 8862F234 +987E01C1 8862F23C +987E01C2 3C608048 +80639D30 5463443E +B07E01C3 3B200000 +3C608048 80639D30 +5463443E 2C030208 +4082017C 38600000 +3D808000 618C5610 +7D8903A6 4E800421 +7C791B78 3A800000 +3ABF0060 3AFE01C5 +3B590034 1C74001F +7F03BA14 1ED40024 7ED6AA14 88760001 -2C030000 40820040 -8876000A 2C030078 -41820034 3D808023 -618C754C 7D8903A6 -4E800421 7C641B78 -7F03C378 38A00010 +2C030000 40820028 +1C74001F 7C83D214 +7F03C378 38A0001F 3D808000 618C31F4 7D8903A6 4E800421 4800001C 7F03C378 -38800010 3D808000 +3880001F 3D808000 618CC160 7D8903A6 4E800421 3A940001 -2C140004 4180FF88 -8862F234 987E01BE -8862F23C 987E01BF -3C608048 80639D30 -5463443E B07E01C0 -3B200000 3C608048 -80639D30 5463443E -2C030208 4082017C -38600000 3D808000 -618C5610 7D8903A6 -4E800421 7C791B78 +2C140004 4180FFA0 3A800000 3ABF0060 -3AFE01C2 3B590034 -1C74001F 7F03BA14 +3AFE0241 3B5900CF +1C74000A 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 -40820028 1C74001F +40820028 1C74000A 7C83D214 7F03C378 -38A0001F 3D808000 +38A0000A 3D808000 618C31F4 7D8903A6 4E800421 4800001C -7F03C378 3880001F +7F03C378 3880000A 3D808000 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 3A800000 -3ABF0060 3AFE023E -3B5900CF 1C74000A +3ABF0060 3AFE0269 +3B5900F7 1C74001D 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 40820028 -1C74000A 7C83D214 -7F03C378 38A0000A +1C74001D 7C83D214 +7F03C378 38A0001D 3D808000 618C31F4 7D8903A6 4E800421 4800001C 7F03C378 -3880000A 3D808000 +3880001D 3D808000 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 -3A800000 3ABF0060 -3AFE0266 3B5900F7 -1C74001D 7F03BA14 -1ED40024 7ED6AA14 -88760001 2C030000 -40820028 1C74001D -7C83D214 7F03C378 -38A0001D 3D808000 +4800001C 387E01C5 +38800118 3D808000 +618CC160 7D8903A6 +4E800421 3D808000 +618CADF4 7D8903A6 +4E800421 987E02DD +2C190000 41820044 +387E02DE 38990394 +38A00033 3D808000 618C31F4 7D8903A6 -4E800421 4800001C -7F03C378 3880001D -3D808000 618CC160 -7D8903A6 4E800421 -3A940001 2C140004 -4180FFA0 4800001C -387E01C2 38800118 +4E800421 3C60803D +6063AD40 80630000 +81830088 A06C0001 +907E0311 886C0006 +907E0315 4800001C +387E02DE 3880003B 3D808000 618CC160 7D8903A6 4E800421 -3D808000 618CADF4 +2C190000 41820018 +7F23CB78 3D808037 +618CF1B0 7D8903A6 +4E800421 7FC3F378 +38800319 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -987E02DA 2C190000 -41820044 387E02DB -38990394 38A00033 -3D808000 618C31F4 +38600205 3D808037 +618CF1E4 7D8903A6 +4E800421 7C751B78 +3C608000 60635600 +80630000 3AE30008 +38600010 98750000 +3860003D 98750203 +38600200 B0750201 +38600000 98750204 +3AC00000 7C76E050 +2C030200 41810010 +B0750201 38600001 +98750204 38750001 +7EE4BB78 7C84B214 +A0B50201 3D808000 +618C31F4 7D8903A6 +4E800421 7EA3AB78 +38800205 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -3C60803D 6063AD40 -80630000 81830088 -A06C0001 907E030E -886C0006 907E0312 -4800001C 387E02DB -3880003B 3D808000 -618CC160 7D8903A6 -4E800421 2C190000 -41820018 7F23CB78 +3AD60200 7C16E000 +4180FFA4 7EA3AB78 3D808037 618CF1B0 7D8903A6 4E800421 -7FC3F378 38800316 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 38600205 -3D808037 618CF1E4 -7D8903A6 4E800421 -7C751B78 3C608000 -60635600 80630000 -3AE30008 38600010 -98750000 3860003D -98750203 38600200 -B0750201 38600000 -98750204 3AC00000 -7C76E050 2C030200 -41810010 B0750201 -38600001 98750204 -38750001 7EE4BB78 -7C84B214 A0B50201 -3D808000 618C31F4 -7D8903A6 4E800421 -7EA3AB78 38800205 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 3AD60200 -7C16E000 4180FFA4 -7EA3AB78 3D808037 -618CF1B0 7D8903A6 -4E800421 38600004 -38800007 38A00000 -3D808039 618C01F0 -7D8903A6 4E800421 -48000021 7C8802A6 -38A00000 3D808038 -618CFD54 7D8903A6 -4E800421 48000070 -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 806DB64C -83A30000 838DB650 -7FBDE214 3860003A -987D0000 806DB654 -907D0001 3C60804D -80635F90 907D0005 -3C608048 80639D60 -907D0009 838DB650 -3B9C000D 938DB650 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 38600004 -38800007 38A00000 -3D808039 618C01F0 +38600004 38800007 +38A00000 3D808039 +618C01F0 7D8903A6 +4E800421 48000021 +7C8802A6 38A00000 +3D808038 618CFD54 7D8903A6 4E800421 -48000021 7C8802A6 -38A0000F 3D808038 -618CFD54 7D8903A6 -4E800421 4800012C -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 806DB64C -83E30000 83CDB650 -7FFFF214 3B600000 -806DC18C 83A30024 -2C1D0000 418200E0 -3B7B0001 2C1B000F -418100D4 839D002C -3860003B 987F0000 -806DB654 907F0001 -807C0010 B07F0005 -807C0024 987F0007 -807C002C 907F0008 -807C0040 907F000C -807C0044 907F0010 -807C004C 907F0014 -807C0050 907F0018 -807C0C9C B07F001C -807C0D44 907F001E -807C001C 907F0022 -887C0DD7 987F0026 -887C0DDB 987F0027 -887C0DEB 987F0028 -887C0DEF 987F0029 -807C0518 2C030000 -41820018 8063002C -2C030000 4182000C -8863000C 48000008 -3860FFFF 987F002A -A07C0DA8 B07F002B -83CDB650 3BDE002D -93CDB650 3BFF002D -83BD0008 2C1D0000 -4082FF28 BA8100B0 +48000070 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +806DB64C 83A30000 +838DB650 7FBDE214 +3860003A 987D0000 +806DB654 907D0001 +3C60804D 80635F90 +907D0005 3C608048 +80639D60 907D0009 +838DB650 3B9C000D +938DB650 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 +38600004 38800007 +38A00000 3D808039 +618C01F0 7D8903A6 +4E800421 48000021 +7C8802A6 38A0000F +3D808038 618CFD54 +7D8903A6 4E800421 +4800012C 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +806DB64C 83E30000 +83CDB650 7FFFF214 +3B600000 806DC18C +83A30024 2C1D0000 +418200E0 3B7B0001 +2C1B000F 418100D4 +839D002C 3860003B +987F0000 806DB654 +907F0001 807C0010 +B07F0005 807C0024 +987F0007 807C002C +907F0008 807C0040 +907F000C 807C0044 +907F0010 807C004C +907F0014 807C0050 +907F0018 807C0C9C +B07F001C 807C0D44 +907F001E 807C001C +907F0022 887C0DD7 +987F0026 887C0DDB +987F0027 887C0DEB +987F0028 887C0DEF +987F0029 807C0518 +2C030000 41820018 +8063002C 2C030000 +4182000C 8863000C +48000008 3860FFFF +987F002A A07C0DA8 +B07F002B 83CDB650 +3BDE002D 93CDB650 +3BFF002D 83BD0008 +2C1D0000 4082FF28 BA8100B0 800100E4 382100E0 7C0803A6 -3C608017 00000000 +4E800020 BA8100B0 +800100E4 382100E0 +7C0803A6 3C608017 +60000000 00000000 C206DA34 00000038 #Recording/SendGamePostFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 diff --git a/Output/Playback/GALE01r2.ini b/Output/Playback/GALE01r2.ini index 4a09634c..220a7880 100644 --- a/Output/Playback/GALE01r2.ini +++ b/Output/Playback/GALE01r2.ini @@ -960,6 +960,58 @@ C23219EC 0000001D #Recording/FlushFrameBuffer.asm 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 +C206DA38 00000033 #Recording/SendGameBones.asm +7C0802A6 90010004 +9421FF20 BE8100B0 +3D808000 618C5604 +7D8903A6 4E800421 +2C030000 41820154 +887F221F 546306F7 +40820148 8B7F000C +806DB64C 83A30000 +838DB650 7FBDE214 +38600021 987D0000 +806DB654 907D0001 +9B7D0005 7FE3FB78 +3D808000 618C55F8 +7D8903A6 4E800421 +987D0006 807F0004 +987D0007 807E0028 +38800000 38BD000A +48000019 B07D0008 +838DB650 3B9C10A2 +938DB650 480000DC +7C0802A6 90010004 +9421FFE4 93E10014 +93C10010 93A1000C +7C7F1B78 7C9E2378 +7CBD2B78 807F0044 +907D0000 807F0054 +907D0004 807F0064 +907D0008 807F002C +907D000C 807F0030 +907D0010 807F0034 +907D0014 807F0038 +907D0018 807F003C +907D001C 807F0040 +907D0020 3BDE0001 +3BBD0024 807F0010 +7FC4F378 7FA5EB78 +2C030000 41820010 +4BFFFF79 7C7E1B78 +7C9D2378 807F0008 +7FC4F378 7FA5EB78 +2C030000 41820010 +4BFFFF59 7C7E1B78 +7C9D2378 7FC3F378 +7FA4EB78 83E10014 +83C10010 83A1000C +80010020 3821001C +7C0803A6 4E800020 +BA8100B0 800100E4 +382100E0 7C0803A6 +8001001C 83E10014 +60000000 00000000 C216D884 00000030 #Recording/SendGameEnd.asm 7C0802A6 90010004 9421FF20 BE8100B0 @@ -1009,273 +1061,276 @@ C216D884 00000030 #Recording/SendGameEnd.asm BA8100B0 800100E4 382100E0 7C0803A6 819F2514 00000000 -C216E74C 0000010A #Recording/SendGameInfo.asm +C216E74C 0000010D #Recording/SendGameInfo.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820814 +2C030000 41820828 38600005 3D808037 618CF1E4 7D8903A6 4E800421 7C7B1B78 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600770 3D808037 -618CF1E4 7D8903A6 -4E800421 7C7E1B78 -93DB0000 38600000 -906DB650 3C608000 -60635600 80630000 -38630008 38800000 -3D808000 618C55FC -7D8903A6 4E800421 -7C7C1B78 38600035 -987E0000 3860001C -987E0001 38600036 -987E0002 386002F8 -B07E0003 38600037 -987E0005 38600040 -B07E0006 38600038 -987E0008 38600054 -B07E0009 38600039 -987E000B 38600006 -B07E000C 3860003A -987E000E 3860000C -B07E000F 3860003B -987E0011 3860002C -B07E0012 3860003C -987E0014 38600008 -B07E0015 3860003D -987E0017 B39E0018 -38600010 987E001A -38600204 B07E001B -38600036 987E001D -3C600310 60630000 -907E001E 387E0022 -7FE4FB78 38A00138 -3D808000 618C31F4 -7D8903A6 4E800421 -387E0062 3880001C -3D808000 618CC160 +3C600000 60638C80 +3D808037 618CF1E4 7D8903A6 4E800421 -387E0022 3AA30060 +7C7E1B78 93DB0000 +38600000 906DB650 +3C608000 60635600 +80630000 38630008 +38800000 3D808000 +618C55FC 7D8903A6 +4E800421 7C7C1B78 +38600035 987E0000 +3860001F 987E0001 +38600036 987E0002 +386002F8 B07E0003 +38600037 987E0005 +38600040 B07E0006 +38600038 987E0008 +38600054 B07E0009 +38600039 987E000B +38600006 B07E000C +3860003A 987E000E +3860000C B07E000F +3860003B 987E0011 +3860002C B07E0012 +3860003C 987E0014 +38600008 B07E0015 +3860003D 987E0017 +B39E0018 38600010 +987E001A 38600204 +B07E001B 38600021 +987E001D 38600000 +B07E001E 38600036 +987E0020 3C600310 +60630000 907E0021 +387E0025 7FE4FB78 +38A00138 3D808000 +618C31F4 7D8903A6 +4E800421 387E0065 +3880001C 3D808000 +618CC160 7D8903A6 +4E800421 387E0025 +3AA30060 3A800000 +1ED40024 7ED6AA14 +88760001 2C030000 +40820034 88760000 +2C030012 40820028 +3C60804C 606320BC +1C940044 7C632214 +80630000 546005EF +4182000C 38600013 +98760000 3A940001 +2C140004 4180FFB4 +387E0025 3AA30060 3A800000 1ED40024 7ED6AA14 88760001 -2C030000 40820034 -88760000 2C030012 -40820028 3C60804C -606320BC 1C940044 -7C632214 80630000 -546005EF 4182000C -38600013 98760000 +2C030000 4082002C +88760000 3D808016 +618C9238 7D8903A6 +4E800421 88960003 +7C041800 4081000C +38600000 98760003 3A940001 2C140004 -4180FFB4 387E0022 -3AA30060 3A800000 +4180FFBC 3C60804D +80635F90 907E015D +3A82F228 3AA00000 +3ADE0161 1EF50008 +38600001 7C76B92E +3AF70004 7C76B92E +3AB50001 2C150004 +4180FFE4 3A800000 +3ABF0060 3AFE0181 +1F140010 7F18BA14 1ED40024 7ED6AA14 88760001 2C030000 -4082002C 88760000 -3D808016 618C9238 +40820040 8876000A +2C030078 41820034 +3D808023 618C754C 7D8903A6 4E800421 -88960003 7C041800 -4081000C 38600000 -98760003 3A940001 -2C140004 4180FFBC -3C60804D 80635F90 -907E015A 3A82F228 -3AA00000 3ADE015E -1EF50008 38600001 -7C76B92E 3AF70004 -7C76B92E 3AB50001 -2C150004 4180FFE4 -3A800000 3ABF0060 -3AFE017E 1F140010 -7F18BA14 1ED40024 +7C641B78 7F03C378 +38A00010 3D808000 +618C31F4 7D8903A6 +4E800421 4800001C +7F03C378 38800010 +3D808000 618CC160 +7D8903A6 4E800421 +3A940001 2C140004 +4180FF88 8862F234 +987E01C1 8862F23C +987E01C2 3C608048 +80639D30 5463443E +B07E01C3 3B200000 +3C608048 80639D30 +5463443E 2C030208 +4082017C 38600000 +3D808000 618C5610 +7D8903A6 4E800421 +7C791B78 3A800000 +3ABF0060 3AFE01C5 +3B590034 1C74001F +7F03BA14 1ED40024 7ED6AA14 88760001 -2C030000 40820040 -8876000A 2C030078 -41820034 3D808023 -618C754C 7D8903A6 -4E800421 7C641B78 -7F03C378 38A00010 +2C030000 40820028 +1C74001F 7C83D214 +7F03C378 38A0001F 3D808000 618C31F4 7D8903A6 4E800421 4800001C 7F03C378 -38800010 3D808000 +3880001F 3D808000 618CC160 7D8903A6 4E800421 3A940001 -2C140004 4180FF88 -8862F234 987E01BE -8862F23C 987E01BF -3C608048 80639D30 -5463443E B07E01C0 -3B200000 3C608048 -80639D30 5463443E -2C030208 4082017C -38600000 3D808000 -618C5610 7D8903A6 -4E800421 7C791B78 +2C140004 4180FFA0 3A800000 3ABF0060 -3AFE01C2 3B590034 -1C74001F 7F03BA14 +3AFE0241 3B5900CF +1C74000A 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 -40820028 1C74001F +40820028 1C74000A 7C83D214 7F03C378 -38A0001F 3D808000 +38A0000A 3D808000 618C31F4 7D8903A6 4E800421 4800001C -7F03C378 3880001F +7F03C378 3880000A 3D808000 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 3A800000 -3ABF0060 3AFE023E -3B5900CF 1C74000A +3ABF0060 3AFE0269 +3B5900F7 1C74001D 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 40820028 -1C74000A 7C83D214 -7F03C378 38A0000A +1C74001D 7C83D214 +7F03C378 38A0001D 3D808000 618C31F4 7D8903A6 4E800421 4800001C 7F03C378 -3880000A 3D808000 +3880001D 3D808000 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 -3A800000 3ABF0060 -3AFE0266 3B5900F7 -1C74001D 7F03BA14 -1ED40024 7ED6AA14 -88760001 2C030000 -40820028 1C74001D -7C83D214 7F03C378 -38A0001D 3D808000 +4800001C 387E01C5 +38800118 3D808000 +618CC160 7D8903A6 +4E800421 3D808000 +618CADF4 7D8903A6 +4E800421 987E02DD +2C190000 41820044 +387E02DE 38990394 +38A00033 3D808000 618C31F4 7D8903A6 -4E800421 4800001C -7F03C378 3880001D -3D808000 618CC160 -7D8903A6 4E800421 -3A940001 2C140004 -4180FFA0 4800001C -387E01C2 38800118 +4E800421 3C60803D +6063AD40 80630000 +81830088 A06C0001 +907E0311 886C0006 +907E0315 4800001C +387E02DE 3880003B 3D808000 618CC160 7D8903A6 4E800421 -3D808000 618CADF4 +2C190000 41820018 +7F23CB78 3D808037 +618CF1B0 7D8903A6 +4E800421 7FC3F378 +38800319 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -987E02DA 2C190000 -41820044 387E02DB -38990394 38A00033 -3D808000 618C31F4 +38600205 3D808037 +618CF1E4 7D8903A6 +4E800421 7C751B78 +3C608000 60635600 +80630000 3AE30008 +38600010 98750000 +3860003D 98750203 +38600200 B0750201 +38600000 98750204 +3AC00000 7C76E050 +2C030200 41810010 +B0750201 38600001 +98750204 38750001 +7EE4BB78 7C84B214 +A0B50201 3D808000 +618C31F4 7D8903A6 +4E800421 7EA3AB78 +38800205 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -3C60803D 6063AD40 -80630000 81830088 -A06C0001 907E030E -886C0006 907E0312 -4800001C 387E02DB -3880003B 3D808000 -618CC160 7D8903A6 -4E800421 2C190000 -41820018 7F23CB78 +3AD60200 7C16E000 +4180FFA4 7EA3AB78 3D808037 618CF1B0 7D8903A6 4E800421 -7FC3F378 38800316 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 38600205 -3D808037 618CF1E4 -7D8903A6 4E800421 -7C751B78 3C608000 -60635600 80630000 -3AE30008 38600010 -98750000 3860003D -98750203 38600200 -B0750201 38600000 -98750204 3AC00000 -7C76E050 2C030200 -41810010 B0750201 -38600001 98750204 -38750001 7EE4BB78 -7C84B214 A0B50201 -3D808000 618C31F4 -7D8903A6 4E800421 -7EA3AB78 38800205 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 3AD60200 -7C16E000 4180FFA4 -7EA3AB78 3D808037 -618CF1B0 7D8903A6 -4E800421 38600004 -38800007 38A00000 -3D808039 618C01F0 -7D8903A6 4E800421 -48000021 7C8802A6 -38A00000 3D808038 -618CFD54 7D8903A6 -4E800421 48000070 -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 806DB64C -83A30000 838DB650 -7FBDE214 3860003A -987D0000 806DB654 -907D0001 3C60804D -80635F90 907D0005 -3C608048 80639D60 -907D0009 838DB650 -3B9C000D 938DB650 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 38600004 -38800007 38A00000 -3D808039 618C01F0 +38600004 38800007 +38A00000 3D808039 +618C01F0 7D8903A6 +4E800421 48000021 +7C8802A6 38A00000 +3D808038 618CFD54 7D8903A6 4E800421 -48000021 7C8802A6 -38A0000F 3D808038 -618CFD54 7D8903A6 -4E800421 4800012C -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 806DB64C -83E30000 83CDB650 -7FFFF214 3B600000 -806DC18C 83A30024 -2C1D0000 418200E0 -3B7B0001 2C1B000F -418100D4 839D002C -3860003B 987F0000 -806DB654 907F0001 -807C0010 B07F0005 -807C0024 987F0007 -807C002C 907F0008 -807C0040 907F000C -807C0044 907F0010 -807C004C 907F0014 -807C0050 907F0018 -807C0C9C B07F001C -807C0D44 907F001E -807C001C 907F0022 -887C0DD7 987F0026 -887C0DDB 987F0027 -887C0DEB 987F0028 -887C0DEF 987F0029 -807C0518 2C030000 -41820018 8063002C -2C030000 4182000C -8863000C 48000008 -3860FFFF 987F002A -A07C0DA8 B07F002B -83CDB650 3BDE002D -93CDB650 3BFF002D -83BD0008 2C1D0000 -4082FF28 BA8100B0 +48000070 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +806DB64C 83A30000 +838DB650 7FBDE214 +3860003A 987D0000 +806DB654 907D0001 +3C60804D 80635F90 +907D0005 3C608048 +80639D60 907D0009 +838DB650 3B9C000D +938DB650 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 +38600004 38800007 +38A00000 3D808039 +618C01F0 7D8903A6 +4E800421 48000021 +7C8802A6 38A0000F +3D808038 618CFD54 +7D8903A6 4E800421 +4800012C 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +806DB64C 83E30000 +83CDB650 7FFFF214 +3B600000 806DC18C +83A30024 2C1D0000 +418200E0 3B7B0001 +2C1B000F 418100D4 +839D002C 3860003B +987F0000 806DB654 +907F0001 807C0010 +B07F0005 807C0024 +987F0007 807C002C +907F0008 807C0040 +907F000C 807C0044 +907F0010 807C004C +907F0014 807C0050 +907F0018 807C0C9C +B07F001C 807C0D44 +907F001E 807C001C +907F0022 887C0DD7 +987F0026 887C0DDB +987F0027 887C0DEB +987F0028 887C0DEF +987F0029 807C0518 +2C030000 41820018 +8063002C 2C030000 +4182000C 8863000C +48000008 3860FFFF +987F002A A07C0DA8 +B07F002B 83CDB650 +3BDE002D 93CDB650 +3BFF002D 83BD0008 +2C1D0000 4082FF28 BA8100B0 800100E4 382100E0 7C0803A6 -3C608017 00000000 +4E800020 BA8100B0 +800100E4 382100E0 +7C0803A6 3C608017 +60000000 00000000 C206DA34 00000038 #Recording/SendGamePostFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 diff --git a/Output/Playback/GALJ01r2.ini b/Output/Playback/GALJ01r2.ini index 0d9f05c8..41fad6a0 100644 --- a/Output/Playback/GALJ01r2.ini +++ b/Output/Playback/GALJ01r2.ini @@ -959,6 +959,58 @@ C23219EC 0000001D #Recording/FlushFrameBuffer.asm 800100E4 382100E0 7C0803A6 8001001C 60000000 00000000 +C206DA38 00000033 #Recording/SendGameBones.asm +7C0802A6 90010004 +9421FF20 BE8100B0 +3D808000 618C5604 +7D8903A6 4E800421 +2C030000 41820154 +887F221F 546306F7 +40820148 8B7F000C +806DB64C 83A30000 +838DB650 7FBDE214 +38600021 987D0000 +806DB654 907D0001 +9B7D0005 7FE3FB78 +3D808000 618C55F8 +7D8903A6 4E800421 +987D0006 807F0004 +987D0007 807E0028 +38800000 38BD000A +48000019 B07D0008 +838DB650 3B9C10A2 +938DB650 480000DC +7C0802A6 90010004 +9421FFE4 93E10014 +93C10010 93A1000C +7C7F1B78 7C9E2378 +7CBD2B78 807F0044 +907D0000 807F0054 +907D0004 807F0064 +907D0008 807F002C +907D000C 807F0030 +907D0010 807F0034 +907D0014 807F0038 +907D0018 807F003C +907D001C 807F0040 +907D0020 3BDE0001 +3BBD0024 807F0010 +7FC4F378 7FA5EB78 +2C030000 41820010 +4BFFFF79 7C7E1B78 +7C9D2378 807F0008 +7FC4F378 7FA5EB78 +2C030000 41820010 +4BFFFF59 7C7E1B78 +7C9D2378 7FC3F378 +7FA4EB78 83E10014 +83C10010 83A1000C +80010020 3821001C +7C0803A6 4E800020 +BA8100B0 800100E4 +382100E0 7C0803A6 +8001001C 83E10014 +60000000 00000000 C216D884 00000030 #Recording/SendGameEnd.asm 7C0802A6 90010004 9421FF20 BE8100B0 @@ -1008,273 +1060,276 @@ C216D884 00000030 #Recording/SendGameEnd.asm BA8100B0 800100E4 382100E0 7C0803A6 819F2514 00000000 -C216E74C 0000010A #Recording/SendGameInfo.asm +C216E74C 0000010D #Recording/SendGameInfo.asm 7C0802A6 90010004 9421FF20 BE8100B0 3D808000 618C5604 7D8903A6 4E800421 -2C030000 41820814 +2C030000 41820828 38600005 3D808037 618CF1E4 7D8903A6 4E800421 7C7B1B78 936DB64C 38800005 3D808000 618CC160 7D8903A6 4E800421 -38600770 3D808037 -618CF1E4 7D8903A6 -4E800421 7C7E1B78 -93DB0000 38600000 -906DB650 3C608000 -60635600 80630000 -38630008 38800000 -3D808000 618C55FC -7D8903A6 4E800421 -7C7C1B78 38600035 -987E0000 3860001C -987E0001 38600036 -987E0002 386002F8 -B07E0003 38600037 -987E0005 38600040 -B07E0006 38600038 -987E0008 38600054 -B07E0009 38600039 -987E000B 38600006 -B07E000C 3860003A -987E000E 3860000C -B07E000F 3860003B -987E0011 3860002C -B07E0012 3860003C -987E0014 38600008 -B07E0015 3860003D -987E0017 B39E0018 -38600010 987E001A -38600204 B07E001B -38600036 987E001D -3C600310 60630000 -907E001E 387E0022 -7FE4FB78 38A00138 -3D808000 618C31F4 -7D8903A6 4E800421 -387E0062 3880001C -3D808000 618CC160 +3C600000 60638C80 +3D808037 618CF1E4 7D8903A6 4E800421 -387E0022 3AA30060 +7C7E1B78 93DB0000 +38600000 906DB650 +3C608000 60635600 +80630000 38630008 +38800000 3D808000 +618C55FC 7D8903A6 +4E800421 7C7C1B78 +38600035 987E0000 +3860001F 987E0001 +38600036 987E0002 +386002F8 B07E0003 +38600037 987E0005 +38600040 B07E0006 +38600038 987E0008 +38600054 B07E0009 +38600039 987E000B +38600006 B07E000C +3860003A 987E000E +3860000C B07E000F +3860003B 987E0011 +3860002C B07E0012 +3860003C 987E0014 +38600008 B07E0015 +3860003D 987E0017 +B39E0018 38600010 +987E001A 38600204 +B07E001B 38600021 +987E001D 38600000 +B07E001E 38600036 +987E0020 3C600310 +60630000 907E0021 +387E0025 7FE4FB78 +38A00138 3D808000 +618C31F4 7D8903A6 +4E800421 387E0065 +3880001C 3D808000 +618CC160 7D8903A6 +4E800421 387E0025 +3AA30060 3A800000 +1ED40024 7ED6AA14 +88760001 2C030000 +40820034 88760000 +2C030012 40820028 +3C60804C 606320BC +1C940044 7C632214 +80630000 546005EF +4182000C 38600013 +98760000 3A940001 +2C140004 4180FFB4 +387E0025 3AA30060 3A800000 1ED40024 7ED6AA14 88760001 -2C030000 40820034 -88760000 2C030012 -40820028 3C60804C -606320BC 1C940044 -7C632214 80630000 -546005EF 4182000C -38600013 98760000 +2C030000 4082002C +88760000 3D808016 +618C9238 7D8903A6 +4E800421 88960003 +7C041800 4081000C +38600000 98760003 3A940001 2C140004 -4180FFB4 387E0022 -3AA30060 3A800000 +4180FFBC 3C60804D +80635F90 907E015D +3A82F228 3AA00000 +3ADE0161 1EF50008 +38600001 7C76B92E +3AF70004 7C76B92E +3AB50001 2C150004 +4180FFE4 3A800000 +3ABF0060 3AFE0181 +1F140010 7F18BA14 1ED40024 7ED6AA14 88760001 2C030000 -4082002C 88760000 -3D808016 618C9238 +40820040 8876000A +2C030078 41820034 +3D808023 618C754C 7D8903A6 4E800421 -88960003 7C041800 -4081000C 38600000 -98760003 3A940001 -2C140004 4180FFBC -3C60804D 80635F90 -907E015A 3A82F228 -3AA00000 3ADE015E -1EF50008 38600001 -7C76B92E 3AF70004 -7C76B92E 3AB50001 -2C150004 4180FFE4 -3A800000 3ABF0060 -3AFE017E 1F140010 -7F18BA14 1ED40024 +7C641B78 7F03C378 +38A00010 3D808000 +618C31F4 7D8903A6 +4E800421 4800001C +7F03C378 38800010 +3D808000 618CC160 +7D8903A6 4E800421 +3A940001 2C140004 +4180FF88 8862F234 +987E01C1 8862F23C +987E01C2 3C608048 +80639D30 5463443E +B07E01C3 3B200000 +3C608048 80639D30 +5463443E 2C030208 +4082017C 38600000 +3D808000 618C5610 +7D8903A6 4E800421 +7C791B78 3A800000 +3ABF0060 3AFE01C5 +3B590034 1C74001F +7F03BA14 1ED40024 7ED6AA14 88760001 -2C030000 40820040 -8876000A 2C030078 -41820034 3D808023 -618C754C 7D8903A6 -4E800421 7C641B78 -7F03C378 38A00010 +2C030000 40820028 +1C74001F 7C83D214 +7F03C378 38A0001F 3D808000 618C31F4 7D8903A6 4E800421 4800001C 7F03C378 -38800010 3D808000 +3880001F 3D808000 618CC160 7D8903A6 4E800421 3A940001 -2C140004 4180FF88 -8862F234 987E01BE -8862F23C 987E01BF -3C608048 80639D30 -5463443E B07E01C0 -3B200000 3C608048 -80639D30 5463443E -2C030208 4082017C -38600000 3D808000 -618C5610 7D8903A6 -4E800421 7C791B78 +2C140004 4180FFA0 3A800000 3ABF0060 -3AFE01C2 3B590034 -1C74001F 7F03BA14 +3AFE0241 3B5900CF +1C74000A 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 -40820028 1C74001F +40820028 1C74000A 7C83D214 7F03C378 -38A0001F 3D808000 +38A0000A 3D808000 618C31F4 7D8903A6 4E800421 4800001C -7F03C378 3880001F +7F03C378 3880000A 3D808000 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 3A800000 -3ABF0060 3AFE023E -3B5900CF 1C74000A +3ABF0060 3AFE0269 +3B5900F7 1C74001D 7F03BA14 1ED40024 7ED6AA14 88760001 2C030000 40820028 -1C74000A 7C83D214 -7F03C378 38A0000A +1C74001D 7C83D214 +7F03C378 38A0001D 3D808000 618C31F4 7D8903A6 4E800421 4800001C 7F03C378 -3880000A 3D808000 +3880001D 3D808000 618CC160 7D8903A6 4E800421 3A940001 2C140004 4180FFA0 -3A800000 3ABF0060 -3AFE0266 3B5900F7 -1C74001D 7F03BA14 -1ED40024 7ED6AA14 -88760001 2C030000 -40820028 1C74001D -7C83D214 7F03C378 -38A0001D 3D808000 +4800001C 387E01C5 +38800118 3D808000 +618CC160 7D8903A6 +4E800421 3D808000 +618CADF4 7D8903A6 +4E800421 987E02DD +2C190000 41820044 +387E02DE 38990394 +38A00033 3D808000 618C31F4 7D8903A6 -4E800421 4800001C -7F03C378 3880001D -3D808000 618CC160 -7D8903A6 4E800421 -3A940001 2C140004 -4180FFA0 4800001C -387E01C2 38800118 +4E800421 3C60803D +6063AD40 80630000 +81830088 A06C0001 +907E0311 886C0006 +907E0315 4800001C +387E02DE 3880003B 3D808000 618CC160 7D8903A6 4E800421 -3D808000 618CADF4 +2C190000 41820018 +7F23CB78 3D808037 +618CF1B0 7D8903A6 +4E800421 7FC3F378 +38800319 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -987E02DA 2C190000 -41820044 387E02DB -38990394 38A00033 -3D808000 618C31F4 +38600205 3D808037 +618CF1E4 7D8903A6 +4E800421 7C751B78 +3C608000 60635600 +80630000 3AE30008 +38600010 98750000 +3860003D 98750203 +38600200 B0750201 +38600000 98750204 +3AC00000 7C76E050 +2C030200 41810010 +B0750201 38600001 +98750204 38750001 +7EE4BB78 7C84B214 +A0B50201 3D808000 +618C31F4 7D8903A6 +4E800421 7EA3AB78 +38800205 38A00001 +3D808000 618C55F0 7D8903A6 4E800421 -3C60803D 6063AD40 -80630000 81830088 -A06C0001 907E030E -886C0006 907E0312 -4800001C 387E02DB -3880003B 3D808000 -618CC160 7D8903A6 -4E800421 2C190000 -41820018 7F23CB78 +3AD60200 7C16E000 +4180FFA4 7EA3AB78 3D808037 618CF1B0 7D8903A6 4E800421 -7FC3F378 38800316 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 38600205 -3D808037 618CF1E4 -7D8903A6 4E800421 -7C751B78 3C608000 -60635600 80630000 -3AE30008 38600010 -98750000 3860003D -98750203 38600200 -B0750201 38600000 -98750204 3AC00000 -7C76E050 2C030200 -41810010 B0750201 -38600001 98750204 -38750001 7EE4BB78 -7C84B214 A0B50201 -3D808000 618C31F4 -7D8903A6 4E800421 -7EA3AB78 38800205 -38A00001 3D808000 -618C55F0 7D8903A6 -4E800421 3AD60200 -7C16E000 4180FFA4 -7EA3AB78 3D808037 -618CF1B0 7D8903A6 -4E800421 38600004 -38800007 38A00000 -3D808039 618C01F0 -7D8903A6 4E800421 -48000021 7C8802A6 -38A00000 3D808038 -618CFD54 7D8903A6 -4E800421 48000070 -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 806DB64C -83A30000 838DB650 -7FBDE214 3860003A -987D0000 806DB654 -907D0001 3C60804D -80635F90 907D0005 -3C608048 80639D60 -907D0009 838DB650 -3B9C000D 938DB650 -BA8100B0 800100E4 -382100E0 7C0803A6 -4E800020 38600004 -38800007 38A00000 -3D808039 618C01F0 +38600004 38800007 +38A00000 3D808039 +618C01F0 7D8903A6 +4E800421 48000021 +7C8802A6 38A00000 +3D808038 618CFD54 7D8903A6 4E800421 -48000021 7C8802A6 -38A0000F 3D808038 -618CFD54 7D8903A6 -4E800421 4800012C -4E800021 7C0802A6 -90010004 9421FF20 -BE8100B0 806DB64C -83E30000 83CDB650 -7FFFF214 3B600000 -806DC18C 83A30024 -2C1D0000 418200E0 -3B7B0001 2C1B000F -418100D4 839D002C -3860003B 987F0000 -806DB654 907F0001 -807C0010 B07F0005 -807C0024 987F0007 -807C002C 907F0008 -807C0040 907F000C -807C0044 907F0010 -807C004C 907F0014 -807C0050 907F0018 -807C0C9C B07F001C -807C0D44 907F001E -807C001C 907F0022 -887C0DD7 987F0026 -887C0DDB 987F0027 -887C0DEB 987F0028 -887C0DEF 987F0029 -807C0518 2C030000 -41820018 8063002C -2C030000 4182000C -8863000C 48000008 -3860FFFF 987F002A -A07C0DA8 B07F002B -83CDB650 3BDE002D -93CDB650 3BFF002D -83BD0008 2C1D0000 -4082FF28 BA8100B0 +48000070 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +806DB64C 83A30000 +838DB650 7FBDE214 +3860003A 987D0000 +806DB654 907D0001 +3C60804D 80635F90 +907D0005 3C608048 +80639D60 907D0009 +838DB650 3B9C000D +938DB650 BA8100B0 800100E4 382100E0 7C0803A6 4E800020 +38600004 38800007 +38A00000 3D808039 +618C01F0 7D8903A6 +4E800421 48000021 +7C8802A6 38A0000F +3D808038 618CFD54 +7D8903A6 4E800421 +4800012C 4E800021 +7C0802A6 90010004 +9421FF20 BE8100B0 +806DB64C 83E30000 +83CDB650 7FFFF214 +3B600000 806DC18C +83A30024 2C1D0000 +418200E0 3B7B0001 +2C1B000F 418100D4 +839D002C 3860003B +987F0000 806DB654 +907F0001 807C0010 +B07F0005 807C0024 +987F0007 807C002C +907F0008 807C0040 +907F000C 807C0044 +907F0010 807C004C +907F0014 807C0050 +907F0018 807C0C9C +B07F001C 807C0D44 +907F001E 807C001C +907F0022 887C0DD7 +987F0026 887C0DDB +987F0027 887C0DEB +987F0028 887C0DEF +987F0029 807C0518 +2C030000 41820018 +8063002C 2C030000 +4182000C 8863000C +48000008 3860FFFF +987F002A A07C0DA8 +B07F002B 83CDB650 +3BDE002D 93CDB650 +3BFF002D 83BD0008 +2C1D0000 4082FF28 BA8100B0 800100E4 382100E0 7C0803A6 -3C608017 00000000 +4E800020 BA8100B0 +800100E4 382100E0 +7C0803A6 3C608017 +60000000 00000000 C206DA34 00000038 #Recording/SendGamePostFrame.asm 7C0802A6 90010004 9421FF20 BE8100B0 diff --git a/Recording/Recording.s b/Recording/Recording.s index 6b71c2ec..23bfa923 100644 --- a/Recording/Recording.s +++ b/Recording/Recording.s @@ -22,7 +22,11 @@ .set CMD_ITEM, 0x3B .set CMD_FRAME_BOOKEND, 0x3C .set CMD_GAME_END, 0x39 -.set COMMAND_COUNT, 10 # number of possible commands +# I realized after being mostly done with this that there's another bones extract branch... I'll leave this one here +# regardless because I think it might include rotation and stuff? This branch is untested atm +# Other branch: https://github.com/project-slippi/slippi-ssbm-asm/commit/e88025b6269714f12d1190beec4f228ee15fe099#diff-933ee24f9d76cf3111e644da95574259e7d4f8f8c40964dbf9a7db35e433e8fdR40 +.set CMD_BONES_EXTRACT, 0x21 +.set COMMAND_COUNT, 11 # number of possible commands .set BONE_BYTES, 4 * 9 # float for each R/S/T, X/Y/Z .set BONE_MAX, 118 # Zelda has the most bones at 118 @@ -35,6 +39,7 @@ .set GAME_FRAME_START_PAYLOAD_LENGTH, 12 #byte count .set GAME_PRE_FRAME_PAYLOAD_LENGTH, 64 # byte count .set GAME_POST_FRAME_PAYLOAD_LENGTH, 84 # byte count +.set GAME_BONES_EXTRACT_PAYLOAD_LENGTH, 9 + (BONE_BYTES * BONE_MAX) # byte count .set GAME_ITEM_INFO_PAYLOAD_LENGTH, 44 # byte count .set GAME_FRAME_BOOKEND_PAYLOAD_LENGTH, 8 # byte count .set GAME_END_PAYLOAD_LENGTH, GAME_END_TXB_SIZE - 1 # byte count @@ -60,7 +65,7 @@ .set SUPPORTED_PORTS, 4 .set MAX_CHARACTERS, SUPPORTED_PORTS * 2 # ICs .set TOTAL_FRAME_START_LEN, GAME_FRAME_START_PAYLOAD_LENGTH + 1 -.set TOTAL_CHAR_FRAME_LEN, MAX_CHARACTERS * (GAME_PRE_FRAME_PAYLOAD_LENGTH + 1) + MAX_CHARACTERS * (GAME_POST_FRAME_PAYLOAD_LENGTH + 1) +.set TOTAL_CHAR_FRAME_LEN, MAX_CHARACTERS * (GAME_PRE_FRAME_PAYLOAD_LENGTH + 1) + MAX_CHARACTERS * (GAME_POST_FRAME_PAYLOAD_LENGTH + 1) + MAX_CHARACTERS * (GAME_BONES_EXTRACT_PAYLOAD_LENGTH + 1) .set TOTAL_ITEM_LEN, MAX_ITEMS * (GAME_ITEM_INFO_PAYLOAD_LENGTH + 1) .set TOTAL_FRAME_BOOKEND_LEN, GAME_FRAME_BOOKEND_PAYLOAD_LENGTH + 1 .set TOTAL_GAME_END_LEN, GAME_END_PAYLOAD_LENGTH + 1 diff --git a/Recording/SendGameBones.asm b/Recording/SendGameBones.asm new file mode 100644 index 00000000..56ceca49 --- /dev/null +++ b/Recording/SendGameBones.asm @@ -0,0 +1,159 @@ +################################################################################ +# Address: 8006da38 +################################################################################ +.include "Common/Common.s" +.include "Recording/Recording.s" + +################################################################################ +# Routine: SendGameBones +# ------------------------------------------------------------------------------ +# Description: Sends bone data to be stored in replay +################################################################################ + +.set REG_PlayerData,31 +.set REG_FighterGobj,30 +.set REG_Buffer,29 +.set REG_BufferOffset,28 +.set REG_PlayerSlot,27 + +backup + +# Check if VS Mode + branchl r12,FN_ShouldRecord + cmpwi r3,0x0 + beq Injection_Exit + +# check if this character is in sleep + lbz r3,0x221F(REG_PlayerData) + rlwinm. r3,r3,0,27,27 + bne Injection_Exit + +#------------- INITIALIZE ------------- +# here we want to initalize some variables we plan on using throughout + lbz REG_PlayerSlot,0xC(REG_PlayerData) #loads this player slot +# get current offset in buffer + lwz r3, primaryDataBuffer(r13) + lwz REG_Buffer, RDB_TXB_ADDRESS(r3) + lwz REG_BufferOffset,bufferOffset(r13) + add REG_Buffer,REG_Buffer,REG_BufferOffset + +#------------- Start bones extract ------------- + +# send bones extract code + li r3, CMD_BONES_EXTRACT + stb r3,0x0(REG_Buffer) + +# send frame count + lwz r3,frameIndex(r13) + stw r3,0x1(REG_Buffer) + +# send playerslot + stb REG_PlayerSlot,0x5(REG_Buffer) + +# send isFollowerBool + mr r3,REG_PlayerData + branchl r12,FN_GetIsFollower + stb r3,0x6(REG_Buffer) + +# send char id + lwz r3,0x04(REG_PlayerData) #load internal char ID + stb r3,0x07(REG_Buffer) + + # Extract bone information + lwz r3, 0x28(REG_FighterGobj) # Get JObj + li r4, 0 + addi r5, REG_Buffer, 0xA + bl JOBJ_ExtractBones + + # Store bone count + sth r3, 0x8(REG_Buffer) + +#------------- Increment Buffer Offset ------------ + lwz REG_BufferOffset,bufferOffset(r13) + addi REG_BufferOffset,REG_BufferOffset,(GAME_BONES_EXTRACT_PAYLOAD_LENGTH+1) + stw REG_BufferOffset,bufferOffset(r13) + + b Injection_Exit + +############################## + +JOBJ_ExtractBones: +# r3 = jobj +# r4 = count +# r5 = buffer_addr + +.set REG_JObj, 31 +.set REG_Count, 30 +.set REG_BufAddr, 29 + +# backup jobj +mflr r0 +stw r0, 0x0004 (sp) +stwu sp, -0x001C (sp) +stw REG_JObj, 0x0014 (sp) +stw REG_Count, 0x10(sp) +stw REG_BufAddr, 0x0C(sp) +mr REG_JObj,r3 +mr REG_Count,r4 +mr REG_BufAddr,r5 + +# output all jobj values +lwz r3, 0x44(REG_JObj) +stw r3, 0x0(REG_BufAddr) # RX +lwz r3, 0x54(REG_JObj) +stw r3, 0x4(REG_BufAddr) # RY +lwz r3, 0x64(REG_JObj) +stw r3, 0x8(REG_BufAddr) # RZ +lwz r3, 0x2C(REG_JObj) +stw r3, 0xC(REG_BufAddr) # SX +lwz r3, 0x30(REG_JObj) +stw r3, 0x10(REG_BufAddr) # SY +lwz r3, 0x34(REG_JObj) +stw r3, 0x14(REG_BufAddr) # SZ +lwz r3, 0x38(REG_JObj) +stw r3, 0x18(REG_BufAddr) # TX +lwz r3, 0x3C(REG_JObj) +stw r3, 0x1C(REG_BufAddr) # TY +lwz r3, 0x40(REG_JObj) +stw r3, 0x20(REG_BufAddr) # TZ + +addi REG_Count, REG_Count, 1 +addi REG_BufAddr, REG_BufAddr, 9 * 4 + +# run on child +lwz r3,0x10(REG_JObj) +mr r4, REG_Count +mr r5, REG_BufAddr +cmpwi r3,0 +beq 0x10 +bl JOBJ_ExtractBones +mr REG_Count, r3 +mr REG_BufAddr, r4 + +# run on sibling +lwz r3,0x8(REG_JObj) +mr r4, REG_Count +mr r5, REG_BufAddr +cmpwi r3,0 +beq 0x10 +bl JOBJ_ExtractBones +mr REG_Count, r3 +mr REG_BufAddr, r4 + +# Return values and exit function +mr r3, REG_Count +mr r4, REG_BufAddr +lwz REG_JObj, 0x0014 (sp) +lwz REG_Count, 0x10(sp) +lwz REG_BufAddr, 0x0C(sp) +lwz r0,0x20(sp) +addi sp, sp, 0x001C +mtlr r0 +blr + +############################## + +Injection_Exit: + restore + lwz r0, 0x001C (sp) + lwz r31, 0x0014 (sp) \ No newline at end of file diff --git a/Recording/SendGameInfo.asm b/Recording/SendGameInfo.asm index f99e5259..d538e908 100644 --- a/Recording/SendGameInfo.asm +++ b/Recording/SendGameInfo.asm @@ -122,6 +122,12 @@ backup li r3, SPLIT_MESSAGE_PAYLOAD_LENGTH sth r3, CommandSizesStart+0x1B(REG_Buffer) +# bones extract command + li r3, CMD_BONES_EXTRACT + stb r3, CommandSizesStart+0x1D(REG_Buffer) + li r3, BONES_EXTRACT_PAYLOAD_LENGTH + sth r3, CommandSizesStart+0x1E(REG_Buffer) + #------------- BEGIN GAME INFO COMMAND ------------- # game information message type .set GameInfoCommandStart, (CommandSizesStart + CommandSizesLength) diff --git a/Recording/SendGamePostFrame.asm b/Recording/SendGamePostFrame.asm index 387eff8f..873a1fa7 100644 --- a/Recording/SendGamePostFrame.asm +++ b/Recording/SendGamePostFrame.asm @@ -12,7 +12,6 @@ ################################################################################ .set REG_PlayerData,31 -.set REG_FighterGobj,30 .set REG_Buffer,29 .set REG_BufferOffset,28 .set REG_PlayerSlot,27 @@ -161,100 +160,11 @@ backup lhz r3,0x2088(REG_PlayerData) sth r3,0x53(REG_Buffer) - # Extract bone information - lwz r3, 0x28(REG_FighterGobj) # Get JObj - li r4, 0 - addi r5, REG_Buffer, 0x4F - bl JOBJ_ExtractBones - - # Store bone count - sth r3, 0x4D(REG_Buffer) - #------------- Increment Buffer Offset ------------ lwz REG_BufferOffset,bufferOffset(r13) addi REG_BufferOffset,REG_BufferOffset,(GAME_POST_FRAME_PAYLOAD_LENGTH+1) stw REG_BufferOffset,bufferOffset(r13) - b Injection_Exit - -############################## - -JOBJ_ExtractBones: -# r3 = jobj -# r4 = count -# r5 = buffer_addr - -.set REG_JObj, 31 -.set REG_Count, 30 -.set REG_BufAddr, 29 - -# backup jobj -mflr r0 -stw r0, 0x0004 (sp) -stwu sp, -0x001C (sp) -stw REG_JObj, 0x0014 (sp) -stw REG_Count, 0x10(sp) -stw REG_BufAddr, 0x0C(sp) -mr REG_JObj,r3 -mr REG_Count,r4 -mr REG_BufAddr,r5 - -# output all jobj values -lwz r3, 0x44(REG_JObj) -stw r3, 0x0(REG_BufAddr) # RX -lwz r3, 0x54(REG_JObj) -stw r3, 0x4(REG_BufAddr) # RY -lwz r3, 0x64(REG_JObj) -stw r3, 0x8(REG_BufAddr) # RZ -lwz r3, 0x2C(REG_JObj) -stw r3, 0xC(REG_BufAddr) # SX -lwz r3, 0x30(REG_JObj) -stw r3, 0x10(REG_BufAddr) # SY -lwz r3, 0x34(REG_JObj) -stw r3, 0x14(REG_BufAddr) # SZ -lwz r3, 0x38(REG_JObj) -stw r3, 0x18(REG_BufAddr) # TX -lwz r3, 0x3C(REG_JObj) -stw r3, 0x1C(REG_BufAddr) # TY -lwz r3, 0x40(REG_JObj) -stw r3, 0x20(REG_BufAddr) # TZ - -addi REG_Count, REG_Count, 1 -addi REG_BufAddr, REG_BufAddr, 9 * 4 - -# run on child -lwz r3,0x10(REG_JObj) -mr r4, REG_Count -mr r5, REG_BufAddr -cmpwi r3,0 -beq 0x10 -bl JOBJ_ExtractBones -mr REG_Count, r3 -mr REG_BufAddr, r4 - -# run on sibling -lwz r3,0x8(REG_JObj) -mr r4, REG_Count -mr r5, REG_BufAddr -cmpwi r3,0 -beq 0x10 -bl JOBJ_ExtractBones -mr REG_Count, r3 -mr REG_BufAddr, r4 - -# Return values and exit function -mr r3, REG_Count -mr r4, REG_BufAddr -lwz REG_JObj, 0x0014 (sp) -lwz REG_Count, 0x10(sp) -lwz REG_BufAddr, 0x0C(sp) -lwz r0,0x20(sp) -addi sp, sp, 0x001C -mtlr r0 -blr - -############################## - Injection_Exit: restore - lwz r0, 0x001C (sp) + lwz r0, 0x001C (sp) \ No newline at end of file