From 551c1aca659f0c3dc408191f6ddb70381330b2d0 Mon Sep 17 00:00:00 2001
From: branon <branon@branon.me>
Date: Fri, 17 Jan 2025 19:57:06 -0500
Subject: [PATCH] feat: a few watchtower items

---
 data/src/pack/obj.pack           | 16 ++++++++--------
 data/src/scripts/_unpack/all.obj | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/data/src/pack/obj.pack b/data/src/pack/obj.pack
index 49dc735a2a..269f3fd680 100644
--- a/data/src/pack/obj.pack
+++ b/data/src/pack/obj.pack
@@ -2378,14 +2378,14 @@
 2377=ogre_tooth
 2378=obj_2378
 2379=rock_cake
-2380=obj_2380
-2381=obj_2381
-2382=obj_2382
-2383=obj_2383
-2384=obj_2384
-2385=obj_2385
-2386=obj_2386
-2387=obj_2387
+2380=watchtower_crystal1
+2381=watchtower_crystal2
+2382=watchtower_crystal3
+2383=watchtower_crystal4
+2384=fingernails
+2385=old_robe
+2386=unusual_armour
+2387=damaged_dagger
 2388=tattered_eye_patch
 2389=vial_water_jangerberries
 2390=mixture_guam_jangerberries
diff --git a/data/src/scripts/_unpack/all.obj b/data/src/scripts/_unpack/all.obj
index 71d0f856d5..a43f1a1608 100644
--- a/data/src/scripts/_unpack/all.obj
+++ b/data/src/scripts/_unpack/all.obj
@@ -1180,7 +1180,7 @@ iop2=Eat
 category=category_734
 tradeable=no
 
-[obj_2380]
+[watchtower_crystal1]
 name=Crystal
 model=model_2335_obj
 recol1s=22292
@@ -1195,7 +1195,7 @@ weight=2lb
 members=yes
 tradeable=no
 
-[obj_2381]
+[watchtower_crystal2]
 name=Crystal
 model=model_2335_obj
 recol1s=22292
@@ -1210,7 +1210,7 @@ weight=2lb
 members=yes
 tradeable=no
 
-[obj_2382]
+[watchtower_crystal3]
 name=Crystal
 model=model_2335_obj
 recol1s=22292
@@ -1225,7 +1225,7 @@ weight=2lb
 members=yes
 tradeable=no
 
-[obj_2383]
+[watchtower_crystal4]
 name=Crystal
 model=model_2335_obj
 recol1s=2978
@@ -1240,7 +1240,7 @@ weight=2lb
 members=yes
 tradeable=no
 
-[obj_2384]
+[fingernails]
 name=Finger nails
 desc=Eeeeyeeew!
 model=model_1787_obj
@@ -1252,7 +1252,7 @@ weight=2g
 members=yes
 tradeable=no
 
-[obj_2385]
+[old_robe]
 name=Old robe
 desc=I can't wear this old thing.
 model=model_2786_obj
@@ -1263,7 +1263,7 @@ weight=4lb
 members=yes
 tradeable=no
 
-[obj_2386]
+[unusual_armour]
 name=Unusual armour
 desc=Looks kind of useless...
 model=model_2574_obj
@@ -1274,7 +1274,7 @@ weight=8lb
 members=yes
 tradeable=no
 
-[obj_2387]
+[damaged_dagger]
 name=Damaged dagger
 desc=Pointy.
 model=model_2672_obj