From f99a715fae311d2611ec4a714b002e103c4642ca Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 7 Jul 2019 00:44:21 -0400 Subject: Replace some hard-coded values with constants --- constants/pokedex_constants.asm | 2 +- constants/pokemon_constants.asm | 2 ++ constants/trainer_constants.asm | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'constants') diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 360fbb4c..b80547f7 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -152,4 +152,4 @@ const_value = 1 const DEX_MEWTWO ; 150 const DEX_MEW ; 151 -NUM_POKEMON EQU 151 +NUM_POKEMON EQU const_value + -1 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index c4189911..f8a38731 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -190,3 +190,5 @@ const_value = 1 const BELLSPROUT ; $BC const WEEPINBELL ; $BD const VICTREEBEL ; $BE + +NUM_POKEMON_INDEXES EQU const_value + -1 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index ee890282..d936aa06 100755 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,6 +1,8 @@ +OPP_ID_OFFSET EQU 200 + trainer_const: MACRO \1 EQU const_value -OPP_\1 EQU const_value + 200 +OPP_\1 EQU const_value + OPP_ID_OFFSET const_value = const_value + 1 ENDM -- cgit v1.3.1-sl0p