thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

PSYCHIC -> PSYCHIC_TYPE (PSYCHIC is ambiguous with PSYCHIC_M)

Browse source
This commit is contained in:
Rangi 2020-07-07 10:54:05 -04:00
parent 06db7ec55b
commit bbc257476f
18 changed files with 286 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

7
constants/battle_constants.asm
View file

@ -21,6 +21,13 @@ MAX_NEUTRAL_DAMAGE EQU 999
SONICBOOM_DAMAGE EQU 20 SONICBOOM_DAMAGE EQU 20
DRAGON_RAGE_DAMAGE EQU 40 DRAGON_RAGE_DAMAGE EQU 40
; type effectiveness factors, scaled by 10
SUPER_EFFECTIVE EQU 20
MORE_EFFECTIVE EQU 15
EFFECTIVE EQU 10
NOT_VERY_EFFECTIVE EQU 05
NO_EFFECT EQU 00
; non-volatile statuses ; non-volatile statuses
SLP EQU %111 ; sleep counter SLP EQU %111 ; sleep counter
PSN EQU 3 PSN EQU 3

32
constants/type_constants.asm
View file

@ -1,23 +1,23 @@
const_def const_def
PHYSICAL EQU const_value PHYSICAL EQU const_value
const NORMAL ; $00 const NORMAL ; $00
const FIGHTING ; $01 const FIGHTING ; $01
const FLYING ; $02 const FLYING ; $02
const POISON ; $03 const POISON ; $03
const GROUND ; $04 const GROUND ; $04
const ROCK ; $05 const ROCK ; $05
const BIRD ; $06 const BIRD ; $06
const BUG ; $07 const BUG ; $07
const GHOST ; $08 const GHOST ; $08
const_value = $14 const_value = $14
SPECIAL EQU const_value SPECIAL EQU const_value
const FIRE ; $14 const FIRE ; $14
const WATER ; $15 const WATER ; $15
const GRASS ; $16 const GRASS ; $16
const ELECTRIC ; $17 const ELECTRIC ; $17
const PSYCHIC ; $18 const PSYCHIC_TYPE ; $18
const ICE ; $19 const ICE ; $19
const DRAGON ; $1A const DRAGON ; $1A

330
data/moves/moves.asm
View file

