diff --git a/Codes.xml b/Codes.xml
index f8ac11c..3d4b6ed 100644
--- a/Codes.xml
+++ b/Codes.xml
@@ -1223,8 +1223,8 @@
timer
Quarterframe Timer (Experimental)
Noki Doki
- 0.1
- Sep 29, 2021
+ 0.2
+ Oct 22, 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 (similar to the x-cam timer of SM64).
@@ -1234,53 +1234,61 @@
::: 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 0000000B
+ C20ECDBC 0000000C
981A0260 3CE0817F
88070100 2C000000
- 41820014 38000000
- 900700B4 900700BC
- 98070100 60E30110
- 38800000 60E50094
- 80CD97F8 80C60048
- 60E700A4 39000002
- 39200000 3D808001
- 618C9904 7D8803A6
- 4E800021 00000000
- C2206738 00000016
+ 41820018 38000000
+ 980700B3 900700B4
+ 900700BC 98070100
+ 60E30110 38800000
+ 60E50094 80CD97F8
+ 80C60048 60E700A4
+ 39000002 39200000
+ 3D808001 618C9904
+ 7D8803A6 4E800021
+ 60000000 00000000
+ C2206738 0000001B
3C60817F 808300BC
- 2C040000 40A20010
+ 2C040000 40A20020
+ 888300B3 810300B4
+ 2C040000 40A20024
810D97E8 8108005C
48000010 3884FFFF
908300BC 810300B8
800300B4 7D080214
- 1D080019 38000003
- 7D080396 380003E8
- 7CE80396 7C0701D6
- 7D004050 3800003C
- 7CC70396 7C0601D6
- 7CE03850 38A300A4
- 3880000F 80630210
- 4CC63182 3D808008
- 618C40C4 7D8803A6
- 4E800021 3C60817F
- 60630110 38800000
- 38A00000 38C10E90
- 38E00081 3D808001
- 618C8E64 7D8803A6
- 4E800021 881F0046
- 60000000 00000000
+ 3CE0000A 60E7F9B0
+ 7C074000 40A00010
+ 7CE83B78 98E300B3
+ 90E300B4 1D0803E9
+ 38000078 7D080396
+ 380003E8 7CE80396
+ 7C0701D6 7D004050
+ 3800003C 7CC70396
+ 7C0601D6 7CE03850
+ 38A300A4 3880000F
+ 80630210 4CC63182
+ 3D808008 618C40C4
+ 7D8803A6 4E800021
+ 3C60817F 60630110
+ 38800000 38A00000
+ 38C10E90 38E00081
+ 3D808001 618C8E64
+ 7D8803A6 4E800021
+ 881F0046 00000000
C20EFA30 00000004
3CA0817F 800500B4
80C3005C 7C003214
900500B4 7C0802A6
60000000 00000000
- C20EDB30 00000003
- 3CA0817F 80C3005C
- 90C500B8 38C0FFFF
- 90C500BC 00000000
+ C20EDB30 00000004
+ 3CA0817F 800500B4
+ 80C3005C 7C003214
+ 900500B4 38C0FFFF
+ 98C500B3 00000000
077F0094 0000001D
00000010 000001A0
00000280 000001E0
@@ -1288,50 +1296,57 @@
25303375 00000000
- C22998C0 0000000B
+ C22998C0 0000000C
981A0260 3CE0817F
88070100 2C000000
- 41820014 38000000
- 900700B4 900700BC
- 98070100 60E30110
- 38800000 60E50094
- 80CD9FC8 80C60048
- 60E700A4 39000002
- 39200000 3D80802D
- 618C0848 7D8803A6
- 4E800021 00000000
- C2143F18 00000016
+ 41820018 38000000
+ 980700B3 900700B4
+ 900700BC 98070100
+ 60E30110 38800000
+ 60E50094 80CD9FC8
+ 80C60048 60E700A4
+ 39000002 39200000
+ 3D80802D 618C0848
+ 7D8803A6 4E800021
+ 60000000 00000000
+ C214083C 0000001B
3C60817F 808300BC
- 2C040000 40A20010
+ 2C040000 40A20020
+ 888300B3 810300B4
+ 2C040000 40A20024
810D9FB8 8108005C
48000010 3884FFFF
908300BC 810300B8
800300B4 7D080214
- 1D080019 38000003
- 7D080396 380003E8
- 7CE80396 7C0701D6
- 7D004050 3800003C
- 7CC70396 7C0601D6
- 7CE03850 38A300A4
- 3880000F 80630210
- 4CC63182 3D808033
- 618C97A4 7D8803A6
- 4E800021 3C60817F
- 60630110 38800000
- 38A00000 38C10BD0
- 38E00081 3D80802C
- 618CFDA8 7D8803A6
- 4E800021 881F0046
- 60000000 00000000
+ 3CE0000A 60E7F9B0
+ 7C074000 40A00010
+ 7CE83B78 98E300B3
+ 90E300B4 1D0803E9
+ 38000078 7D080396
+ 380003E8 7CE80396
+ 7C0701D6 7D004050
+ 3800003C 7CC70396
+ 7C0601D6 7CE03850
+ 38A300A4 3880000F
+ 80630210 4CC63182
+ 3D808033 618C97A4
+ 7D8803A6 4E800021
+ 3C60817F 60630110
+ 38800000 38A00000
+ 38C10BD0 38E00081
+ 3D80802C 618CFDA8
+ 7D8803A6 4E800021
+ 881F0046 00000000
C229C520 00000004
3CA0817F 800500B4
80C3005C 7C003214
900500B4 7C0802A6
60000000 00000000
- C229A5AC 00000003
- 3CA0817F 80C3005C
- 90C500B8 38C0FFFF
- 90C500BC 00000000
+ C229A5AC 00000004
+ 3CA0817F 800500B4
+ 80C3005C 7C003214
+ 900500B4 38C0FFFF
+ 98C500B3 00000000
077F0094 0000001D
00000010 000001A0
00000280 000001E0
@@ -1339,50 +1354,57 @@
25303375 00000000
- C2291758 0000000B
+ C2291758 0000000C
981A0260 3CE0817F
88070100 2C000000
- 41820014 38000000
- 900700B4 900700BC
- 98070100 60E30110
- 38800000 60E50094
- 80CD9EF0 80C60048
- 60E700A4 39000002
- 39200000 3D80802C
- 618C89F0 7D8803A6
- 4E800021 00000000
- C2138B54 00000016
+ 41820018 38000000
+ 980700B3 900700B4
+ 900700BC 98070100
+ 60E30110 38800000
+ 60E50094 80CD9EF0
+ 80C60048 60E700A4
+ 39000002 39200000
+ 3D80802C 618C89F0
+ 7D8803A6 4E800021
+ 60000000 00000000
+ C2138B54 0000001B
3C60817F 808300BC
- 2C040000 40A20010
+ 2C040000 40A20020
+ 888300B3 810300B4
+ 2C040000 40A20024
810D9EE0 8108005C
48000010 3884FFFF
908300BC 810300B8
800300B4 7D080214
- 1D080019 38000003
- 7D080396 380003E8
- 7CE80396 7C0701D6
- 7D004050 3800003C
- 7CC70396 7C0601D6
- 7CE03850 38A300A4
- 3880000F 80630210
- 4CC63182 3D808033
- 618C1924 7D8803A6
- 4E800021 3C60817F
- 60630110 38800000
- 38A00000 38C10BE4
- 38E00081 3D80802C
- 618C7F50 7D8803A6
- 4E800021 881F0046
- 60000000 00000000
+ 3CE0000A 60E7F9B0
+ 7C074000 40A00010
+ 7CE83B78 98E300B3
+ 90E300B4 1D0803E9
+ 38000078 7D080396
+ 380003E8 7CE80396
+ 7C0701D6 7D004050
+ 3800003C 7CC70396
+ 7C0601D6 7CE03850
+ 38A300A4 3880000F
+ 80630210 4CC63182
+ 3D808033 618C1924
+ 7D8803A6 4E800021
+ 3C60817F 60630110
+ 38800000 38A00000
+ 38C10BE4 38E00081
+ 3D80802C 618C7F50
+ 7D8803A6 4E800021
+ 881F0046 00000000
C22943FC 00000004
3CA0817F 800500B4
80C3005C 7C003214
900500B4 7C0802A6
60000000 00000000
- C2292480 00000003
- 3CA0817F 80C3005C
- 90C500B8 38C0FFFF
- 90C500BC 00000000
+ C2292480 00000004
+ 3CA0817F 800500B4
+ 80C3005C 7C003214
+ 900500B4 38C0FFFF
+ 98C500B3 00000000
077F0094 0000001D
00000010 000001A0
00000280 000001E0
@@ -1390,50 +1412,57 @@
25303375 00000000
- C2279570 0000000B
+ C2279570 0000000C
981A0260 3CE0817F
88070100 2C000000
- 41820014 38000000
- 900700B4 900700BC
- 98070100 60E30110
- 38800000 60E50094
- 80CD9E88 80C60048
- 60E700A4 39000002
- 39200000 3D80802B
- 618C0058 7D8803A6
- 4E800021 00000000
- C21252A4 00000016
+ 41820018 38000000
+ 980700B3 900700B4
+ 900700BC 98070100
+ 60E30110 38800000
+ 60E50094 80CD9E88
+ 80C60048 60E700A4
+ 39000002 39200000
+ 3D80802B 618C0058
+ 7D8803A6 4E800021
+ 60000000 00000000
+ C21252A4 0000001B
3C60817F 808300BC
- 2C040000 40A20010
+ 2C040000 40A20020
+ 888300B3 810300B4
+ 2C040000 40A20024
810D9E78 8108005C
48000010 3884FFFF
908300BC 810300B8
800300B4 7D080214
- 1D080019 38000003
- 7D080396 380003E8
- 7CE80396 7C0701D6
- 7D004050 3800003C
- 7CC70396 7C0601D6
- 7CE03850 38A300A4
- 3880000F 80630210
- 4CC63182 3D808031
- 618C90A4 7D8803A6
- 4E800021 3C60817F
- 60630110 38800000
- 38A00000 38C10BEC
- 38E00081 3D80802A
- 618CF5B8 7D8803A6
- 4E800021 881F0046
- 60000000 00000000
+ 3CE0000A 60E7F9B0
+ 7C074000 40A00010
+ 7CE83B78 98E300B3
+ 90E300B4 1D0803E9
+ 38000078 7D080396
+ 380003E8 7CE80396
+ 7C0701D6 7D004050
+ 3800003C 7CC70396
+ 7C0601D6 7CE03850
+ 38A300A4 3880000F
+ 80630210 4CC63182
+ 3D808031 618C90A4
+ 7D8803A6 4E800021
+ 3C60817F 60630110
+ 38800000 38A00000
+ 38C10BEC 38E00081
+ 3D80802A 618CF5B8
+ 7D8803A6 4E800021
+ 881F0046 00000000
C227C214 00000004
3CA0817F 800500B4
80C3005C 7C003214
900500B4 7C0802A6
60000000 00000000
- C227A298 00000003
- 3CA0817F 80C3005C
- 90C500B8 38C0FFFF
- 90C500BC 00000000
+ C227A298 00000004
+ 3CA0817F 800500B4
+ 80C3005C 7C003214
+ 900500B4 38C0FFFF
+ 98C500B3 00000000
077F0094 0000001D
00000010 000001A0
00000280 000001E0
diff --git a/changelog.md b/changelog.md
index dfbaa04..f617a2c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,13 @@
# Changelog
+## Oct 22, 2021
+
+### Updated 'Quarterframe Timer (Experimental)'
+
+* Adjusted speed to match real time on 30fps. The timer will run slightly faster than real time on 25fps PAL, just as the game itself does.
+* Fixed the ability for the timer to eventually roll back to 0:00.000; it will now stop at 99:59.994 (the highest achievable time below 100 minutes).
+* Fixed the ability for the timer to eventually resume while waiting on a Shine textbox; it will now keep displaying the end time forever (well, until the next area transition).
+
## Oct 10, 2021
### Added 'Speed Display' and 'Shiny Shines'