From 269f2c3ba72776e975f5b00d9a1361cadbda42a7 Mon Sep 17 00:00:00 2001
From: dannye <corrnondacqb@yahoo.com>
Date: Sat, 11 Jun 2016 15:45:24 -0500
Subject: Sync with pokered from August 29, 2015 to April 6, 2016

---
 constants/misc_constants.asm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'constants/misc_constants.asm')

diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index c6945a42..8e5b9866 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -10,6 +10,9 @@ PARTY_LENGTH EQU 6
 MONS_PER_BOX EQU 20
 NUM_BOXES    EQU 12
 
+BAG_ITEM_CAPACITY EQU 20
+PC_ITEM_CAPACITY  EQU 50
+
 HOF_MON           EQU $10
 HOF_TEAM          EQU PARTY_LENGTH * HOF_MON
 HOF_TEAM_CAPACITY EQU 50
@@ -52,14 +55,6 @@ NPC_MOVEMENT_UP    EQU $40
 NPC_MOVEMENT_LEFT  EQU $80
 NPC_MOVEMENT_RIGHT EQU $C0
 
-; battle types
-const_value set $0
-	const NORMAL_BATTLE ; $0
-	const OLD_MAN_BATTLE ; $1
-	const SAFARI_BATTLE ; $2
-	const HURRY_RUN_AWAY_BATTLE ; $3
-	const STARTER_PIKACHU_BATTLE ; $4
-
 ; text box IDs
 MESSAGE_BOX                       EQU $01
 FIELD_MOVE_MON_MENU               EQU $04
@@ -180,6 +175,13 @@ HP_BAR_RED    EQU 2
 ; D733 flags
 BIT_TEST_BATTLE EQU 0
 
+; battle type constants
+BATTLE_TYPE_NORMAL  EQU 0
+BATTLE_TYPE_OLD_MAN EQU 1
+BATTLE_TYPE_SAFARI  EQU 2
+BATTLE_TYPE_RUN     EQU 3
+BATTLE_TYPE_PIKACHU EQU 4
+
 ; serial
 
 ESTABLISH_CONNECTION_WITH_INTERNAL_CLOCK EQU $01
-- 
cgit v1.3.1-sl0p