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 /engine | |
| 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 'engine')
| -rw-r--r-- | engine/battle/move_effects/conversion.asm | 4 | ||||
| -rw-r--r-- | engine/battle/move_effects/conversion2.asm | 2 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 2 | ||||
| -rw-r--r-- | engine/items/item_effects.asm | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm index eaa3d6c9c..b6081a6bd 100644 --- a/engine/battle/move_effects/conversion.asm +++ b/engine/battle/move_effects/conversion.asm @@ -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] diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm index 802b57b53..bc8667278 100644 --- a/engine/battle/move_effects/conversion2.asm +++ b/engine/battle/move_effects/conversion2.asm @@ -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 diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index b7426caec..b3a0082e1 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -535,7 +535,7 @@ InitializeEventsScript: setevent EVENT_PLAYERS_HOUSE_2F_DOLL_2 setevent EVENT_PLAYERS_HOUSE_2F_BIG_DOLL setevent EVENT_DECO_BED_1 - setevent EVENT_DECO_PLANT_4 + setevent EVENT_DECO_POSTER_1 setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN setevent EVENT_OLIVINE_GYM_JASMINE setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 11928cd63..b92181d91 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -110,7 +110,7 @@ ItemEffects: dw NoEffect ; MYSTIC_WATER dw NoEffect ; TWISTEDSPOON dw NoEffect ; WHT_APRICORN - dw NoEffect ; BLACKBELT + dw NoEffect ; BLACKBELT_I dw NoEffect ; BLK_APRICORN dw NoEffect ; ITEM_64 dw NoEffect ; PNK_APRICORN |