@ -10,169 +10,169 @@ move: MACRO
db \6 ; pp db \6 ; pp
ENDM ENDM
move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 move POUND, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35
MoveEnd: MoveEnd:
move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25 move KARATE_CHOP, NO_ADDITIONAL_EFFECT, 50, NORMAL, 100, 25
move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10 move DOUBLESLAP, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 10
move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15 move COMET_PUNCH, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 85, 15
move MEGA_PUNCH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 85, 20 move MEGA_PUNCH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 85, 20
move PAY_DAY, PAY_DAY_EFFECT, 40, NORMAL, 100, 20 move PAY_DAY, PAY_DAY_EFFECT, 40, NORMAL, 100, 20
move FIRE_PUNCH, BURN_SIDE_EFFECT1, 75, FIRE, 100, 15 move FIRE_PUNCH, BURN_SIDE_EFFECT1, 75, FIRE, 100, 15
move ICE_PUNCH, FREEZE_SIDE_EFFECT, 75, ICE, 100, 15 move ICE_PUNCH, FREEZE_SIDE_EFFECT, 75, ICE, 100, 15
move THUNDERPUNCH, PARALYZE_SIDE_EFFECT1, 75, ELECTRIC, 100, 15 move THUNDERPUNCH, PARALYZE_SIDE_EFFECT1, 75, ELECTRIC, 100, 15
move SCRATCH, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 move SCRATCH, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35
move VICEGRIP, NO_ADDITIONAL_EFFECT, 55, NORMAL, 100, 30 move VICEGRIP, NO_ADDITIONAL_EFFECT, 55, NORMAL, 100, 30
move GUILLOTINE, OHKO_EFFECT, 1, NORMAL, 30, 5 move GUILLOTINE, OHKO_EFFECT, 1, NORMAL, 30, 5
move RAZOR_WIND, CHARGE_EFFECT, 80, NORMAL, 75, 10 move RAZOR_WIND, CHARGE_EFFECT, 80, NORMAL, 75, 10
move SWORDS_DANCE, ATTACK_UP2_EFFECT, 0, NORMAL, 100, 30 move SWORDS_DANCE, ATTACK_UP2_EFFECT, 0, NORMAL, 100, 30
move CUT, NO_ADDITIONAL_EFFECT, 50, NORMAL, 95, 30 move CUT, NO_ADDITIONAL_EFFECT, 50, NORMAL, 95, 30
move GUST, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35 move GUST, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 35
move WING_ATTACK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35 move WING_ATTACK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35
move WHIRLWIND, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 85, 20 move WHIRLWIND, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 85, 20
move FLY, FLY_EFFECT, 70, FLYING, 95, 15 move FLY, FLY_EFFECT, 70, FLYING, 95, 15
move BIND, TRAPPING_EFFECT, 15, NORMAL, 75, 20 move BIND, TRAPPING_EFFECT, 15, NORMAL, 75, 20
move SLAM, NO_ADDITIONAL_EFFECT, 80, NORMAL, 75, 20 move SLAM, NO_ADDITIONAL_EFFECT, 80, NORMAL, 75, 20
move VINE_WHIP, NO_ADDITIONAL_EFFECT, 35, GRASS, 100, 10 move VINE_WHIP, NO_ADDITIONAL_EFFECT, 35, GRASS, 100, 10
move STOMP, FLINCH_SIDE_EFFECT2, 65, NORMAL, 100, 20 move STOMP, FLINCH_SIDE_EFFECT2, 65, NORMAL, 100, 20
move DOUBLE_KICK, ATTACK_TWICE_EFFECT, 30, FIGHTING, 100, 30 move DOUBLE_KICK, ATTACK_TWICE_EFFECT, 30, FIGHTING, 100, 30
move MEGA_KICK, NO_ADDITIONAL_EFFECT, 120, NORMAL, 75, 5 move MEGA_KICK, NO_ADDITIONAL_EFFECT, 120, NORMAL, 75, 5
move JUMP_KICK, JUMP_KICK_EFFECT, 70, FIGHTING, 95, 25 move JUMP_KICK, JUMP_KICK_EFFECT, 70, FIGHTING, 95, 25
move ROLLING_KICK, FLINCH_SIDE_EFFECT2, 60, FIGHTING, 85, 15 move ROLLING_KICK, FLINCH_SIDE_EFFECT2, 60, FIGHTING, 85, 15
move SAND_ATTACK, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 15 move SAND_ATTACK, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 15
move HEADBUTT, FLINCH_SIDE_EFFECT2, 70, NORMAL, 100, 15 move HEADBUTT, FLINCH_SIDE_EFFECT2, 70, NORMAL, 100, 15
move HORN_ATTACK, NO_ADDITIONAL_EFFECT, 65, NORMAL, 100, 25 move HORN_ATTACK, NO_ADDITIONAL_EFFECT, 65, NORMAL, 100, 25
move FURY_ATTACK, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 move FURY_ATTACK, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20
move HORN_DRILL, OHKO_EFFECT, 1, NORMAL, 30, 5 move HORN_DRILL, OHKO_EFFECT, 1, NORMAL, 30, 5
move TACKLE, NO_ADDITIONAL_EFFECT, 35, NORMAL, 95, 35 move TACKLE, NO_ADDITIONAL_EFFECT, 35, NORMAL, 95, 35
move BODY_SLAM, PARALYZE_SIDE_EFFECT2, 85, NORMAL, 100, 15 move BODY_SLAM, PARALYZE_SIDE_EFFECT2, 85, NORMAL, 100, 15
move WRAP, TRAPPING_EFFECT, 15, NORMAL, 85, 20 move WRAP, TRAPPING_EFFECT, 15, NORMAL, 85, 20
move TAKE_DOWN, RECOIL_EFFECT, 90, NORMAL, 85, 20 move TAKE_DOWN, RECOIL_EFFECT, 90, NORMAL, 85, 20
move THRASH, THRASH_PETAL_DANCE_EFFECT, 90, NORMAL, 100, 20 move THRASH, THRASH_PETAL_DANCE_EFFECT, 90, NORMAL, 100, 20
move DOUBLE_EDGE, RECOIL_EFFECT, 100, NORMAL, 100, 15 move DOUBLE_EDGE, RECOIL_EFFECT, 100, NORMAL, 100, 15
move TAIL_WHIP, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30 move TAIL_WHIP, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30
move POISON_STING, POISON_SIDE_EFFECT1, 15, POISON, 100, 35 move POISON_STING, POISON_SIDE_EFFECT1, 15, POISON, 100, 35
move TWINEEDLE, TWINEEDLE_EFFECT, 25, BUG, 100, 20 move TWINEEDLE, TWINEEDLE_EFFECT, 25, BUG, 100, 20
move PIN_MISSILE, TWO_TO_FIVE_ATTACKS_EFFECT, 14, BUG, 85, 20 move PIN_MISSILE, TWO_TO_FIVE_ATTACKS_EFFECT, 14, BUG, 85, 20
move LEER, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30 move LEER, DEFENSE_DOWN1_EFFECT, 0, NORMAL, 100, 30
move BITE, FLINCH_SIDE_EFFECT1, 60, NORMAL, 100, 25 move BITE, FLINCH_SIDE_EFFECT1, 60, NORMAL, 100, 25
move GROWL, ATTACK_DOWN1_EFFECT, 0, NORMAL, 100, 40 move GROWL, ATTACK_DOWN1_EFFECT, 0, NORMAL, 100, 40
move ROAR, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 100, 20 move ROAR, SWITCH_AND_TELEPORT_EFFECT, 0, NORMAL, 100, 20
move SING, SLEEP_EFFECT, 0, NORMAL, 55, 15 move SING, SLEEP_EFFECT, 0, NORMAL, 55, 15
move SUPERSONIC, CONFUSION_EFFECT, 0, NORMAL, 55, 20 move SUPERSONIC, CONFUSION_EFFECT, 0, NORMAL, 55, 20
move SONICBOOM, SPECIAL_DAMAGE_EFFECT, 1, NORMAL, 90, 20 move SONICBOOM, SPECIAL_DAMAGE_EFFECT, 1, NORMAL, 90, 20
move DISABLE, DISABLE_EFFECT, 0, NORMAL, 55, 20 move DISABLE, DISABLE_EFFECT, 0, NORMAL, 55, 20
move ACID, DEFENSE_DOWN_SIDE_EFFECT, 40, POISON, 100, 30 move ACID, DEFENSE_DOWN_SIDE_EFFECT, 40, POISON, 100, 30
move EMBER, BURN_SIDE_EFFECT1, 40, FIRE, 100, 25 move EMBER, BURN_SIDE_EFFECT1, 40, FIRE, 100, 25
move FLAMETHROWER, BURN_SIDE_EFFECT1, 95, FIRE, 100, 15 move FLAMETHROWER, BURN_SIDE_EFFECT1, 95, FIRE, 100, 15
move MIST, MIST_EFFECT, 0, ICE, 100, 30 move MIST, MIST_EFFECT, 0, ICE, 100, 30
move WATER_GUN, NO_ADDITIONAL_EFFECT, 40, WATER, 100, 25 move WATER_GUN, NO_ADDITIONAL_EFFECT, 40, WATER, 100, 25
move HYDRO_PUMP, NO_ADDITIONAL_EFFECT, 120, WATER, 80, 5 move HYDRO_PUMP, NO_ADDITIONAL_EFFECT, 120, WATER, 80, 5
move SURF, NO_ADDITIONAL_EFFECT, 95, WATER, 100, 15 move SURF, NO_ADDITIONAL_EFFECT, 95, WATER, 100, 15
move ICE_BEAM, FREEZE_SIDE_EFFECT, 95, ICE, 100, 10 move ICE_BEAM, FREEZE_SIDE_EFFECT, 95, ICE, 100, 10
move BLIZZARD, FREEZE_SIDE_EFFECT, 120, ICE, 90, 5 move BLIZZARD, FREEZE_SIDE_EFFECT, 120, ICE, 90, 5
move PSYBEAM, CONFUSION_SIDE_EFFECT, 65, PSYCHIC, 100, 20 move PSYBEAM, CONFUSION_SIDE_EFFECT, 65, PSYCHIC_TYPE, 100, 20
move BUBBLEBEAM, SPEED_DOWN_SIDE_EFFECT, 65, WATER, 100, 20 move BUBBLEBEAM, SPEED_DOWN_SIDE_EFFECT, 65, WATER, 100, 20
move AURORA_BEAM, ATTACK_DOWN_SIDE_EFFECT, 65, ICE, 100, 20 move AURORA_BEAM, ATTACK_DOWN_SIDE_EFFECT, 65, ICE, 100, 20
move HYPER_BEAM, HYPER_BEAM_EFFECT, 150, NORMAL, 90, 5 move HYPER_BEAM, HYPER_BEAM_EFFECT, 150, NORMAL, 90, 5
move PECK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35 move PECK, NO_ADDITIONAL_EFFECT, 35, FLYING, 100, 35
move DRILL_PECK, NO_ADDITIONAL_EFFECT, 80, FLYING, 100, 20 move DRILL_PECK, NO_ADDITIONAL_EFFECT, 80, FLYING, 100, 20
move SUBMISSION, RECOIL_EFFECT, 80, FIGHTING, 80, 25 move SUBMISSION, RECOIL_EFFECT, 80, FIGHTING, 80, 25
move LOW_KICK, FLINCH_SIDE_EFFECT2, 50, FIGHTING, 90, 20 move LOW_KICK, FLINCH_SIDE_EFFECT2, 50, FIGHTING, 90, 20
move COUNTER, NO_ADDITIONAL_EFFECT, 1, FIGHTING, 100, 20 move COUNTER, NO_ADDITIONAL_EFFECT, 1, FIGHTING, 100, 20
move SEISMIC_TOSS, SPECIAL_DAMAGE_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 STRENGTH, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 15
move ABSORB, DRAIN_HP_EFFECT, 20, GRASS, 100, 20 move ABSORB, DRAIN_HP_EFFECT, 20, GRASS, 100, 20
move MEGA_DRAIN, DRAIN_HP_EFFECT, 40, GRASS, 100, 10 move MEGA_DRAIN, DRAIN_HP_EFFECT, 40, GRASS, 100, 10
move LEECH_SEED, LEECH_SEED_EFFECT, 0, GRASS, 90, 10 move LEECH_SEED, LEECH_SEED_EFFECT, 0, GRASS, 90, 10
move GROWTH, SPECIAL_UP1_EFFECT, 0, NORMAL, 100, 40 move GROWTH, SPECIAL_UP1_EFFECT, 0, NORMAL, 100, 40
move RAZOR_LEAF, NO_ADDITIONAL_EFFECT, 55, GRASS, 95, 25 move RAZOR_LEAF, NO_ADDITIONAL_EFFECT, 55, GRASS, 95, 25
move SOLARBEAM, CHARGE_EFFECT, 120, GRASS, 100, 10 move SOLARBEAM, CHARGE_EFFECT, 120, GRASS, 100, 10
move POISONPOWDER, POISON_EFFECT, 0, POISON, 75, 35 move POISONPOWDER, POISON_EFFECT, 0, POISON, 75, 35
move STUN_SPORE, PARALYZE_EFFECT, 0, GRASS, 75, 30 move STUN_SPORE, PARALYZE_EFFECT, 0, GRASS, 75, 30
move SLEEP_POWDER, SLEEP_EFFECT, 0, GRASS, 75, 15 move SLEEP_POWDER, SLEEP_EFFECT, 0, GRASS, 75, 15
move PETAL_DANCE, THRASH_PETAL_DANCE_EFFECT, 70, GRASS, 100, 20 move PETAL_DANCE, THRASH_PETAL_DANCE_EFFECT, 70, GRASS, 100, 20
move STRING_SHOT, SPEED_DOWN1_EFFECT, 0, BUG, 95, 40 move STRING_SHOT, SPEED_DOWN1_EFFECT, 0, BUG, 95, 40
move DRAGON_RAGE, SPECIAL_DAMAGE_EFFECT, 1, DRAGON, 100, 10 move DRAGON_RAGE, SPECIAL_DAMAGE_EFFECT, 1, DRAGON, 100, 10
move FIRE_SPIN, TRAPPING_EFFECT, 15, FIRE, 70, 15 move FIRE_SPIN, TRAPPING_EFFECT, 15, FIRE, 70, 15
move THUNDERSHOCK, PARALYZE_SIDE_EFFECT1, 40, ELECTRIC, 100, 30 move THUNDERSHOCK, PARALYZE_SIDE_EFFECT1, 40, ELECTRIC, 100, 30
move THUNDERBOLT, PARALYZE_SIDE_EFFECT1, 95, ELECTRIC, 100, 15 move THUNDERBOLT, PARALYZE_SIDE_EFFECT1, 95, ELECTRIC, 100, 15
move THUNDER_WAVE, PARALYZE_EFFECT, 0, ELECTRIC, 100, 20 move THUNDER_WAVE, PARALYZE_EFFECT, 0, ELECTRIC, 100, 20
move THUNDER, PARALYZE_SIDE_EFFECT1, 120, ELECTRIC, 70, 10 move THUNDER, PARALYZE_SIDE_EFFECT1, 120, ELECTRIC, 70, 10
move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 65, 15 move ROCK_THROW, NO_ADDITIONAL_EFFECT, 50, ROCK, 65, 15
move EARTHQUAKE, NO_ADDITIONAL_EFFECT, 100, GROUND, 100, 10 move EARTHQUAKE, NO_ADDITIONAL_EFFECT, 100, GROUND, 100, 10
move FISSURE, OHKO_EFFECT, 1, GROUND, 30, 5 move FISSURE, OHKO_EFFECT, 1, GROUND, 30, 5
move DIG, CHARGE_EFFECT, 100, GROUND, 100, 10 move DIG, CHARGE_EFFECT, 100, GROUND, 100, 10
move TOXIC, POISON_EFFECT, 0, POISON, 85, 10 move TOXIC, POISON_EFFECT, 0, POISON, 85, 10
move CONFUSION, CONFUSION_SIDE_EFFECT, 50, PSYCHIC, 100, 25 move CONFUSION, CONFUSION_SIDE_EFFECT, 50, PSYCHIC_TYPE, 100, 25
move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC, 100, 10 move PSYCHIC_M, SPECIAL_DOWN_SIDE_EFFECT, 90, PSYCHIC_TYPE, 100, 10
move HYPNOSIS, SLEEP_EFFECT, 0, PSYCHIC, 60, 20 move HYPNOSIS, SLEEP_EFFECT, 0, PSYCHIC_TYPE, 60, 20
move MEDITATE, ATTACK_UP1_EFFECT, 0, PSYCHIC, 100, 40 move MEDITATE, ATTACK_UP1_EFFECT, 0, PSYCHIC_TYPE, 100, 40
move AGILITY, SPEED_UP2_EFFECT, 0, PSYCHIC, 100, 30 move AGILITY, SPEED_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 30
move QUICK_ATTACK, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 30 move QUICK_ATTACK, NO_ADDITIONAL_EFFECT, 40, NORMAL, 100, 30
move RAGE, RAGE_EFFECT, 20, NORMAL, 100, 20 move RAGE, RAGE_EFFECT, 20, NORMAL, 100, 20
move TELEPORT, SWITCH_AND_TELEPORT_EFFECT, 0, PSYCHIC, 100, 20 move TELEPORT, SWITCH_AND_TELEPORT_EFFECT, 0, PSYCHIC_TYPE, 100, 20
move NIGHT_SHADE, SPECIAL_DAMAGE_EFFECT, 0, GHOST, 100, 15 move NIGHT_SHADE, SPECIAL_DAMAGE_EFFECT, 0, GHOST, 100, 15
move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10 move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10
move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40 move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40
move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15 move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15
move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20 move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20
move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30 move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30
move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20 move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20
move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20 move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20
move CONFUSE_RAY, CONFUSION_EFFECT, 0, GHOST, 100, 10 move CONFUSE_RAY, CONFUSION_EFFECT, 0, GHOST, 100, 10
move WITHDRAW, DEFENSE_UP1_EFFECT, 0, WATER, 100, 40 move WITHDRAW, DEFENSE_UP1_EFFECT, 0, WATER, 100, 40
move DEFENSE_CURL, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 40 move DEFENSE_CURL, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 40
move BARRIER, DEFENSE_UP2_EFFECT, 0, PSYCHIC, 100, 30 move BARRIER, DEFENSE_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 30
move LIGHT_SCREEN, LIGHT_SCREEN_EFFECT, 0, PSYCHIC, 100, 30 move LIGHT_SCREEN, LIGHT_SCREEN_EFFECT, 0, PSYCHIC_TYPE, 100, 30
move HAZE, HAZE_EFFECT, 0, ICE, 100, 30 move HAZE, HAZE_EFFECT, 0, ICE, 100, 30
move REFLECT, REFLECT_EFFECT, 0, PSYCHIC, 100, 20 move REFLECT, REFLECT_EFFECT, 0, PSYCHIC_TYPE, 100, 20
move FOCUS_ENERGY, FOCUS_ENERGY_EFFECT, 0, NORMAL, 100, 30 move FOCUS_ENERGY, FOCUS_ENERGY_EFFECT, 0, NORMAL, 100, 30
move BIDE, BIDE_EFFECT, 0, NORMAL, 100, 10 move BIDE, BIDE_EFFECT, 0, NORMAL, 100, 10
move METRONOME, METRONOME_EFFECT, 0, NORMAL, 100, 10 move METRONOME, METRONOME_EFFECT, 0, NORMAL, 100, 10
move MIRROR_MOVE, MIRROR_MOVE_EFFECT, 0, FLYING, 100, 20 move MIRROR_MOVE, MIRROR_MOVE_EFFECT, 0, FLYING, 100, 20
move SELFDESTRUCT, EXPLODE_EFFECT, 130, NORMAL, 100, 5 move SELFDESTRUCT, EXPLODE_EFFECT, 130, NORMAL, 100, 5
move EGG_BOMB, NO_ADDITIONAL_EFFECT, 100, NORMAL, 75, 10 move EGG_BOMB, NO_ADDITIONAL_EFFECT, 100, NORMAL, 75, 10
move LICK, PARALYZE_SIDE_EFFECT2, 20, GHOST, 100, 30 move LICK, PARALYZE_SIDE_EFFECT2, 20, GHOST, 100, 30
move SMOG, POISON_SIDE_EFFECT2, 20, POISON, 70, 20 move SMOG, POISON_SIDE_EFFECT2, 20, POISON, 70, 20
move SLUDGE, POISON_SIDE_EFFECT2, 65, POISON, 100, 20 move SLUDGE, POISON_SIDE_EFFECT2, 65, POISON, 100, 20
move BONE_CLUB, FLINCH_SIDE_EFFECT1, 65, GROUND, 85, 20 move BONE_CLUB, FLINCH_SIDE_EFFECT1, 65, GROUND, 85, 20
move FIRE_BLAST, BURN_SIDE_EFFECT2, 120, FIRE, 85, 5 move FIRE_BLAST, BURN_SIDE_EFFECT2, 120, FIRE, 85, 5
move WATERFALL, NO_ADDITIONAL_EFFECT, 80, WATER, 100, 15 move WATERFALL, NO_ADDITIONAL_EFFECT, 80, WATER, 100, 15
move CLAMP, TRAPPING_EFFECT, 35, WATER, 75, 10 move CLAMP, TRAPPING_EFFECT, 35, WATER, 75, 10
move SWIFT, SWIFT_EFFECT, 60, NORMAL, 100, 20 move SWIFT, SWIFT_EFFECT, 60, NORMAL, 100, 20
move SKULL_BASH, CHARGE_EFFECT, 100, NORMAL, 100, 15 move SKULL_BASH, CHARGE_EFFECT, 100, NORMAL, 100, 15
move SPIKE_CANNON, TWO_TO_FIVE_ATTACKS_EFFECT, 20, 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 CONSTRICT, SPEED_DOWN_SIDE_EFFECT, 10, NORMAL, 100, 35
move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC, 100, 20 move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 20
move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC, 80, 15 move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC_TYPE, 80, 15
move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10 move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10
move HI_JUMP_KICK, JUMP_KICK_EFFECT, 85, FIGHTING, 90, 20 move HI_JUMP_KICK, JUMP_KICK_EFFECT, 85, FIGHTING, 90, 20
move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30 move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30
move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC, 100, 15 move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC_TYPE, 100, 15
move POISON_GAS, POISON_EFFECT, 0, POISON, 55, 40 move POISON_GAS, POISON_EFFECT, 0, POISON, 55, 40
move BARRAGE, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20 move BARRAGE, TWO_TO_FIVE_ATTACKS_EFFECT, 15, NORMAL, 85, 20
move LEECH_LIFE, DRAIN_HP_EFFECT, 20, BUG, 100, 15 move LEECH_LIFE, DRAIN_HP_EFFECT, 20, BUG, 100, 15
move LOVELY_KISS, SLEEP_EFFECT, 0, NORMAL, 75, 10 move LOVELY_KISS, SLEEP_EFFECT, 0, NORMAL, 75, 10
move SKY_ATTACK, CHARGE_EFFECT, 140, FLYING, 90, 5 move SKY_ATTACK, CHARGE_EFFECT, 140, FLYING, 90, 5
move TRANSFORM, TRANSFORM_EFFECT, 0, NORMAL, 100, 10 move TRANSFORM, TRANSFORM_EFFECT, 0, NORMAL, 100, 10
move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 20, WATER, 100, 30 move BUBBLE, SPEED_DOWN_SIDE_EFFECT, 20, WATER, 100, 30
move DIZZY_PUNCH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 10 move DIZZY_PUNCH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 10
move SPORE, SLEEP_EFFECT, 0, GRASS, 100, 15 move SPORE, SLEEP_EFFECT, 0, GRASS, 100, 15
move FLASH, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 70, 20 move FLASH, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 70, 20
move PSYWAVE, SPECIAL_DAMAGE_EFFECT, 1, PSYCHIC, 80, 15 move PSYWAVE, SPECIAL_DAMAGE_EFFECT, 1, PSYCHIC_TYPE, 80, 15
move SPLASH, SPLASH_EFFECT, 0, NORMAL, 100, 40 move SPLASH, SPLASH_EFFECT, 0, NORMAL, 100, 40
move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, POISON, 100, 40 move ACID_ARMOR, DEFENSE_UP2_EFFECT, 0, POISON, 100, 40
move CRABHAMMER, NO_ADDITIONAL_EFFECT, 90, WATER, 85, 10 move CRABHAMMER, NO_ADDITIONAL_EFFECT, 90, WATER, 85, 10
move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5 move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5
move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15 move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15
move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 10 move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 10
move REST, HEAL_EFFECT, 0, PSYCHIC, 100, 10 move REST, HEAL_EFFECT, 0, PSYCHIC_TYPE, 100, 10
move ROCK_SLIDE, NO_ADDITIONAL_EFFECT, 75, ROCK, 90, 10 move ROCK_SLIDE, NO_ADDITIONAL_EFFECT, 75, ROCK, 90, 10
move HYPER_FANG, FLINCH_SIDE_EFFECT1, 80, NORMAL, 90, 15 move HYPER_FANG, FLINCH_SIDE_EFFECT1, 80, NORMAL, 90, 15
move SHARPEN, ATTACK_UP1_EFFECT, 0, NORMAL, 100, 30 move SHARPEN, ATTACK_UP1_EFFECT, 0, NORMAL, 100, 30
move CONVERSION, CONVERSION_EFFECT, 0, NORMAL, 100, 30 move CONVERSION, CONVERSION_EFFECT, 0, NORMAL, 100, 30
move TRI_ATTACK, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 10 move TRI_ATTACK, NO_ADDITIONAL_EFFECT, 80, NORMAL, 100, 10
move SUPER_FANG, SUPER_FANG_EFFECT, 1, NORMAL, 90, 10 move SUPER_FANG, SUPER_FANG_EFFECT, 1, NORMAL, 90, 10
move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20 move SLASH, NO_ADDITIONAL_EFFECT, 70, NORMAL, 100, 20
move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10 move SUBSTITUTE, SUBSTITUTE_EFFECT, 0, NORMAL, 100, 10
move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10

