From d276f2e0eb060c5127ed94d8cc72c81403ac6d7c Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:05:08 +1000 Subject: [PATCH 01/12] Remastered Dance Call assets --- mod.yml | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 272 insertions(+) diff --git a/mod.yml b/mod.yml index 127b7eb..33e0d9f 100644 --- a/mod.yml +++ b/mod.yml @@ -1415,6 +1415,278 @@ assets: method: bdscript source: - name: limit/jack.bdscript +- name: remastered/limit/fm/jack.bar/FM_jack_bar0.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar0.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar1.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar1.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar2.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar2.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar3.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar3.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar4.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar4.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar5.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar5.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar6.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar6.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar7.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar7.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar8.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar8.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar9.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar9.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar10.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar10.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar11.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar11.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar12.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar12.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar13.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar13.dds + type: internal +- name: remastered/limit/fm/jack.bar/FM_jack_bar14.dds + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/FM_jack_bar14.dds + type: internal +- name: remastered/limit/fm/jack.bar/se/limit/se407 + platform: pc + method: copy + source: + - name: remastered/limit/fm/jack.bar/se/limit/se407 + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar0.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar0.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar0.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar0.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar0.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar0.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar1.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar1.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar1.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar1.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar1.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar1.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar2.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar2.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar2.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar2.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar2.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar2.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar3.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar3.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar3.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar3.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar3.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar3.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar4.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar4.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar4.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar4.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar4.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar4.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar5.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar5.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar5.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar5.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar5.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar5.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar6.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar6.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar6.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar6.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar6.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar6.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar7.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar7.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar7.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar7.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar7.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar7.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar8.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar8.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar8.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar8.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar8.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar8.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar9.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar9.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar9.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar9.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar9.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar9.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar10.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar10.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar10.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar10.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar10.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar10.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar11.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar11.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar11.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar11.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar11.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar11.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar12.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar12.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar12.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar12.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar12.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar12.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar13.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar13.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar13.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar13.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar13.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar13.dds + type: internal +- name: remastered/limit/us/jack.bar/US_jack_bar14.dds + multi: + - name: remastered/limit/fr/jack.bar/FR_jack_bar14.dds + - name: remastered/limit/gr/jack.bar/GR_jack_bar14.dds + - name: remastered/limit/it/jack.bar/IT_jack_bar14.dds + - name: remastered/limit/sp/jack.bar/SP_jack_bar14.dds + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/US_jack_bar14.dds + type: internal +- name: remastered/limit/us/jack.bar/se/limit/se407 + multi: + - name: remastered/limit/fr/jack.bar/se/limit/se407 + - name: remastered/limit/gr/jack.bar/se/limit/se407 + - name: remastered/limit/it/jack.bar/se/limit/se407 + - name: remastered/limit/sp/jack.bar/se/limit/se407 + platform: pc + method: copy + source: + - name: remastered/limit/us/jack.bar/se/limit/se407 + type: internal #Proper Xemnas II Dome Skip - name: obj/B_EX170_LAST.mdlx method: binarc From cbeab2dd24b0c078891292b9fed0e30d1798db3e Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Sun, 27 Oct 2024 20:45:37 +1100 Subject: [PATCH 02/12] TT3 Sunset Terrace tram --- 00progress.bin/tt.bin | Bin 5850 -> 5850 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/00progress.bin/tt.bin b/00progress.bin/tt.bin index 9beff900def812ba139214708aec1ecf77c74276..5f7ac857d9d567545fe62c9afd0ed8f0182f64ef 100644 GIT binary patch delta 15 WcmcbmdrNo2DiJ0zhRth4^q2rL)CD*I delta 15 XcmcbmdrNo2DiNmt|2MA@(PIJtKP?9! From 448bc495bd6e4ae1ef9397559c60495be34a84d8 Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Sun, 27 Oct 2024 20:46:24 +1100 Subject: [PATCH 03/12] Compatibility with newest Steam & EPIC version --- F266B00B GoA ROM.lua | 174 +++++++++++++++++++++---------------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/F266B00B GoA ROM.lua b/F266B00B GoA ROM.lua index de9f180..9a2e957 100644 --- a/F266B00B GoA ROM.lua +++ b/F266B00B GoA ROM.lua @@ -7,7 +7,7 @@ LUAGUI_DESC = 'A GoA build for use with the Randomizer. Requires ROM patching.' function _OnInit() GameVersion = 0 -print('GoA v1.54.1') +print('GoA v1.54.2') GoAOffset = 0x7C SeedCleared = false end @@ -60,122 +60,122 @@ elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC GameVersion = 2 print('GoA Epic Version') Now = 0x0716DF8 - Sve = 0x2A0BF80 - Save = 0x09A92F0 - Obj0Pointer = 0x2A24A70 - Sys3Pointer = 0x2AE5890 - Btl0Pointer = 0x2AE5898 - ARDPointer = 0x2A0F268 - Music = 0x0ABA784 - Pause = 0x0ABB2B8 - React = 0x2A10BA2 - Cntrl = 0x2A16C28 - Timer = 0x0ABB290 - Songs = 0x0B657B4 + Sve = 0x2A0BFC0 + Save = 0x09A9330 + Obj0Pointer = 0x2A24AB0 + Sys3Pointer = 0x2AE58D0 + Btl0Pointer = 0x2AE58D8 + ARDPointer = 0x2A0F2A8 + Music = 0x0ABA7C4 + Pause = 0x0ABB2F8 + React = 0x2A10BE2 + Cntrl = 0x2A16C68 + Timer = 0x0ABB2D0 + Songs = 0x0B657F4 GScre = 0x072AEB0 GMdal = 0x072B044 - GKill = 0x0AF6B86 + GKill = 0x0AF6BC6 CamTyp = 0x0718A98 GamSpd = 0x0717214 - CutNow = 0x0B649D8 - CutLen = 0x0B649F4 - CutSkp = 0x0B649DC - BtlTyp = 0x2A10E44 - BtlEnd = 0x2A0F720 + CutNow = 0x0B64A18 + CutLen = 0x0B64A34 + CutSkp = 0x0B64A1C + BtlTyp = 0x2A10E84 + BtlEnd = 0x2A0F760 TxtBox = 0x074DCB0 - DemCln = 0x2A0F2F4 - Slot1 = 0x2A22FD8 + DemCln = 0x2A0F334 + Slot1 = 0x2A22318 NextSlot = 0x278 - Point1 = 0x2A0F488 + Point1 = 0x2A0F4C8 NxtPoint = 0x50 - Gauge1 = 0x2A0F578 + Gauge1 = 0x2A0F5B8 NxtGauge = 0x48 - Menu1 = 0x2A10B50 + Menu1 = 0x2A10B90 NextMenu = 0x8 Obj0 = ReadLong(Obj0Pointer) Sys3 = ReadLong(Sys3Pointer) Btl0 = ReadLong(Btl0Pointer) - MSN = 0x0BF2C40 + MSN = 0x0BF2C80 elseif ReadString(0x09A9830,4) == 'KH2J' then --Steam Global GameVersion = 3 print('GoA Steam Global Version') Now = 0x0717008 - Sve = 0x2A0C4C0 - Save = 0x09A9830 - Obj0Pointer = 0x2A24FB0 - Sys3Pointer = 0x2AE5DD0 - Btl0Pointer = 0x2AE5DD8 - ARDPointer = 0x2A0F7A8 - Music = 0x0ABACC4 - Pause = 0x0ABB7F8 - React = 0x2A110E2 - Cntrl = 0x2A17168 - Timer = 0x0ABB7D0 - Songs = 0x0B65CF4 + Sve = 0x2A0C540 + Save = 0x09A98B0 + Obj0Pointer = 0x2A25030 + Sys3Pointer = 0x2AE5E50 + Btl0Pointer = 0x2AE5E58 + ARDPointer = 0x2A0F828 + Music = 0x0ABAD44 + Pause = 0x0ABB828 + React = 0x2A11162 + Cntrl = 0x2A171E8 + Timer = 0x0ABB850 + Songs = 0x0B65D44 GScre = 0x072B130 GMdal = 0x072B2C4 - GKill = 0x0AF70C6 + GKill = 0x0AF7146 CamTyp = 0x0718CA8 GamSpd = 0x0717424 - CutNow = 0x0B64F18 - CutLen = 0x0B64F34 - CutSkp = 0x0B64F1C - BtlTyp = 0x2A11384 - BtlEnd = 0x2A0FC60 + CutNow = 0x0B64F98 + CutLen = 0x0B64FB4 + CutSkp = 0x0B64F9C + BtlTyp = 0x2A11404 + BtlEnd = 0x2A0FCE0 TxtBox = 0x074DF20 - DemCln = 0x2A0F834 - Slot1 = 0x2A23518 + DemCln = 0x2A0F8B4 + Slot1 = 0x2A23598 NextSlot = 0x278 - Point1 = 0x2A0F9C8 + Point1 = 0x2A0FA48 NxtPoint = 0x50 - Gauge1 = 0x2A0FAB8 + Gauge1 = 0x2A0FB38 NxtGauge = 0x48 - Menu1 = 0x2A11090 + Menu1 = 0x2A11110 NextMenu = 0x8 Obj0 = ReadLong(Obj0Pointer) Sys3 = ReadLong(Sys3Pointer) Btl0 = ReadLong(Btl0Pointer) - MSN = 0x0BF3340 + MSN = 0x0BF33C0 elseif ReadString(0x09A8830,4) == 'KH2J' then --Steam JP GameVersion = 4 print('GoA Steam JP Version') - Now = 0x0716008 - Sve = 0x2A0B4C0 - Save = 0x09A8830 - Obj0Pointer = 0x2A23FB0 - Sys3Pointer = 0x2AE4DD0 - Btl0Pointer = 0x2AE4DD8 - ARDPointer = 0x2A0E7A8 - Music = 0x0AB9CC4 - Pause = 0x0ABA7F8 - React = 0x2A100E2 - Cntrl = 0x2A16168 - Timer = 0x0ABA7D0 - Songs = 0x0B64CF4 - GScre = 0x072A130 - GMdal = 0x072A2C4 - GKill = 0x0AF60C6 - CamTyp = 0x0717CA8 - GamSpd = 0x0716424 - CutNow = 0x0B63F18 - CutLen = 0x0B63F34 - CutSkp = 0x0B63F1C - BtlTyp = 0x2A10384 - BtlEnd = 0x2A0EC60 - TxtBox = 0x074CF20 - DemCln = 0x2A0E834 - Slot1 = 0x2A22518 + Now = 0x0717008 + Sve = 0x2A0C540 + Save = 0x09A98B0 + Obj0Pointer = 0x2A25030 + Sys3Pointer = 0x2AE5E50 + Btl0Pointer = 0x2AE5E58 + ARDPointer = 0x2A0F828 + Music = 0x0ABAD44 + Pause = 0x0ABB878 + React = 0x2A11162 + Cntrl = 0x2A171E8 + Timer = 0x0ABB850 + Songs = 0x0B65D74 + GScre = 0x072B130 + GMdal = 0x072B2C4 + GKill = 0x0AF7146 + CamTyp = 0x0718CA8 + GamSpd = 0x0717424 + CutNow = 0x0B64F98 + CutLen = 0x0B64FB4 + CutSkp = 0x0B64F9C + BtlTyp = 0x2A11404 + BtlEnd = 0x2A0FCE0 + TxtBox = 0x074DF20 + DemCln = 0x2A0F8B4 + Slot1 = 0x2A23598 NextSlot = 0x278 - Point1 = 0x2A0E9C8 + Point1 = 0x2A0FA48 NxtPoint = 0x50 - Gauge1 = 0x2A0EAB8 + Gauge1 = 0x2A0FB38 NxtGauge = 0x48 - Menu1 = 0x2A10090 + Menu1 = 0x2A11110 NextMenu = 0x8 Obj0 = ReadLong(Obj0Pointer) Sys3 = ReadLong(Sys3Pointer) Btl0 = ReadLong(Btl0Pointer) - MSN = 0x0BF2340 + MSN = 0x0BF33C0 end end if GameVersion ~= 0 then @@ -874,14 +874,14 @@ end --Show all items in shops (ASSEMBLY edit) if not OnPC then WriteInt(0x264250,0) -elseif ReadLong(0x2FAA22) == 0x43B70F0D74D68541 then --Epic Global - WriteByte(0x2FAA26,0) -elseif ReadLong(0x2FA682) == 0x43B70F0D74D68541 then --Epic JP - WriteByte(0x2FA686,0) -elseif ReadLong(0x2FB562) == 0x43B70F0D74D68541 then --Steam Global - WriteByte(0x2FB566,0) -elseif ReadLong(0x2FB2E2) == 0x43B70F0D74D68541 then --Steam JP - WriteByte(0x2FB2E6,0) +elseif ReadLong(0x2FAD62) == 0x43B70F0D74D68541 then --Epic Global + WriteByte(0x2FAD66,0) +elseif ReadLong(0x2FA9C2) == 0x43B70F0D74D68541 then --Epic JP (UNTESTED!!!) + WriteByte(0x2FA9C6,0) +elseif ReadLong(0x2FB8A2) == 0x43B70F0D74D68541 then --Steam Global + WriteByte(0x2FB8A6,0) +elseif ReadLong(0x2FB622) == 0x43B70F0D74D68541 then --Steam JP + WriteByte(0x2FB626,0) end --Alternate Party Models (adding new UCM using MEMT causes problems when shopping) if World == 0x0C and Place ~= 0x070C then --Mage & Knight (KH I) From ab93c858eb48f45ef211452d85830fb915645438 Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Sun, 27 Oct 2024 20:49:50 +1100 Subject: [PATCH 04/12] Update mod.yml --- mod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod.yml b/mod.yml index b22f369..d5495a9 100644 --- a/mod.yml +++ b/mod.yml @@ -1,4 +1,4 @@ -title: GoA ROM Edition v1.54.1 +title: GoA ROM Edition v1.54.2 description: GoA, but with a lot of stuff done through ROM to reduce workload on Lua. Credit to ニンニク for the Japanese translation. assets: #Lua Script From f327051b196834e004a29ab81320e357becc011b Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Mon, 28 Oct 2024 01:48:39 +1100 Subject: [PATCH 05/12] Epic JP proper address --- F266B00B GoA ROM.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/F266B00B GoA ROM.lua b/F266B00B GoA ROM.lua index 9a2e957..e7ce46a 100644 --- a/F266B00B GoA ROM.lua +++ b/F266B00B GoA ROM.lua @@ -876,8 +876,8 @@ if not OnPC then WriteInt(0x264250,0) elseif ReadLong(0x2FAD62) == 0x43B70F0D74D68541 then --Epic Global WriteByte(0x2FAD66,0) -elseif ReadLong(0x2FA9C2) == 0x43B70F0D74D68541 then --Epic JP (UNTESTED!!!) - WriteByte(0x2FA9C6,0) +elseif ReadLong(0x2FABA2) == 0x43B70F0D74D68541 then --Epic JP + WriteByte(0x2FABA6,0) elseif ReadLong(0x2FB8A2) == 0x43B70F0D74D68541 then --Steam Global WriteByte(0x2FB8A6,0) elseif ReadLong(0x2FB622) == 0x43B70F0D74D68541 then --Steam JP From 0e0548b9097fd8fd06bfd0eac42748b71816d0ad Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Tue, 5 Nov 2024 11:52:03 +1100 Subject: [PATCH 06/12] Fix typo --- F266B00B GoA ROM.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/F266B00B GoA ROM.lua b/F266B00B GoA ROM.lua index e7ce46a..149fe9b 100644 --- a/F266B00B GoA ROM.lua +++ b/F266B00B GoA ROM.lua @@ -107,7 +107,7 @@ elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC Btl0Pointer = 0x2AE5E58 ARDPointer = 0x2A0F828 Music = 0x0ABAD44 - Pause = 0x0ABB828 + Pause = 0x0ABB878 React = 0x2A11162 Cntrl = 0x2A171E8 Timer = 0x0ABB850 From d7f511ee8551ee78966b42b3eb5eb551482da03a Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:03:26 +1100 Subject: [PATCH 07/12] Printouts for outdated versions --- F266B00B GoA ROM.lua | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/F266B00B GoA ROM.lua b/F266B00B GoA ROM.lua index 149fe9b..4bc5a1d 100644 --- a/F266B00B GoA ROM.lua +++ b/F266B00B GoA ROM.lua @@ -56,7 +56,7 @@ if (GAME_ID == 0xF266B00B or GAME_ID == 0xFAF99301) and ENGINE_TYPE == "ENGINE" MSN = 0x04FA440 elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC OnPC = true - if ReadString(0x09A92F0,4) == 'KH2J' then --EGS + if ReadString(0x9A92F0,4) == 'KH2J' then --EGS GameVersion = 2 print('GoA Epic Version') Now = 0x0716DF8 @@ -96,7 +96,7 @@ elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC Sys3 = ReadLong(Sys3Pointer) Btl0 = ReadLong(Btl0Pointer) MSN = 0x0BF2C80 - elseif ReadString(0x09A9830,4) == 'KH2J' then --Steam Global + elseif ReadString(0x9A9830,4) == 'KH2J' then --Steam Global GameVersion = 3 print('GoA Steam Global Version') Now = 0x0717008 @@ -136,7 +136,7 @@ elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC Sys3 = ReadLong(Sys3Pointer) Btl0 = ReadLong(Btl0Pointer) MSN = 0x0BF33C0 - elseif ReadString(0x09A8830,4) == 'KH2J' then --Steam JP + elseif ReadString(0x9A8830,4) == 'KH2J' then --Steam JP GameVersion = 4 print('GoA Steam JP Version') Now = 0x0717008 @@ -176,6 +176,15 @@ elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC Sys3 = ReadLong(Sys3Pointer) Btl0 = ReadLong(Btl0Pointer) MSN = 0x0BF33C0 + elseif ReadString(0x9A7070,4) == "KH2J" or ReadString(0x9A70B0,4) == "KH2J" or ReadString(0x9A92F0,4) == "KH2J" then + GameVersion = -1 + print("Epic Version is outdated. Please update the game.") + elseif ReadString(0x9A9830,4) == "KH2J" then + GameVersion = -1 + print("Steam Global Version is outdated. Please update the game.") + elseif ReadString(0x9A8830,4) == "KH2J" then + GameVersion = -1 + print("Steam JP Version is outdated. Please update the game.") end end if GameVersion ~= 0 then @@ -281,6 +290,8 @@ function _OnFrame() if GameVersion == 0 then --Get anchor addresses GetVersion() return +else if GameVersion < 0 then --Incompatible version + return end if true then --Define current values for common addresses World = ReadByte(Now+0x00) From 51d653b9ae12cc9539cd9244a56bca8c3011ac4d Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:04:06 +1100 Subject: [PATCH 08/12] Typo fix --- F266B00B GoA ROM.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/F266B00B GoA ROM.lua b/F266B00B GoA ROM.lua index 4bc5a1d..76d9043 100644 --- a/F266B00B GoA ROM.lua +++ b/F266B00B GoA ROM.lua @@ -290,7 +290,7 @@ function _OnFrame() if GameVersion == 0 then --Get anchor addresses GetVersion() return -else if GameVersion < 0 then --Incompatible version +elseif GameVersion < 0 then --Incompatible version return end if true then --Define current values for common addresses From 5db3fa1854b6ad13e268fc65abdbad255f0eb320 Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Tue, 5 Nov 2024 12:06:13 +1100 Subject: [PATCH 09/12] Conditional fixes --- F266B00B GoA ROM.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/F266B00B GoA ROM.lua b/F266B00B GoA ROM.lua index 76d9043..71387af 100644 --- a/F266B00B GoA ROM.lua +++ b/F266B00B GoA ROM.lua @@ -56,7 +56,7 @@ if (GAME_ID == 0xF266B00B or GAME_ID == 0xFAF99301) and ENGINE_TYPE == "ENGINE" MSN = 0x04FA440 elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC OnPC = true - if ReadString(0x9A92F0,4) == 'KH2J' then --EGS + if ReadString(0x9A9330,4) == 'KH2J' then --EGS GameVersion = 2 print('GoA Epic Version') Now = 0x0716DF8 @@ -96,7 +96,7 @@ elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC Sys3 = ReadLong(Sys3Pointer) Btl0 = ReadLong(Btl0Pointer) MSN = 0x0BF2C80 - elseif ReadString(0x9A9830,4) == 'KH2J' then --Steam Global + elseif ReadString(0x9A98B0,4) == 'KH2J' then --Steam Global GameVersion = 3 print('GoA Steam Global Version') Now = 0x0717008 @@ -136,7 +136,7 @@ elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC Sys3 = ReadLong(Sys3Pointer) Btl0 = ReadLong(Btl0Pointer) MSN = 0x0BF33C0 - elseif ReadString(0x9A8830,4) == 'KH2J' then --Steam JP + elseif ReadString(0x9A98B0,4) == 'KH2J' then --Steam JP (same as Global for now) GameVersion = 4 print('GoA Steam JP Version') Now = 0x0717008 From 7cbf988f3b6fb25f62ef3417754d71a67135205f Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Fri, 8 Nov 2024 19:12:29 +1100 Subject: [PATCH 10/12] Another typo fix --- F266B00B GoA ROM.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/F266B00B GoA ROM.lua b/F266B00B GoA ROM.lua index 71387af..6f8fa94 100644 --- a/F266B00B GoA ROM.lua +++ b/F266B00B GoA ROM.lua @@ -84,7 +84,7 @@ elseif GAME_ID == 0x431219CC and ENGINE_TYPE == 'BACKEND' then --PC BtlEnd = 0x2A0F760 TxtBox = 0x074DCB0 DemCln = 0x2A0F334 - Slot1 = 0x2A22318 + Slot1 = 0x2A23018 NextSlot = 0x278 Point1 = 0x2A0F4C8 NxtPoint = 0x50 From 0eeb97962d85b6760ad6b7e311a79ec335b1f153 Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Wed, 13 Nov 2024 07:10:25 +1100 Subject: [PATCH 11/12] Revert "Remastered Dance Call assets" This reverts commit d276f2e0eb060c5127ed94d8cc72c81403ac6d7c. --- mod.yml | 272 -------------------------------------------------------- 1 file changed, 272 deletions(-) diff --git a/mod.yml b/mod.yml index d5495a9..926ed6e 100644 --- a/mod.yml +++ b/mod.yml @@ -1415,278 +1415,6 @@ assets: method: bdscript source: - name: limit/jack.bdscript -- name: remastered/limit/fm/jack.bar/FM_jack_bar0.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar0.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar1.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar1.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar2.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar2.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar3.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar3.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar4.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar4.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar5.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar5.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar6.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar6.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar7.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar7.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar8.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar8.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar9.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar9.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar10.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar10.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar11.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar11.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar12.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar12.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar13.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar13.dds - type: internal -- name: remastered/limit/fm/jack.bar/FM_jack_bar14.dds - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/FM_jack_bar14.dds - type: internal -- name: remastered/limit/fm/jack.bar/se/limit/se407 - platform: pc - method: copy - source: - - name: remastered/limit/fm/jack.bar/se/limit/se407 - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar0.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar0.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar0.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar0.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar0.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar0.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar1.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar1.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar1.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar1.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar1.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar1.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar2.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar2.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar2.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar2.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar2.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar2.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar3.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar3.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar3.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar3.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar3.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar3.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar4.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar4.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar4.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar4.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar4.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar4.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar5.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar5.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar5.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar5.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar5.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar5.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar6.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar6.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar6.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar6.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar6.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar6.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar7.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar7.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar7.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar7.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar7.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar7.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar8.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar8.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar8.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar8.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar8.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar8.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar9.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar9.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar9.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar9.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar9.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar9.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar10.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar10.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar10.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar10.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar10.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar10.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar11.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar11.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar11.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar11.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar11.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar11.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar12.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar12.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar12.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar12.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar12.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar12.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar13.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar13.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar13.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar13.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar13.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar13.dds - type: internal -- name: remastered/limit/us/jack.bar/US_jack_bar14.dds - multi: - - name: remastered/limit/fr/jack.bar/FR_jack_bar14.dds - - name: remastered/limit/gr/jack.bar/GR_jack_bar14.dds - - name: remastered/limit/it/jack.bar/IT_jack_bar14.dds - - name: remastered/limit/sp/jack.bar/SP_jack_bar14.dds - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/US_jack_bar14.dds - type: internal -- name: remastered/limit/us/jack.bar/se/limit/se407 - multi: - - name: remastered/limit/fr/jack.bar/se/limit/se407 - - name: remastered/limit/gr/jack.bar/se/limit/se407 - - name: remastered/limit/it/jack.bar/se/limit/se407 - - name: remastered/limit/sp/jack.bar/se/limit/se407 - platform: pc - method: copy - source: - - name: remastered/limit/us/jack.bar/se/limit/se407 - type: internal #Proper Xemnas II Dome Skip - name: obj/B_EX170_LAST.mdlx method: binarc From ac87c93bb7cc7da98bafa362aed390aef29bd6eb Mon Sep 17 00:00:00 2001 From: 1234567890num <53823593+1234567890num@users.noreply.github.com> Date: Sat, 28 Dec 2024 15:52:16 +1100 Subject: [PATCH 12/12] Update mod.yml --- mod.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/mod.yml b/mod.yml index 926ed6e..5f339d7 100644 --- a/mod.yml +++ b/mod.yml @@ -5026,6 +5026,7 @@ assets: method: areadatascript source: - name: ard/tt41/evt.script +#MSN Editing #Fast Hyenas II - name: msn/jp/LK05_MS201.bar method: binarc