summaryrefslogtreecommitdiff
path: root/constants/misc_constants.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-11 20:37:15 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-11 20:37:15 -0400
commitf5983c0f813d3d908b6016db3ed866e4ca9437dc (patch)
treed6888723f443557ce45c9a00d873caa5e7a8930e /constants/misc_constants.asm
parent041c4f28a3c35e31329222769534942439b70f29 (diff)
parent401d6e7f36e86aa246a2c0591195e1f0f01e879f (diff)
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'constants/misc_constants.asm')
-rw-r--r--constants/misc_constants.asm18
1 files changed, 10 insertions, 8 deletions
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