From 8729d58d5a7aa1b537ecaf928aed04849fabcc11 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Thu, 18 Aug 2016 12:16:57 -0700 Subject: contest move effect constants --- constants/battle_move_effects.s | 215 +++++++++++++++++++++++++++++++++++++++ constants/constants.s | 3 +- constants/contest_move_effects.s | 49 +++++++++ constants/move_effects.s | 215 --------------------------------------- 4 files changed, 266 insertions(+), 216 deletions(-) create mode 100644 constants/battle_move_effects.s create mode 100644 constants/contest_move_effects.s delete mode 100644 constants/move_effects.s diff --git a/constants/battle_move_effects.s b/constants/battle_move_effects.s new file mode 100644 index 000000000..bd801083b --- /dev/null +++ b/constants/battle_move_effects.s @@ -0,0 +1,215 @@ + enum_start + enum EFFECT_HIT + enum EFFECT_SLEEP + enum EFFECT_POISON_HIT + enum EFFECT_ABSORB + enum EFFECT_BURN_HIT + enum EFFECT_FREEZE_HIT + enum EFFECT_PARALYZE_HIT + enum EFFECT_EXPLOSION + enum EFFECT_DREAM_EATER + enum EFFECT_MIRROR_MOVE + enum EFFECT_ATTACK_UP + enum EFFECT_DEFENSE_UP + enum EFFECT_SPEED_UP + enum EFFECT_SPECIAL_ATTACK_UP + enum EFFECT_SPECIAL_DEFENSE_UP + enum EFFECT_ACCURACY_UP + enum EFFECT_EVASION_UP + enum EFFECT_ALWAYS_HIT + enum EFFECT_ATTACK_DOWN + enum EFFECT_DEFENSE_DOWN + enum EFFECT_SPEED_DOWN + enum EFFECT_SPECIAL_ATTACK_DOWN @ unused + enum EFFECT_SPECIAL_DEFENSE_DOWN @ unused + enum EFFECT_ACCURACY_DOWN + enum EFFECT_EVASION_DOWN + enum EFFECT_HAZE + enum EFFECT_BIDE + enum EFFECT_RAMPAGE + enum EFFECT_ROAR + enum EFFECT_MULTI_HIT + enum EFFECT_CONVERSION + enum EFFECT_FLINCH_HIT + enum EFFECT_RESTORE_HP + enum EFFECT_TOXIC + enum EFFECT_PAY_DAY + enum EFFECT_LIGHT_SCREEN + enum EFFECT_TRI_ATTACK + enum EFFECT_REST + enum EFFECT_OHKO + enum EFFECT_RAZOR_WIND + enum EFFECT_SUPER_FANG + enum EFFECT_DRAGON_RAGE + enum EFFECT_TRAP + enum EFFECT_HIGH_CRITICAL + enum EFFECT_DOUBLE_HIT + enum EFFECT_RECOIL_IF_MISS + enum EFFECT_MIST + enum EFFECT_FOCUS_ENERGY + enum EFFECT_RECOIL + enum EFFECT_CONFUSE + enum EFFECT_ATTACK_UP_2 + enum EFFECT_DEFENSE_UP_2 + enum EFFECT_SPEED_UP_2 + enum EFFECT_SPECIAL_ATTACK_UP_2 + enum EFFECT_SPECIAL_DEFENSE_UP_2 + enum EFFECT_ACCURACY_UP_2 + enum EFFECT_EVASION_UP_2 + enum EFFECT_TRANSFORM + enum EFFECT_ATTACK_DOWN_2 + enum EFFECT_DEFENSE_DOWN_2 + enum EFFECT_SPEED_DOWN_2 + enum EFFECT_SPECIAL_ATTACK_DOWN_2 + enum EFFECT_SPECIAL_DEFENSE_DOWN_2 + enum EFFECT_ACCURACY_DOWN_2 + enum EFFECT_EVASION_DOWN_2 + enum EFFECT_REFLECT + enum EFFECT_POISON + enum EFFECT_PARALYZE + enum EFFECT_ATTACK_DOWN_HIT + enum EFFECT_DEFENSE_DOWN_HIT + enum EFFECT_SPEED_DOWN_HIT + enum EFFECT_SPECIAL_ATTACK_DOWN_HIT + enum EFFECT_SPECIAL_DEFENSE_DOWN_HIT + enum EFFECT_ACCURACY_DOWN_HIT + enum EFFECT_EVASION_DOWN_HIT + enum EFFECT_SKY_ATTACK + enum EFFECT_CONFUSE_HIT + enum EFFECT_TWINEEDLE + enum EFFECT_VITAL_THROW + enum EFFECT_SUBSTITUTE + enum EFFECT_RECHARGE + enum EFFECT_RAGE + enum EFFECT_MIMIC + enum EFFECT_METRONOME + enum EFFECT_LEECH_SEED + enum EFFECT_SPLASH + enum EFFECT_DISABLE + enum EFFECT_LEVEL_DAMAGE + enum EFFECT_PSYWAVE + enum EFFECT_COUNTER + enum EFFECT_ENCORE + enum EFFECT_PAIN_SPLIT + enum EFFECT_SNORE + enum EFFECT_CONVERSION_2 + enum EFFECT_LOCK_ON + enum EFFECT_SKETCH + enum EFFECT_UNUSED_60 @ thaw + enum EFFECT_SLEEP_TALK + enum EFFECT_DESTINY_BOND + enum EFFECT_FLAIL + enum EFFECT_SPITE + enum EFFECT_FALSE_SWIPE + enum EFFECT_HEAL_BELL + enum EFFECT_QUICK_ATTACK + enum EFFECT_TRIPLE_KICK + enum EFFECT_THIEF + enum EFFECT_MEAN_LOOK + enum EFFECT_NIGHTMARE + enum EFFECT_MINIMIZE + enum EFFECT_CURSE + enum EFFECT_UNUSED_6E + enum EFFECT_PROTECT + enum EFFECT_SPIKES + enum EFFECT_FORESIGHT + enum EFFECT_PERISH_SONG + enum EFFECT_SANDSTORM + enum EFFECT_ENDURE + enum EFFECT_ROLLOUT + enum EFFECT_SWAGGER + enum EFFECT_FURY_CUTTER + enum EFFECT_ATTRACT + enum EFFECT_RETURN + enum EFFECT_PRESENT + enum EFFECT_FRUSTRATION + enum EFFECT_SAFEGUARD + enum EFFECT_THAW_HIT + enum EFFECT_MAGNITUDE + enum EFFECT_BATON_PASS + enum EFFECT_PURSUIT + enum EFFECT_RAPID_SPIN + enum EFFECT_SONICBOOM + enum EFFECT_UNUSED_83 + enum EFFECT_MORNING_SUN + enum EFFECT_SYNTHESIS + enum EFFECT_MOONLIGHT + enum EFFECT_HIDDEN_POWER + enum EFFECT_RAIN_DANCE + enum EFFECT_SUNNY_DAY + enum EFFECT_DEFENSE_UP_HIT + enum EFFECT_ATTACK_UP_HIT + enum EFFECT_ALL_STATS_UP_HIT + enum EFFECT_UNUSED_8D @ incomplete fake out in gen 2 + enum EFFECT_BELLY_DRUM + enum EFFECT_PSYCH_UP + enum EFFECT_MIRROR_COAT + enum EFFECT_SKULL_BASH + enum EFFECT_TWISTER + enum EFFECT_EARTHQUAKE + enum EFFECT_FUTURE_SIGHT + enum EFFECT_GUST + enum EFFECT_FLINCH_HIT_2 @ STOMP ASTONISH EXTRASENSORY NEEDLE_ARM + enum EFFECT_SOLARBEAM + enum EFFECT_THUNDER + enum EFFECT_TELEPORT + enum EFFECT_BEAT_UP + enum EFFECT_FLY + enum EFFECT_DEFENSE_CURL + enum EFFECT_SOFTBOILED + enum EFFECT_FAKE_OUT + enum EFFECT_UPROAR + enum EFFECT_STOCKPILE + enum EFFECT_SPIT_UP + enum EFFECT_SWALLOW + enum EFFECT_UNUSED_A3 + enum EFFECT_HAIL + enum EFFECT_TORMENT + enum EFFECT_FLATTER + enum EFFECT_WILL_O_WISP + enum EFFECT_MEMENTO + enum EFFECT_FACADE + enum EFFECT_FOCUS_PUNCH + enum EFFECT_SMELLINGSALT + enum EFFECT_FOLLOW_ME + enum EFFECT_NATURE_POWER + enum EFFECT_CHARGE + enum EFFECT_TAUNT + enum EFFECT_HELPING_HAND + enum EFFECT_TRICK + enum EFFECT_ROLE_PLAY + enum EFFECT_WISH + enum EFFECT_ASSIST + enum EFFECT_INGRAIN + enum EFFECT_SUPERPOWER + enum EFFECT_MAGIC_COAT + enum EFFECT_RECYCLE + enum EFFECT_REVENGE + enum EFFECT_BRICK_BREAK + enum EFFECT_YAWN + enum EFFECT_KNOCK_OFF + enum EFFECT_ENDEAVOR + enum EFFECT_ERUPTION + enum EFFECT_SKILL_SWAP + enum EFFECT_IMPRISON + enum EFFECT_REFRESH + enum EFFECT_GRUDGE + enum EFFECT_SNATCH + enum EFFECT_LOW_KICK + enum EFFECT_SECRET_POWER + enum EFFECT_DOUBLE_EDGE + enum EFFECT_TEETER_DANCE + enum EFFECT_BLAZE_KICK + enum EFFECT_MUD_SPORT + enum EFFECT_POISON_FANG + enum EFFECT_WEATHER_BALL + enum EFFECT_OVERHEAT + enum EFFECT_TICKLE + enum EFFECT_COSMIC_POWER + enum EFFECT_SKY_UPPERCUT + enum EFFECT_BULK_UP + enum EFFECT_POISON_TAIL + enum EFFECT_WATER_SPORT + enum EFFECT_CALM_MIND + enum EFFECT_DRAGON_DANCE + enum EFFECT_CAMOUFLAGE diff --git a/constants/constants.s b/constants/constants.s index b1313a319..42c9fa382 100644 --- a/constants/constants.s +++ b/constants/constants.s @@ -24,4 +24,5 @@ .include "constants/hold_effects.s" .include "constants/battle.s" .include "constants/battle_text.s" - .include "constants/move_effects.s" + .include "constants/battle_move_effects.s" + .include "constants/contest_move_effects.s" diff --git a/constants/contest_move_effects.s b/constants/contest_move_effects.s new file mode 100644 index 000000000..9f5966a9e --- /dev/null +++ b/constants/contest_move_effects.s @@ -0,0 +1,49 @@ + enum_start + enum CONTEST_EFFECT_HIGHLY_APPEALING @ 0 + enum CONTEST_EFFECT_USER_MORE_EASILY_STARTLED @ 1 + enum CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES @ 2 + enum CONTEST_EFFECT_REPETITION_NOT_BORING @ 3 + enum CONTEST_EFFECT_AVOID_STARTLE_ONCE @ 4 + enum CONTEST_EFFECT_AVOID_STARTLE @ 5 + enum CONTEST_EFFECT_AVOID_STARTLE_SLIGHTLY @ 6 + enum CONTEST_EFFECT_USER_LESS_EASILY_STARTLED @ 7 + enum CONTEST_EFFECT_STARTLE_FRONT_MON @ 8 + enum CONTEST_EFFECT_SLIGHTLY_STARTLE_PREV_MONS @ 9 + enum CONTEST_EFFECT_STARTLE_PREV_MON @ 10 + enum CONTEST_EFFECT_STARTLE_PREV_MONS @ 11 + enum CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON @ 12 + enum CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS @ 13 + enum CONTEST_EFFECT_STARTLE_PREV_MON_2 @ 14 + enum CONTEST_EFFECT_STARTLE_PREV_MONS_2 @ 15 + enum CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION @ 16 + enum CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION @ 17 + enum CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN @ 18 + enum CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL @ 19 + enum CONTEST_EFFECT_STARTLE_MONS_COOL_APPEAL @ 20 + enum CONTEST_EFFECT_STARTLE_MONS_BEAUTY_APPEAL @ 21 + enum CONTEST_EFFECT_STARTLE_MONS_CUTE_APPEAL @ 22 + enum CONTEST_EFFECT_STARTLE_MONS_SMART_APPEAL @ 23 + enum CONTEST_EFFECT_STARTLE_MONS_TOUGH_APPEAL @ 24 + enum CONTEST_EFFECT_MAKE_FOLLOWING_MON_NERVOUS @ 25 + enum CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS @ 26 + enum CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS @ 27 + enum CONTEST_EFFECT_BADLY_STARTLES_MONS_IN_GOOD_CONDITION @ 28 + enum CONTEST_EFFECT_BETTER_IF_FIRST @ 29 + enum CONTEST_EFFECT_BETTER_IF_LAST @ 30 + enum CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES @ 31 + enum CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE @ 32 + enum CONTEST_EFFECT_BETTER_WHEN_LATER @ 33 + enum CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING @ 34 + enum CONTEST_EFFECT_BETTER_IF_SAME_TYPE @ 35 + enum CONTEST_EFFECT_BETTER_IF_DIFF_TYPE @ 36 + enum CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL @ 37 + enum CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS @ 38 + enum CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION @ 39 + enum CONTEST_EFFECT_NEXT_APPEAL_EARLIER @ 40 + enum CONTEST_EFFECT_NEXT_APPEAL_LATER @ 41 + enum CONTEST_EFFECT_MAKE_SCRAMBLING_TURN_ORDER_EASIER @ 42 + enum CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER @ 43 + enum CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST @ 44 + enum CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS @ 45 + enum CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED @ 46 + enum CONTEST_EFFECT_DONT_EXCITE_AUDIENCE_EXCITEMENT @ 47 diff --git a/constants/move_effects.s b/constants/move_effects.s deleted file mode 100644 index bd801083b..000000000 --- a/constants/move_effects.s +++ /dev/null @@ -1,215 +0,0 @@ - enum_start - enum EFFECT_HIT - enum EFFECT_SLEEP - enum EFFECT_POISON_HIT - enum EFFECT_ABSORB - enum EFFECT_BURN_HIT - enum EFFECT_FREEZE_HIT - enum EFFECT_PARALYZE_HIT - enum EFFECT_EXPLOSION - enum EFFECT_DREAM_EATER - enum EFFECT_MIRROR_MOVE - enum EFFECT_ATTACK_UP - enum EFFECT_DEFENSE_UP - enum EFFECT_SPEED_UP - enum EFFECT_SPECIAL_ATTACK_UP - enum EFFECT_SPECIAL_DEFENSE_UP - enum EFFECT_ACCURACY_UP - enum EFFECT_EVASION_UP - enum EFFECT_ALWAYS_HIT - enum EFFECT_ATTACK_DOWN - enum EFFECT_DEFENSE_DOWN - enum EFFECT_SPEED_DOWN - enum EFFECT_SPECIAL_ATTACK_DOWN @ unused - enum EFFECT_SPECIAL_DEFENSE_DOWN @ unused - enum EFFECT_ACCURACY_DOWN - enum EFFECT_EVASION_DOWN - enum EFFECT_HAZE - enum EFFECT_BIDE - enum EFFECT_RAMPAGE - enum EFFECT_ROAR - enum EFFECT_MULTI_HIT - enum EFFECT_CONVERSION - enum EFFECT_FLINCH_HIT - enum EFFECT_RESTORE_HP - enum EFFECT_TOXIC - enum EFFECT_PAY_DAY - enum EFFECT_LIGHT_SCREEN - enum EFFECT_TRI_ATTACK - enum EFFECT_REST - enum EFFECT_OHKO - enum EFFECT_RAZOR_WIND - enum EFFECT_SUPER_FANG - enum EFFECT_DRAGON_RAGE - enum EFFECT_TRAP - enum EFFECT_HIGH_CRITICAL - enum EFFECT_DOUBLE_HIT - enum EFFECT_RECOIL_IF_MISS - enum EFFECT_MIST - enum EFFECT_FOCUS_ENERGY - enum EFFECT_RECOIL - enum EFFECT_CONFUSE - enum EFFECT_ATTACK_UP_2 - enum EFFECT_DEFENSE_UP_2 - enum EFFECT_SPEED_UP_2 - enum EFFECT_SPECIAL_ATTACK_UP_2 - enum EFFECT_SPECIAL_DEFENSE_UP_2 - enum EFFECT_ACCURACY_UP_2 - enum EFFECT_EVASION_UP_2 - enum EFFECT_TRANSFORM - enum EFFECT_ATTACK_DOWN_2 - enum EFFECT_DEFENSE_DOWN_2 - enum EFFECT_SPEED_DOWN_2 - enum EFFECT_SPECIAL_ATTACK_DOWN_2 - enum EFFECT_SPECIAL_DEFENSE_DOWN_2 - enum EFFECT_ACCURACY_DOWN_2 - enum EFFECT_EVASION_DOWN_2 - enum EFFECT_REFLECT - enum EFFECT_POISON - enum EFFECT_PARALYZE - enum EFFECT_ATTACK_DOWN_HIT - enum EFFECT_DEFENSE_DOWN_HIT - enum EFFECT_SPEED_DOWN_HIT - enum EFFECT_SPECIAL_ATTACK_DOWN_HIT - enum EFFECT_SPECIAL_DEFENSE_DOWN_HIT - enum EFFECT_ACCURACY_DOWN_HIT - enum EFFECT_EVASION_DOWN_HIT - enum EFFECT_SKY_ATTACK - enum EFFECT_CONFUSE_HIT - enum EFFECT_TWINEEDLE - enum EFFECT_VITAL_THROW - enum EFFECT_SUBSTITUTE - enum EFFECT_RECHARGE - enum EFFECT_RAGE - enum EFFECT_MIMIC - enum EFFECT_METRONOME - enum EFFECT_LEECH_SEED - enum EFFECT_SPLASH - enum EFFECT_DISABLE - enum EFFECT_LEVEL_DAMAGE - enum EFFECT_PSYWAVE - enum EFFECT_COUNTER - enum EFFECT_ENCORE - enum EFFECT_PAIN_SPLIT - enum EFFECT_SNORE - enum EFFECT_CONVERSION_2 - enum EFFECT_LOCK_ON - enum EFFECT_SKETCH - enum EFFECT_UNUSED_60 @ thaw - enum EFFECT_SLEEP_TALK - enum EFFECT_DESTINY_BOND - enum EFFECT_FLAIL - enum EFFECT_SPITE - enum EFFECT_FALSE_SWIPE - enum EFFECT_HEAL_BELL - enum EFFECT_QUICK_ATTACK - enum EFFECT_TRIPLE_KICK - enum EFFECT_THIEF - enum EFFECT_MEAN_LOOK - enum EFFECT_NIGHTMARE - enum EFFECT_MINIMIZE - enum EFFECT_CURSE - enum EFFECT_UNUSED_6E - enum EFFECT_PROTECT - enum EFFECT_SPIKES - enum EFFECT_FORESIGHT - enum EFFECT_PERISH_SONG - enum EFFECT_SANDSTORM - enum EFFECT_ENDURE - enum EFFECT_ROLLOUT - enum EFFECT_SWAGGER - enum EFFECT_FURY_CUTTER - enum EFFECT_ATTRACT - enum EFFECT_RETURN - enum EFFECT_PRESENT - enum EFFECT_FRUSTRATION - enum EFFECT_SAFEGUARD - enum EFFECT_THAW_HIT - enum EFFECT_MAGNITUDE - enum EFFECT_BATON_PASS - enum EFFECT_PURSUIT - enum EFFECT_RAPID_SPIN - enum EFFECT_SONICBOOM - enum EFFECT_UNUSED_83 - enum EFFECT_MORNING_SUN - enum EFFECT_SYNTHESIS - enum EFFECT_MOONLIGHT - enum EFFECT_HIDDEN_POWER - enum EFFECT_RAIN_DANCE - enum EFFECT_SUNNY_DAY - enum EFFECT_DEFENSE_UP_HIT - enum EFFECT_ATTACK_UP_HIT - enum EFFECT_ALL_STATS_UP_HIT - enum EFFECT_UNUSED_8D @ incomplete fake out in gen 2 - enum EFFECT_BELLY_DRUM - enum EFFECT_PSYCH_UP - enum EFFECT_MIRROR_COAT - enum EFFECT_SKULL_BASH - enum EFFECT_TWISTER - enum EFFECT_EARTHQUAKE - enum EFFECT_FUTURE_SIGHT - enum EFFECT_GUST - enum EFFECT_FLINCH_HIT_2 @ STOMP ASTONISH EXTRASENSORY NEEDLE_ARM - enum EFFECT_SOLARBEAM - enum EFFECT_THUNDER - enum EFFECT_TELEPORT - enum EFFECT_BEAT_UP - enum EFFECT_FLY - enum EFFECT_DEFENSE_CURL - enum EFFECT_SOFTBOILED - enum EFFECT_FAKE_OUT - enum EFFECT_UPROAR - enum EFFECT_STOCKPILE - enum EFFECT_SPIT_UP - enum EFFECT_SWALLOW - enum EFFECT_UNUSED_A3 - enum EFFECT_HAIL - enum EFFECT_TORMENT - enum EFFECT_FLATTER - enum EFFECT_WILL_O_WISP - enum EFFECT_MEMENTO - enum EFFECT_FACADE - enum EFFECT_FOCUS_PUNCH - enum EFFECT_SMELLINGSALT - enum EFFECT_FOLLOW_ME - enum EFFECT_NATURE_POWER - enum EFFECT_CHARGE - enum EFFECT_TAUNT - enum EFFECT_HELPING_HAND - enum EFFECT_TRICK - enum EFFECT_ROLE_PLAY - enum EFFECT_WISH - enum EFFECT_ASSIST - enum EFFECT_INGRAIN - enum EFFECT_SUPERPOWER - enum EFFECT_MAGIC_COAT - enum EFFECT_RECYCLE - enum EFFECT_REVENGE - enum EFFECT_BRICK_BREAK - enum EFFECT_YAWN - enum EFFECT_KNOCK_OFF - enum EFFECT_ENDEAVOR - enum EFFECT_ERUPTION - enum EFFECT_SKILL_SWAP - enum EFFECT_IMPRISON - enum EFFECT_REFRESH - enum EFFECT_GRUDGE - enum EFFECT_SNATCH - enum EFFECT_LOW_KICK - enum EFFECT_SECRET_POWER - enum EFFECT_DOUBLE_EDGE - enum EFFECT_TEETER_DANCE - enum EFFECT_BLAZE_KICK - enum EFFECT_MUD_SPORT - enum EFFECT_POISON_FANG - enum EFFECT_WEATHER_BALL - enum EFFECT_OVERHEAT - enum EFFECT_TICKLE - enum EFFECT_COSMIC_POWER - enum EFFECT_SKY_UPPERCUT - enum EFFECT_BULK_UP - enum EFFECT_POISON_TAIL - enum EFFECT_WATER_SPORT - enum EFFECT_CALM_MIND - enum EFFECT_DRAGON_DANCE - enum EFFECT_CAMOUFLAGE -- cgit v1.2.3