ref: 342791a001cecbfd8192ced7dd2478485d98fa45
parent: 8f49e37b82a90bbef8c7133c4adea8f82abf00e7
author: yenatch <yenatch@gmail.com>
date: Mon Sep 1 13:59:10 EDT 2014
Use a macro for move attributes. The formatting was pretty bad, so that's fixed too.
--- a/data/moves.asm
+++ b/data/moves.asm
@@ -1,168 +1,177 @@
-Moves: ; 38000 (e:4000)
-; characteristics of each move
-; animation, effect, power, type, accuracy, PP
- db POUND ,NO_ADDITIONAL_EFFECT ,$28,NORMAL, $FF,35
- db KARATE_CHOP ,NO_ADDITIONAL_EFFECT ,$32,NORMAL, $FF,25
- db DOUBLESLAP ,TWO_TO_FIVE_ATTACKS_EFFECT,$0F,NORMAL, $D8,10
- db COMET_PUNCH ,TWO_TO_FIVE_ATTACKS_EFFECT,$12,NORMAL, $D8,15
- db MEGA_PUNCH ,NO_ADDITIONAL_EFFECT ,$50,NORMAL, $D8,20
- db PAY_DAY ,PAY_DAY_EFFECT ,$28,NORMAL, $FF,20
- db FIRE_PUNCH ,BURN_SIDE_EFFECT1 ,$4B,FIRE, $FF,15
- db ICE_PUNCH ,FREEZE_SIDE_EFFECT ,$4B,ICE, $FF,15
- db THUNDERPUNCH,PARALYZE_SIDE_EFFECT1 ,$4B,ELECTRIC,$FF,15
- db SCRATCH ,NO_ADDITIONAL_EFFECT ,$28,NORMAL, $FF,35
- db VICEGRIP ,NO_ADDITIONAL_EFFECT ,$37,NORMAL, $FF,30
- db GUILLOTINE ,OHKO_EFFECT ,$01,NORMAL, $4C,5
- db RAZOR_WIND ,CHARGE_EFFECT ,$50,NORMAL, $BF,10
- db SWORDS_DANCE,ATTACK_UP2_EFFECT ,$00,NORMAL, $FF,30
- db CUT ,NO_ADDITIONAL_EFFECT ,$32,NORMAL, $F2,30
- db GUST ,NO_ADDITIONAL_EFFECT ,$28,NORMAL, $FF,35
- db WING_ATTACK ,NO_ADDITIONAL_EFFECT ,$23,FLYING, $FF,35
- db WHIRLWIND ,SWITCH_AND_TELEPORT_EFFECT,$00,NORMAL, $D8,20
- db FLY ,FLY_EFFECT ,$46,FLYING, $F2,15
- db BIND ,TRAPPING_EFFECT ,$0F,NORMAL, $BF,20
- db SLAM ,NO_ADDITIONAL_EFFECT ,$50,NORMAL, $BF,20
- db VINE_WHIP ,NO_ADDITIONAL_EFFECT ,$23,GRASS, $FF,10
- db STOMP ,FLINCH_SIDE_EFFECT2 ,$41,NORMAL, $FF,20
- db DOUBLE_KICK ,ATTACK_TWICE_EFFECT ,$1E,FIGHTING,$FF,30
- db MEGA_KICK ,NO_ADDITIONAL_EFFECT ,$78,NORMAL, $BF,5
- db JUMP_KICK ,JUMP_KICK_EFFECT ,$46,FIGHTING,$F2,25
- db ROLLING_KICK,FLINCH_SIDE_EFFECT2 ,$3C,FIGHTING,$D8,15
- db SAND_ATTACK ,ACCURACY_DOWN1_EFFECT ,$00,NORMAL, $FF,15
- db HEADBUTT ,FLINCH_SIDE_EFFECT2 ,$46,NORMAL, $FF,15
- db HORN_ATTACK ,NO_ADDITIONAL_EFFECT ,$41,NORMAL, $FF,25
- db FURY_ATTACK ,TWO_TO_FIVE_ATTACKS_EFFECT,$0F,NORMAL, $D8,20
- db HORN_DRILL ,OHKO_EFFECT ,$01,NORMAL, $4C,5
- db TACKLE ,NO_ADDITIONAL_EFFECT ,$23,NORMAL, $F2,35
- db BODY_SLAM ,PARALYZE_SIDE_EFFECT2 ,$55,NORMAL, $FF,15
- db WRAP ,TRAPPING_EFFECT ,$0F,NORMAL, $D8,20
- db TAKE_DOWN ,RECOIL_EFFECT ,$5A,NORMAL, $D8,20
- db THRASH ,THRASH_PETAL_DANCE_EFFECT ,$5A,NORMAL, $FF,20
- db DOUBLE_EDGE ,RECOIL_EFFECT ,$64,NORMAL, $FF,15
- db TAIL_WHIP ,DEFENSE_DOWN1_EFFECT ,$00,NORMAL, $FF,30
- db POISON_STING,POISON_SIDE_EFFECT1 ,$0F,POISON, $FF,35
- db TWINEEDLE ,TWINEEDLE_EFFECT ,$19,BUG, $FF,20
- db PIN_MISSILE ,TWO_TO_FIVE_ATTACKS_EFFECT,$0E,BUG, $D8,20
- db LEER ,DEFENSE_DOWN1_EFFECT ,$00,NORMAL, $FF,30
- db BITE ,FLINCH_SIDE_EFFECT1 ,$3C,NORMAL, $FF,25
- db GROWL ,ATTACK_DOWN1_EFFECT ,$00,NORMAL, $FF,40
- db ROAR ,SWITCH_AND_TELEPORT_EFFECT,$00,NORMAL, $FF,20
- db SING ,SLEEP_EFFECT ,$00,NORMAL, $8C,15
- db SUPERSONIC ,CONFUSION_EFFECT ,$00,NORMAL, $8C,20
- db SONICBOOM ,SPECIAL_DAMAGE_EFFECT ,$01,NORMAL, $E5,20
- db DISABLE ,DISABLE_EFFECT ,$00,NORMAL, $8C,20
- db ACID ,DEFENSE_DOWN_SIDE_EFFECT ,$28,POISON, $FF,30
- db EMBER ,BURN_SIDE_EFFECT1 ,$28,FIRE, $FF,25
- db FLAMETHROWER,BURN_SIDE_EFFECT1 ,$5F,FIRE, $FF,15
- db MIST ,MIST_EFFECT ,$00,ICE, $FF,30
- db WATER_GUN ,NO_ADDITIONAL_EFFECT ,$28,WATER, $FF,25
- db HYDRO_PUMP ,NO_ADDITIONAL_EFFECT ,$78,WATER, $CC,5
- db SURF ,NO_ADDITIONAL_EFFECT ,$5F,WATER, $FF,15
- db ICE_BEAM ,FREEZE_SIDE_EFFECT ,$5F,ICE, $FF,10
- db BLIZZARD ,FREEZE_SIDE_EFFECT ,$78,ICE, $E5,5
- db PSYBEAM ,CONFUSION_SIDE_EFFECT ,$41,PSYCHIC, $FF,20
- db BUBBLEBEAM ,SPEED_DOWN_SIDE_EFFECT ,$41,WATER, $FF,20
- db AURORA_BEAM ,ATTACK_DOWN_SIDE_EFFECT ,$41,ICE, $FF,20
- db HYPER_BEAM ,HYPER_BEAM_EFFECT ,$96,NORMAL, $E5,5
- db PECK ,NO_ADDITIONAL_EFFECT ,$23,FLYING, $FF,35
- db DRILL_PECK ,NO_ADDITIONAL_EFFECT ,$50,FLYING, $FF,20
- db SUBMISSION ,RECOIL_EFFECT ,$50,FIGHTING,$CC,25
- db LOW_KICK ,FLINCH_SIDE_EFFECT2 ,$32,FIGHTING,$E5,20
- db COUNTER ,NO_ADDITIONAL_EFFECT ,$01,FIGHTING,$FF,20
- db SEISMIC_TOSS,SPECIAL_DAMAGE_EFFECT ,$01,FIGHTING,$FF,20
- db STRENGTH ,NO_ADDITIONAL_EFFECT ,$50,NORMAL, $FF,15
- db ABSORB ,DRAIN_HP_EFFECT ,$14,GRASS, $FF,20
- db MEGA_DRAIN ,DRAIN_HP_EFFECT ,$28,GRASS, $FF,10
- db LEECH_SEED ,LEECH_SEED_EFFECT ,$00,GRASS, $E5,10
- db GROWTH ,SPECIAL_UP1_EFFECT ,$00,NORMAL, $FF,40
- db RAZOR_LEAF ,NO_ADDITIONAL_EFFECT ,$37,GRASS, $F2,25
- db SOLARBEAM ,CHARGE_EFFECT ,$78,GRASS, $FF,10
- db POISONPOWDER,POISON_EFFECT ,$00,POISON, $BF,35
- db STUN_SPORE ,PARALYZE_EFFECT ,$00,GRASS, $BF,30
- db SLEEP_POWDER,SLEEP_EFFECT ,$00,GRASS, $BF,15
- db PETAL_DANCE ,THRASH_PETAL_DANCE_EFFECT ,$46,GRASS, $FF,20
- db STRING_SHOT ,SPEED_DOWN1_EFFECT ,$00,BUG, $F2,40
- db DRAGON_RAGE ,SPECIAL_DAMAGE_EFFECT ,$01,DRAGON, $FF,10
- db FIRE_SPIN ,TRAPPING_EFFECT ,$0F,FIRE, $B2,15
- db THUNDERSHOCK,PARALYZE_SIDE_EFFECT1 ,$28,ELECTRIC,$FF,30
- db THUNDERBOLT ,PARALYZE_SIDE_EFFECT1 ,$5F,ELECTRIC,$FF,15
- db THUNDER_WAVE,PARALYZE_EFFECT ,$00,ELECTRIC,$FF,20
- db THUNDER ,PARALYZE_SIDE_EFFECT1 ,$78,ELECTRIC,$B2,10
- db ROCK_THROW ,NO_ADDITIONAL_EFFECT ,$32,ROCK, $A5,15
- db EARTHQUAKE ,NO_ADDITIONAL_EFFECT ,$64,GROUND, $FF,10
- db FISSURE ,OHKO_EFFECT ,$01,GROUND, $4C,5
- db DIG ,CHARGE_EFFECT ,$64,GROUND, $FF,10
- db TOXIC ,POISON_EFFECT ,$00,POISON, $D8,10
- db CONFUSION ,CONFUSION_SIDE_EFFECT ,$32,PSYCHIC, $FF,25
- db PSYCHIC_M ,SPECIAL_DOWN_SIDE_EFFECT ,$5A,PSYCHIC, $FF,10
- db HYPNOSIS ,SLEEP_EFFECT ,$00,PSYCHIC, $99,20
- db MEDITATE ,ATTACK_UP1_EFFECT ,$00,PSYCHIC, $FF,40
- db AGILITY ,SPEED_UP2_EFFECT ,$00,PSYCHIC, $FF,30
- db QUICK_ATTACK,NO_ADDITIONAL_EFFECT ,$28,NORMAL, $FF,30
- db RAGE ,RAGE_EFFECT ,$14,NORMAL, $FF,20
- db TELEPORT ,SWITCH_AND_TELEPORT_EFFECT,$00,PSYCHIC, $FF,20
- db NIGHT_SHADE ,SPECIAL_DAMAGE_EFFECT ,$00,GHOST, $FF,15
- db MIMIC ,MIMIC_EFFECT ,$00,NORMAL, $FF,10
- db SCREECH ,DEFENSE_DOWN2_EFFECT ,$00,NORMAL, $D8,40
- db DOUBLE_TEAM ,EVASION_UP1_EFFECT ,$00,NORMAL, $FF,15
- db RECOVER ,HEAL_EFFECT ,$00,NORMAL, $FF,20
- db HARDEN ,DEFENSE_UP1_EFFECT ,$00,NORMAL, $FF,30
- db MINIMIZE ,EVASION_UP1_EFFECT ,$00,NORMAL, $FF,20
- db SMOKESCREEN ,ACCURACY_DOWN1_EFFECT ,$00,NORMAL, $FF,20
- db CONFUSE_RAY ,CONFUSION_EFFECT ,$00,GHOST, $FF,10
- db WITHDRAW ,DEFENSE_UP1_EFFECT ,$00,WATER, $FF,40
- db DEFENSE_CURL,DEFENSE_UP1_EFFECT ,$00,NORMAL, $FF,40
- db BARRIER ,DEFENSE_UP2_EFFECT ,$00,PSYCHIC, $FF,30
- db LIGHT_SCREEN,LIGHT_SCREEN_EFFECT ,$00,PSYCHIC, $FF,30
- db HAZE ,HAZE_EFFECT ,$00,ICE, $FF,30
- db REFLECT ,REFLECT_EFFECT ,$00,PSYCHIC, $FF,20
- db FOCUS_ENERGY,FOCUS_ENERGY_EFFECT ,$00,NORMAL, $FF,30
- db BIDE ,BIDE_EFFECT ,$00,NORMAL, $FF,10
- db METRONOME ,METRONOME_EFFECT ,$00,NORMAL, $FF,10
- db MIRROR_MOVE ,MIRROR_MOVE_EFFECT ,$00,FLYING, $FF,20
- db SELFDESTRUCT,EXPLODE_EFFECT ,$82,NORMAL, $FF,5
- db EGG_BOMB ,NO_ADDITIONAL_EFFECT ,$64,NORMAL, $BF,10
- db LICK ,PARALYZE_SIDE_EFFECT2 ,$14,GHOST, $FF,30
- db SMOG ,POISON_SIDE_EFFECT2 ,$14,POISON, $B2,20
- db SLUDGE ,POISON_SIDE_EFFECT2 ,$41,POISON, $FF,20
- db BONE_CLUB ,FLINCH_SIDE_EFFECT1 ,$41,GROUND, $D8,20
- db FIRE_BLAST ,BURN_SIDE_EFFECT2 ,$78,FIRE, $D8,5
- db WATERFALL ,NO_ADDITIONAL_EFFECT ,$50,WATER, $FF,15
- db CLAMP ,TRAPPING_EFFECT ,$23,WATER, $BF,10
- db SWIFT ,SWIFT_EFFECT ,$3C,NORMAL, $FF,20
- db SKULL_BASH ,CHARGE_EFFECT ,$64,NORMAL, $FF,15
- db SPIKE_CANNON,TWO_TO_FIVE_ATTACKS_EFFECT,$14,NORMAL, $FF,15
- db CONSTRICT ,SPEED_DOWN_SIDE_EFFECT ,$0A,NORMAL, $FF,35
- db AMNESIA ,SPECIAL_UP2_EFFECT ,$00,PSYCHIC, $FF,20
- db KINESIS ,ACCURACY_DOWN1_EFFECT ,$00,PSYCHIC, $CC,15
- db SOFTBOILED ,HEAL_EFFECT ,$00,NORMAL, $FF,10
- db HI_JUMP_KICK,JUMP_KICK_EFFECT ,$55,FIGHTING,$E5,20
- db GLARE ,PARALYZE_EFFECT ,$00,NORMAL, $BF,30
- db DREAM_EATER ,DREAM_EATER_EFFECT ,$64,PSYCHIC, $FF,15
- db POISON_GAS ,POISON_EFFECT ,$00,POISON, $8C,40
- db BARRAGE ,TWO_TO_FIVE_ATTACKS_EFFECT,$0F,NORMAL, $D8,20
- db LEECH_LIFE ,DRAIN_HP_EFFECT ,$14,BUG, $FF,15
- db LOVELY_KISS ,SLEEP_EFFECT ,$00,NORMAL, $BF,10
- db SKY_ATTACK ,CHARGE_EFFECT ,$8C,FLYING, $E5,5
- db TRANSFORM ,TRANSFORM_EFFECT ,$00,NORMAL, $FF,10
- db BUBBLE ,SPEED_DOWN_SIDE_EFFECT ,$14,WATER, $FF,30
- db DIZZY_PUNCH ,NO_ADDITIONAL_EFFECT ,$46,NORMAL, $FF,10
- db SPORE ,SLEEP_EFFECT ,$00,GRASS, $FF,15
- db FLASH ,ACCURACY_DOWN1_EFFECT ,$00,NORMAL, $B2,20
- db PSYWAVE ,SPECIAL_DAMAGE_EFFECT ,$01,PSYCHIC, $CC,15
- db SPLASH ,SPLASH_EFFECT ,$00,NORMAL, $FF,40
- db ACID_ARMOR ,DEFENSE_UP2_EFFECT ,$00,POISON, $FF,40
- db CRABHAMMER ,NO_ADDITIONAL_EFFECT ,$5A,WATER, $D8,10
- db EXPLOSION ,EXPLODE_EFFECT ,$AA,NORMAL, $FF,5
- db FURY_SWIPES ,TWO_TO_FIVE_ATTACKS_EFFECT,$12,NORMAL, $CC,15
- db BONEMERANG ,ATTACK_TWICE_EFFECT ,$32,GROUND, $E5,10
- db REST ,HEAL_EFFECT ,$00,PSYCHIC, $FF,10
- db ROCK_SLIDE ,NO_ADDITIONAL_EFFECT ,$4B,ROCK, $E5,10
- db HYPER_FANG ,FLINCH_SIDE_EFFECT1 ,$50,NORMAL, $E5,15
- db SHARPEN ,ATTACK_UP1_EFFECT ,$00,NORMAL, $FF,30
- db CONVERSION ,CONVERSION_EFFECT ,$00,NORMAL, $FF,30
- db TRI_ATTACK ,NO_ADDITIONAL_EFFECT ,$50,NORMAL, $FF,10
- db SUPER_FANG ,SUPER_FANG_EFFECT ,$01,NORMAL, $E5,10
- db SLASH ,NO_ADDITIONAL_EFFECT ,$46,NORMAL, $FF,20
- db SUBSTITUTE ,SUBSTITUTE_EFFECT ,$00,NORMAL, $FF,10
- db STRUGGLE ,RECOIL_EFFECT ,$32,NORMAL, $FF,10
+Moves:
+; Characteristics of each move.
+
+move: macro
+ db \1 ; animation (interchangeable with move id)
+ db \2 ; effect
+ db \3 ; power
+ db \4 ; type
+ db \5 percent ; accuracy
+ db \6 ; pp
+endm
+
+ move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35
+ move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25
+ move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10
+ move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15
+ move MEGA_PUNCH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 85, 20
+ move PAY_DAY, PAY_DAY_EFFECT, 40, NORMAL, 100, 20
+ move FIRE_PUNCH, BURN_SIDE_EFFECT1, 75, FIRE, 100, 15
+ move ICE_PUNCH, FREEZE_SIDE_EFFECT, 75, ICE, 100, 15
+ move THUNDERPUNCH, PARALYZE_SIDE_EFFECT1, 75, ELECTRIC, 100, 15
+ move SCRATCH, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35
+ move VICEGRIP, NO_ADDITIONAL_EFFECT, 55, NORMAL, 100, 30
+ move GUILLOTINE, OHKO_EFFECT, 1, NORMAL, 30, 5
+ move RAZOR_WIND, CHARGE_EFFECT, 80, NORMAL, 75, 10
+ move SWORDS_DANCE, ATTACK_UP2_EFFECT, 0, NORMAL, 100, 30
+ move CUT, NO_ADDITIONAL_EFFECT, 50, NORMAL, 95, 30
+ move GUST, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35
+ move WING_ATTACK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35
+ move WHIRLWIND, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 85, 20
+ move FLY, FLY_EFFECT, 70, FLYING, 95, 15
+ move BIND, TRAPPING_EFFECT, 15, NORMAL, 75, 20
+ move SLAM, NO_ADDITIONAL_EFFECT, 80, NORMAL, 75, 20
+ move VINE_WHIP, NO_ADDITIONAL_EFFECT, 35, GRASS, 100, 10
+ move STOMP, FLINCH_SIDE_EFFECT2, 65, NORMAL, 100, 20
+ move DOUBLE_KICK, ATTACK_TWICE_EFFECT, 30, FIGHTING, 100, 30
+ move MEGA_KICK, NO_ADDITIONAL_EFFECT, 120, NORMAL, 75, 5
+ move JUMP_KICK, JUMP_KICK_EFFECT, 70, FIGHTING, 95, 25
+ move ROLLING_KICK, FLINCH_SIDE_EFFECT2, 60, FIGHTING, 85, 15
+ move SAND_ATTACK, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 15
+ move HEADBUTT, FLINCH_SIDE_EFFECT2, 70, NORMAL, 100, 15
+ move HORN_ATTACK, NO_ADDITIONAL_EFFECT, 65, NORMAL, 100, 25
+ move FURY_ATTACK, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20
+ move HORN_DRILL, OHKO_EFFECT, 1, NORMAL, 30, 5
+ move TACKLE, NO_ADDITIONAL_EFFECT, 35, NORMAL, 95, 35
+ move BODY_SLAM, PARALYZE_SIDE_EFFECT2, 85, NORMAL, 100, 15
+ move WRAP, TRAPPING_EFFECT, 15, NORMAL, 85, 20
+ move TAKE_DOWN, RECOIL_EFFECT, 90, NORMAL, 85, 20
+ move THRASH, THRASH_PETAL_DANCE_EFFECT, 90, NORMAL, 100, 20
+ move DOUBLE_EDGE, RECOIL_EFFECT, 100, NORMAL, 100, 15
+ move TAIL_WHIP, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30
+ move POISON_STING, POISON_SIDE_EFFECT1, 15, POISON, 100, 35
+ move TWINEEDLE, TWINEEDLE_EFFECT, 25, BUG, 100, 20
+ move PIN_MISSILE, TWO_TO_FIVE_ATTACKS_EFFECT, 14, BUG, 85, 20
+ move LEER, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30
+ move BITE, FLINCH_SIDE_EFFECT1, 60, NORMAL, 100, 25
+ move GROWL, ATTACK_DOWN1_EFFECT, 0, NORMAL, 100, 40
+ move ROAR, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 100, 20
+ move SING, SLEEP_EFFECT, 0, NORMAL, 55, 15
+ move SUPERSONIC, CONFUSION_EFFECT, 0, NORMAL, 55, 20
+ move SONICBOOM, SPECIAL_DAMAGE_EFFECT, 1, NORMAL, 90, 20
+ move DISABLE, DISABLE_EFFECT, 0, NORMAL, 55, 20
+ move ACID, DEFENSE_DOWN_SIDE_EFFECT, 40, POISON, 100, 30
+ move EMBER, BURN_SIDE_EFFECT1, 40, FIRE, 100, 25
+ move FLAMETHROWER, BURN_SIDE_EFFECT1, 95, FIRE, 100, 15
+ move MIST, MIST_EFFECT, 0, ICE, 100, 30
+ move WATER_GUN, NO_ADDITIONAL_EFFECT, 40, WATER, 100, 25
+ move HYDRO_PUMP, NO_ADDITIONAL_EFFECT, 120, WATER, 80, 5
+ move SURF, NO_ADDITIONAL_EFFECT, 95, WATER, 100, 15
+ move ICE_BEAM, FREEZE_SIDE_EFFECT, 95, ICE, 100, 10
+ move BLIZZARD, FREEZE_SIDE_EFFECT, 120, ICE, 90, 5
+ move PSYBEAM, CONFUSION_SIDE_EFFECT, 65, PSYCHIC, 100, 20
+ move BUBBLEBEAM, SPEED_DOWN_SIDE_EFFECT, 65, WATER, 100, 20
+ move AURORA_BEAM, ATTACK_DOWN_SIDE_EFFECT, 65, ICE, 100, 20
+ move HYPER_BEAM, HYPER_BEAM_EFFECT, 150, NORMAL, 90, 5
+ move PECK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35
+ move DRILL_PECK, NO_ADDITIONAL_EFFECT, 80, FLYING, 100, 20
+ move SUBMISSION, RECOIL_EFFECT, 80, FIGHTING, 80, 25
+ move LOW_KICK, FLINCH_SIDE_EFFECT2, 50, FIGHTING, 90, 20
+ move COUNTER, NO_ADDITIONAL_EFFECT, 1, FIGHTING, 100, 20
+ move SEISMIC_TOSS, SPECIAL_DAMAGE_EFFECT, 1, FIGHTING, 100, 20
+ move STRENGTH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 15
+ move ABSORB, DRAIN_HP_EFFECT, 20, GRASS, 100, 20
+ move MEGA_DRAIN, DRAIN_HP_EFFECT, 40, GRASS, 100, 10
+ move LEECH_SEED, LEECH_SEED_EFFECT, 0, GRASS, 90, 10
+ move GROWTH, SPECIAL_UP1_EFFECT, 0, NORMAL, 100, 40
+ move RAZOR_LEAF, NO_ADDITIONAL_EFFECT, 55, GRASS, 95, 25
+ move SOLARBEAM, CHARGE_EFFECT, 120, GRASS, 100, 10
+ move POISONPOWDER, POISON_EFFECT, 0, POISON, 75, 35
+ move STUN_SPORE, PARALYZE_EFFECT, 0, GRASS, 75, 30
+ move SLEEP_POWDER, SLEEP_EFFECT, 0, GRASS, 75, 15
+ move PETAL_DANCE, THRASH_PETAL_DANCE_EFFECT, 70, GRASS, 100, 20
+ move STRING_SHOT, SPEED_DOWN1_EFFECT, 0, BUG, 95, 40
+ move DRAGON_RAGE, SPECIAL_DAMAGE_EFFECT, 1, DRAGON, 100, 10
+ move FIRE_SPIN, TRAPPING_EFFECT, 15, FIRE, 70, 15
+ move THUNDERSHOCK, PARALYZE_SIDE_EFFECT1, 40, ELECTRIC, 100, 30
+ move THUNDERBOLT, PARALYZE_SIDE_EFFECT1, 95, ELECTRIC, 100, 15
+ move THUNDER_WAVE, PARALYZE_EFFECT, 0, ELECTRIC, 100, 20
+ move THUNDER, PARALYZE_SIDE_EFFECT1, 120, ELECTRIC, 70, 10
+ move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 65, 15
+ move EARTHQUAKE, NO_ADDITIONAL_EFFECT, 100, GROUND, 100, 10
+ move FISSURE, OHKO_EFFECT, 1, GROUND, 30, 5
+ move DIG, CHARGE_EFFECT, 100, GROUND, 100, 10
+ move TOXIC, POISON_EFFECT, 0, POISON, 85, 10
+ move CONFUSION, CONFUSION_SIDE_EFFECT, 50, PSYCHIC, 100, 25
+ move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC, 100, 10
+ move HYPNOSIS, SLEEP_EFFECT, 0, PSYCHIC, 60, 20
+ move MEDITATE, ATTACK_UP1_EFFECT, 0, PSYCHIC, 100, 40
+ move AGILITY, SPEED_UP2_EFFECT, 0, PSYCHIC, 100, 30
+ move QUICK_ATTACK, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 30
+ move RAGE, RAGE_EFFECT, 20, NORMAL, 100, 20
+ move TELEPORT, SWITCH_AND_TELEPORT_EFFECT, 0, PSYCHIC, 100, 20
+ move NIGHT_SHADE, SPECIAL_DAMAGE_EFFECT, 0, GHOST, 100, 15
+ move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10
+ move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40
+ move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15
+ move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20
+ move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30
+ move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20
+ move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20
+ move CONFUSE_RAY, CONFUSION_EFFECT, 0, GHOST, 100, 10
+ move WITHDRAW, DEFENSE_UP1_EFFECT, 0, WATER, 100, 40
+ move DEFENSE_CURL, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 40
+ move BARRIER, DEFENSE_UP2_EFFECT, 0, PSYCHIC, 100, 30
+ move LIGHT_SCREEN, LIGHT_SCREEN_EFFECT, 0, PSYCHIC, 100, 30
+ move HAZE, HAZE_EFFECT, 0, ICE, 100, 30
+ move REFLECT, REFLECT_EFFECT, 0, PSYCHIC, 100, 20
+ move FOCUS_ENERGY, FOCUS_ENERGY_EFFECT, 0, NORMAL, 100, 30
+ move BIDE, BIDE_EFFECT, 0, NORMAL, 100, 10
+ move METRONOME, METRONOME_EFFECT, 0, NORMAL, 100, 10
+ move MIRROR_MOVE, MIRROR_MOVE_EFFECT, 0, FLYING, 100, 20
+ move SELFDESTRUCT, EXPLODE_EFFECT, 130, NORMAL, 100, 5
+ move EGG_BOMB, NO_ADDITIONAL_EFFECT, 100, NORMAL, 75, 10
+ move LICK, PARALYZE_SIDE_EFFECT2, 20, GHOST, 100, 30
+ move SMOG, POISON_SIDE_EFFECT2, 20, POISON, 70, 20
+ move SLUDGE, POISON_SIDE_EFFECT2, 65, POISON, 100, 20
+ move BONE_CLUB, FLINCH_SIDE_EFFECT1, 65, GROUND, 85, 20
+ move FIRE_BLAST, BURN_SIDE_EFFECT2, 120, FIRE, 85, 5
+ move WATERFALL, NO_ADDITIONAL_EFFECT, 80, WATER, 100, 15
+ move CLAMP, TRAPPING_EFFECT, 35, WATER, 75, 10
+ move SWIFT, SWIFT_EFFECT, 60, NORMAL, 100, 20
+ move SKULL_BASH, CHARGE_EFFECT, 100, NORMAL, 100, 15
+ move SPIKE_CANNON, TWO_TO_FIVE_ATTACKS_EFFECT, 20, NORMAL, 100, 15
+ move CONSTRICT, SPEED_DOWN_SIDE_EFFECT, 10, NORMAL, 100, 35
+ move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC, 100, 20
+ move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC, 80, 15
+ move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10
+ move HI_JUMP_KICK, JUMP_KICK_EFFECT, 85, FIGHTING, 90, 20
+ move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30
+ move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC, 100, 15
+ move POISON_GAS, POISON_EFFECT, 0, POISON, 55, 40
+ move BARRAGE, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20
+ move LEECH_LIFE, DRAIN_HP_EFFECT, 20, BUG, 100, 15
+ move LOVELY_KISS, SLEEP_EFFECT, 0, NORMAL, 75, 10
+ move SKY_ATTACK, CHARGE_EFFECT, 140, FLYING, 90, 5
+ move TRANSFORM, TRANSFORM_EFFECT, 0, NORMAL, 100, 10
+ move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 20, WATER, 100, 30
+ move DIZZY_PUNCH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 10
+ move SPORE, SLEEP_EFFECT, 0, GRASS, 100, 15
+ move FLASH, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 70, 20
+ move PSYWAVE, SPECIAL_DAMAGE_EFFECT, 1, PSYCHIC, 80, 15
+ move SPLASH, SPLASH_EFFECT, 0, NORMAL, 100, 40
+ move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, POISON, 100, 40
+ move CRABHAMMER, NO_ADDITIONAL_EFFECT, 90, WATER, 85, 10
+ move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5
+ move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15
+ move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 10
+ move REST, HEAL_EFFECT, 0, PSYCHIC, 100, 10
+ move ROCK_SLIDE, NO_ADDITIONAL_EFFECT, 75, ROCK, 90, 10
+ move HYPER_FANG, FLINCH_SIDE_EFFECT1, 80, NORMAL, 90, 15
+ move SHARPEN, ATTACK_UP1_EFFECT, 0, NORMAL, 100, 30
+ move CONVERSION, CONVERSION_EFFECT, 0, NORMAL, 100, 30
+ move TRI_ATTACK, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 10
+ move SUPER_FANG, SUPER_FANG_EFFECT, 1, NORMAL, 90, 10
+ move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20
+ move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10
+ move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10
--- a/macros.asm
+++ b/macros.asm
@@ -11,6 +11,9 @@
dex EQUS "db $5f, $50" ; End a Pokedex entry.
+percent EQUS "* $ff / 100"
+
+
homecall: MACRO
ld a, [H_LOADEDROMBANK]
push af