diff --git a/README.md b/README.md index 0b28fb47..cad9255d 100644 --- a/README.md +++ b/README.md @@ -476,7 +476,8 @@ The specific versions are: | PSO DC v1 JP | 1OJF | Client functions not supported | | PSO DC v1 US | 1OEF | Client functions not supported | | PSO DC v1 EU | 1OPF | Client functions not supported | -| PSO DC 08/2001 prototype | 2OJ5 | SH-4 | +| PSO DC 08/06/2001 prototype | 2OJ4 | SH-4 | +| PSO DC 08/22/2001 prototype | 2OJ5 | SH-4 | | PSO DC v2 JP | 2OJF | SH-4 | | PSO DC v2 US | 2OEF | SH-4 | | PSO DC v2 EU | 2OPF | SH-4 | diff --git a/notes/ar-codes.txt b/notes/ar-codes.txt index 401af239..962c63f4 100644 --- a/notes/ar-codes.txt +++ b/notes/ar-codes.txt @@ -13,6 +13,7 @@ Version codes (from README.md): 1OJF: PSO DC v1 JP 1OEF: PSO DC v1 US 1OPF: PSO DC v1 EU + 2OJ4: PSO DC 08/2001 prototype 2OJ5: PSO DC 08/2001 prototype 2OJF: PSO DC v2 JP 2OEF: PSO DC v2 US diff --git a/notes/dc-proto-connection-addresses.txt b/notes/dc-proto-connection-addresses.txt index 49388390..25334051 100644 --- a/notes/dc-proto-connection-addresses.txt +++ b/notes/dc-proto-connection-addresses.txt @@ -2,4 +2,5 @@ 1OJ2 (11/2000): test1.st-pso.games.sega.net 1OJ3 (12/2000): sg107634.csrd.sega.co.jp OR master.pso.dream-key.com 1OJ4 (01/2001): master.pso.dream-key.com -2OJ5 (08/2001; v2): game01.st-pso.games.sega.net +2OJ4 (08/06/2001; v2): game01.st-pso.games.sega.net +2OJ5 (08/22/2001; v2): game01.st-pso.games.sega.net diff --git a/system/client-functions/DisableIdleDisconnect/DisableIdleDisconnect.1___.patch.s b/system/client-functions/DisableIdleDisconnect/DisableIdleDisconnect.1___.patch.s index ad5b0c4c..49370e03 100644 --- a/system/client-functions/DisableIdleDisconnect/DisableIdleDisconnect.1___.patch.s +++ b/system/client-functions/DisableIdleDisconnect/DisableIdleDisconnect.1___.patch.s @@ -1,7 +1,7 @@ .meta name="Disable idle DC" .meta description="Disables the idle\ndisconnect timeout" -.versions 1OJ3 1OJ4 1OJF 1OEF 1OPF 2OJ5 2OJF 2OEF 2OPF +.versions 1OJ3 1OJ4 1OJF 1OEF 1OPF 2OJ4 2OJ5 2OJF 2OEF 2OPF entry_ptr: reloc0: @@ -10,7 +10,7 @@ start: .include WriteCodeBlocksDC .align 4 - .data + .data .data 0x00000002 mov r0, 0 diff --git a/system/client-functions/FastTekker/FastTekker.1___.patch.s b/system/client-functions/FastTekker/FastTekker.1___.patch.s index 5cf7fe1b..e03d2471 100644 --- a/system/client-functions/FastTekker/FastTekker.1___.patch.s +++ b/system/client-functions/FastTekker/FastTekker.1___.patch.s @@ -1,7 +1,7 @@ .meta name="Fast tekker" .meta description="Skips wind-up sound\nat tekker window" -.versions 1OJ1 1OJ2 1OJ3 1OJ4 1OJF 1OEF 1OPF 2OJ5 2OJF 2OEF 2OPF +.versions 1OJ1 1OJ2 1OJ3 1OJ4 1OJF 1OEF 1OPF 2OJ4 2OJ5 2OJF 2OEF 2OPF entry_ptr: reloc0: @@ -10,12 +10,12 @@ start: .include WriteCodeBlocksDC .align 4 - .data + .data .data 0x00000002 mov r1, 1 .align 4 - .data + .data .data 0x00000002 nop diff --git a/system/client-functions/InvisibleMag/InvisibleMag.1___.patch.s b/system/client-functions/InvisibleMag/InvisibleMag.1___.patch.s index 66a6fec9..4197270a 100644 --- a/system/client-functions/InvisibleMag/InvisibleMag.1___.patch.s +++ b/system/client-functions/InvisibleMag/InvisibleMag.1___.patch.s @@ -5,7 +5,7 @@ # https://www.gc-forever.com/forums/viewtopic.php?t=2049 # DC port by fuzziqersoftware -.versions 1OJ2 1OJ3 1OJ4 1OJF 1OEF 1OPF 2OJ5 2OJF 2OEF 2OPF +.versions 1OJ2 1OJ3 1OJ4 1OJF 1OEF 1OPF 2OJ4 2OJ5 2OJF 2OEF 2OPF entry_ptr: reloc0: @@ -14,7 +14,7 @@ start: .include WriteCodeBlocksDC .align 4 - .data + .data .data 0x00000004 rets nop diff --git a/system/client-functions/ItemLossPrevention/ItemLossPrevention.2___.patch.s b/system/client-functions/ItemLossPrevention/ItemLossPrevention.2___.patch.s index 4b7b49cc..c8de53e7 100644 --- a/system/client-functions/ItemLossPrevention/ItemLossPrevention.2___.patch.s +++ b/system/client-functions/ItemLossPrevention/ItemLossPrevention.2___.patch.s @@ -5,7 +5,7 @@ # https://www.gc-forever.com/forums/viewtopic.php?t=2049 # DCv2 port by fuzziqersoftware -.versions 2OEF 2OJ5 2OJF 2OPF +.versions 2OJ4 2OJ5 2OJF 2OEF 2OPF entry_ptr: reloc0: @@ -14,59 +14,59 @@ start: .include WriteCodeBlocksDC .align 4 - .data + .data .data 6 nop bs +0x2C nop .align 4 - .data + .data .data 2 sett .align 4 - .data + .data .data 2 and r0, 0xFE .align 4 - .data + .data .data 2 nop .align 4 - .data + .data .data 2 and r0, 0xFE .align 4 - .data + .data .data 2 nop .align 4 - .data + .data .data 2 and r0, 0xFE .align 4 - .data + .data .data 2 nop .align 4 - .data + .data .data 2 and r0, 0xFE .align 4 - .data + .data .data 2 nop .align 4 - .data + .data .data 2 and r0, 0xFE diff --git a/system/client-functions/RaresInQuests/RaresInQuests.2___.patch.s b/system/client-functions/RaresInQuests/RaresInQuests.2___.patch.s index 59bd6758..3b0f45e1 100644 --- a/system/client-functions/RaresInQuests/RaresInQuests.2___.patch.s +++ b/system/client-functions/RaresInQuests/RaresInQuests.2___.patch.s @@ -1,7 +1,7 @@ .meta name="Rares in quests" .meta description="Disables logic that\nprevents items\nabove 8 stars and\nrares from dropping\nin quests." -.versions 2OEF 2OJ5 2OJF 2OPF +.versions 2OJ4 2OJ5 2OJF 2OEF 2OPF entry_ptr: reloc0: @@ -10,12 +10,12 @@ start: .include WriteCodeBlocksDC .align 4 - .data + .data .data 2 nop .align 4 - .data + .data .data 2 nop diff --git a/system/client-functions/System/VersionDetectDC.sh4.s b/system/client-functions/System/VersionDetectDC.sh4.s index 76da9cc6..9f465304 100644 --- a/system/client-functions/System/VersionDetectDC.sh4.s +++ b/system/client-functions/System/VersionDetectDC.sh4.s @@ -50,7 +50,7 @@ data_start: .data 0x314F4546 # 1OEF .data 0x8C28B3F4 # v1 EU .data 0x314F5046 # 1OPF - .data 0x8C2F3748 # v2 08/2001 + .data 0x8C2F3748 # v2 08/06/2001 AND v2 08/22/2001 (TODO: Find a way to tell these apart) .data 0x324F4A35 # 2OJ5 .data 0x8C2F11D0 # v2 JP .data 0x324F4A46 # 2OJF diff --git a/system/client-functions/UltimateMapFix/UltimateMapFix.2___.patch.s b/system/client-functions/UltimateMapFix/UltimateMapFix.2___.patch.s index c59ffbcf..9c7ffeaa 100644 --- a/system/client-functions/UltimateMapFix/UltimateMapFix.2___.patch.s +++ b/system/client-functions/UltimateMapFix/UltimateMapFix.2___.patch.s @@ -2,7 +2,7 @@ .meta description="Adds missing maps\nto Ultimate for\ncertain quests" # Patch by Matt Swift -.versions 2OEF 2OJ5 2OJF 2OPF +.versions 2OJ5 2OJF 2OEF 2OPF entry_ptr: reloc0: @@ -12,25 +12,25 @@ start: # Modify location of Ultimate Cave 1 map pointer table to 8C008100 and make it have 6 entries .align 4 - .data + .data .data 6 .binary 0081008C0600 # Modify location of Ultimate Cave 3 map pointer table to 8C008130 and make it have 6 entries .align 4 - .data + .data .data 6 .binary 3081008C0600 # Modify location of Ultimate Mine 1 map pointer table to 8C008160 and make it have 6 entries .align 4 - .data + .data .data 6 .binary 6081008C0600 # Modify location of Ultimate Mine 2 map pointer table to 8C008190 and make it have 6 entries .align 4 - .data + .data .data 6 .binary 9081008C0600 @@ -38,25 +38,25 @@ start: .align 4 .data 0x8C008100 .data 48 - .binary + .binary # New map pointer table for Cave 3 .align 4 .data 0x8C008130 .data 48 - .binary + .binary # New map pointer table for Mine 1 .align 4 .data 0x8C008160 .data 48 - .binary + .binary # New map pointer table for Mine 2 .align 4 .data 0x8C008190 .data 48 - .binary + .binary # Add missing map names: map_acave01_05, map_acave03_05, map_amachine01_05, map_amachine02_05 .align 4