2
data/pokemon/base_stats/abra.asm
View file

@ -3,7 +3,7 @@
db 25, 20, 15, 90, 105 db 25, 20, 15, 90, 105
; hp atk def spd spc ; hp atk def spd spc
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 200 ; catch rate db 200 ; catch rate
db 73 ; base exp db 73 ; base exp

2
data/pokemon/base_stats/alakazam.asm
View file

@ -3,7 +3,7 @@
db 55, 50, 45, 120, 135 db 55, 50, 45, 120, 135
; hp atk def spd spc ; hp atk def spd spc
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 50 ; catch rate db 50 ; catch rate
db 186 ; base exp db 186 ; base exp

2
data/pokemon/base_stats/drowzee.asm
View file

@ -3,7 +3,7 @@
db 60, 48, 45, 42, 90 db 60, 48, 45, 42, 90
; hp atk def spd spc ; hp atk def spd spc
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 190 ; catch rate db 190 ; catch rate
db 102 ; base exp db 102 ; base exp

2
data/pokemon/base_stats/exeggcute.asm
View file

@ -3,7 +3,7 @@
db 60, 40, 80, 40, 60 db 60, 40, 80, 40, 60
; hp atk def spd spc ; hp atk def spd spc
db GRASS, PSYCHIC ; type db GRASS, PSYCHIC_TYPE ; type
db 90 ; catch rate db 90 ; catch rate
db 98 ; base exp db 98 ; base exp

