diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-03-21 17:50:44 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-03-21 17:59:26 -0400 |
| commit | 0345e4fb0e3f39a038e9eced72380a5a1ab6694f (patch) | |
| tree | c90b2bebe86dffe78e6597d220f70196d3e69e25 /constants | |
| parent | adbe7f995cd8198bd0074b6ccf38f8c6acd3e684 (diff) | |
Add suffixes to some constants to avoid ambiguity
- `PSYCHIC` → `PSYCHIC_TYPE` (not the trainer `PSYCHIC_T` or the move `PSYCHIC_M`)
- `BLACKBELT` → `BLACKBELT_I` (not the trainer `BLACKBELT_T`)
- `CURSE_T` → `CURSE_TYPE` (not the move `CURSE`)
- `TOWN_MAP_D` → `TOWN_MAP_POSTER` (not the item `TOWN_MAP`)
This also uncovered a misidentified event: `EVENT_DECO_PLANT_4` → `EVENT_DECO_POSTER_1`. (There are three plants and four posters.)
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/deco_constants.asm | 2 | ||||
| -rw-r--r-- | constants/event_flags.asm | 6 | ||||
| -rw-r--r-- | constants/item_constants.asm | 2 | ||||
| -rw-r--r-- | constants/type_constants.asm | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index d18018214..09d292d59 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -13,7 +13,7 @@ const_value = 1 const MAGNAPLANT const TROPICPLANT const JUMBOPLANT - const TOWN_MAP_D + const TOWN_MAP_POSTER const FAMICOM const SUPER_NES const NINTENDO_64 diff --git a/constants/event_flags.asm b/constants/event_flags.asm index c15e82dad..1fb88e524 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -701,10 +701,10 @@ const EVENT_DECO_PLANT_1 const EVENT_DECO_PLANT_2 const EVENT_DECO_PLANT_3 - const EVENT_DECO_PLANT_4 - const EVENT_DECO_POSTER_1 ; 2b0 - const EVENT_DECO_POSTER_2 + const EVENT_DECO_POSTER_1 + const EVENT_DECO_POSTER_2 ; 2b0 const EVENT_DECO_POSTER_3 + const EVENT_DECO_POSTER_4 const EVENT_DECO_FAMICOM const EVENT_DECO_SNES const EVENT_DECO_N64 diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 32dcab831..06ad1dc14 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -103,7 +103,7 @@ const MYSTIC_WATER ; 5f const TWISTEDSPOON ; 60 const WHT_APRICORN ; 61 - const BLACKBELT ; 62 + const BLACKBELT_I ; 62 const BLK_APRICORN ; 63 const ITEM_64 ; 64 const PNK_APRICORN ; 65 diff --git a/constants/type_constants.asm b/constants/type_constants.asm index c3524e9d9..3fb9649aa 100644 --- a/constants/type_constants.asm +++ b/constants/type_constants.asm @@ -28,7 +28,7 @@ UNUSED_TYPES EQU const_value const TYPE_16 const TYPE_17 const TYPE_18 - const CURSE_T + const CURSE_TYPE UNUSED_TYPES_END EQU const_value SPECIAL EQU const_value @@ -36,7 +36,7 @@ SPECIAL EQU const_value const WATER const GRASS const ELECTRIC - const PSYCHIC + const PSYCHIC_TYPE const ICE const DRAGON const DARK |