From 5625d84b820e280f1cb0128dfec90df014727360 Mon Sep 17 00:00:00 2001
From: rr- <dash@wind.garden>
Date: Sun, 31 Oct 2021 20:46:07 +0100
Subject: [PATCH] vars: pull InvItemPuzzle4

---
 src/game/inv.h     |  1 +
 src/game/invvars.c | 26 ++++++++++++++++++++++++++
 src/global/vars.h  |  1 -
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/game/inv.h b/src/game/inv.h
index f9cb85c41..9ab00047b 100644
--- a/src/game/inv.h
+++ b/src/game/inv.h
@@ -29,6 +29,7 @@ extern INVENTORY_ITEM InvItemScion;
 extern INVENTORY_ITEM InvItemPuzzle1;
 extern INVENTORY_ITEM InvItemPuzzle2;
 extern INVENTORY_ITEM InvItemPuzzle3;
+extern INVENTORY_ITEM InvItemPuzzle4;
 
 extern TEXTSTRING *InvItemText[2];
 extern TEXTSTRING *InvRingText;
diff --git a/src/game/invvars.c b/src/game/invvars.c
index 8bfff6e3e..a805481cd 100644
--- a/src/game/invvars.c
+++ b/src/game/invvars.c
@@ -331,3 +331,29 @@ INVENTORY_ITEM InvItemPuzzle3 = {
     .inv_pos = 106,
     .sprlist = NULL,
 };
+
+INVENTORY_ITEM InvItemPuzzle4 = {
+    .string = "Puzzle",
+    .object_number = O_PUZZLE_OPTION4,
+    .frames_total = 1,
+    .current_frame = 0,
+    .goal_frame = 0,
+    .open_frame = 0,
+    .anim_direction = 1,
+    .anim_speed = 1,
+    .anim_count = 0,
+    .pt_xrot_sel = 7200,
+    .pt_xrot = 0,
+    .x_rot_sel = -4352,
+    .x_rot = 0,
+    .y_rot_sel = 0,
+    .y_rot = 0,
+    .ytrans_sel = 0,
+    .ytrans = 0,
+    .ztrans_sel = 256,
+    .ztrans = 0,
+    .which_meshes = 0xFFFFFFFF,
+    .drawn_meshes = 0xFFFFFFFF,
+    .inv_pos = 105,
+    .sprlist = NULL,
+};
diff --git a/src/global/vars.h b/src/global/vars.h
index bf7861dea..7a0c722f8 100644
--- a/src/global/vars.h
+++ b/src/global/vars.h
@@ -118,7 +118,6 @@ extern int32_t KeyChange;
 #define CompassNeedle           VAR_U_(0x0045A0AC, int16_t)
 #define Item_Data               VAR_U_(0x0045A0B8, int16_t)
 
-#define InvItemPuzzle4          VAR_U_(0x00455C20, INVENTORY_ITEM)
 #define InvItemKey1             VAR_U_(0x00455C60, INVENTORY_ITEM)
 #define InvItemKey2             VAR_U_(0x00455CA0, INVENTORY_ITEM)
 #define InvItemKey3             VAR_U_(0x00455CE0, INVENTORY_ITEM)