2
data/pokemon/base_stats/exeggutor.asm
View file

@ -3,7 +3,7 @@
db 95, 95, 85, 55, 125 db 95, 95, 85, 55, 125
; hp atk def spd spc ; hp atk def spd spc
db GRASS, PSYCHIC ; type db GRASS, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 212 ; base exp db 212 ; base exp

2
data/pokemon/base_stats/hypno.asm
View file

@ -3,7 +3,7 @@
db 85, 73, 70, 67, 115 db 85, 73, 70, 67, 115
; hp atk def spd spc ; hp atk def spd spc
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 75 ; catch rate db 75 ; catch rate
db 165 ; base exp db 165 ; base exp

2
data/pokemon/base_stats/jynx.asm
View file

@ -3,7 +3,7 @@
db 65, 50, 35, 95, 95 db 65, 50, 35, 95, 95
; hp atk def spd spc ; hp atk def spd spc
db ICE, PSYCHIC ; type db ICE, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 137 ; base exp db 137 ; base exp

2
data/pokemon/base_stats/kadabra.asm
View file

@ -3,7 +3,7 @@
db 40, 35, 30, 105, 120 db 40, 35, 30, 105, 120
; hp atk def spd spc ; hp atk def spd spc
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 100 ; catch rate db 100 ; catch rate
db 145 ; base exp db 145 ; base exp

