Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No redundant item effect labels

Browse Source
This commit is contained in:
Rangi
2018-02-05 13:03:05 -05:00
parent f8f3294130
commit 96c058f0a7
4 changed files with 225 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/items/attributes.asm
View File

@@ -6,7 +6,7 @@ item_attribute: MACRO
ENDM ENDM
ItemAttributes: ; 67c1 ItemAttributes: ; 67c1
; entries correspond to constants/item_constants.asm ; entries correspond to item ids
; MASTER_BALL ; MASTER_BALL
item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE item_attribute 0, 0, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; ULTRA_BALL ; ULTRA_BALL

1
data/items/descriptions.asm
View File

@@ -1,4 +1,5 @@
ItemDescriptions: ItemDescriptions:
; entries correspond to item ids
dw MasterBallDesc dw MasterBallDesc
dw UltraBallDesc dw UltraBallDesc
dw BrightpowderDesc dw BrightpowderDesc

8
docs/bugs_and_glitches.md
View File

@@ -587,7 +587,7 @@ Text_StringBuffer2ExpPoints::
## BRN/PSN/PAR do not affect catch rate ## BRN/PSN/PAR do not affect catch rate
This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.asm): This is a bug with `PokeBallEffect` in [engine/item_effects.asm](/engine/item_effects.asm):
```asm ```asm
; This routine is buggy. It was intended that SLP and FRZ provide a higher ; This routine is buggy. It was intended that SLP and FRZ provide a higher
@@ -1135,7 +1135,7 @@ endr
This bug can affect Mew or Pokémon other than Ditto that used Transform via Mirror Move or Sketch. This bug can affect Mew or Pokémon other than Ditto that used Transform via Mirror Move or Sketch.
This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.asm): This is a bug with `PokeBallEffect` in [engine/item_effects.asm](/engine/item_effects.asm):
```asm ```asm
ld hl, wEnemySubStatus5 ld hl, wEnemySubStatus5
@@ -1207,7 +1207,7 @@ This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.
([Video](https://www.youtube.com/watch?v=v1ErZdLCIyU)) ([Video](https://www.youtube.com/watch?v=v1ErZdLCIyU))
This is a bug with `ParkBall` in [engine/item_effects.asm](/engine/item_effects.asm): This is a bug with `PokeBallEffect` in [engine/item_effects.asm](/engine/item_effects.asm):
```asm ```asm
.room_in_party .room_in_party
@@ -1232,7 +1232,7 @@ This is a bug with `ParkBall` in [engine/item_effects.asm](/engine/item_effects.
## `HELD_CATCH_CHANCE` has no effect ## `HELD_CATCH_CHANCE` has no effect
This is a bug with `PokeBall` in [engine/item_effects.asm](/engine/item_effects.asm): This is a bug with `PokeBallEffect` in [engine/item_effects.asm](/engine/item_effects.asm):
```asm ```asm
; BUG: farcall overwrites a, and GetItemHeldEffect takes b anyway. ; BUG: farcall overwrites a, and GetItemHeldEffect takes b anyway.

579
engine/item_effects.asm
View File

@@ -14,201 +14,190 @@ _DoItemEffect:: ; e722
ItemEffects: ; e73c ItemEffects: ; e73c
; entries correspond to item ids (see constants/item_constants.asm) ; entries correspond to item ids
dw MasterBall dw PokeBallEffect ; NO_ITEM
dw UltraBall dw PokeBallEffect ; MASTER_BALL
dw Brightpowder dw ItemDoesNothingEffect ; ULTRA_BALL
dw GreatBall dw PokeBallEffect ; BRIGHTPOWDER
dw PokeBall dw PokeBallEffect ; GREAT_BALL
dw TownMap dw TownMapEffect ; POKE_BALL
dw Bicycle dw BicycleEffect ; TOWN_MAP
dw MoonStone dw EvoStoneEffect ; BICYCLE
dw Antidote dw StatusHealingEffect ; MOON_STONE
dw BurnHeal dw StatusHealingEffect ; ANTIDOTE
dw IceHeal dw StatusHealingEffect ; BURN_HEAL
dw Awakening dw StatusHealingEffect ; ICE_HEAL
dw ParlyzHeal dw StatusHealingEffect ; AWAKENING
dw FullRestore dw FullRestoreEffect ; PARLYZ_HEAL
dw MaxPotion dw RestoreHPEffect ; FULL_RESTORE
dw HyperPotion dw RestoreHPEffect ; MAX_POTION
dw SuperPotion dw RestoreHPEffect ; HYPER_POTION
dw Potion dw RestoreHPEffect ; SUPER_POTION
dw EscapeRope dw EscapeRopeEffect ; POTION
dw Repel dw RepelEffect ; ESCAPE_ROPE
dw MaxElixer dw RestorePPEffect ; REPEL
dw FireStone dw EvoStoneEffect ; MAX_ELIXER
dw Thunderstone dw EvoStoneEffect ; FIRE_STONE
dw WaterStone dw EvoStoneEffect ; THUNDERSTONE
dw Item19 dw ItemDoesNothingEffect ; WATER_STONE
dw HPUp dw VitaminEffect ; ITEM_19
dw Protein dw VitaminEffect ; HP_UP
dw Iron dw VitaminEffect ; PROTEIN
dw Carbos dw VitaminEffect ; IRON
dw LuckyPunch dw ItemDoesNothingEffect ; CARBOS
dw Calcium dw VitaminEffect ; LUCKY_PUNCH
dw RareCandy dw RareCandyEffect ; CALCIUM
dw XAccuracy dw XAccuracyEffect ; RARE_CANDY
dw LeafStone dw EvoStoneEffect ; X_ACCURACY
dw MetalPowder dw ItemDoesNothingEffect ; LEAF_STONE
dw Nugget dw ItemDoesNothingEffect ; METAL_POWDER
dw PokeDoll dw PokeDollEffect ; NUGGET
dw FullHeal dw StatusHealingEffect ; POKE_DOLL
dw Revive dw ReviveEffect ; FULL_HEAL
dw MaxRevive dw ReviveEffect ; REVIVE
dw GuardSpec dw GuardSpecEffect ; MAX_REVIVE
dw SuperRepel dw SuperRepelEffect ; GUARD_SPEC
dw MaxRepel dw MaxRepelEffect ; SUPER_REPEL
dw DireHit dw DireHitEffect ; MAX_REPEL
dw Item2D dw ItemDoesNothingEffect ; DIRE_HIT
dw FreshWater dw RestoreHPEffect ; ITEM_2D
dw SodaPop dw RestoreHPEffect ; FRESH_WATER
dw Lemonade dw RestoreHPEffect ; SODA_POP
dw XAttack dw XItemEffect ; LEMONADE
dw Item32 dw ItemDoesNothingEffect ; X_ATTACK
dw XDefend dw XItemEffect ; ITEM_32
dw XSpeed dw XItemEffect ; X_DEFEND
dw XSpecial dw XItemEffect ; X_SPEED
dw CoinCase dw CoinCaseEffect ; X_SPECIAL
dw Itemfinder dw ItemfinderEffect ; COIN_CASE
dw PokeFlute dw PokeFluteEffect ; ITEMFINDER
dw ExpShare dw ItemDoesNothingEffect ; POKE_FLUTE
dw OldRod dw OldRodEffect ; EXP_SHARE
dw GoodRod dw GoodRodEffect ; OLD_ROD
dw SilverLeaf dw ItemDoesNothingEffect ; GOOD_ROD
dw SuperRod dw SuperRodEffect ; SILVER_LEAF
dw PPUp dw RestorePPEffect ; SUPER_ROD
dw Ether dw RestorePPEffect ; PP_UP
dw MaxEther dw RestorePPEffect ; ETHER
dw Elixer dw RestorePPEffect ; MAX_ETHER
dw RedScale dw ItemDoesNothingEffect ; ELIXER
dw Secretpotion dw ItemDoesNothingEffect ; RED_SCALE
dw SSTicket dw ItemDoesNothingEffect ; SECRETPOTION
dw MysteryEgg dw ItemDoesNothingEffect ; S_S_TICKET
dw ClearBell dw ItemDoesNothingEffect ; MYSTERY_EGG
dw SilverWing dw ItemDoesNothingEffect ; CLEAR_BELL
dw MoomooMilk dw RestoreHPEffect ; SILVER_WING
dw QuickClaw dw ItemDoesNothingEffect ; MOOMOO_MILK
dw Psncureberry dw StatusHealingEffect ; QUICK_CLAW
dw GoldLeaf dw ItemDoesNothingEffect ; PSNCUREBERRY
dw SoftSand dw ItemDoesNothingEffect ; GOLD_LEAF
dw SharpBeak dw ItemDoesNothingEffect ; SOFT_SAND
dw Przcureberry dw StatusHealingEffect ; SHARP_BEAK
dw BurntBerry dw StatusHealingEffect ; PRZCUREBERRY
dw IceBerry dw StatusHealingEffect ; BURNT_BERRY
dw PoisonBarb dw ItemDoesNothingEffect ; ICE_BERRY
dw KingsRock dw ItemDoesNothingEffect ; POISON_BARB
dw BitterBerry dw BitterBerryEffect ; KINGS_ROCK
dw MintBerry dw StatusHealingEffect ; BITTER_BERRY
dw RedApricorn dw ItemDoesNothingEffect ; MINT_BERRY
dw Tinymushroom dw ItemDoesNothingEffect ; RED_APRICORN
dw BigMushroom dw ItemDoesNothingEffect ; TINYMUSHROOM
dw Silverpowder dw ItemDoesNothingEffect ; BIG_MUSHROOM
dw BluApricorn dw ItemDoesNothingEffect ; SILVERPOWDER
dw Item5A dw ItemDoesNothingEffect ; BLU_APRICORN
dw AmuletCoin dw ItemDoesNothingEffect ; ITEM_5A
dw YlwApricorn dw ItemDoesNothingEffect ; AMULET_COIN
dw GrnApricorn dw ItemDoesNothingEffect ; YLW_APRICORN
dw CleanseTag dw ItemDoesNothingEffect ; GRN_APRICORN
dw MysticWater dw ItemDoesNothingEffect ; CLEANSE_TAG
dw Twistedspoon dw ItemDoesNothingEffect ; MYSTIC_WATER
dw WhtApricorn dw ItemDoesNothingEffect ; TWISTEDSPOON
dw Blackbelt dw ItemDoesNothingEffect ; WHT_APRICORN
dw BlkApricorn dw ItemDoesNothingEffect ; BLACKBELT
dw Item64 dw ItemDoesNothingEffect ; BLK_APRICORN
dw PnkApricorn dw ItemDoesNothingEffect ; ITEM_64
dw Blackglasses dw ItemDoesNothingEffect ; PNK_APRICORN
dw Slowpoketail dw ItemDoesNothingEffect ; BLACKGLASSES
dw PinkBow dw ItemDoesNothingEffect ; SLOWPOKETAIL
dw Stick dw ItemDoesNothingEffect ; PINK_BOW
dw SmokeBall dw ItemDoesNothingEffect ; STICK
dw Nevermeltice dw ItemDoesNothingEffect ; SMOKE_BALL
dw Magnet dw ItemDoesNothingEffect ; NEVERMELTICE
dw Miracleberry dw StatusHealingEffect ; MAGNET
dw Pearl dw ItemDoesNothingEffect ; MIRACLEBERRY
dw BigPearl dw ItemDoesNothingEffect ; PEARL
dw Everstone dw ItemDoesNothingEffect ; BIG_PEARL
dw SpellTag dw ItemDoesNothingEffect ; EVERSTONE
dw Ragecandybar dw RestoreHPEffect ; SPELL_TAG
dw GsBall dw ItemDoesNothingEffect ; RAGECANDYBAR
dw BlueCard dw BlueCardEffect ; GS_BALL
dw MiracleSeed dw ItemDoesNothingEffect ; BLUE_CARD
dw ThickClub dw ItemDoesNothingEffect ; MIRACLE_SEED
dw FocusBand dw ItemDoesNothingEffect ; THICK_CLUB
dw Item78 dw ItemDoesNothingEffect ; FOCUS_BAND
dw Energypowder dw EnergypowderEffect ; ITEM_78
dw EnergyRoot dw EnergyRootEffect ; ENERGYPOWDER
dw HealPowder dw HealPowderEffect ; ENERGY_ROOT
dw RevivalHerb dw RevivalHerbEffect ; HEAL_POWDER
dw HardStone dw ItemDoesNothingEffect ; REVIVAL_HERB
dw LuckyEgg dw ItemDoesNothingEffect ; HARD_STONE
dw CardKey dw CardKeyEffect ; LUCKY_EGG
dw MachinePart dw ItemDoesNothingEffect ; CARD_KEY
dw EggTicket dw ItemDoesNothingEffect ; MACHINE_PART
dw LostItem dw ItemDoesNothingEffect ; EGG_TICKET
dw Stardust dw ItemDoesNothingEffect ; LOST_ITEM
dw StarPiece dw ItemDoesNothingEffect ; STARDUST
dw BasementKey dw BasementKeyEffect ; STAR_PIECE
dw Pass dw ItemDoesNothingEffect ; BASEMENT_KEY
dw Item87 dw ItemDoesNothingEffect ; PASS
dw Item88 dw ItemDoesNothingEffect ; ITEM_87
dw Item89 dw ItemDoesNothingEffect ; ITEM_88
dw Charcoal dw ItemDoesNothingEffect ; ITEM_89
dw BerryJuice dw RestoreHPEffect ; CHARCOAL
dw ScopeLens dw ItemDoesNothingEffect ; BERRY_JUICE
dw Item8D dw ItemDoesNothingEffect ; SCOPE_LENS
dw Item8E dw ItemDoesNothingEffect ; ITEM_8D
dw MetalCoat dw ItemDoesNothingEffect ; ITEM_8E
dw DragonFang dw ItemDoesNothingEffect ; METAL_COAT
dw Item91 dw ItemDoesNothingEffect ; DRAGON_FANG
dw Leftovers dw ItemDoesNothingEffect ; ITEM_91
dw Item93 dw ItemDoesNothingEffect ; LEFTOVERS
dw Item94 dw ItemDoesNothingEffect ; ITEM_93
dw Item95 dw ItemDoesNothingEffect ; ITEM_94
dw Mysteryberry dw RestorePPEffect ; ITEM_95
dw DragonScale dw ItemDoesNothingEffect ; MYSTERYBERRY
dw BerserkGene dw ItemDoesNothingEffect ; DRAGON_SCALE
dw Item99 dw ItemDoesNothingEffect ; BERSERK_GENE
dw Item9A dw ItemDoesNothingEffect ; ITEM_99
dw Item9B dw ItemDoesNothingEffect ; ITEM_9A
dw SacredAsh dw SacredAshEffect ; ITEM_9B
dw HeavyBall dw PokeBallEffect ; SACRED_ASH
dw FlowerMail dw ItemDoesNothingEffect ; HEAVY_BALL
dw LevelBall dw PokeBallEffect ; FLOWER_MAIL
dw LureBall dw PokeBallEffect ; LEVEL_BALL
dw FastBall dw PokeBallEffect ; LURE_BALL
dw ItemA2 dw ItemDoesNothingEffect ; FAST_BALL
dw LightBall dw ItemDoesNothingEffect ; ITEM_A2
dw FriendBall dw PokeBallEffect ; LIGHT_BALL
dw MoonBall dw PokeBallEffect ; FRIEND_BALL
dw LoveBall dw PokeBallEffect ; MOON_BALL
dw NormalBox dw NormalBoxEffect ; LOVE_BALL
dw GorgeousBox dw GorgeousBoxEffect ; NORMAL_BOX
dw SunStone dw EvoStoneEffect ; GORGEOUS_BOX
dw PolkadotBow dw ItemDoesNothingEffect ; SUN_STONE
dw ItemAB dw ItemDoesNothingEffect ; POLKADOT_BOW
dw UpGrade dw ItemDoesNothingEffect ; ITEM_AB
dw Berry dw RestoreHPEffect ; UP_GRADE
dw GoldBerry dw RestoreHPEffect ; BERRY
dw Squirtbottle dw SquirtbottleEffect ; GOLD_BERRY
dw ItemB0 dw ItemDoesNothingEffect ; SQUIRTBOTTLE
dw ParkBall dw PokeBallEffect ; ITEM_B0
dw RainbowWing dw ItemDoesNothingEffect ; PARK_BALL
dw ItemB3 dw ItemDoesNothingEffect ; RAINBOW_WING
; e8a2 ; e8a2
MasterBall: PokeBallEffect: ; e8a2
UltraBall:
GreatBall:
PokeBall:
HeavyBall:
LevelBall:
LureBall:
FastBall:
FriendBall:
MoonBall:
LoveBall:
ParkBall: ; e8a2
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
jp nz, UseBallInTrainerBattle jp nz, UseBallInTrainerBattle
@@ -1158,24 +1147,19 @@ ReturnToBattle_UseBall: ; edfa (3:6dfa)
farcall _ReturnToBattle_UseBall farcall _ReturnToBattle_UseBall
ret ret
TownMap: ; ee01 TownMapEffect: ; ee01
farcall PokegearMap farcall PokegearMap
ret ret
; ee08 ; ee08
Bicycle: ; ee08 BicycleEffect: ; ee08
farcall BikeFunction farcall BikeFunction
ret ret
; ee0f ; ee0f
MoonStone: EvoStoneEffect: ; ee0f
FireStone:
Thunderstone:
WaterStone:
LeafStone:
SunStone: ; ee0f
ld b, PARTYMENUACTION_EVO_STONE ld b, PARTYMENUACTION_EVO_STONE
call UseItem_SelectMon call UseItem_SelectMon
@@ -1208,11 +1192,7 @@ SunStone: ; ee0f
; ee3d ; ee3d
HPUp: VitaminEffect: ; ee3d
Protein:
Iron:
Carbos:
Calcium: ; ee3d
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@@ -1345,7 +1325,7 @@ RareCandy_StatBooster_GetParameters: ; eef5
; 0xef14 ; 0xef14
RareCandy: ; ef14 RareCandyEffect: ; ef14
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@@ -1437,7 +1417,7 @@ RareCandy: ; ef14
; efad ; efad
HealPowder: ; efad HealPowderEffect: ; efad
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
@@ -1459,18 +1439,7 @@ HealPowder: ; efad
; efcc ; efcc
Antidote: StatusHealingEffect: ; efcc
BurnHeal:
IceHeal:
Awakening:
ParlyzHeal:
FullHeal:
Psncureberry:
Przcureberry:
BurntBerry:
IceBerry:
MintBerry:
Miracleberry: ; efcc
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
jp c, StatusHealer_ExitMenu jp c, StatusHealer_ExitMenu
@@ -1590,7 +1559,7 @@ StatusHealer_Jumptable: ; f09e (3:709e)
dw StatusHealer_ExitMenu dw StatusHealer_ExitMenu
RevivalHerb: ; f0a9 RevivalHerbEffect: ; f0a9
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
jp c, StatusHealer_ExitMenu jp c, StatusHealer_ExitMenu
@@ -1609,8 +1578,7 @@ RevivalHerb: ; f0a9
; f0c8 ; f0c8
Revive: ReviveEffect: ; f0c8
MaxRevive: ; f0c8
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
jp c, StatusHealer_ExitMenu jp c, StatusHealer_ExitMenu
@@ -1668,7 +1636,7 @@ RevivePokemon: ; f0d6
; f128 ; f128
FullRestore: ; f128 FullRestoreEffect: ; f128
ld b, PARTYMENUACTION_HEALING_ITEM ld b, PARTYMENUACTION_HEALING_ITEM
call UseItem_SelectMon call UseItem_SelectMon
jp c, StatusHealer_ExitMenu jp c, StatusHealer_ExitMenu
@@ -1708,7 +1676,7 @@ FullRestore: ; f128
; f16a ; f16a
BitterBerry: ; f16a BitterBerryEffect: ; f16a
ld hl, wPlayerSubStatus3 ld hl, wPlayerSubStatus3
bit SUBSTATUS_CONFUSED, [hl] bit SUBSTATUS_CONFUSED, [hl]
ld a, 1 ld a, 1
@@ -1729,29 +1697,18 @@ BitterBerry: ; f16a
; f186 ; f186
MaxPotion: RestoreHPEffect: ; f186
HyperPotion:
SuperPotion:
Potion:
FreshWater:
SodaPop:
Lemonade:
MoomooMilk:
Ragecandybar:
BerryJuice:
Berry:
GoldBerry: ; f186
call ItemRestoreHP call ItemRestoreHP
jp StatusHealer_Jumptable jp StatusHealer_Jumptable
; f18c ; f18c
Energypowder: ; f18c EnergypowderEffect: ; f18c
ld c, HAPPINESS_BITTERPOWDER ld c, HAPPINESS_BITTERPOWDER
jr EnergypowderEnergyRootCommon jr EnergypowderEnergyRootCommon
; f190 ; f190
EnergyRoot: ; f190 EnergyRootEffect: ; f190
ld c, HAPPINESS_ENERGYROOT ld c, HAPPINESS_ENERGYROOT
; f192 ; f192
@@ -2179,7 +2136,7 @@ Softboiled_MilkDrinkFunction: ; f3df (3:73df)
; 0xf44f ; 0xf44f
EscapeRope: ; f44f EscapeRopeEffect: ; f44f
xor a xor a
ld [wItemEffectSucceeded], a ld [wItemEffectSucceeded], a
farcall EscapeRopeFunction farcall EscapeRopeFunction
@@ -2191,17 +2148,17 @@ EscapeRope: ; f44f
; f462 ; f462
SuperRepel: ; f462 SuperRepelEffect: ; f462
ld b, 200 ld b, 200
jr UseRepel jr UseRepel
; f466 ; f466
MaxRepel: ; f466 MaxRepelEffect: ; f466
ld b, 250 ld b, 250
jr UseRepel jr UseRepel
; f466 ; f466
Repel: ; f46a RepelEffect: ; f46a
ld b, 100 ld b, 100
; f46c ; f46c
@@ -2223,7 +2180,7 @@ TextJump_RepelUsedEarlierIsStillInEffect: ; 0xf47d
; 0xf482 ; 0xf482
XAccuracy: ; f482 XAccuracyEffect: ; f482
ld hl, wPlayerSubStatus4 ld hl, wPlayerSubStatus4
bit SUBSTATUS_X_ACCURACY, [hl] bit SUBSTATUS_X_ACCURACY, [hl]
jp nz, WontHaveAnyEffect_NotUsedMessage jp nz, WontHaveAnyEffect_NotUsedMessage
@@ -2232,7 +2189,7 @@ XAccuracy: ; f482
; f48f ; f48f
PokeDoll: ; f48f PokeDollEffect: ; f48f
ld a, [wBattleMode] ld a, [wBattleMode]
dec a dec a
jr nz, .asm_f4a6 jr nz, .asm_f4a6
@@ -2251,7 +2208,7 @@ PokeDoll: ; f48f
; f4ab ; f4ab
GuardSpec: ; f4ab GuardSpecEffect: ; f4ab
ld hl, wPlayerSubStatus4 ld hl, wPlayerSubStatus4
bit SUBSTATUS_MIST, [hl] bit SUBSTATUS_MIST, [hl]
jp nz, WontHaveAnyEffect_NotUsedMessage jp nz, WontHaveAnyEffect_NotUsedMessage
@@ -2260,7 +2217,7 @@ GuardSpec: ; f4ab
; f4b8 ; f4b8
DireHit: ; f4b8 DireHitEffect: ; f4b8
ld hl, wPlayerSubStatus4 ld hl, wPlayerSubStatus4
bit SUBSTATUS_FOCUS_ENERGY, [hl] bit SUBSTATUS_FOCUS_ENERGY, [hl]
jp nz, WontHaveAnyEffect_NotUsedMessage jp nz, WontHaveAnyEffect_NotUsedMessage
@@ -2269,10 +2226,7 @@ DireHit: ; f4b8
; f4c5 ; f4c5
XAttack: XItemEffect: ; f4c5
XDefend:
XSpeed:
XSpecial: ; f4c5
call UseItemText call UseItemText
ld a, [wCurItem] ld a, [wCurItem]
@@ -2308,7 +2262,7 @@ XSpecial: ; f4c5
INCLUDE "data/items/x_stats.asm" INCLUDE "data/items/x_stats.asm"
PokeFlute: ; f50c PokeFluteEffect: ; f50c
ld a, [wBattleMode] ld a, [wBattleMode]
and a and a
jr nz, .dummy jr nz, .dummy
@@ -2406,7 +2360,7 @@ PokeFlute: ; f50c
; f58f ; f58f
BlueCard: ; f58f BlueCardEffect: ; f58f
ld hl, .bluecardtext ld hl, .bluecardtext
jp MenuTextBoxWaitButton jp MenuTextBoxWaitButton
@@ -2416,7 +2370,7 @@ BlueCard: ; f58f
; f59a ; f59a
CoinCase: ; f59a CoinCaseEffect: ; f59a
ld hl, .coincasetext ld hl, .coincasetext
jp MenuTextBoxWaitButton jp MenuTextBoxWaitButton
@@ -2426,17 +2380,17 @@ CoinCase: ; f59a
; f5a5 ; f5a5
OldRod: ; f5a5 OldRodEffect: ; f5a5
ld e, $0 ld e, $0
jr UseRod jr UseRod
; f5a9 ; f5a9
GoodRod: ; f5a9 GoodRodEffect: ; f5a9
ld e, $1 ld e, $1
jr UseRod jr UseRod
; f5ad ; f5ad
SuperRod: ; f5ad SuperRodEffect: ; f5ad
ld e, $2 ld e, $2
jr UseRod jr UseRod
; f5b1 ; f5b1
@@ -2447,18 +2401,13 @@ UseRod: ; f5b1
; f5b8 ; f5b8
Itemfinder: ; f5b8 ItemfinderEffect: ; f5b8
farcall ItemFinder farcall ItemFinder
ret ret
; f5bf ; f5bf
MaxElixer: RestorePPEffect: ; f5bf
PPUp:
Ether:
MaxEther:
Elixer:
Mysteryberry: ; f5bf
ld a, [wCurItem] ld a, [wCurItem]
ld [wd002], a ld [wd002], a
@@ -2724,25 +2673,25 @@ UnknownText_0xf739: ; 0xf739
; 0xf73e ; 0xf73e
Squirtbottle: ; f73e SquirtbottleEffect: ; f73e
farcall _Squirtbottle farcall _Squirtbottle
ret ret
; f745 ; f745
CardKey: ; f745 CardKeyEffect: ; f745
farcall _CardKey farcall _CardKey
ret ret
; f74c ; f74c
BasementKey: ; f74c BasementKeyEffect: ; f74c
farcall _BasementKey farcall _BasementKey
ret ret
; f753 ; f753
SacredAsh: ; f753 SacredAshEffect: ; f753
farcall _SacredAsh farcall _SacredAsh
ld a, [wItemEffectSucceeded] ld a, [wItemEffectSucceeded]
cp $1 cp $1
@@ -2752,12 +2701,12 @@ SacredAsh: ; f753
; f763 ; f763
NormalBox: ; f763 NormalBoxEffect: ; f763
ld c, DECOFLAG_SILVER_TROPHY_DOLL ld c, DECOFLAG_SILVER_TROPHY_DOLL
jr OpenBox jr OpenBox
; f767 ; f767
GorgeousBox: ; f767 GorgeousBoxEffect: ; f767
ld c, DECOFLAG_GOLD_TROPHY_DOLL ld c, DECOFLAG_GOLD_TROPHY_DOLL
OpenBox: ; f769 OpenBox: ; f769
farcall SetSpecificDecorationFlag farcall SetSpecificDecorationFlag
@@ -2774,97 +2723,7 @@ OpenBox: ; f769
db "@" db "@"
; 0xf77d ; 0xf77d
Brightpowder: ItemDoesNothingEffect: ; f77d
Item19:
LuckyPunch:
MetalPowder:
Nugget:
Item2D:
Item32:
ExpShare:
SilverLeaf:
RedScale:
Secretpotion:
SSTicket:
MysteryEgg:
ClearBell:
SilverWing:
QuickClaw:
GoldLeaf:
SoftSand:
SharpBeak:
PoisonBarb:
KingsRock:
RedApricorn:
Tinymushroom:
BigMushroom:
Silverpowder:
BluApricorn:
Item5A:
AmuletCoin:
YlwApricorn:
GrnApricorn:
CleanseTag:
MysticWater:
Twistedspoon:
WhtApricorn:
Blackbelt:
BlkApricorn:
Item64:
PnkApricorn:
Blackglasses:
Slowpoketail:
PinkBow:
Stick:
SmokeBall:
Nevermeltice:
Magnet:
Pearl:
BigPearl:
Everstone:
SpellTag:
GsBall:
MiracleSeed:
ThickClub:
FocusBand:
Item78:
HardStone:
LuckyEgg:
MachinePart:
EggTicket:
LostItem:
Stardust:
StarPiece:
Pass:
Item87:
Item88:
Item89:
Charcoal:
ScopeLens:
Item8D:
Item8E:
MetalCoat:
DragonFang:
Item91:
Leftovers:
Item93:
Item94:
Item95:
DragonScale:
BerserkGene:
Item99:
Item9A:
Item9B:
FlowerMail:
ItemA2:
LightBall:
PolkadotBow:
ItemAB:
UpGrade:
ItemB0:
RainbowWing:
ItemB3:
TeruSama: ; f77d
jp IsntTheTimeMessage jp IsntTheTimeMessage
; f780 ; f780