From b45f89f80c62d22cbc2a4b38ae63a2da67878ee4 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Thu, 11 Jan 2018 01:45:27 -0500
Subject: More constants and data tables

---
 constants/item_data_constants.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'constants/item_data_constants.asm')

diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
index dfcff9eb0..ae08419f3 100644
--- a/constants/item_data_constants.asm
+++ b/constants/item_data_constants.asm
@@ -164,7 +164,7 @@ const_value set 70
 
 
 ; PartyMenuActionText values
-; GetPartyMenuTilemapPointers arguments (see engine/party_menu.asm)
+; GetPartyMenuQualityIndexes arguments (see engine/party_menu.asm)
 	const_def
 	const PARTYMENUACTION_CHOOSE_POKEMON
 	const PARTYMENUACTION_HEALING_ITEM
-- 
cgit v1.2.3


From a436bbc23bb7ba723a7f897ddbe9d25830169612 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Thu, 11 Jan 2018 02:54:07 -0500
Subject: Move party menu qualities to data/

---
 constants/item_data_constants.asm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'constants/item_data_constants.asm')

diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
index ae08419f3..2e7c2eb2e 100644
--- a/constants/item_data_constants.asm
+++ b/constants/item_data_constants.asm
@@ -163,8 +163,7 @@ const_value set 70
 	const MART_UNDERGROUND
 
 
-; PartyMenuActionText values
-; GetPartyMenuQualityIndexes arguments (see engine/party_menu.asm)
+; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm)
 	const_def
 	const PARTYMENUACTION_CHOOSE_POKEMON
 	const PARTYMENUACTION_HEALING_ITEM
-- 
cgit v1.2.3


From 94d6a327218fc56753238b424df208245092d96c Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Thu, 11 Jan 2018 12:00:01 -0500
Subject: Use maskbits some more

---
 constants/item_data_constants.asm | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to 'constants/item_data_constants.asm')

diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
index 2e7c2eb2e..9b80c7b50 100644
--- a/constants/item_data_constants.asm
+++ b/constants/item_data_constants.asm
@@ -9,21 +9,15 @@
 	const ITEMATTR_HELP
 ITEMATTR_STRUCT_LENGTH EQU const_value
 
-
-; pack pockets
-ITEM     EQU 1
-KEY_ITEM EQU 2
-BALL     EQU 3
-TM_HM    EQU 4
-
-; pack pocket sizes
-MAX_ITEMS     EQU 20
-MAX_KEY_ITEMS EQU 25
-MAX_BALLS     EQU 12
-MAX_PC_ITEMS  EQU 50
-
+; item types
+const_value set 1
+	const ITEM     ; 1
+	const KEY_ITEM ; 2
+	const BALL     ; 3
+	const TM_HM    ; 4
 
 ; item menu types
+; UseItem.dw indexes (see engine/pack.asm)
 ITEMMENU_NOUSE   EQU 0
 ITEMMENU_CURRENT EQU 4
 ITEMMENU_PARTY   EQU 5
@@ -34,6 +28,20 @@ CANT_SELECT EQU 1 << 6
 CANT_TOSS   EQU 1 << 7
 
 
+; pack pockets
+	const_def
+	const ITEM_POCKET     ; 0
+	const BALL_POCKET     ; 1
+	const KEY_ITEM_POCKET ; 2
+	const TM_HM_POCKET    ; 3
+NUM_POCKETS EQU const_value +- 1
+
+MAX_ITEMS     EQU 20
+MAX_BALLS     EQU 12
+MAX_KEY_ITEMS EQU 25
+MAX_PC_ITEMS  EQU 50
+
+
 ; mail
 MAIL_MSG_LENGTH    EQU $20
 MAILBOX_CAPACITY   EQU 10
-- 
cgit v1.2.3


From 163f3e0c3f56831b5255b31045798ac950098faa Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Thu, 11 Jan 2018 22:16:17 -0500
Subject: Local UI tiles don't belong in charmap Separate 1bpp font tiles from
 gfx/mobile/phone_tiles.png

---
 constants/item_data_constants.asm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'constants/item_data_constants.asm')

diff --git a/constants/item_data_constants.asm b/constants/item_data_constants.asm
index 9b80c7b50..b3a35d72b 100644
--- a/constants/item_data_constants.asm
+++ b/constants/item_data_constants.asm
@@ -43,6 +43,7 @@ MAX_PC_ITEMS  EQU 50
 
 
 ; mail
+MAIL_LINE_LENGTH   EQU $10
 MAIL_MSG_LENGTH    EQU $20
 MAILBOX_CAPACITY   EQU 10
 MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
-- 
cgit v1.2.3