2
data/pokemon/base_stats/mew.asm
View file

@ -3,7 +3,7 @@
db 100, 100, 100, 100, 100 db 100, 100, 100, 100, 100
; hp atk def spd spc ; hp atk def spd spc
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 64 ; base exp db 64 ; base exp

2
data/pokemon/base_stats/mewtwo.asm
View file

@ -3,7 +3,7 @@
db 106, 110, 90, 130, 154 db 106, 110, 90, 130, 154
; hp atk def spd spc ; hp atk def spd spc
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 3 ; catch rate db 3 ; catch rate
db 220 ; base exp db 220 ; base exp

2
data/pokemon/base_stats/mrmime.asm
View file

@ -3,7 +3,7 @@
db 40, 45, 65, 90, 100 db 40, 45, 65, 90, 100
; hp atk def spd spc ; hp atk def spd spc
db PSYCHIC, PSYCHIC ; type db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 45 ; catch rate db 45 ; catch rate
db 136 ; base exp db 136 ; base exp

2
data/pokemon/base_stats/slowbro.asm
View file

@ -3,7 +3,7 @@
db 95, 75, 110, 30, 80 db 95, 75, 110, 30, 80
; hp atk def spd spc ; hp atk def spd spc
db WATER, PSYCHIC ; type db WATER, PSYCHIC_TYPE ; type
db 75 ; catch rate db 75 ; catch rate
db 164 ; base exp db 164 ; base exp

