mirror of
https://github.com/pret/pokered.git
synced 2024-10-22 22:55:31 +00:00
Clean up item comments (#443)
This commit is contained in:
parent
f6017ddbfd
commit
07cefd462f
3 changed files with 21 additions and 15 deletions
|
@ -52,13 +52,13 @@ DEF SAFARI_ROCK EQU CASCADEBADGE ; overload
|
|||
const DOME_FOSSIL ; $29
|
||||
const HELIX_FOSSIL ; $2A
|
||||
const SECRET_KEY ; $2B
|
||||
const ITEM_2C ; $2C
|
||||
const ITEM_2C ; $2C ; unused
|
||||
const BIKE_VOUCHER ; $2D
|
||||
const X_ACCURACY ; $2E
|
||||
const LEAF_STONE ; $2F
|
||||
const CARD_KEY ; $30
|
||||
const NUGGET ; $31
|
||||
const ITEM_32 ; $32
|
||||
const ITEM_32 ; $32 ; unused
|
||||
const POKE_DOLL ; $33
|
||||
const FULL_HEAL ; $34
|
||||
const REVIVE ; $35
|
||||
|
|
|
@ -28,7 +28,7 @@ AttackAnimationPointers:
|
|||
dw JumpKickAnim
|
||||
dw RollingKickAnim
|
||||
dw SandAttackAnim
|
||||
dw HeadButtAnim
|
||||
dw HeadbuttAnim
|
||||
dw HornAttackAnim
|
||||
dw FuryAttackAnim
|
||||
dw HornDrillAnim
|
||||
|
@ -363,7 +363,7 @@ SandAttackAnim:
|
|||
battle_anim SAND_ATTACK, SUBANIM_1_SAND, 1, 6
|
||||
db -1 ; end
|
||||
|
||||
HeadButtAnim:
|
||||
HeadbuttAnim:
|
||||
battle_anim HEADBUTT, SUBANIM_1_STAR_BIG, 1, 6
|
||||
db -1 ; end
|
||||
|
||||
|
|
|
@ -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
|
||||
|
@ -665,7 +665,7 @@ ItemUseBicycle:
|
|||
.printText
|
||||
jp PrintText
|
||||
|
||||
; used for Surf out-of-battle effect
|
||||
; indirectly used by SURF in StartMenu_Pokemon.surf
|
||||
ItemUseSurfboard:
|
||||
ld a, [wWalkBikeSurfState]
|
||||
ld [wWalkBikeSurfStateCopy], a
|
||||
|
@ -1427,6 +1427,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
|
||||
|
@ -1437,6 +1440,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
|
||||
|
@ -1482,7 +1488,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
|
||||
|
@ -1597,7 +1603,7 @@ ItemUseCardKey:
|
|||
|
||||
INCLUDE "data/events/card_key_coords.asm"
|
||||
|
||||
ItemUsePokedoll:
|
||||
ItemUsePokeDoll:
|
||||
ld a, [wIsInBattle]
|
||||
dec a
|
||||
jp nz, ItemUseNotTime
|
||||
|
@ -1662,7 +1668,7 @@ ItemUseXStat:
|
|||
ld [hl], a ; restore [wPlayerMoveNum]
|
||||
ret
|
||||
|
||||
ItemUsePokeflute:
|
||||
ItemUsePokeFlute:
|
||||
ld a, [wIsInBattle]
|
||||
and a
|
||||
jr nz, .inBattle
|
||||
|
|
Loading…
Reference in a new issue