diff options
| author | dannye <33dannye@gmail.com> | 2024-05-05 11:06:40 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-05-05 11:06:40 -0500 |
| commit | b135272f9510ed78e8c062efe552d6dbdcc1523f (patch) | |
| tree | 5dc1941a3b42651f268dbb90f6e3170ccd977408 /engine/items | |
| parent | Remove pcm.py since pcm.c handles it (diff) | |
| parent | Use constant in wram for hidden item flags (#445) (diff) | |
| download | pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.tar.gz pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.tar.xz pokeyellow-b135272f9510ed78e8c062efe552d6dbdcc1523f.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/item_effects.asm | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 2ce6587e..5e502cfa 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -23,7 +23,7 @@ ItemUsePtrTable: dw ItemUseBall ; POKE_BALL dw ItemUseTownMap ; TOWN_MAP dw ItemUseBicycle ; BICYCLE - dw ItemUseSurfboard ; out-of-battle Surf effect + dw ItemUseSurfboard ; SURFBOARD dw ItemUseBall ; SAFARI_BALL dw ItemUsePokedex ; POKEDEX dw ItemUseEvoStone ; MOON_STONE @@ -60,19 +60,19 @@ ItemUsePtrTable: dw UnusableItem ; DOME_FOSSIL dw UnusableItem ; HELIX_FOSSIL dw UnusableItem ; SECRET_KEY - dw UnusableItem + dw UnusableItem ; ITEM_2C dw UnusableItem ; BIKE_VOUCHER dw ItemUseXAccuracy ; X_ACCURACY dw ItemUseEvoStone ; LEAF_STONE dw ItemUseCardKey ; CARD_KEY dw UnusableItem ; NUGGET - dw UnusableItem ; ??? PP_UP - dw ItemUsePokedoll ; POKE_DOLL + dw UnusableItem ; ITEM_32 + dw ItemUsePokeDoll ; POKE_DOLL dw ItemUseMedicine ; FULL_HEAL dw ItemUseMedicine ; REVIVE dw ItemUseMedicine ; MAX_REVIVE dw ItemUseGuardSpec ; GUARD_SPEC - dw ItemUseSuperRepel ; SUPER_REPL + dw ItemUseSuperRepel ; SUPER_REPEL dw ItemUseMaxRepel ; MAX_REPEL dw ItemUseDireHit ; DIRE_HIT dw UnusableItem ; COIN @@ -89,13 +89,13 @@ ItemUsePtrTable: dw ItemUseOaksParcel ; OAKS_PARCEL dw ItemUseItemfinder ; ITEMFINDER dw UnusableItem ; SILPH_SCOPE - dw ItemUsePokeflute ; POKE_FLUTE + dw ItemUsePokeFlute ; POKE_FLUTE dw UnusableItem ; LIFT_KEY dw UnusableItem ; EXP_ALL dw ItemUseOldRod ; OLD_ROD dw ItemUseGoodRod ; GOOD_ROD dw ItemUseSuperRod ; SUPER_ROD - dw ItemUsePPUp ; PP_UP (real one) + dw ItemUsePPUp ; PP_UP dw ItemUsePPRestore ; ETHER dw ItemUsePPRestore ; MAX_ETHER dw ItemUsePPRestore ; ELIXER @@ -696,7 +696,7 @@ ItemUseBicycle: ld [wWalkBikeSurfState], a ret -; used for Surf out-of-battle effect +; indirectly used by SURF in StartMenu_Pokemon.surf ItemUseSurfboard: ld a, [wWalkBikeSurfState] ld [wWalkBikeSurfStateCopy], a @@ -1565,6 +1565,9 @@ VitaminNoEffectText: INCLUDE "data/battle/stat_names.asm" +; for BOULDERBADGE when used from the +; ITEM window, which corresponds to +; SAFARI_BAIT during Safari Game encounters ItemUseBait: ld hl, ThrewBaitText call PrintText @@ -1575,6 +1578,9 @@ ItemUseBait: ld de, wSafariEscapeFactor ; escape factor jr BaitRockCommon +; for CASCADEBADGE when used from the +; ITEM window, which corresponds to +; SAFARI_ROCK during Safari Game encounters ItemUseRock: ld hl, ThrewRockText call PrintText @@ -1620,7 +1626,7 @@ ThrewRockText: text_far _ThrewRockText text_end -; also used for Dig out-of-battle effect +; indirectly used by DIG in StartMenu_Pokemon.dig ItemUseEscapeRope: ld a, [wIsInBattle] and a @@ -1746,7 +1752,7 @@ ItemUseCardKey: INCLUDE "data/events/card_key_coords.asm" -ItemUsePokedoll: +ItemUsePokeDoll: ld a, [wIsInBattle] dec a jp nz, ItemUseNotTime @@ -1839,7 +1845,7 @@ ItemUseXStat: ld [hl], a ; restore [wPlayerMoveNum] ret -ItemUsePokeflute: +ItemUsePokeFlute: ld a, [wIsInBattle] and a jr nz, .inBattle |