From 104835a73b94c54c74a95ef3ba031c5ab626c2bd Mon Sep 17 00:00:00 2001 From: QbeRoot Date: Fri, 16 Feb 2018 03:46:09 +0100 Subject: [PATCH] fixed timer reset in Corona --- changelog.xml | 7 ++ codes/GMSE01.xml | 203 +++++++++++++++++++++-------------------------- codes/GMSJ01.xml | 203 +++++++++++++++++++++-------------------------- codes/GMSJ0A.xml | 203 +++++++++++++++++++++-------------------------- codes/GMSP01.xml | 203 +++++++++++++++++++++-------------------------- gctGenerator.js | 12 +-- 6 files changed, 382 insertions(+), 449 deletions(-) diff --git a/changelog.xml b/changelog.xml index 0c62a1b..cc6e371 100644 --- a/changelog.xml +++ b/changelog.xml @@ -1,5 +1,12 @@ + + Feb 16, 2018 + + Fixed timer compatibility in Fast Any% and Stage Loader. + The timer didn’t reset in Corona. + + Feb 13, 2018 diff --git a/codes/GMSE01.xml b/codes/GMSE01.xml index 6276021..26efa2e 100644 --- a/codes/GMSE01.xml +++ b/codes/GMSE01.xml @@ -504,129 +504,110 @@ Fast Any% Psychonauter, Noki Doki - 1.3.2 + 1.4 Loads stages in any% order, skips all save boxes, replaces all dialog with "!!!" (except for the Pianta 5 secret) and makes all FMVs skippable (except for the Pinna 1 cutscenes). This code is not compatible with the Level Select, Stage Loader or Stage Randomizer code. - Jan 24, 2018 + Feb 16, 2018 - C22A6710 00000077 + C22A6710 00000064 3C60817F 60630100 38000000 9003000C 38000001 98030001 - 3C60803E 60639710 - 80AD9FA0 88830002 - 2C04000E 41820368 - 2C04000D 418202FC - 2C040001 41810374 - 88850007 70800001 - 41A2000C 38803400 - 480002D4 88850006 - 70800080 41A2000C - 38800906 480002C0 + 80AD9FA0 889F0012 + 2C040001 418102F4 + 98030000 88850007 + 70800001 41A2000C + 38803400 480002D4 + 88850006 70800080 + 41A2000C 38800906 + 480002C0 70800040 + 41A2000C 38800905 + 480002B0 70800020 + 41A2000C 38800904 + 480002A0 70800010 + 41A2000C 38800903 + 48000290 70800008 + 41A2000C 38800902 + 48000280 70800004 + 41A2000C 38800901 + 48000270 88850005 70800040 41A2000C - 38800905 480002B0 + 38800900 4800025C 70800020 41A2000C - 38800904 480002A0 + 38800606 4800024C 70800010 41A2000C - 38800903 48000290 + 38800605 4800023C 70800008 41A2000C - 38800902 48000280 + 38800604 4800022C 70800004 41A2000C - 38800901 48000270 - 88850005 70800040 - 41A2000C 38800900 - 4800025C 70800020 - 41A2000C 38800606 - 4800024C 70800010 - 41A2000C 38800605 - 4800023C 70800008 - 41A2000C 38800604 - 4800022C 70800004 - 41A2000C 38800603 - 4800021C 70800002 - 41A2000C 38800602 - 4800020C 70800001 - 41A2000C 38800601 - 480001FC 88850000 - 70800040 41A2000C - 38800600 480001E8 - 70800020 41A2000C - 38800206 480001D8 - 88850002 70800001 - 41A2000C 38800205 - 480001C4 88850001 - 70800080 41A2000C - 38800306 480001B0 - 70800040 41A2000C - 38800305 480001A0 - 70800020 41A2000C - 38800304 48000190 - 70800010 41A2000C - 38800303 48000180 - 70800008 41A2000C - 38800302 48000170 - 70800004 41A2000C - 38800301 48000160 - 88850004 70800010 - 41A2000C 38800300 - 4800014C 70800008 - 41A2000C 38800506 - 4800013C 70800002 - 41A2000C 38800502 - 4800012C 70800001 - 41A2000C 38800503 - 4800011C 88850003 - 70800080 41A2000C - 38800502 48000108 - 70800040 41A2000C - 38800501 480000F8 - 88850008 70800004 - 41A2000C 38800500 - 480000E4 88850007 - 70800080 41A2000C - 38800806 480000D0 - 88850008 70800001 - 41A2000C 38800805 - 480000BC 88850007 - 70800020 41A2000C - 38800804 480000A8 - 70800040 41A2000C - 38800803 48000098 - 88850008 70800002 - 41A2000C 38800802 - 48000084 88850007 - 70800010 41A2000C - 38800801 48000070 - 88850003 70800004 - 41A2000C 38800800 - 4800005C 70800008 - 41A2000C 38800406 - 4800004C 88850000 - 70800010 41A2000C - 38800400 48000038 - 70800008 41A2000C - 38800204 48000028 - 70800004 41A2000C - 38800203 48000018 + 38800603 4800021C 70800002 41A2000C - 38800202 48000008 - 38800200 90830000 - 988500DF 48000084 - 8083FFFC 2C040500 - 4082000C 38800D00 - 4BFFFFE4 2C040502 - 4082000C 38800D01 - 4BFFFFD4 2C040504 - 4082000C 38800D02 - 4BFFFFC4 2C040505 - 4082000C 38800D03 - 4BFFFFB4 2C040506 - 4082000C 38800D04 - 4BFFFFA4 2C040507 - 40A20028 38800D05 - 4BFFFF94 88850005 + 38800602 4800020C + 70800001 41A2000C + 38800601 480001FC + 88850000 70800040 + 41A2000C 38800600 + 480001E8 70800020 + 41A2000C 38800206 + 480001D8 88850002 + 70800001 41A2000C + 38800205 480001C4 + 88850001 70800080 + 41A2000C 38800306 + 480001B0 70800040 + 41A2000C 38800305 + 480001A0 70800020 + 41A2000C 38800304 + 48000190 70800010 + 41A2000C 38800303 + 48000180 70800008 + 41A2000C 38800302 + 48000170 70800004 + 41A2000C 38800301 + 48000160 88850004 + 70800010 41A2000C + 38800300 4800014C 70800008 41A2000C - 38800E01 4BFFFF80 - 38800E00 4BFFFF78 + 38800506 4800013C + 70800002 41A2000C + 38800502 4800012C + 70800001 41A2000C + 38800503 4800011C + 88850003 70800080 + 41A2000C 38800502 + 48000108 70800040 + 41A2000C 38800501 + 480000F8 88850008 + 70800004 41A2000C + 38800500 480000E4 + 88850007 70800080 + 41A2000C 38800806 + 480000D0 88850008 + 70800001 41A2000C + 38800805 480000BC + 88850007 70800020 + 41A2000C 38800804 + 480000A8 70800040 + 41A2000C 38800803 + 48000098 88850008 + 70800002 41A2000C + 38800802 48000084 + 88850007 70800010 + 41A2000C 38800801 + 48000070 88850003 + 70800004 41A2000C + 38800800 4800005C + 70800008 41A2000C + 38800406 4800004C + 88850000 70800010 + 41A2000C 38800400 + 48000038 70800008 + 41A2000C 38800204 + 48000028 70800004 + 41A2000C 38800203 + 48000018 70800002 + 41A2000C 38800202 + 48000008 38800200 + B09F0012 988500DF 807F0020 00000000 0416210C 4E800020 04157EF8 48000020 diff --git a/codes/GMSJ01.xml b/codes/GMSJ01.xml index 1916d07..3eb8bab 100644 --- a/codes/GMSJ01.xml +++ b/codes/GMSJ01.xml @@ -506,129 +506,110 @@ Fast Any% Psychonauter, Noki Doki - 1.3.2 - Jan 24, 2018 + 1.4 + Feb 16, 2018 Loads stages in any% order, skips all save boxes, replaces all dialog with "!!!" (except for the Pianta 5 secret) and makes all FMVs skippable (except for the Pinna 1 cutscenes). This code is not compatible with the Level Select or Stage Loader code. - C20FA19C 00000077 + C20FA19C 00000064 3C60817F 60630100 38000000 9003000C 38000001 98030001 - 3C60803E 60636010 - 80AD97D0 88830002 - 2C04000E 41820368 - 2C04000D 418202FC - 2C040001 41810374 - 88850007 70800001 - 41A2000C 38803400 - 480002D4 88850006 - 70800080 41A2000C - 38800906 480002C0 + 80AD97D0 889F0012 + 2C040001 418102F4 + 98030000 88850007 + 70800001 41A2000C + 38803400 480002D4 + 88850006 70800080 + 41A2000C 38800906 + 480002C0 70800040 + 41A2000C 38800905 + 480002B0 70800020 + 41A2000C 38800904 + 480002A0 70800010 + 41A2000C 38800903 + 48000290 70800008 + 41A2000C 38800902 + 48000280 70800004 + 41A2000C 38800901 + 48000270 88850005 70800040 41A2000C - 38800905 480002B0 + 38800900 4800025C 70800020 41A2000C - 38800904 480002A0 + 38800606 4800024C 70800010 41A2000C - 38800903 48000290 + 38800605 4800023C 70800008 41A2000C - 38800902 48000280 + 38800604 4800022C 70800004 41A2000C - 38800901 48000270 - 88850005 70800040 - 41A2000C 38800900 - 4800025C 70800020 - 41A2000C 38800606 - 4800024C 70800010 - 41A2000C 38800605 - 4800023C 70800008 - 41A2000C 38800604 - 4800022C 70800004 - 41A2000C 38800603 - 4800021C 70800002 - 41A2000C 38800602 - 4800020C 70800001 - 41A2000C 38800601 - 480001FC 88850000 - 70800040 41A2000C - 38800600 480001E8 - 70800020 41A2000C - 38800206 480001D8 - 88850002 70800001 - 41A2000C 38800205 - 480001C4 88850001 - 70800080 41A2000C - 38800306 480001B0 - 70800040 41A2000C - 38800305 480001A0 - 70800020 41A2000C - 38800304 48000190 - 70800010 41A2000C - 38800303 48000180 - 70800008 41A2000C - 38800302 48000170 - 70800004 41A2000C - 38800301 48000160 - 88850004 70800010 - 41A2000C 38800300 - 4800014C 70800008 - 41A2000C 38800506 - 4800013C 70800002 - 41A2000C 38800502 - 4800012C 70800001 - 41A2000C 38800503 - 4800011C 88850003 - 70800080 41A2000C - 38800502 48000108 - 70800040 41A2000C - 38800501 480000F8 - 88850008 70800004 - 41A2000C 38800500 - 480000E4 88850007 - 70800080 41A2000C - 38800806 480000D0 - 88850008 70800001 - 41A2000C 38800805 - 480000BC 88850007 - 70800020 41A2000C - 38800804 480000A8 - 70800040 41A2000C - 38800803 48000098 - 88850008 70800002 - 41A2000C 38800802 - 48000084 88850007 - 70800010 41A2000C - 38800801 48000070 - 88850003 70800004 - 41A2000C 38800800 - 4800005C 70800008 - 41A2000C 38800406 - 4800004C 88850000 - 70800010 41A2000C - 38800400 48000038 - 70800008 41A2000C - 38800204 48000028 - 70800004 41A2000C - 38800203 48000018 + 38800603 4800021C 70800002 41A2000C - 38800202 48000008 - 38800200 90830000 - 988500DF 48000084 - 8083FFFC 2C040500 - 4082000C 38800D00 - 4BFFFFE4 2C040502 - 4082000C 38800D01 - 4BFFFFD4 2C040504 - 4082000C 38800D02 - 4BFFFFC4 2C040505 - 4082000C 38800D03 - 4BFFFFB4 2C040506 - 4082000C 38800D04 - 4BFFFFA4 2C040507 - 40A20028 38800D05 - 4BFFFF94 88850005 + 38800602 4800020C + 70800001 41A2000C + 38800601 480001FC + 88850000 70800040 + 41A2000C 38800600 + 480001E8 70800020 + 41A2000C 38800206 + 480001D8 88850002 + 70800001 41A2000C + 38800205 480001C4 + 88850001 70800080 + 41A2000C 38800306 + 480001B0 70800040 + 41A2000C 38800305 + 480001A0 70800020 + 41A2000C 38800304 + 48000190 70800010 + 41A2000C 38800303 + 48000180 70800008 + 41A2000C 38800302 + 48000170 70800004 + 41A2000C 38800301 + 48000160 88850004 + 70800010 41A2000C + 38800300 4800014C 70800008 41A2000C - 38800E01 4BFFFF80 - 38800E00 4BFFFF78 + 38800506 4800013C + 70800002 41A2000C + 38800502 4800012C + 70800001 41A2000C + 38800503 4800011C + 88850003 70800080 + 41A2000C 38800502 + 48000108 70800040 + 41A2000C 38800501 + 480000F8 88850008 + 70800004 41A2000C + 38800500 480000E4 + 88850007 70800080 + 41A2000C 38800806 + 480000D0 88850008 + 70800001 41A2000C + 38800805 480000BC + 88850007 70800020 + 41A2000C 38800804 + 480000A8 70800040 + 41A2000C 38800803 + 48000098 88850008 + 70800002 41A2000C + 38800802 48000084 + 88850007 70800010 + 41A2000C 38800801 + 48000070 88850003 + 70800004 41A2000C + 38800800 4800005C + 70800008 41A2000C + 38800406 4800004C + 88850000 70800010 + 41A2000C 38800400 + 48000038 70800008 + 41A2000C 38800204 + 48000028 70800004 + 41A2000C 38800203 + 48000018 70800002 + 41A2000C 38800202 + 48000008 38800200 + B09F0012 988500DF 807F0020 00000000 042193D8 48000020 04223094 4E800020 diff --git a/codes/GMSJ0A.xml b/codes/GMSJ0A.xml index 52aa9b6..23aa29b 100644 --- a/codes/GMSJ0A.xml +++ b/codes/GMSJ0A.xml @@ -506,129 +506,110 @@ Fast Any% Psychonauter, Noki Doki - 1.3.2 - Jan 24, 2018 + 1.4 + Feb 16, 2018 Loads stages in any% order, skips all save boxes, replaces all dialog with "!!!" (except for the Pianta 5 secret) and makes all FMVs skippable (except for the Pinna 1 cutscenes). This code is not compatible with the Level Select or Stage Loader code. - C22865F4 00000077 + C22865F4 00000064 3C60817F 60630100 38000000 9003000C 38000001 98030001 - 3C60803D 6063A8F0 - 80AD9E60 88830002 - 2C04000E 41820368 - 2C04000D 418202FC - 2C040001 41810374 - 88850007 70800001 - 41A2000C 38803400 - 480002D4 88850006 - 70800080 41A2000C - 38800906 480002C0 + 80AD9E60 889F0012 + 2C040001 418102F4 + 98030000 88850007 + 70800001 41A2000C + 38803400 480002D4 + 88850006 70800080 + 41A2000C 38800906 + 480002C0 70800040 + 41A2000C 38800905 + 480002B0 70800020 + 41A2000C 38800904 + 480002A0 70800010 + 41A2000C 38800903 + 48000290 70800008 + 41A2000C 38800902 + 48000280 70800004 + 41A2000C 38800901 + 48000270 88850005 70800040 41A2000C - 38800905 480002B0 + 38800900 4800025C 70800020 41A2000C - 38800904 480002A0 + 38800606 4800024C 70800010 41A2000C - 38800903 48000290 + 38800605 4800023C 70800008 41A2000C - 38800902 48000280 + 38800604 4800022C 70800004 41A2000C - 38800901 48000270 - 88850005 70800040 - 41A2000C 38800900 - 4800025C 70800020 - 41A2000C 38800606 - 4800024C 70800010 - 41A2000C 38800605 - 4800023C 70800008 - 41A2000C 38800604 - 4800022C 70800004 - 41A2000C 38800603 - 4800021C 70800002 - 41A2000C 38800602 - 4800020C 70800001 - 41A2000C 38800601 - 480001FC 88850000 - 70800040 41A2000C - 38800600 480001E8 - 70800020 41A2000C - 38800206 480001D8 - 88850002 70800001 - 41A2000C 38800205 - 480001C4 88850001 - 70800080 41A2000C - 38800306 480001B0 - 70800040 41A2000C - 38800305 480001A0 - 70800020 41A2000C - 38800304 48000190 - 70800010 41A2000C - 38800303 48000180 - 70800008 41A2000C - 38800302 48000170 - 70800004 41A2000C - 38800301 48000160 - 88850004 70800010 - 41A2000C 38800300 - 4800014C 70800008 - 41A2000C 38800506 - 4800013C 70800002 - 41A2000C 38800502 - 4800012C 70800001 - 41A2000C 38800503 - 4800011C 88850003 - 70800080 41A2000C - 38800502 48000108 - 70800040 41A2000C - 38800501 480000F8 - 88850008 70800004 - 41A2000C 38800500 - 480000E4 88850007 - 70800080 41A2000C - 38800806 480000D0 - 88850008 70800001 - 41A2000C 38800805 - 480000BC 88850007 - 70800020 41A2000C - 38800804 480000A8 - 70800040 41A2000C - 38800803 48000098 - 88850008 70800002 - 41A2000C 38800802 - 48000084 88850007 - 70800010 41A2000C - 38800801 48000070 - 88850003 70800004 - 41A2000C 38800800 - 4800005C 70800008 - 41A2000C 38800406 - 4800004C 88850000 - 70800010 41A2000C - 38800400 48000038 - 70800008 41A2000C - 38800204 48000028 - 70800004 41A2000C - 38800203 48000018 + 38800603 4800021C 70800002 41A2000C - 38800202 48000008 - 38800200 90830000 - 988500DF 48000084 - 8083FFFC 2C040500 - 4082000C 38800D00 - 4BFFFFE4 2C040502 - 4082000C 38800D01 - 4BFFFFD4 2C040504 - 4082000C 38800D02 - 4BFFFFC4 2C040505 - 4082000C 38800D03 - 4BFFFFB4 2C040506 - 4082000C 38800D04 - 4BFFFFA4 2C040507 - 40A20028 38800D05 - 4BFFFF94 88850005 + 38800602 4800020C + 70800001 41A2000C + 38800601 480001FC + 88850000 70800040 + 41A2000C 38800600 + 480001E8 70800020 + 41A2000C 38800206 + 480001D8 88850002 + 70800001 41A2000C + 38800205 480001C4 + 88850001 70800080 + 41A2000C 38800306 + 480001B0 70800040 + 41A2000C 38800305 + 480001A0 70800020 + 41A2000C 38800304 + 48000190 70800010 + 41A2000C 38800303 + 48000180 70800008 + 41A2000C 38800302 + 48000170 70800004 + 41A2000C 38800301 + 48000160 88850004 + 70800010 41A2000C + 38800300 4800014C 70800008 41A2000C - 38800E01 4BFFFF80 - 38800E00 4BFFFF78 + 38800506 4800013C + 70800002 41A2000C + 38800502 4800012C + 70800001 41A2000C + 38800503 4800011C + 88850003 70800080 + 41A2000C 38800502 + 48000108 70800040 + 41A2000C 38800501 + 480000F8 88850008 + 70800004 41A2000C + 38800500 480000E4 + 88850007 70800080 + 41A2000C 38800806 + 480000D0 88850008 + 70800001 41A2000C + 38800805 480000BC + 88850007 70800020 + 41A2000C 38800804 + 480000A8 70800040 + 41A2000C 38800803 + 48000098 88850008 + 70800002 41A2000C + 38800802 48000084 + 88850007 70800010 + 41A2000C 38800801 + 48000070 88850003 + 70800004 41A2000C + 38800800 4800005C + 70800008 41A2000C + 38800406 4800004C + 88850000 70800010 + 41A2000C 38800400 + 48000038 70800008 + 41A2000C 38800204 + 48000028 70800004 + 41A2000C 38800203 + 48000018 70800002 + 41A2000C 38800202 + 48000008 38800200 + B09F0012 988500DF 807F0020 00000000 0413934C 48000020 04143178 4E800020 diff --git a/codes/GMSP01.xml b/codes/GMSP01.xml index 335401f..57e0ecb 100644 --- a/codes/GMSP01.xml +++ b/codes/GMSP01.xml @@ -514,129 +514,110 @@ Fast Any% Psychonauter, Noki Doki - 1.3.2 - Jan 24, 2018 + 1.4 + Feb 16, 2018 Loads stages in any% order, skips all save boxes, replaces all dialog with "!!!" (except for the Pianta 5 secret) and makes all FMVs skippable (except for the Pinna 1 cutscenes). This code is not compatible with the Level Select or Stage Loader code. - C229E668 00000077 + C229E668 00000064 3C60817F 60630100 38000000 9003000C 38000001 98030001 - 3C60803E 606310D0 - 80AD9EC8 88830002 - 2C04000E 41820368 - 2C04000D 418202FC - 2C040001 41810374 - 88850007 70800001 - 41A2000C 38803400 - 480002D4 88850006 - 70800080 41A2000C - 38800906 480002C0 + 80AD9EC8 889F0012 + 2C040001 418102F4 + 98030000 88850007 + 70800001 41A2000C + 38803400 480002D4 + 88850006 70800080 + 41A2000C 38800906 + 480002C0 70800040 + 41A2000C 38800905 + 480002B0 70800020 + 41A2000C 38800904 + 480002A0 70800010 + 41A2000C 38800903 + 48000290 70800008 + 41A2000C 38800902 + 48000280 70800004 + 41A2000C 38800901 + 48000270 88850005 70800040 41A2000C - 38800905 480002B0 + 38800900 4800025C 70800020 41A2000C - 38800904 480002A0 + 38800606 4800024C 70800010 41A2000C - 38800903 48000290 + 38800605 4800023C 70800008 41A2000C - 38800902 48000280 + 38800604 4800022C 70800004 41A2000C - 38800901 48000270 - 88850005 70800040 - 41A2000C 38800900 - 4800025C 70800020 - 41A2000C 38800606 - 4800024C 70800010 - 41A2000C 38800605 - 4800023C 70800008 - 41A2000C 38800604 - 4800022C 70800004 - 41A2000C 38800603 - 4800021C 70800002 - 41A2000C 38800602 - 4800020C 70800001 - 41A2000C 38800601 - 480001FC 88850000 - 70800040 41A2000C - 38800600 480001E8 - 70800020 41A2000C - 38800206 480001D8 - 88850002 70800001 - 41A2000C 38800205 - 480001C4 88850001 - 70800080 41A2000C - 38800306 480001B0 - 70800040 41A2000C - 38800305 480001A0 - 70800020 41A2000C - 38800304 48000190 - 70800010 41A2000C - 38800303 48000180 - 70800008 41A2000C - 38800302 48000170 - 70800004 41A2000C - 38800301 48000160 - 88850004 70800010 - 41A2000C 38800300 - 4800014C 70800008 - 41A2000C 38800506 - 4800013C 70800002 - 41A2000C 38800502 - 4800012C 70800001 - 41A2000C 38800503 - 4800011C 88850003 - 70800080 41A2000C - 38800502 48000108 - 70800040 41A2000C - 38800501 480000F8 - 88850008 70800004 - 41A2000C 38800500 - 480000E4 88850007 - 70800080 41A2000C - 38800806 480000D0 - 88850008 70800001 - 41A2000C 38800805 - 480000BC 88850007 - 70800020 41A2000C - 38800804 480000A8 - 70800040 41A2000C - 38800803 48000098 - 88850008 70800002 - 41A2000C 38800802 - 48000084 88850007 - 70800010 41A2000C - 38800801 48000070 - 88850003 70800004 - 41A2000C 38800800 - 4800005C 70800008 - 41A2000C 38800406 - 4800004C 88850000 - 70800010 41A2000C - 38800400 48000038 - 70800008 41A2000C - 38800204 48000028 - 70800004 41A2000C - 38800203 48000018 + 38800603 4800021C 70800002 41A2000C - 38800202 48000008 - 38800200 90830000 - 988500DF 48000084 - 8083FFFC 2C040500 - 4082000C 38800D00 - 4BFFFFE4 2C040502 - 4082000C 38800D01 - 4BFFFFD4 2C040504 - 4082000C 38800D02 - 4BFFFFC4 2C040505 - 4082000C 38800D03 - 4BFFFFB4 2C040506 - 4082000C 38800D04 - 4BFFFFA4 2C040507 - 40A20028 38800D05 - 4BFFFF94 88850005 + 38800602 4800020C + 70800001 41A2000C + 38800601 480001FC + 88850000 70800040 + 41A2000C 38800600 + 480001E8 70800020 + 41A2000C 38800206 + 480001D8 88850002 + 70800001 41A2000C + 38800205 480001C4 + 88850001 70800080 + 41A2000C 38800306 + 480001B0 70800040 + 41A2000C 38800305 + 480001A0 70800020 + 41A2000C 38800304 + 48000190 70800010 + 41A2000C 38800303 + 48000180 70800008 + 41A2000C 38800302 + 48000170 70800004 + 41A2000C 38800301 + 48000160 88850004 + 70800010 41A2000C + 38800300 4800014C 70800008 41A2000C - 38800E01 4BFFFF80 - 38800E00 4BFFFF78 + 38800506 4800013C + 70800002 41A2000C + 38800502 4800012C + 70800001 41A2000C + 38800503 4800011C + 88850003 70800080 + 41A2000C 38800502 + 48000108 70800040 + 41A2000C 38800501 + 480000F8 88850008 + 70800004 41A2000C + 38800500 480000E4 + 88850007 70800080 + 41A2000C 38800806 + 480000D0 88850008 + 70800001 41A2000C + 38800805 480000BC + 88850007 70800020 + 41A2000C 38800804 + 480000A8 70800040 + 41A2000C 38800803 + 48000098 88850008 + 70800002 41A2000C + 38800802 48000084 + 88850007 70800010 + 41A2000C 38800801 + 48000070 88850003 + 70800004 41A2000C + 38800800 4800005C + 70800008 41A2000C + 38800406 4800004C + 88850000 70800010 + 41A2000C 38800400 + 48000038 70800008 + 41A2000C 38800204 + 48000028 70800004 + 41A2000C 38800203 + 48000018 70800002 + 41A2000C 38800202 + 48000008 38800200 + B09F0012 988500DF 807F0020 00000000 0414CF44 48000020 04157158 4E800020 diff --git a/gctGenerator.js b/gctGenerator.js index 25f80a9..c068674 100644 --- a/gctGenerator.js +++ b/gctGenerator.js @@ -375,16 +375,18 @@ function getFastCode() { asm.push("38000001"); // li r0, 1 asm.push("98040101"); // stb r0, 0x0101(r4) - asm.push("881F0012"); // lbz r0, 0x12(r31) + asm.push("887F0012"); // lbz r3, 0x12(r31) - asm.push("2C00000F"); // cmpwi r0, 15 + asm.push("2C03000F"); // cmpwi r3, 15 asm.push("40820010"); // bne- 0x10 asm.push("3800" + ("000" + ((levelCodes.length - (order === 'random')) * 2).toString(16).toUpperCase()).slice(-4)); // li r0, length asm.push("90040000"); // stw r0, 0(r4) - asm.push("4800" + ("000" + (branchBase + 0x38).toString(16).toUpperCase()).slice(-4)); // b done + asm.push("4800" + ("000" + (branchBase + 0x3C).toString(16).toUpperCase()).slice(-4)); // b done - asm.push("2C000001"); // cmpwi r0, 1 - asm.push("4181" + ("000" + (branchBase + 0x30).toString(16).toUpperCase()).slice(-4)); // bgt- done + asm.push("2C030001"); // cmpwi r3, 1 + asm.push("4181" + ("000" + (branchBase + 0x34).toString(16).toUpperCase()).slice(-4)); // bgt- done + + asm.push("98040100"); // stb r0, 0x0100(r4) asm.push("80AD" + game.fmOffset); // lwz r5, TFlagManager::smInstance asm.push("7CC802A6"); // mflr r6