diff --git a/cores/WindWaker/API/WWAPI.ts b/cores/WindWaker/API/WWAPI.ts
index 85ff08d..2624f86 100644
--- a/cores/WindWaker/API/WWAPI.ts
+++ b/cores/WindWaker/API/WWAPI.ts
@@ -157,6 +157,7 @@ export interface IQuestStatus {
     bracelet: Buffer;
     pirate_charm: Buffer;
     hero_charm: Buffer;
+    heart_pieces: number;
     owned_charts: Buffer;
     opened_charts: Buffer;
     completed_charts: Buffer;
@@ -176,7 +177,6 @@ export interface ISaveContext {
     inventory: IInventory;
     questStatus: IQuestStatus;
     current_hp: number;
-    max_hp: number;
     current_mp: number;
     max_mp: number;
 }
diff --git a/cores/WindWaker/src/QuestStatus.ts b/cores/WindWaker/src/QuestStatus.ts
index e9cc554..c75688c 100644
--- a/cores/WindWaker/src/QuestStatus.ts
+++ b/cores/WindWaker/src/QuestStatus.ts
@@ -105,6 +105,13 @@ export class QuestStatus extends JSONTemplate implements API.IQuestStatus {
         this.emulator.rdramWriteBuffer(0x803C4CC0, flag)
     }
 
+    get heart_pieces(): number {
+        return this.emulator.rdramRead16(0x803C4C08);
+    }
+    set heart_pieces(flag: number) {
+        this.emulator.rdramWrite16(0x803C4C08, flag);
+    }
+
     /*
     0 - Wind's Requiem
     1 - Ballad of Gales
diff --git a/cores/WindWaker/src/SaveContext.ts b/cores/WindWaker/src/SaveContext.ts
index c3ce0b0..1a98e2a 100644
--- a/cores/WindWaker/src/SaveContext.ts
+++ b/cores/WindWaker/src/SaveContext.ts
@@ -19,13 +19,6 @@ export class SaveContext extends JSONTemplate implements API.ISaveContext {
         this.questStatus = new CORE.QuestStatus(emu);
     }
 
-    get max_hp(): number {
-        return this.emulator.rdramRead16(0x803C4C08);
-    }
-    set max_hp(flag: number) {
-        this.emulator.rdramWrite16(0x803C4C08, flag);
-    }
-
     get current_hp(): number {
         return this.emulator.rdramRead16(0x803C4C0A);
     }