From 8f7b38d08264d4059380e1d7a8361958fcfbf5ae Mon Sep 17 00:00:00 2001 From: QbeRoot Date: Mon, 28 Oct 2019 22:23:03 +0100 Subject: [PATCH] fixed manta crash with p/a/s display --- changelog.xml | 7 ++++ codes/GMSE01.xml | 90 ++++++++++++++++++++++++------------------------ codes/GMSJ01.xml | 90 ++++++++++++++++++++++++------------------------ codes/GMSJ0A.xml | 76 ++++++++++++++++++++++++++++++++++++++++ codes/GMSP01.xml | 90 ++++++++++++++++++++++++------------------------ 5 files changed, 218 insertions(+), 135 deletions(-) diff --git a/changelog.xml b/changelog.xml index b654dc2..4742d5f 100644 --- a/changelog.xml +++ b/changelog.xml @@ -1,5 +1,12 @@ + + Oct 28, 2019 + + Updated 'Position/angle/speed display' + Fixed a buffer overflow which caused a crash upon starting the manta fight, and ported the code to JP 1.1. + + Oct 22, 2019 diff --git a/codes/GMSE01.xml b/codes/GMSE01.xml index 1240910..2e8c3de 100644 --- a/codes/GMSE01.xml +++ b/codes/GMSE01.xml @@ -1044,66 +1044,58 @@ Position/angle/speed display Noki Doki - 1.1 - Dec 23, 2018 + 1.2 + Oct 28, 2019 Shows Mario's position, angle and speed at any given time. 062A6160 00000010 - 49553F21 60000000 + 49553F19 60000000 60000000 60000000 042998B8 49560749 - 04143F14 496B6249 + 04143F14 496B6209 077FA000 000001E8 - 9421FF60 7C0802A6 - 900100A4 93E1009C + 9421FFE0 7C0802A6 + 90010024 93E1001C 4AABD6E5 38E00200 38C00320 38A0FFD8 - 3880000A 38610088 + 3880000A 38610008 4AAD01B9 814D9FC8 - 3FE08180 3BFFA1F0 + 3FE08180 3BFFA1EC 39200000 39000002 - 38E2B498 80CA0048 - 38A10088 38800000 - 7FE3FB78 4AAD67F5 - 38810008 7FE3FB78 - 4AAD6C09 39200001 - 913F01B0 800100A4 - 7C0803A6 83E1009C - 382100A0 4E800020 - 9421FFD8 7C0802A6 - 9001002C DBA10010 - DBC10018 DBE10020 - 93C10008 93E1000C + 3CE08180 38E7A164 + 80CA0048 38A10008 + 38800000 7FE3FB78 + 4AAD67F1 39200001 + 913F01B0 80010024 + 7C0803A6 83E1001C + 38210020 4E800020 + 9421FFE8 7C0802A6 + 9001001C 93A1000C + 93C10010 93E10014 7C7F1B78 81230000 - 83C90064 3D208180 - 8129A3A0 2F890000 - 409E0034 7FE3FB78 - 7FC903A6 4E800421 - 8001002C 7C0803A6 - 83C10008 83E1000C - CBA10010 CBC10018 - CBE10020 38210028 + 83A90064 3D208180 + 8129A39C 2F890000 + 409E002C 7FE3FB78 + 7FA903A6 4E800421 + 8001001C 7C0803A6 + 83A1000C 83C10010 + 83E10014 38210018 4E800020 3D208040 - 6129E10C 81290000 - C3E90000 C3C90004 - C3A90008 3C608180 - 3863A1F0 4AAD6B55 - 3D208040 6129E120 - 81090000 39290004 - 81490000 3929FFF0 - 81290000 C0A80000 - C08A0004 A0C90000 - FC60E890 FC40F090 - FC20F890 3CA08180 - 38A5A1A4 3880007F - 4CC63242 4AB3F651 - 4BFFFF64 9421FFF0 + 6129E0E8 83C90000 + 3C608180 3863A1EC + 4AAD6B79 C0BE00A8 + C09E00B0 A0DE0096 + C07E0018 C05E0014 + C03E0010 3CA08180 + 38A5A164 38800080 + 4CC63242 4AB3F691 + 4BFFFF94 9421FFF0 7C0802A6 90010014 93E1000C 7C7F1B78 - 4AAF154D 38E00081 + 4AAF158D 38E00081 7FE6FB78 38A00000 38800000 3C608180 - 3863A1F0 4AAD5C1D + 3863A1EC 4AAD5C5D 80010014 7C0803A6 83E1000C 38210010 4E800020 5820506F @@ -1114,7 +1106,15 @@ 6C652025 68750A48 20537064 20252E32 660A5620 53706420 - 252E3266 00000000 + 252E3266 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202000 00000000 diff --git a/codes/GMSJ01.xml b/codes/GMSJ01.xml index 70543c6..9ff1daa 100644 --- a/codes/GMSJ01.xml +++ b/codes/GMSJ01.xml @@ -787,66 +787,58 @@ Position/angle/speed display Noki Doki - 1.0 - Jun 05, 2018 + 1.2 + Oct 28, 2019 Shows Mario's position, angle and speed at any given time. 060F9B64 00000010 - 4970051D 60000000 + 49700515 60000000 60000000 60000000 040ECE3C 4970D1C5 - 04206734 495F3A29 + 04206734 495F39E9 077FA000 000001E8 - 9421FF60 7C0802A6 - 900100A4 93E1009C + 9421FFE0 7C0802A6 + 90010024 93E1001C 4A91239D 38E00200 38C00320 38A0FFD8 - 3880000A 38610088 + 3880000A 38610008 4A8191F5 814D97F8 - 3FE08180 3BFFA1F0 + 3FE08180 3BFFA1EC 39200000 39000002 - 38E2D528 80CA0048 - 38A10088 38800000 - 7FE3FB78 4A81F8B1 - 38810008 7FE3FB78 - 4A81FCC5 39200001 - 913F01B0 800100A4 - 7C0803A6 83E1009C - 382100A0 4E800020 - 9421FFD8 7C0802A6 - 9001002C DBA10010 - DBC10018 DBE10020 - 93C10008 93E1000C + 3CE08180 38E7A164 + 80CA0048 38A10008 + 38800000 7FE3FB78 + 4A81F8AD 39200001 + 913F01B0 80010024 + 7C0803A6 83E1001C + 38210020 4E800020 + 9421FFE8 7C0802A6 + 9001001C 93A1000C + 93C10010 93E10014 7C7F1B78 81230000 - 83C90064 3D208180 - 8129A3A0 2F890000 - 409E0034 7FE3FB78 - 7FC903A6 4E800421 - 8001002C 7C0803A6 - 83C10008 83E1000C - CBA10010 CBC10018 - CBE10020 38210028 + 83A90064 3D208180 + 8129A39C 2F890000 + 409E002C 7FE3FB78 + 7FA903A6 4E800421 + 8001001C 7C0803A6 + 83A1000C 83C10010 + 83E10014 38210018 4E800020 3D208040 - 6129A39C 81290000 - C3E90000 C3C90004 - C3A90008 3C608180 - 3863A1F0 4A81FC11 - 3D208040 6129A3B0 - 81090000 39290004 - 81490000 3929FFF0 - 81290000 C0A80000 - C08A0004 A0C90000 - FC60E890 FC40F090 - FC20F890 3CA08180 - 38A5A1A4 3880007F - 4CC63242 4A889F71 - 4BFFFF64 9421FFF0 + 6129A378 83C90000 + 3C608180 3863A1EC + 4A81FC35 C0BE00A8 + C09E00B0 A0DE0096 + C07E0018 C05E0014 + C03E0010 3CA08180 + 38A5A164 38800080 + 4CC63242 4A889FB1 + 4BFFFF94 9421FFF0 7C0802A6 90010014 93E1000C 7C7F1B78 - 4A83B0B9 38E00081 + 4A83B0F9 38E00081 7FE6FB78 38A00000 38800000 3C608180 - 3863A1F0 4A81ECD9 + 3863A1EC 4A81ED19 80010014 7C0803A6 83E1000C 38210010 4E800020 5820506F @@ -857,7 +849,15 @@ 6C652025 68750A48 20537064 20252E32 660A5620 53706420 - 252E3266 00000000 + 252E3266 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202000 00000000 diff --git a/codes/GMSJ0A.xml b/codes/GMSJ0A.xml index 72919d2..1b1611d 100644 --- a/codes/GMSJ0A.xml +++ b/codes/GMSJ0A.xml @@ -682,6 +682,82 @@ 0424E560 60000000 + + Position/angle/speed display + Noki Doki + 1.2 + Oct 28, 2019 + Shows Mario's position, angle and speed at any given time. + + 06285FBC 00000010 + 495740BD 60000000 + 60000000 60000000 + 04279568 49580A99 + 041252A0 496D4E7D + 077FA000 000001E8 + 9421FFE0 7C0802A6 + 90010024 93E1001C + 4AA9CEF5 38E00200 + 38C00320 38A0FFD8 + 3880000A 38610008 + 4AAAF9C9 814D9E88 + 3FE08180 3BFFA1EC + 39200000 39000002 + 3CE08180 38E7A164 + 80CA0048 38A10008 + 38800000 7FE3FB78 + 4AAB6001 39200001 + 913F01B0 80010024 + 7C0803A6 83E1001C + 38210020 4E800020 + 9421FFE8 7C0802A6 + 9001001C 93A1000C + 93C10010 93E10014 + 7C7F1B78 81230000 + 83A90064 3D208180 + 8129A39C 2F890000 + 409E002C 7FE3FB78 + 7FA903A6 4E800421 + 8001001C 7C0803A6 + 83A1000C 83C10010 + 83E10014 38210018 + 4E800020 3D20803F + 6129EF88 83C90000 + 3C608180 3863A1EC + 4AAB6389 C0BE00A8 + C09E00B0 A0DE0096 + C07E0018 C05E0014 + C03E0010 3CA08180 + 38A5A164 38800080 + 4CC63242 4AB1EF91 + 4BFFFF94 9421FFF0 + 7C0802A6 90010014 + 93E1000C 7C7F1B78 + 4AAD0D9D 38E00081 + 7FE6FB78 38A00000 + 38800000 3C608180 + 3863A1EC 4AAB546D + 80010014 7C0803A6 + 83E1000C 38210010 + 4E800020 5820506F + 7320252E 30660A59 + 20506F73 20252E30 + 660A5A20 506F7320 + 252E3066 0A416E67 + 6C652025 68750A48 + 20537064 20252E32 + 660A5620 53706420 + 252E3266 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202000 00000000 + + Intro skip Noki Doki diff --git a/codes/GMSP01.xml b/codes/GMSP01.xml index ea5aed2..51c74b0 100644 --- a/codes/GMSP01.xml +++ b/codes/GMSP01.xml @@ -804,66 +804,58 @@ Position/angle/speed display Noki Doki - 1.1 - Dec 23, 2018 + 1.2 + Oct 28, 2019 Shows Mario's position, angle and speed at any given time. 0629E070 00000010 - 4955C011 60000000 + 4955C009 60000000 60000000 60000000 04291750 495688B1 - 04138B50 496C160D + 04138B50 496C15CD 077FA000 000001E8 - 9421FF60 7C0802A6 - 900100A4 93E1009C + 9421FFE0 7C0802A6 + 90010024 93E1001C 4AAB56B5 38E00200 38C00320 38A0FFD8 - 3880000A 38610088 + 3880000A 38610008 4AAC824D 814D9EF0 - 3FE08180 3BFFA1F0 + 3FE08180 3BFFA1EC 39200000 39000002 - 38E2B2F0 80CA0048 - 38A10088 38800000 - 7FE3FB78 4AACE99D - 38810008 7FE3FB78 - 4AACEDB1 39200001 - 913F01B0 800100A4 - 7C0803A6 83E1009C - 382100A0 4E800020 - 9421FFD8 7C0802A6 - 9001002C DBA10010 - DBC10018 DBE10020 - 93C10008 93E1000C + 3CE08180 38E7A164 + 80CA0048 38A10008 + 38800000 7FE3FB78 + 4AACE999 39200001 + 913F01B0 80010024 + 7C0803A6 83E1001C + 38210020 4E800020 + 9421FFE8 7C0802A6 + 9001001C 93A1000C + 93C10010 93E10014 7C7F1B78 81230000 - 83C90064 3D208180 - 8129A3A0 2F890000 - 409E0034 7FE3FB78 - 7FC903A6 4E800421 - 8001002C 7C0803A6 - 83C10008 83E1000C - CBA10010 CBC10018 - CBE10020 38210028 + 83A90064 3D208180 + 8129A39C 2F890000 + 409E002C 7FE3FB78 + 7FA903A6 4E800421 + 8001001C 7C0803A6 + 83A1000C 83C10010 + 83E10014 38210018 4E800020 3D208040 - 612957D4 81290000 - C3E90000 C3C90004 - C3A90008 3C608180 - 3863A1F0 4AACECFD - 3D208040 612957E8 - 81090000 39290004 - 81490000 3929FFF0 - 81290000 C0A80000 - C08A0004 A0C90000 - FC60E890 FC40F090 - FC20F890 3CA08180 - 38A5A1A4 3880007F - 4CC63242 4AB377D1 - 4BFFFF64 9421FFF0 + 612957B0 83C90000 + 3C608180 3863A1EC + 4AACED21 C0BE00A8 + C09E00B0 A0DE0096 + C07E0018 C05E0014 + C03E0010 3CA08180 + 38A5A164 38800080 + 4CC63242 4AB37811 + 4BFFFF94 9421FFF0 7C0802A6 90010014 93E1000C 7C7F1B78 - 4AAE96F5 38E00081 + 4AAE9735 38E00081 7FE6FB78 38A00000 38800000 3C608180 - 3863A1F0 4AACDDC5 + 3863A1EC 4AACDE05 80010014 7C0803A6 83E1000C 38210010 4E800020 5820506F @@ -874,7 +866,15 @@ 6C652025 68750A48 20537064 20252E32 660A5620 53706420 - 252E3266 00000000 + 252E3266 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202020 20202020 + 20202000 00000000