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:
@@ -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]
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user