diff options
| author | Daniel Harding <33dannye@gmail.com> | 2019-07-17 17:30:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 17:30:53 -0500 |
| commit | 36597a7917144bbf5d9ae63a0f9d537f6f58eb74 (patch) | |
| tree | e478588912070f759c95b8c276c03dc7a296c9d2 /constants | |
| parent | 8addeffe6fb5012113e695b17680734933076e8e (diff) | |
| parent | 092be231ccec12904d189092270b792c7f1fd68e (diff) | |
Merge pull request #220 from Rangi42/master
Replace some hard-coded values with constants
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/pokedex_constants.asm | 2 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm | 2 | ||||
| -rwxr-xr-x | constants/trainer_constants.asm | 4 |
3 files changed, 6 insertions, 2 deletions
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 |