diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-22 18:03:00 -0500 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-22 18:03:00 -0500 |
commit | d08199c79d8168368aeac0381427d533e09f073d (patch) | |
tree | e97f322f3ec8a6f9e12e3360d358f3ed10ccb4d9 /constants | |
parent | 630d789c70fcd2b87336caf4762be2012790d4a8 (diff) |
Color fns, some more address decoding in link/mobile
Diffstat (limited to 'constants')
-rwxr-xr-x | constants/cgb_constants.asm | 6 | ||||
-rw-r--r-- | constants/trainer_constants.asm | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm index 5fb29ae84..fdf3882b0 100755 --- a/constants/cgb_constants.asm +++ b/constants/cgb_constants.asm @@ -8,7 +8,7 @@ const SCGB_06 const SCGB_07 const SCGB_08 - const SCGB_09 + const SCGB_MAPPALS const SCGB_0A const SCGB_0B const SCGB_0C @@ -19,7 +19,7 @@ const SCGB_11 const SCGB_12 const SCGB_13 - const SCGB_14 + const SCGB_PACKPALS const SCGB_15 const SCGB_16 const SCGB_17 @@ -27,7 +27,7 @@ const SCGB_19 const SCGB_1A const SCGB_1B - const SCGB_1C + const SCGB_FRONTPICPALS const SCGB_1D const SCGB_1E diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index 98d6c22c4..06a263348 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,5 +1,6 @@ ; trainer groups enum_start +CHRIS EQU __enum__ trainerclass TRAINER_NONE ; 0 const PHONECONTACT_MOM const PHONECONTACT_BIKESHOP @@ -7,6 +8,7 @@ const PHONECONTACT_ELM const PHONECONTACT_BUENA +KRIS EQU __enum__ trainerclass FALKNER ; 1 trainerclass WHITNEY ; 2 |