summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-08-31 10:58:41 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-08-31 10:58:41 -0400
commit8ce20e5c31ed2255e708e6a38c7b75d3d8bee48c (patch)
tree8c4770326f0b1b347a84f7adf4e7d3f447a51992 /constants
parentbfd9f617c96af851ad4100b752ea967ef8989edc (diff)
Define a constant for the ghost Marowak (hard-coded throughout the engine, like the starters)
Diffstat (limited to 'constants')
-rw-r--r--constants/pokemon_constants.asm8
-rwxr-xr-xconstants/starter_mons.asm3
2 files changed, 8 insertions, 3 deletions
diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm
index 5a91f0f8..7312dbf1 100644
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -199,3 +199,11 @@
const VICTREEBEL ; $BE
NUM_POKEMON_INDEXES EQU const_value - 1
+
+; starters
+STARTER1 EQU CHARMANDER
+STARTER2 EQU SQUIRTLE
+STARTER3 EQU BULBASAUR
+
+; ghost in Pokémon Tower
+GHOST_MON EQU MAROWAK
diff --git a/constants/starter_mons.asm b/constants/starter_mons.asm
deleted file mode 100755
index 16de35d4..00000000
--- a/constants/starter_mons.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-STARTER1 EQU CHARMANDER
-STARTER2 EQU SQUIRTLE
-STARTER3 EQU BULBASAUR