2
data/pokemon/base_stats/slowpoke.asm
View file

@ -3,7 +3,7 @@
db 90, 65, 65, 15, 40 db 90, 65, 65, 15, 40
; hp atk def spd spc ; hp atk def spd spc
db WATER, PSYCHIC ; type db WATER, PSYCHIC_TYPE ; type
db 190 ; catch rate db 190 ; catch rate
db 99 ; base exp db 99 ; base exp

2
data/pokemon/base_stats/starmie.asm
View file

@ -3,7 +3,7 @@
db 60, 75, 85, 115, 100 db 60, 75, 85, 115, 100
; hp atk def spd spc ; hp atk def spd spc
db WATER, PSYCHIC ; type db WATER, PSYCHIC_TYPE ; type
db 60 ; catch rate db 60 ; catch rate
db 207 ; base exp db 207 ; base exp

172
data/types/type_matchups.asm
View file

@ -1,89 +1,85 @@
TypeEffects: TypeEffects:
; format: attacking type, defending type, damage multiplier ; attacker, defender, *=
; the multiplier is a (decimal) fixed-point number: db WATER, FIRE, SUPER_EFFECTIVE
; 20 is ×2.0 db FIRE, GRASS, SUPER_EFFECTIVE
; 05 is ×0.5 db FIRE, ICE, SUPER_EFFECTIVE
; 00 is ×0 db GRASS, WATER, SUPER_EFFECTIVE
db WATER,FIRE,20 db ELECTRIC, WATER, SUPER_EFFECTIVE
db FIRE,GRASS,20 db WATER, ROCK, SUPER_EFFECTIVE
db FIRE,ICE,20 db GROUND, FLYING, NO_EFFECT
db GRASS,WATER,20 db WATER, WATER, NOT_VERY_EFFECTIVE
db ELECTRIC,WATER,20 db FIRE, FIRE, NOT_VERY_EFFECTIVE
db WATER,ROCK,20 db ELECTRIC, ELECTRIC, NOT_VERY_EFFECTIVE
db GROUND,FLYING,00 db ICE, ICE, NOT_VERY_EFFECTIVE
db WATER,WATER,05 db GRASS, GRASS, NOT_VERY_EFFECTIVE
db FIRE,FIRE,05 db PSYCHIC_TYPE, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
db ELECTRIC,ELECTRIC,05 db FIRE, WATER, NOT_VERY_EFFECTIVE
db ICE,ICE,05 db GRASS, FIRE, NOT_VERY_EFFECTIVE
db GRASS,GRASS,05 db WATER, GRASS, NOT_VERY_EFFECTIVE
db PSYCHIC,PSYCHIC,05 db ELECTRIC, GRASS, NOT_VERY_EFFECTIVE
db FIRE,WATER,05 db NORMAL, ROCK, NOT_VERY_EFFECTIVE
db GRASS,FIRE,05 db NORMAL, GHOST, NO_EFFECT
db WATER,GRASS,05 db GHOST, GHOST, SUPER_EFFECTIVE
db ELECTRIC,GRASS,05 db FIRE, BUG, SUPER_EFFECTIVE
db NORMAL,ROCK,05 db FIRE, ROCK, NOT_VERY_EFFECTIVE
db NORMAL,GHOST,00 db WATER, GROUND, SUPER_EFFECTIVE
db GHOST,GHOST,20 db ELECTRIC, GROUND, NO_EFFECT
db FIRE,BUG,20 db ELECTRIC, FLYING, SUPER_EFFECTIVE
db FIRE,ROCK,05 db GRASS, GROUND, SUPER_EFFECTIVE
db WATER,GROUND,20 db GRASS, BUG, NOT_VERY_EFFECTIVE
db ELECTRIC,GROUND,00 db GRASS, POISON, NOT_VERY_EFFECTIVE
db ELECTRIC,FLYING,20 db GRASS, ROCK, SUPER_EFFECTIVE
db GRASS,GROUND,20 db GRASS, FLYING, NOT_VERY_EFFECTIVE
db GRASS,BUG,05 db ICE, WATER, NOT_VERY_EFFECTIVE
db GRASS,POISON,05 db ICE, GRASS, SUPER_EFFECTIVE
db GRASS,ROCK,20 db ICE, GROUND, SUPER_EFFECTIVE
db GRASS,FLYING,05 db ICE, FLYING, SUPER_EFFECTIVE
db ICE,WATER,05 db FIGHTING, NORMAL, SUPER_EFFECTIVE
db ICE,GRASS,20 db FIGHTING, POISON, NOT_VERY_EFFECTIVE
db ICE,GROUND,20 db FIGHTING, FLYING, NOT_VERY_EFFECTIVE
db ICE,FLYING,20 db FIGHTING, PSYCHIC_TYPE, NOT_VERY_EFFECTIVE
db FIGHTING,NORMAL,20 db FIGHTING, BUG, NOT_VERY_EFFECTIVE
db FIGHTING,POISON,05 db FIGHTING, ROCK, SUPER_EFFECTIVE
db FIGHTING,FLYING,05 db FIGHTING, ICE, SUPER_EFFECTIVE
db FIGHTING,PSYCHIC,05 db FIGHTING, GHOST, NO_EFFECT
db FIGHTING,BUG,05 db POISON, GRASS, SUPER_EFFECTIVE
db FIGHTING,ROCK,20 db POISON, POISON, NOT_VERY_EFFECTIVE
db FIGHTING,ICE,20 db POISON, GROUND, NOT_VERY_EFFECTIVE
db FIGHTING,GHOST,00 db POISON, BUG, SUPER_EFFECTIVE
db POISON,GRASS,20 db POISON, ROCK, NOT_VERY_EFFECTIVE
db POISON,POISON,05 db POISON, GHOST, NOT_VERY_EFFECTIVE
db POISON,GROUND,05 db GROUND, FIRE, SUPER_EFFECTIVE
db POISON,BUG,20 db GROUND, ELECTRIC, SUPER_EFFECTIVE
db POISON,ROCK,05 db GROUND, GRASS, NOT_VERY_EFFECTIVE
db POISON,GHOST,05 db GROUND, BUG, NOT_VERY_EFFECTIVE
db GROUND,FIRE,20 db GROUND, ROCK, SUPER_EFFECTIVE
db GROUND,ELECTRIC,20 db GROUND, POISON, SUPER_EFFECTIVE
db GROUND,GRASS,05 db FLYING, ELECTRIC, NOT_VERY_EFFECTIVE
db GROUND,BUG,05 db FLYING, FIGHTING, SUPER_EFFECTIVE
db GROUND,ROCK,20 db FLYING, BUG, SUPER_EFFECTIVE
db GROUND,POISON,20 db FLYING, GRASS, SUPER_EFFECTIVE
db FLYING,ELECTRIC,05 db FLYING, ROCK, NOT_VERY_EFFECTIVE
db FLYING,FIGHTING,20 db PSYCHIC_TYPE, FIGHTING, SUPER_EFFECTIVE
db FLYING,BUG,20 db PSYCHIC_TYPE, POISON, SUPER_EFFECTIVE
db FLYING,GRASS,20 db BUG, FIRE, NOT_VERY_EFFECTIVE
db FLYING,ROCK,05 db BUG, GRASS, SUPER_EFFECTIVE
db PSYCHIC,FIGHTING,20 db BUG, FIGHTING, NOT_VERY_EFFECTIVE
db PSYCHIC,POISON,20 db BUG, FLYING, NOT_VERY_EFFECTIVE
db BUG,FIRE,05 db BUG, PSYCHIC_TYPE, SUPER_EFFECTIVE
db BUG,GRASS,20 db BUG, GHOST, NOT_VERY_EFFECTIVE
db BUG,FIGHTING,05 db BUG, POISON, SUPER_EFFECTIVE
db BUG,FLYING,05 db ROCK, FIRE, SUPER_EFFECTIVE
db BUG,PSYCHIC,20 db ROCK, FIGHTING, NOT_VERY_EFFECTIVE
db BUG,GHOST,05 db ROCK, GROUND, NOT_VERY_EFFECTIVE
db BUG,POISON,20 db ROCK, FLYING, SUPER_EFFECTIVE
db ROCK,FIRE,20 db ROCK, BUG, SUPER_EFFECTIVE
db ROCK,FIGHTING,05 db ROCK, ICE, SUPER_EFFECTIVE
db ROCK,GROUND,05 db GHOST, NORMAL, NO_EFFECT
db ROCK,FLYING,20 db GHOST, PSYCHIC_TYPE, NO_EFFECT
db ROCK,BUG,20 db FIRE, DRAGON, NOT_VERY_EFFECTIVE
db ROCK,ICE,20 db WATER, DRAGON, NOT_VERY_EFFECTIVE
db GHOST,NORMAL,00 db ELECTRIC, DRAGON, NOT_VERY_EFFECTIVE
db GHOST,PSYCHIC,00 db GRASS, DRAGON, NOT_VERY_EFFECTIVE
db FIRE,DRAGON,05 db ICE, DRAGON, SUPER_EFFECTIVE
db WATER,DRAGON,05 db DRAGON, DRAGON, SUPER_EFFECTIVE
db ELECTRIC,DRAGON,05 db -1 ; end
db GRASS,DRAGON,05
db ICE,DRAGON,20
db DRAGON,DRAGON,20
db $FF