summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-11-03 10:13:06 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2020-11-03 10:13:06 -0500
commit826e070f0443b50ff31a49b4faf7c66577f1e26e (patch)
tree5a466635490c15e6a9e78e037507a22fceb1da9f /constants
parent01d6e6c75843fdc0035499ce0214c19be74a9bda (diff)
More syncing with pokegold
Diffstat (limited to 'constants')
-rw-r--r--constants/mart_constants.asm1
-rw-r--r--constants/trainer_constants.asm4
2 files changed, 3 insertions, 2 deletions
diff --git a/constants/mart_constants.asm b/constants/mart_constants.asm
index c4834f524..957211427 100644
--- a/constants/mart_constants.asm
+++ b/constants/mart_constants.asm
@@ -42,3 +42,4 @@
const MART_MT_MOON
const MART_INDIGO_PLATEAU
const MART_UNDERGROUND
+NUM_MARTS EQU const_value
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index 4d45b7a11..6b1e1c52b 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -655,8 +655,8 @@ KRIS EQU __trainer_class__
const ALLAN
trainerclass KIMONO_GIRL ; 3c
- const NAOKO1
- const NAOKO2
+ const NAOKO_UNUSED
+ const NAOKO
const SAYO
const ZUKI
const KUNI