diff --git a/Codes.xml b/Codes.xml
index 1b9c88e..56c96f7 100644
--- a/Codes.xml
+++ b/Codes.xml
@@ -5150,4 +5150,355 @@
4181FFDC 00000000
+
+ savestate
+ Mario Savestate
+ マリオ状態保存
+ sup39(サポミク)
+ 1.0
+ Feb 13, 2023
+
+ Allows to save and load the following states:
+ - Mario's current state (e.g. dive, ground pound)
+ - Mario's speed
+ - Last held object
+ - FLUDD's water amount
+
+ | Combination | Result |
+ | ------------| ------------------------------- |
+ | D-Pad Left | Save the states mentioned above |
+ | D-Pad Right | Load the states mentioned above |
+
+
+ 次の状態をセーブ・ロードできるようにします：
+ - マリオの状態(ダイブ、ヒップドロップなど)
+ - マリオの速度
+ - 最後に掴んだオブジェクト
+ - ポンプの水量
+
+ | ボタン | 機能 |
+ | ---------- | ------------------ |
+ | 十字キー左 | 上記の状態をセーブ |
+ | 十字キー右 | 上記の状態をロード |
+
+
+ 48000000 8040A378
+ DE000000 80008180
+ 80000000 817F0040
+ 80000001 817F0050
+ 80000002 817F0058
+ 80000003 817F005C
+ 80000004 817F0060
+ 92210005 000003E4
+ 80000006 817F0064
+ 28400D50 00000001
+ 9C0010F0 0000007C
+ 9C0008F1 00000118
+ 9C0004F2 000000B0
+ 9C0004F3 000000A8
+ 9C0004F4 00000384
+ 9C000456 00001C80
+ 28400D51 00000002
+ 237F0040 00000000
+ 9A00100F 0000007C
+ 9A00081F 00000118
+ 9A00042F 000000B0
+ 9A00043F 000000A8
+ 9A00044F 00000384
+ 9A000465 00001C80
+ E0000000 00000000
+ C20EFA34 00000003
+ 90010004 3D80817F
+ 38000000 900C0040
+ 60000000 00000000
+
+
+ 48000000 803FEF88
+ DE000000 80008180
+ 80000000 817F0040
+ 80000001 817F0050
+ 80000002 817F0058
+ 80000003 817F005C
+ 80000004 817F0060
+ 92210005 000003E4
+ 80000006 817F0064
+ 283F5428 00000001
+ 9C0010F0 0000007C
+ 9C0008F1 00000118
+ 9C0004F2 000000B0
+ 9C0004F3 000000A8
+ 9C0004F4 00000384
+ 9C000456 00001C80
+ 283F5429 00000002
+ 237F0040 00000000
+ 9A00100F 0000007C
+ 9A00081F 00000118
+ 9A00042F 000000B0
+ 9A00043F 000000A8
+ 9A00044F 00000384
+ 9A000465 00001C80
+ E0000000 00000000
+ C227C218 00000003
+ 90010004 3D80817F
+ 38000000 900C0040
+ 60000000 00000000
+
+
+ 48000000 804057B0
+ DE000000 80008180
+ 80000000 817F0040
+ 80000001 817F0050
+ 80000002 817F0058
+ 80000003 817F005C
+ 80000004 817F0060
+ 92210005 000003E4
+ 80000006 817F0064
+ 283FBBF4 00000001
+ 9C0010F0 0000007C
+ 9C0008F1 00000118
+ 9C0004F2 000000B0
+ 9C0004F3 000000A8
+ 9C0004F4 00000384
+ 9C000456 00001C80
+ 283FBBF5 00000002
+ 237F0040 00000000
+ 9A00100F 0000007C
+ 9A00081F 00000118
+ 9A00042F 000000B0
+ 9A00043F 000000A8
+ 9A00044F 00000384
+ 9A000465 00001C80
+ E0000000 00000000
+ C2294400 00000003
+ 90010004 3D80817F
+ 38000000 900C0040
+ 60000000 00000000
+
+
+ 48000000 8040E0E8
+ DE000000 80008180
+ 80000000 817F0040
+ 80000001 817F0050
+ 80000002 817F0058
+ 80000003 817F005C
+ 80000004 817F0060
+ 92210005 000003E4
+ 80000006 817F0064
+ 28404454 00000001
+ 9C0010F0 0000007C
+ 9C0008F1 00000118
+ 9C0004F2 000000B0
+ 9C0004F3 000000A8
+ 9C0004F4 00000384
+ 9C000456 00001C80
+ 28404455 00000002
+ 237F0040 00000000
+ 9A00100F 0000007C
+ 9A00081F 00000118
+ 9A00042F 000000B0
+ 9A00043F 000000A8
+ 9A00044F 00000384
+ 9A000465 00001C80
+ E0000000 00000000
+ C229C524 00000003
+ 90010004 3D80817F
+ 38000000 900C0040
+ 60000000 00000000
+
+
+
+ misc
+ No Shine Get Animation
+ sup39(サポミク)
+ 1.0
+ Feb 13, 2023
+
+ Prevent Mario from starting the 'Shine Get' animation
+ when touching a shine.
+
+ Note that the shine is not counted as collected
+ when this code is enabled.
+
+ | Combination | Result |
+ | ------------------- | ---------------- |
+ | L + X + D-Pad Left | Enable the code |
+ | L + X + D-Pad Right | Disable the code |
+
+
+ シャインキャッチの時にマリオがSHINE GETアニメーションを始めないようにします。
+
+ このコードを有効にするとキャッチしたシャインは実際に取得されません。
+
+ | ボタン | 機能 |
+ | ------------------ | ---------------------- |
+ | L + X + 十字キー左 | このコードを有効にする |
+ | L + X + 十字キー右 | このコードを無効にする |
+
+
+ 28400D50 00000441
+ C210C3D4 00000003
+ 3D80817F 39600000
+ 916C003C 7C030378
+ 60000000 00000000
+ C2120540 00000008
+ 3D80817F 81630058
+ 916C003C 8163005C
+ 396B0004 556B003A
+ 916C00B8 3800FFFF
+ 900C00BC 880C0479
+ 980C0478 A16C04A4
+ 396B0001 B16C04A4
+ 60000000 00000000
+ C2195304 00000005
+ 3D80817F 800C003C
+ 816D97E8 816B0058
+ 7C005850 28000004
+ 916C003C 4C810020
+ 7C0802A6 00000000
+ C212055C 00000002
+ 80030064 5400003C
+ 90030064 00000000
+ C2120564 00000003
+ 3C000C40 60000201
+ 901F007C 38000000
+ 901F0084 00000000
+ 28400D51 00000442
+ 04120540 4BFCD5A9
+ 0412055C 4E800021
+ 04120564 B01F0084
+ 04195304 7C0802A6
+ E0000000 00000000
+
+
+ 283F5428 00000441
+ C2296F2C 00000003
+ 3D80817F 39600000
+ 916C003C 7C030378
+ 60000000 00000000
+ C2221148 00000008
+ 3D80817F 81630058
+ 916C003C 8163005C
+ 396B0004 556B003A
+ 916C00B8 3800FFFF
+ 900C00BC 880C0479
+ 980C0478 A16C04A4
+ 396B0001 B16C04A4
+ 60000000 00000000
+ C219D0BC 00000005
+ 3D80817F 800C003C
+ 816D9E78 816B0058
+ 7C005850 28000004
+ 916C003C 4C810020
+ 7C0802A6 00000000
+ C2221164 00000002
+ 80030064 5400003C
+ 90030064 00000000
+ C222116C 00000003
+ 3C000C40 60000201
+ 901F007C 38000000
+ 901F0084 00000000
+ 283F5429 00000442
+ 04221148 480590CD
+ 04221164 4E800021
+ 0422116C B01F0084
+ 0419D0BC 7C0802A6
+ E0000000 00000000
+
+
+ 283FBBF4 00000441
+ C22AF6EC 00000003
+ 3D80817F 39600000
+ 916C003C 7C030378
+ 60000000 00000000
+ C223918C 00000008
+ 3D80817F 81630058
+ 916C003C 8163005C
+ 396B0004 556B003A
+ 916C00B8 3800FFFF
+ 900C00BC 880C0479
+ 980C0478 A16C04A4
+ 396B0001 B16C04A4
+ 60000000 00000000
+ C21B51EC 00000005
+ 3D80817F 800C003C
+ 816D9EE0 816B0058
+ 7C005850 28000004
+ 916C003C 4C810020
+ 7C0802A6 00000000
+ C22391A8 00000002
+ 80030064 5400003C
+ 90030064 00000000
+ C22391B0 00000003
+ 3C000C40 60000201
+ 901F007C 38000000
+ 901F0084 00000000
+ 283FBBF5 00000442
+ 0423918C 48059271
+ 042391A8 4E800021
+ 042391B0 B01F0084
+ 041B51EC 7C0802A6
+ E0000000 00000000
+
+
+ 28404454 00000441
+ C22B771C 00000003
+ 3D80817F 39600000
+ 916C003C 7C030378
+ 60000000 00000000
+ C2241400 00000008
+ 3D80817F 81630058
+ 916C003C 8163005C
+ 396B0004 556B003A
+ 916C00B8 3800FFFF
+ 900C00BC 880C0479
+ 980C0478 A16C04A4
+ 396B0001 B16C04A4
+ 60000000 00000000
+ C21BD334 00000005
+ 3D80817F 800C003C
+ 816D9FB8 816B0058
+ 7C005850 28000004
+ 916C003C 4C810020
+ 7C0802A6 00000000
+ C224141C 00000002
+ 80030064 5400003C
+ 90030064 00000000
+ C2241424 00000003
+ 3C000C40 60000201
+ 901F007C 38000000
+ 901F0084 00000000
+ 28404455 00000442
+ 04241400 48059165
+ 0424141C 4E800021
+ 04241424 B01F0084
+ 041BD334 7C0802A6
+ E0000000 00000000
+
+
+
+ misc
+ Fruit Never Time Out
+ 永久フルーツ
+ sup39(サポミク)
+ 1.0
+ Feb 13, 2023
+
+ Make fruits never time out.
+
+
+ フルーツを時間経過で消えないようにします。
+
+
+ 044091A8 7FFFFFFF
+
+
+ 043FD858 7FFFFFFF
+
+
+ 04404078 7FFFFFFF
+
+
+ 0440C918 7FFFFFFF
+
+
diff --git a/Readme.md b/Readme.md
index 31da56d..00372b1 100644
--- a/Readme.md
+++ b/Readme.md
@@ -59,7 +59,14 @@ Some codes store some states in the games memory starting from address 0x817F000
|  | `0x2E` | `0x2F` | Not Allocated |
|  | `0x30` | `0x33` | QF Time Savestate: Stored QF Time |
|  | `0x34` | `0x3B` | In-Game Time Savestate: Stored Elapsed Time |
-|  | `0x3C` | `0x93` | Not Allocated |
+|  | `0x3C` | `0x3F` | Open World Shine Get: Last Touched Shine Game QF |
+|  | `0x40` | `0x4F` | Mario Savestate: Stored State (0x7C-0x8B) |
+|  | `0x50` | `0x57` | Mario Savestate: Stored Flag (0x118-0x123) |
+|  | `0x58` | `0x5B` | Mario Savestate: Stored Horizontal Speed |
+|  | `0x5C` | `0x5F` | Mario Savestate: Stored Vertical Speed |
+|  | `0x60` | `0x63` | Mario Savestate: Stored Last Grab Target |
+|  | `0x64` | `0x67` | Mario Savestate: Stored Water Amount |
+|  | `0x68` | `0x93` | Not Allocated |
|  | `0x94` | `0xA3` | QF Timer: Coordinates of the Text box (LTRB) |
|  | `0xA4` | `0xB0` | QF Timer: Timer Format String |
|  | `0xB0` | `0xB1` | QF Timer: (Unused) |
diff --git a/changelog.md b/changelog.md
index 9d89cce..d2a0764 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,9 @@
# Changelog
+## Feb 13, 2023
+- Added 'Mario State Savestate'
+- Added 'No Shine Get Animation'
+- Added 'Fruit Never Time Out'
+
## Feb 11, 2023
- Added 'Deathless Blooper Surfing'
- Added 'In-Game Time Savestate'