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

@@ -46,7 +46,7 @@ BattleCommand_Conversion:
ld a, [hl]
cp -1
jr z, .fail
cp CURSE_T
cp CURSE_TYPE
jr z, .next
ld a, [de]
cp [hl]
@@ -75,7 +75,7 @@ BattleCommand_Conversion:
ld a, [hl]
cp -1
jr z, .loop3
cp CURSE_T
cp CURSE_TYPE
jr z, .loop3
ld a, [de]
cp [hl]

View File

@@ -20,7 +20,7 @@ BattleCommand_Conversion2:
call GetMoveAttr
ld d, a
pop hl
cp CURSE_T
cp CURSE_TYPE
jr z, .failed
call AnimateCurrentMove
call BattleCommand_SwitchTurn