From 0126189cbdde6cbfdaa2b9fc407f947a8400cede Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Sat, 29 Jun 2024 12:22:27 -0700 Subject: [PATCH] fix 3OJ2 and 3OJ3 item loss patches --- notes/patch-ports.txt | 6 +++--- .../ItemLossPrevention.3OJ2.patch.s | 12 ++++++++++++ .../ItemLossPrevention.3OJ3.patch.s | 12 ++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/notes/patch-ports.txt b/notes/patch-ports.txt index 9ec4aeda..87ff0ee6 100644 --- a/notes/patch-ports.txt +++ b/notes/patch-ports.txt @@ -73,9 +73,9 @@ ItemLossPrevention *** desc=Don't lose items if\nyou don't log off\nnormally JP12------------- JP13------------- JP14------------- JP15------------- US10------------- US11------------- US12------------- EU--------------- DISASSEMBLY (US10) 801D33E4 4800004C 801D38EC 4800004C 801D3CC4 4800004C 801D39B8 4800004C 801D381C 4800004C 801D381C 4800004C 801D3A1C 4800004C 801D3ED8 4800004C b +0x0000004C /* 801D3868 */ - 8020010C 60000000 801FF710 60000000 801FF0FC 60000000 801FF0FC 60000000 801FFA44 60000000 801FF9E0 60000000 nop - 802016CC 60000000 80200C9C 60000000 80200658 60000000 80200658 60000000 80200FD0 60000000 80200F3C 60000000 nop - 801FD944 38000000 80202860 38000000 802021C4 38000000 802021C4 38000000 80202B94 38000000 80202AA8 38000000 li r0, 0x0000 +801FE900 60000000 801FF174 60000000 8020010C 60000000 801FF710 60000000 801FF0FC 60000000 801FF0FC 60000000 801FFA44 60000000 801FF9E0 60000000 nop +801FFE5C 60000000 802006D0 60000000 802016CC 60000000 80200C9C 60000000 80200658 60000000 80200658 60000000 80200FD0 60000000 80200F3C 60000000 nop +802019C8 38000000 8020223C 38000000 801FD944 38000000 80202860 38000000 802021C4 38000000 802021C4 38000000 80202B94 38000000 80202AA8 38000000 li r0, 0x0000 802C2060 4800004C 802C2F98 4800004C 802C42E4 4800004C 802C3E78 4800004C 802C2A40 4800004C 802C2A84 4800004C 802C402C 4800004C 802C37C0 4800004C b +0x0000004C /* 802C2A8C */ 802D0AA0 48000020 802D1A58 48000020 802D2C10 48000020 802D2938 48000020 802D1480 48000020 802D14C4 48000020 802D2AEC 48000020 802D2280 48000020 b +0x00000020 /* 802D14A0 */ diff --git a/system/client-functions/ItemLossPrevention/ItemLossPrevention.3OJ2.patch.s b/system/client-functions/ItemLossPrevention/ItemLossPrevention.3OJ2.patch.s index 6c72c4ad..fbdd229e 100644 --- a/system/client-functions/ItemLossPrevention/ItemLossPrevention.3OJ2.patch.s +++ b/system/client-functions/ItemLossPrevention/ItemLossPrevention.3OJ2.patch.s @@ -13,6 +13,18 @@ start: .data 0x801D33E4 # address .data 0x00000004 # size .data 0x4800004C # 801D33E4 => b +0x0000004C /* 801D3430 */ + # region @ 801FE900 (4 bytes) + .data 0x801FE900 # address + .data 0x00000004 # size + .data 0x60000000 # 801FE900 => nop + # region @ 801FFE5C (4 bytes) + .data 0x801FFE5C # address + .data 0x00000004 # size + .data 0x60000000 # 801FFE5C => nop + # region @ 802019C8 (4 bytes) + .data 0x802019C8 # address + .data 0x00000004 # size + .data 0x38000000 # 802019C8 => li r0, 0x0000 # region @ 802C2060 (4 bytes) .data 0x802C2060 # address .data 0x00000004 # size diff --git a/system/client-functions/ItemLossPrevention/ItemLossPrevention.3OJ3.patch.s b/system/client-functions/ItemLossPrevention/ItemLossPrevention.3OJ3.patch.s index 6a988949..75fabbbe 100644 --- a/system/client-functions/ItemLossPrevention/ItemLossPrevention.3OJ3.patch.s +++ b/system/client-functions/ItemLossPrevention/ItemLossPrevention.3OJ3.patch.s @@ -13,6 +13,18 @@ start: .data 0x801D38EC # address .data 0x00000004 # size .data 0x4800004C # 801D38EC => b +0x0000004C /* 801D3938 */ + # region @ 801FF174 (4 bytes) + .data 0x801FF174 # address + .data 0x00000004 # size + .data 0x60000000 # 801FF174 => nop + # region @ 802006D0 (4 bytes) + .data 0x802006D0 # address + .data 0x00000004 # size + .data 0x60000000 # 802006D0 => nop + # region @ 8020223C (4 bytes) + .data 0x8020223C # address + .data 0x00000004 # size + .data 0x38000000 # 8020223C => li r0, 0x0000 # region @ 802C2F98 (4 bytes) .data 0x802C2F98 # address .data 0x00000004 # size