shithub: pokecrystal

Download patch

ref: 71f51955c9b50a5e03739e2bd1d927ea55ee6d5a
parent: c648a6ced975f6dc7cc4ba3a5a1cb2de39d692a4
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Mon Feb 5 08:07:22 EST 2018

Terser name for the does-nothing effect

--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -15,185 +15,185 @@
 
 ItemEffects: ; e73c
 ; entries correspond to item ids
-	dw PokeBallEffect        ; MASTER_BALL
-	dw PokeBallEffect        ; ULTRA_BALL
-	dw ItemDoesNothingEffect ; BRIGHTPOWDER
-	dw PokeBallEffect        ; GREAT_BALL
-	dw PokeBallEffect        ; POKE_BALL
-	dw TownMapEffect         ; TOWN_MAP
-	dw BicycleEffect         ; BICYCLE
-	dw EvoStoneEffect        ; MOON_STONE
-	dw StatusHealingEffect   ; ANTIDOTE
-	dw StatusHealingEffect   ; BURN_HEAL
-	dw StatusHealingEffect   ; ICE_HEAL
-	dw StatusHealingEffect   ; AWAKENING
-	dw StatusHealingEffect   ; PARLYZ_HEAL
-	dw FullRestoreEffect     ; FULL_RESTORE
-	dw RestoreHPEffect       ; MAX_POTION
-	dw RestoreHPEffect       ; HYPER_POTION
-	dw RestoreHPEffect       ; SUPER_POTION
-	dw RestoreHPEffect       ; POTION
-	dw EscapeRopeEffect      ; ESCAPE_ROPE
-	dw RepelEffect           ; REPEL
-	dw RestorePPEffect       ; MAX_ELIXER
-	dw EvoStoneEffect        ; FIRE_STONE
-	dw EvoStoneEffect        ; THUNDERSTONE
-	dw EvoStoneEffect        ; WATER_STONE
-	dw ItemDoesNothingEffect ; ITEM_19
-	dw VitaminEffect         ; HP_UP
-	dw VitaminEffect         ; PROTEIN
-	dw VitaminEffect         ; IRON
-	dw VitaminEffect         ; CARBOS
-	dw ItemDoesNothingEffect ; LUCKY_PUNCH
-	dw VitaminEffect         ; CALCIUM
-	dw RareCandyEffect       ; RARE_CANDY
-	dw XAccuracyEffect       ; X_ACCURACY
-	dw EvoStoneEffect        ; LEAF_STONE
-	dw ItemDoesNothingEffect ; METAL_POWDER
-	dw ItemDoesNothingEffect ; NUGGET
-	dw PokeDollEffect        ; POKE_DOLL
-	dw StatusHealingEffect   ; FULL_HEAL
-	dw ReviveEffect          ; REVIVE
-	dw ReviveEffect          ; MAX_REVIVE
-	dw GuardSpecEffect       ; GUARD_SPEC
-	dw SuperRepelEffect      ; SUPER_REPEL
-	dw MaxRepelEffect        ; MAX_REPEL
-	dw DireHitEffect         ; DIRE_HIT
-	dw ItemDoesNothingEffect ; ITEM_2D
-	dw RestoreHPEffect       ; FRESH_WATER
-	dw RestoreHPEffect       ; SODA_POP
-	dw RestoreHPEffect       ; LEMONADE
-	dw XItemEffect           ; X_ATTACK
-	dw ItemDoesNothingEffect ; ITEM_32
-	dw XItemEffect           ; X_DEFEND
-	dw XItemEffect           ; X_SPEED
-	dw XItemEffect           ; X_SPECIAL
-	dw CoinCaseEffect        ; COIN_CASE
-	dw ItemfinderEffect      ; ITEMFINDER
-	dw PokeFluteEffect       ; POKE_FLUTE
-	dw ItemDoesNothingEffect ; EXP_SHARE
-	dw OldRodEffect          ; OLD_ROD
-	dw GoodRodEffect         ; GOOD_ROD
-	dw ItemDoesNothingEffect ; SILVER_LEAF
-	dw SuperRodEffect        ; SUPER_ROD
-	dw RestorePPEffect       ; PP_UP
-	dw RestorePPEffect       ; ETHER
-	dw RestorePPEffect       ; MAX_ETHER
-	dw RestorePPEffect       ; ELIXER
-	dw ItemDoesNothingEffect ; RED_SCALE
-	dw ItemDoesNothingEffect ; SECRETPOTION
-	dw ItemDoesNothingEffect ; S_S_TICKET
-	dw ItemDoesNothingEffect ; MYSTERY_EGG
-	dw ItemDoesNothingEffect ; CLEAR_BELL
-	dw ItemDoesNothingEffect ; SILVER_WING
-	dw RestoreHPEffect       ; MOOMOO_MILK
-	dw ItemDoesNothingEffect ; QUICK_CLAW
-	dw StatusHealingEffect   ; PSNCUREBERRY
-	dw ItemDoesNothingEffect ; GOLD_LEAF
-	dw ItemDoesNothingEffect ; SOFT_SAND
-	dw ItemDoesNothingEffect ; SHARP_BEAK
-	dw StatusHealingEffect   ; PRZCUREBERRY
-	dw StatusHealingEffect   ; BURNT_BERRY
-	dw StatusHealingEffect   ; ICE_BERRY
-	dw ItemDoesNothingEffect ; POISON_BARB
-	dw ItemDoesNothingEffect ; KINGS_ROCK
-	dw BitterBerryEffect     ; BITTER_BERRY
-	dw StatusHealingEffect   ; MINT_BERRY
-	dw ItemDoesNothingEffect ; RED_APRICORN
-	dw ItemDoesNothingEffect ; TINYMUSHROOM
-	dw ItemDoesNothingEffect ; BIG_MUSHROOM
-	dw ItemDoesNothingEffect ; SILVERPOWDER
-	dw ItemDoesNothingEffect ; BLU_APRICORN
-	dw ItemDoesNothingEffect ; ITEM_5A
-	dw ItemDoesNothingEffect ; AMULET_COIN
-	dw ItemDoesNothingEffect ; YLW_APRICORN
-	dw ItemDoesNothingEffect ; GRN_APRICORN
-	dw ItemDoesNothingEffect ; CLEANSE_TAG
-	dw ItemDoesNothingEffect ; MYSTIC_WATER
-	dw ItemDoesNothingEffect ; TWISTEDSPOON
-	dw ItemDoesNothingEffect ; WHT_APRICORN
-	dw ItemDoesNothingEffect ; BLACKBELT
-	dw ItemDoesNothingEffect ; BLK_APRICORN
-	dw ItemDoesNothingEffect ; ITEM_64
-	dw ItemDoesNothingEffect ; PNK_APRICORN
-	dw ItemDoesNothingEffect ; BLACKGLASSES
-	dw ItemDoesNothingEffect ; SLOWPOKETAIL
-	dw ItemDoesNothingEffect ; PINK_BOW
-	dw ItemDoesNothingEffect ; STICK
-	dw ItemDoesNothingEffect ; SMOKE_BALL
-	dw ItemDoesNothingEffect ; NEVERMELTICE
-	dw ItemDoesNothingEffect ; MAGNET
-	dw StatusHealingEffect   ; MIRACLEBERRY
-	dw ItemDoesNothingEffect ; PEARL
-	dw ItemDoesNothingEffect ; BIG_PEARL
-	dw ItemDoesNothingEffect ; EVERSTONE
-	dw ItemDoesNothingEffect ; SPELL_TAG
-	dw RestoreHPEffect       ; RAGECANDYBAR
-	dw ItemDoesNothingEffect ; GS_BALL
-	dw BlueCardEffect        ; BLUE_CARD
-	dw ItemDoesNothingEffect ; MIRACLE_SEED
-	dw ItemDoesNothingEffect ; THICK_CLUB
-	dw ItemDoesNothingEffect ; FOCUS_BAND
-	dw ItemDoesNothingEffect ; ITEM_78
-	dw EnergypowderEffect    ; ENERGYPOWDER
-	dw EnergyRootEffect      ; ENERGY_ROOT
-	dw HealPowderEffect      ; HEAL_POWDER
-	dw RevivalHerbEffect     ; REVIVAL_HERB
-	dw ItemDoesNothingEffect ; HARD_STONE
-	dw ItemDoesNothingEffect ; LUCKY_EGG
-	dw CardKeyEffect         ; CARD_KEY
-	dw ItemDoesNothingEffect ; MACHINE_PART
-	dw ItemDoesNothingEffect ; EGG_TICKET
-	dw ItemDoesNothingEffect ; LOST_ITEM
-	dw ItemDoesNothingEffect ; STARDUST
-	dw ItemDoesNothingEffect ; STAR_PIECE
-	dw BasementKeyEffect     ; BASEMENT_KEY
-	dw ItemDoesNothingEffect ; PASS
-	dw ItemDoesNothingEffect ; ITEM_87
-	dw ItemDoesNothingEffect ; ITEM_88
-	dw ItemDoesNothingEffect ; ITEM_89
-	dw ItemDoesNothingEffect ; CHARCOAL
-	dw RestoreHPEffect       ; BERRY_JUICE
-	dw ItemDoesNothingEffect ; SCOPE_LENS
-	dw ItemDoesNothingEffect ; ITEM_8D
-	dw ItemDoesNothingEffect ; ITEM_8E
-	dw ItemDoesNothingEffect ; METAL_COAT
-	dw ItemDoesNothingEffect ; DRAGON_FANG
-	dw ItemDoesNothingEffect ; ITEM_91
-	dw ItemDoesNothingEffect ; LEFTOVERS
-	dw ItemDoesNothingEffect ; ITEM_93
-	dw ItemDoesNothingEffect ; ITEM_94
-	dw ItemDoesNothingEffect ; ITEM_95
-	dw RestorePPEffect       ; MYSTERYBERRY
-	dw ItemDoesNothingEffect ; DRAGON_SCALE
-	dw ItemDoesNothingEffect ; BERSERK_GENE
-	dw ItemDoesNothingEffect ; ITEM_99
-	dw ItemDoesNothingEffect ; ITEM_9A
-	dw ItemDoesNothingEffect ; ITEM_9B
-	dw SacredAshEffect       ; SACRED_ASH
-	dw PokeBallEffect        ; HEAVY_BALL
-	dw ItemDoesNothingEffect ; FLOWER_MAIL
-	dw PokeBallEffect        ; LEVEL_BALL
-	dw PokeBallEffect        ; LURE_BALL
-	dw PokeBallEffect        ; FAST_BALL
-	dw ItemDoesNothingEffect ; ITEM_A2
-	dw ItemDoesNothingEffect ; LIGHT_BALL
-	dw PokeBallEffect        ; FRIEND_BALL
-	dw PokeBallEffect        ; MOON_BALL
-	dw PokeBallEffect        ; LOVE_BALL
-	dw NormalBoxEffect       ; NORMAL_BOX
-	dw GorgeousBoxEffect     ; GORGEOUS_BOX
-	dw EvoStoneEffect        ; SUN_STONE
-	dw ItemDoesNothingEffect ; POLKADOT_BOW
-	dw ItemDoesNothingEffect ; ITEM_AB
-	dw ItemDoesNothingEffect ; UP_GRADE
-	dw RestoreHPEffect       ; BERRY
-	dw RestoreHPEffect       ; GOLD_BERRY
-	dw SquirtbottleEffect    ; SQUIRTBOTTLE
-	dw ItemDoesNothingEffect ; ITEM_B0
-	dw PokeBallEffect        ; PARK_BALL
-	dw ItemDoesNothingEffect ; RAINBOW_WING
-	dw ItemDoesNothingEffect ; ITEM_B3
+	dw PokeBallEffect      ; MASTER_BALL
+	dw PokeBallEffect      ; ULTRA_BALL
+	dw NoEffect            ; BRIGHTPOWDER
+	dw PokeBallEffect      ; GREAT_BALL
+	dw PokeBallEffect      ; POKE_BALL
+	dw TownMapEffect       ; TOWN_MAP
+	dw BicycleEffect       ; BICYCLE
+	dw EvoStoneEffect      ; MOON_STONE
+	dw StatusHealingEffect ; ANTIDOTE
+	dw StatusHealingEffect ; BURN_HEAL
+	dw StatusHealingEffect ; ICE_HEAL
+	dw StatusHealingEffect ; AWAKENING
+	dw StatusHealingEffect ; PARLYZ_HEAL
+	dw FullRestoreEffect   ; FULL_RESTORE
+	dw RestoreHPEffect     ; MAX_POTION
+	dw RestoreHPEffect     ; HYPER_POTION
+	dw RestoreHPEffect     ; SUPER_POTION
+	dw RestoreHPEffect     ; POTION
+	dw EscapeRopeEffect    ; ESCAPE_ROPE
+	dw RepelEffect         ; REPEL
+	dw RestorePPEffect     ; MAX_ELIXER
+	dw EvoStoneEffect      ; FIRE_STONE
+	dw EvoStoneEffect      ; THUNDERSTONE
+	dw EvoStoneEffect      ; WATER_STONE
+	dw NoEffect            ; ITEM_19
+	dw VitaminEffect       ; HP_UP
+	dw VitaminEffect       ; PROTEIN
+	dw VitaminEffect       ; IRON
+	dw VitaminEffect       ; CARBOS
+	dw NoEffect            ; LUCKY_PUNCH
+	dw VitaminEffect       ; CALCIUM
+	dw RareCandyEffect     ; RARE_CANDY
+	dw XAccuracyEffect     ; X_ACCURACY
+	dw EvoStoneEffect      ; LEAF_STONE
+	dw NoEffect            ; METAL_POWDER
+	dw NoEffect            ; NUGGET
+	dw PokeDollEffect      ; POKE_DOLL
+	dw StatusHealingEffect ; FULL_HEAL
+	dw ReviveEffect        ; REVIVE
+	dw ReviveEffect        ; MAX_REVIVE
+	dw GuardSpecEffect     ; GUARD_SPEC
+	dw SuperRepelEffect    ; SUPER_REPEL
+	dw MaxRepelEffect      ; MAX_REPEL
+	dw DireHitEffect       ; DIRE_HIT
+	dw NoEffect            ; ITEM_2D
+	dw RestoreHPEffect     ; FRESH_WATER
+	dw RestoreHPEffect     ; SODA_POP
+	dw RestoreHPEffect     ; LEMONADE
+	dw XItemEffect         ; X_ATTACK
+	dw NoEffect            ; ITEM_32
+	dw XItemEffect         ; X_DEFEND
+	dw XItemEffect         ; X_SPEED
+	dw XItemEffect         ; X_SPECIAL
+	dw CoinCaseEffect      ; COIN_CASE
+	dw ItemfinderEffect    ; ITEMFINDER
+	dw PokeFluteEffect     ; POKE_FLUTE
+	dw NoEffect            ; EXP_SHARE
+	dw OldRodEffect        ; OLD_ROD
+	dw GoodRodEffect       ; GOOD_ROD
+	dw NoEffect            ; SILVER_LEAF
+	dw SuperRodEffect      ; SUPER_ROD
+	dw RestorePPEffect     ; PP_UP
+	dw RestorePPEffect     ; ETHER
+	dw RestorePPEffect     ; MAX_ETHER
+	dw RestorePPEffect     ; ELIXER
+	dw NoEffect            ; RED_SCALE
+	dw NoEffect            ; SECRETPOTION
+	dw NoEffect            ; S_S_TICKET
+	dw NoEffect            ; MYSTERY_EGG
+	dw NoEffect            ; CLEAR_BELL
+	dw NoEffect            ; SILVER_WING
+	dw RestoreHPEffect     ; MOOMOO_MILK
+	dw NoEffect            ; QUICK_CLAW
+	dw StatusHealingEffect ; PSNCUREBERRY
+	dw NoEffect            ; GOLD_LEAF
+	dw NoEffect            ; SOFT_SAND
+	dw NoEffect            ; SHARP_BEAK
+	dw StatusHealingEffect ; PRZCUREBERRY
+	dw StatusHealingEffect ; BURNT_BERRY
+	dw StatusHealingEffect ; ICE_BERRY
+	dw NoEffect            ; POISON_BARB
+	dw NoEffect            ; KINGS_ROCK
+	dw BitterBerryEffect   ; BITTER_BERRY
+	dw StatusHealingEffect ; MINT_BERRY
+	dw NoEffect            ; RED_APRICORN
+	dw NoEffect            ; TINYMUSHROOM
+	dw NoEffect            ; BIG_MUSHROOM
+	dw NoEffect            ; SILVERPOWDER
+	dw NoEffect            ; BLU_APRICORN
+	dw NoEffect            ; ITEM_5A
+	dw NoEffect            ; AMULET_COIN
+	dw NoEffect            ; YLW_APRICORN
+	dw NoEffect            ; GRN_APRICORN
+	dw NoEffect            ; CLEANSE_TAG
+	dw NoEffect            ; MYSTIC_WATER
+	dw NoEffect            ; TWISTEDSPOON
+	dw NoEffect            ; WHT_APRICORN
+	dw NoEffect            ; BLACKBELT
+	dw NoEffect            ; BLK_APRICORN
+	dw NoEffect            ; ITEM_64
+	dw NoEffect            ; PNK_APRICORN
+	dw NoEffect            ; BLACKGLASSES
+	dw NoEffect            ; SLOWPOKETAIL
+	dw NoEffect            ; PINK_BOW
+	dw NoEffect            ; STICK
+	dw NoEffect            ; SMOKE_BALL
+	dw NoEffect            ; NEVERMELTICE
+	dw NoEffect            ; MAGNET
+	dw StatusHealingEffect ; MIRACLEBERRY
+	dw NoEffect            ; PEARL
+	dw NoEffect            ; BIG_PEARL
+	dw NoEffect            ; EVERSTONE
+	dw NoEffect            ; SPELL_TAG
+	dw RestoreHPEffect     ; RAGECANDYBAR
+	dw NoEffect            ; GS_BALL
+	dw BlueCardEffect      ; BLUE_CARD
+	dw NoEffect            ; MIRACLE_SEED
+	dw NoEffect            ; THICK_CLUB
+	dw NoEffect            ; FOCUS_BAND
+	dw NoEffect            ; ITEM_78
+	dw EnergypowderEffect  ; ENERGYPOWDER
+	dw EnergyRootEffect    ; ENERGY_ROOT
+	dw HealPowderEffect    ; HEAL_POWDER
+	dw RevivalHerbEffect   ; REVIVAL_HERB
+	dw NoEffect            ; HARD_STONE
+	dw NoEffect            ; LUCKY_EGG
+	dw CardKeyEffect       ; CARD_KEY
+	dw NoEffect            ; MACHINE_PART
+	dw NoEffect            ; EGG_TICKET
+	dw NoEffect            ; LOST_ITEM
+	dw NoEffect            ; STARDUST
+	dw NoEffect            ; STAR_PIECE
+	dw BasementKeyEffect   ; BASEMENT_KEY
+	dw NoEffect            ; PASS
+	dw NoEffect            ; ITEM_87
+	dw NoEffect            ; ITEM_88
+	dw NoEffect            ; ITEM_89
+	dw NoEffect            ; CHARCOAL
+	dw RestoreHPEffect     ; BERRY_JUICE
+	dw NoEffect            ; SCOPE_LENS
+	dw NoEffect            ; ITEM_8D
+	dw NoEffect            ; ITEM_8E
+	dw NoEffect            ; METAL_COAT
+	dw NoEffect            ; DRAGON_FANG
+	dw NoEffect            ; ITEM_91
+	dw NoEffect            ; LEFTOVERS
+	dw NoEffect            ; ITEM_93
+	dw NoEffect            ; ITEM_94
+	dw NoEffect            ; ITEM_95
+	dw RestorePPEffect     ; MYSTERYBERRY
+	dw NoEffect            ; DRAGON_SCALE
+	dw NoEffect            ; BERSERK_GENE
+	dw NoEffect            ; ITEM_99
+	dw NoEffect            ; ITEM_9A
+	dw NoEffect            ; ITEM_9B
+	dw SacredAshEffect     ; SACRED_ASH
+	dw PokeBallEffect      ; HEAVY_BALL
+	dw NoEffect            ; FLOWER_MAIL
+	dw PokeBallEffect      ; LEVEL_BALL
+	dw PokeBallEffect      ; LURE_BALL
+	dw PokeBallEffect      ; FAST_BALL
+	dw NoEffect            ; ITEM_A2
+	dw NoEffect            ; LIGHT_BALL
+	dw PokeBallEffect      ; FRIEND_BALL
+	dw PokeBallEffect      ; MOON_BALL
+	dw PokeBallEffect      ; LOVE_BALL
+	dw NormalBoxEffect     ; NORMAL_BOX
+	dw GorgeousBoxEffect   ; GORGEOUS_BOX
+	dw EvoStoneEffect      ; SUN_STONE
+	dw NoEffect            ; POLKADOT_BOW
+	dw NoEffect            ; ITEM_AB
+	dw NoEffect            ; UP_GRADE
+	dw RestoreHPEffect     ; BERRY
+	dw RestoreHPEffect     ; GOLD_BERRY
+	dw SquirtbottleEffect  ; SQUIRTBOTTLE
+	dw NoEffect            ; ITEM_B0
+	dw PokeBallEffect      ; PARK_BALL
+	dw NoEffect            ; RAINBOW_WING
+	dw NoEffect            ; ITEM_B3
 ; e8a2
 
 
@@ -2723,7 +2723,7 @@
 	db "@"
 ; 0xf77d
 
-ItemDoesNothingEffect: ; f77d
+NoEffect: ; f77d
 	jp IsntTheTimeMessage
 ; f780