diff --git a/Codes.xml b/Codes.xml
index 5d661cb..dd4b24d 100644
--- a/Codes.xml
+++ b/Codes.xml
@@ -1695,8 +1695,8 @@
timer
Quarterframe Timer (Experimental)
Noki Doki
- 0.2
- Oct 22, 2021
+ 0.3
+ Nov 15, 2021
Adds an in-game timer to every level, starting on the last black frame after the
loading screen and ending as soon as the 'Shine Get' animation starts
@@ -1705,30 +1705,24 @@
::: warning
The timer pauses during loading times and FMVs.
:::
-
- ::: danger
- Requires the Level Select code, Fast Any% or Stage Loader to be active.
- At the moment, Shine Get Timer will not restart from 0 in sublevels if used alongside this code.
- :::
- C20ECE44 0000000C
+ C20ECE44 0000000B
981A0260 3CE0817F
- 88070100 2C000000
- 41820018 38000000
- 980700B3 900700B4
- 900700BC 98070100
- 60E30110 38800000
- 60E50094 80CD97F8
- 80C60048 60E700A4
- 39000002 39200000
- 3D808001 618C9904
- 7D8803A6 4E800021
- 60000000 00000000
+ 880700B3 2C000000
+ 38000000 900700BC
+ 4182000C B00700B2
+ 900700B4 60E30110
+ 38800000 60E50094
+ 80CD97F8 80C60048
+ 60E700A4 39000002
+ 39200000 3D808001
+ 618C9904 7D8803A6
+ 4E800021 00000000
C2206738 0000001B
3C60817F 808300BC
2C040000 40A20020
- 888300B3 810300B4
+ 888300B2 810300B4
2C040000 40A20024
810D97E8 8108005C
48000010 3884FFFF
@@ -1736,7 +1730,7 @@
800300B4 7D080214
3CE0000A 60E7F9B0
7C074000 40A00010
- 7CE83B78 98E300B3
+ 7CE83B78 98E300B2
90E300B4 1D0803E9
38000078 7D080396
380003E8 7CE80396
@@ -1753,16 +1747,33 @@
3D808001 618C8E64
7D8803A6 4E800021
881F0046 00000000
- C20EFA30 00000004
- 3CA0817F 800500B4
- 80C3005C 7C003214
- 900500B4 7C0802A6
- 60000000 00000000
+ C20EFA30 00000005
+ 3CA0817F A00500B2
+ 2C000000 40820014
+ 800500B4 80C3005C
+ 7C003214 900500B4
+ 7C0802A6 00000000
C20EDB30 00000004
3CA0817F 800500B4
80C3005C 7C003214
900500B4 38C0FFFF
- 98C500B3 00000000
+ B0C500B2 00000000
+ C22257CC 00000002
+ 2C030001 3C60817F
+ 98A300B3 00000000
+ C20EBD98 00000002
+ 389C0001 3CA0817F
+ 988500B3 00000000
+ C20EC72C 00000004
+ 38000001 3CA0817F
+ 980500B3 801F005C
+ 900500B8 3800FFFF
+ 900500BC 00000000
+ C20ED8F0 00000004
+ 3CA0817F 980500B3
+ 801E005C 900500B8
+ 3800FFFF 900500BC
+ 60000000 00000000
077F0094 0000001D
00000010 000001A0
00000280 000001E0
@@ -1770,23 +1781,22 @@
25303375 00000000
- C22998C0 0000000C
+ C22998C0 0000000B
981A0260 3CE0817F
- 88070100 2C000000
- 41820018 38000000
- 980700B3 900700B4
- 900700BC 98070100
- 60E30110 38800000
- 60E50094 80CD9FC8
- 80C60048 60E700A4
- 39000002 39200000
- 3D80802D 618C0848
- 7D8803A6 4E800021
- 60000000 00000000
+ 880700B3 2C000000
+ 38000000 900700BC
+ 4182000C B00700B2
+ 900700B4 60E30110
+ 38800000 60E50094
+ 80CD9FC8 80C60048
+ 60E700A4 39000002
+ 39200000 3D80802D
+ 618C0848 7D8803A6
+ 4E800021 00000000
C2143F18 0000001B
3C60817F 808300BC
2C040000 40A20020
- 888300B3 810300B4
+ 888300B2 810300B4
2C040000 40A20024
810D9FB8 8108005C
48000010 3884FFFF
@@ -1794,7 +1804,7 @@
800300B4 7D080214
3CE0000A 60E7F9B0
7C074000 40A00010
- 7CE83B78 98E300B3
+ 7CE83B78 98E300B2
90E300B4 1D0803E9
38000078 7D080396
380003E8 7CE80396
@@ -1811,16 +1821,33 @@
3D80802C 618CFDA8
7D8803A6 4E800021
881F0046 00000000
- C229C520 00000004
- 3CA0817F 800500B4
- 80C3005C 7C003214
- 900500B4 7C0802A6
- 60000000 00000000
+ C229C520 00000005
+ 3CA0817F A00500B2
+ 2C000000 40820014
+ 800500B4 80C3005C
+ 7C003214 900500B4
+ 7C0802A6 00000000
C229A5AC 00000004
3CA0817F 800500B4
80C3005C 7C003214
900500B4 38C0FFFF
- 98C500B3 00000000
+ B0C500B2 00000000
+ C2164E24 00000002
+ 2C030001 3C60817F
+ 98A300B3 00000000
+ C229880C 00000002
+ 389C0001 3CA0817F
+ 988500B3 00000000
+ C22991A8 00000004
+ 38000001 3CA0817F
+ 980500B3 801F005C
+ 900500B8 3800FFFF
+ 900500BC 00000000
+ C229A36C 00000004
+ 3CA0817F 980500B3
+ 801E005C 900500B8
+ 3800FFFF 900500BC
+ 60000000 00000000
077F0094 0000001D
00000010 000001A0
00000280 000001E0
@@ -1828,23 +1855,22 @@
25303375 00000000
- C2291758 0000000C
+ C2291758 0000000B
981A0260 3CE0817F
- 88070100 2C000000
- 41820018 38000000
- 980700B3 900700B4
- 900700BC 98070100
- 60E30110 38800000
- 60E50094 80CD9EF0
- 80C60048 60E700A4
- 39000002 39200000
- 3D80802C 618C89F0
- 7D8803A6 4E800021
- 60000000 00000000
+ 880700B3 2C000000
+ 38000000 900700BC
+ 4182000C B00700B2
+ 900700B4 60E30110
+ 38800000 60E50094
+ 80CD9EF0 80C60048
+ 60E700A4 39000002
+ 39200000 3D80802C
+ 618C89F0 7D8803A6
+ 4E800021 00000000
C2138B54 0000001B
3C60817F 808300BC
2C040000 40A20020
- 888300B3 810300B4
+ 888300B2 810300B4
2C040000 40A20024
810D9EE0 8108005C
48000010 3884FFFF
@@ -1852,7 +1878,7 @@
800300B4 7D080214
3CE0000A 60E7F9B0
7C074000 40A00010
- 7CE83B78 98E300B3
+ 7CE83B78 98E300B2
90E300B4 1D0803E9
38000078 7D080396
380003E8 7CE80396
@@ -1869,16 +1895,33 @@
3D80802C 618C7F50
7D8803A6 4E800021
881F0046 00000000
- C22943FC 00000004
- 3CA0817F 800500B4
- 80C3005C 7C003214
- 900500B4 7C0802A6
- 60000000 00000000
+ C22943FC 00000005
+ 3CA0817F A00500B2
+ 2C000000 40820014
+ 800500B4 80C3005C
+ 7C003214 900500B4
+ 7C0802A6 00000000
C2292480 00000004
3CA0817F 800500B4
80C3005C 7C003214
900500B4 38C0FFFF
- 98C500B3 00000000
+ B0C500B2 00000000
+ C2159E9C 00000002
+ 2C030001 3C60817F
+ 98A300B3 00000000
+ C22906A4 00000002
+ 389C0001 3CA0817F
+ 988500B3 00000000
+ C2291040 00000004
+ 38000001 3CA0817F
+ 980500B3 801F005C
+ 900500B8 3800FFFF
+ 900500BC 00000000
+ C2292204 00000004
+ 3CA0817F 980500B3
+ 801E005C 900500B8
+ 3800FFFF 900500BC
+ 60000000 00000000
077F0094 0000001D
00000010 000001A0
00000280 000001E0
@@ -1886,23 +1929,22 @@
25303375 00000000
- C2279570 0000000C
+ C2279570 0000000B
981A0260 3CE0817F
- 88070100 2C000000
- 41820018 38000000
- 980700B3 900700B4
- 900700BC 98070100
- 60E30110 38800000
- 60E50094 80CD9E88
- 80C60048 60E700A4
- 39000002 39200000
- 3D80802B 618C0058
- 7D8803A6 4E800021
- 60000000 00000000
+ 880700B3 2C000000
+ 38000000 900700BC
+ 4182000C B00700B2
+ 900700B4 60E30110
+ 38800000 60E50094
+ 80CD9E88 80C60048
+ 60E700A4 39000002
+ 39200000 3D80802B
+ 618C0058 7D8803A6
+ 4E800021 00000000
C21252A4 0000001B
3C60817F 808300BC
2C040000 40A20020
- 888300B3 810300B4
+ 888300B2 810300B4
2C040000 40A20024
810D9E78 8108005C
48000010 3884FFFF
@@ -1910,7 +1952,7 @@
800300B4 7D080214
3CE0000A 60E7F9B0
7C074000 40A00010
- 7CE83B78 98E300B3
+ 7CE83B78 98E300B2
90E300B4 1D0803E9
38000078 7D080396
380003E8 7CE80396
@@ -1927,16 +1969,33 @@
3D80802A 618CF5B8
7D8803A6 4E800021
881F0046 00000000
- C227C214 00000004
- 3CA0817F 800500B4
- 80C3005C 7C003214
- 900500B4 7C0802A6
- 60000000 00000000
+ C227C214 00000005
+ 3CA0817F A00500B2
+ 2C000000 40820014
+ 800500B4 80C3005C
+ 7C003214 900500B4
+ 7C0802A6 00000000
C227A298 00000004
3CA0817F 800500B4
80C3005C 7C003214
900500B4 38C0FFFF
- 98C500B3 00000000
+ B0C500B2 00000000
+ C2145EBC 00000002
+ 2C030001 3C60817F
+ 98A300B3 00000000
+ C22784B4 00000002
+ 389C0001 3CA0817F
+ 988500B3 00000000
+ C2278E58 00000004
+ 38000001 3CA0817F
+ 980500B3 801F005C
+ 900500B8 3800FFFF
+ 900500BC 00000000
+ C227A01C 00000004
+ 3CA0817F 980500B3
+ 801E005C 900500B8
+ 3800FFFF 900500BC
+ 60000000 00000000
077F0094 0000001D
00000010 000001A0
00000280 000001E0
diff --git a/changelog.md b/changelog.md
index f617a2c..5efec23 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,13 @@
# Changelog
+## Nov 15, 2021
+
+### Updated 'Quarterframe Timer (Experimental)'
+
+* Revamped reset behavior; this code is now fully compatible with Shine Get Timer, and no longer depends on any loader code.
+* The timer now freezes upon hitting a loading zone (similarly to Shine Get Timer) or exiting area.
+* Fixed possible overflows when entering a loading zone after staying in the same area for a very long time.
+
## Oct 22, 2021
### Updated 'Quarterframe Timer (Experimental)'