From 714a6ad1237b904da781b94dc3d7dc027b8ae27e Mon Sep 17 00:00:00 2001
From: Luke Hubmayer-Werner <mongoose41@gmail.com>
Date: Mon, 11 Dec 2023 01:43:40 +1030
Subject: [PATCH] Use long item names in inventory

---
 data/string_blocks.tsv |  3 ++-
 widgets/PartyMenu.gd   |  3 ++-
 widgets/PartyMenu.tscn | 31 ++++++++++++++++++++-----------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/data/string_blocks.tsv b/data/string_blocks.tsv
index d50ae7c..a9f5926 100644
--- a/data/string_blocks.tsv
+++ b/data/string_blocks.tsv
@@ -2,9 +2,10 @@ name	num_entries	address	snes_address	bytes	snes_bytes	rpge_ptr_offset	snes_ptr_
 ability_names	33	0x116200		8					
 battle_commands	96	0x201150	0x115800	7	5				
 character_names	5	0x115500		6					
-dialogue	0x900	0x2013F0	0x082220	3	2	0x000000	0x0A0000	True
+dialogue	0x900	0x2013F0	0x082220	3	2	0x000000	0x0A0000	True	
 enemy_names	384	0x200050	0x105C00	10	8				
 items	0x100	0x111380		9					
+item_long_names	0x120	0x275860	0x111380	24	9				
 item_descriptions	128	0x114000		2		0x110000	0x110000	True	True
 job_names	22	0x115600		8					
 job_and_ability_descs	133	0x117140		2		0x110000	0x110000		True
diff --git a/widgets/PartyMenu.gd b/widgets/PartyMenu.gd
index c1167e4..df75ac7 100644
--- a/widgets/PartyMenu.gd
+++ b/widgets/PartyMenu.gd
@@ -38,7 +38,8 @@ func update_labels(data: Dictionary):
 	for i in 256:
 		var item_id = data.inventory_item_ids[i]
 		var item_qty = data.inventory_item_qtys[i]
-		var item_name = StringLoader.tables.items[item_id]
+		# var item_name = StringLoader.tables.items[item_id]
+		var item_name = StringLoader.tables.item_long_names[item_id].rstrip(' ')
 		var lbl_item_name := Label.new()
 		var lbl_item_qty := Label.new()
 		lbl_item_qty.align = HALIGN_RIGHT
diff --git a/widgets/PartyMenu.tscn b/widgets/PartyMenu.tscn
index cb5c585..7f995a8 100644
--- a/widgets/PartyMenu.tscn
+++ b/widgets/PartyMenu.tscn
@@ -349,32 +349,41 @@ size_flags_horizontal = 3
 text = "Rare"
 align = 1
 
-[node name="itemdesc" type="PanelContainer" parent="submenus/items_menu"]
+[node name="VBoxContainer" type="VBoxContainer" parent="submenus/items_menu"]
 anchor_right = 1.0
+anchor_bottom = 1.0
 margin_top = 22.0
-margin_bottom = 66.0
+custom_constants/separation = 0
 
-[node name="lbl_item_description" type="Label" parent="submenus/items_menu/itemdesc"]
+[node name="panel_item_description" type="PanelContainer" parent="submenus/items_menu/VBoxContainer"]
+unique_name_in_owner = true
+visible = false
+margin_right = 320.0
+margin_bottom = 52.0
+
+[node name="lbl_item_description" type="Label" parent="submenus/items_menu/VBoxContainer/panel_item_description"]
 unique_name_in_owner = true
 margin_left = 4.0
 margin_top = 4.0
 margin_right = 316.0
-margin_bottom = 40.0
+margin_bottom = 48.0
+rect_min_size = Vector2( 0, 44 )
 size_flags_vertical = 1
 text = "Item description"
 
-[node name="items" type="PanelContainer" parent="submenus/items_menu"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-margin_top = 66.0
+[node name="items" type="PanelContainer" parent="submenus/items_menu/VBoxContainer"]
+margin_right = 320.0
+margin_bottom = 218.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
 
-[node name="ScrollContainer" type="ScrollContainer" parent="submenus/items_menu/items"]
+[node name="ScrollContainer" type="ScrollContainer" parent="submenus/items_menu/VBoxContainer/items"]
 margin_left = 4.0
 margin_top = 4.0
 margin_right = 316.0
-margin_bottom = 170.0
+margin_bottom = 214.0
 
-[node name="items_container" type="GridContainer" parent="submenus/items_menu/items/ScrollContainer"]
+[node name="items_container" type="GridContainer" parent="submenus/items_menu/VBoxContainer/items/ScrollContainer"]
 unique_name_in_owner = true
 custom_constants/vseparation = 0
 columns = 4