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.)
This commit is contained in:
Rangi
2020-03-21 17:50:44 -04:00
parent adbe7f995c
commit 0345e4fb0e
40 changed files with 487 additions and 487 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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