diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 16:23:34 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 16:23:34 -0500 |
| commit | cb5e3378de0582217cdb308d33cee7afb4d7cb89 (patch) | |
| tree | da5c9f5da1d93265727b85ee3cb328d4a8f5e78b /data/battle | |
| parent | efe6981a0db99aa2deeb7fbea5a51c9e40dd4138 (diff) | |
Move type data to data/types/
Diffstat (limited to 'data/battle')
| -rw-r--r-- | data/battle/type_boost_items.asm | 20 | ||||
| -rw-r--r-- | data/battle/type_matchups.asm | 119 |
2 files changed, 0 insertions, 139 deletions
diff --git a/data/battle/type_boost_items.asm b/data/battle/type_boost_items.asm deleted file mode 100644 index 3b7231a59..000000000 --- a/data/battle/type_boost_items.asm +++ /dev/null @@ -1,20 +0,0 @@ -TypeBoostItems: ; 35703 - db HELD_NORMAL_BOOST, NORMAL ; PINK_BOW/POLKADOT_BOW - db HELD_FIGHTING_BOOST, FIGHTING ; BLACKBELT - db HELD_FLYING_BOOST, FLYING ; SHARP_BEAK - db HELD_POISON_BOOST, POISON ; POISON BARB - db HELD_GROUND_BOOST, GROUND ; SOFT_SAND - db HELD_ROCK_BOOST, ROCK ; HARD_STONE - db HELD_BUG_BOOST, BUG ; SILVERPOWDER - db HELD_GHOST_BOOST, GHOST ; SPELL_TAG - db HELD_FIRE_BOOST, FIRE ; CHARCOAL - db HELD_WATER_BOOST, WATER ; MYSTIC WATER - db HELD_GRASS_BOOST, GRASS ; MIRACLE_SEED - db HELD_ELECTRIC_BOOST, ELECTRIC ; MAGNET - db HELD_PSYCHIC_BOOST, PSYCHIC ; TWISTEDSPOON - db HELD_ICE_BOOST, ICE ; NEVERMELTICE - db HELD_DRAGON_BOOST, DRAGON ; DRAGON_SCALE - db HELD_DARK_BOOST, DARK ; BLACKGLASSES - db HELD_STEEL_BOOST, STEEL ; METAL_COAT - db -1 -; 35726 diff --git a/data/battle/type_matchups.asm b/data/battle/type_matchups.asm deleted file mode 100644 index 90e38ae2c..000000000 --- a/data/battle/type_matchups.asm +++ /dev/null @@ -1,119 +0,0 @@ -TypeMatchups: ; 34bb1 - ; attacker, defender, *= - db NORMAL, ROCK, NOT_VERY_EFFECTIVE - db NORMAL, STEEL, NOT_VERY_EFFECTIVE - db FIRE, FIRE, NOT_VERY_EFFECTIVE - db FIRE, WATER, NOT_VERY_EFFECTIVE - db FIRE, GRASS, SUPER_EFFECTIVE - db FIRE, ICE, SUPER_EFFECTIVE - db FIRE, BUG, SUPER_EFFECTIVE - db FIRE, ROCK, NOT_VERY_EFFECTIVE - db FIRE, DRAGON, NOT_VERY_EFFECTIVE - db FIRE, STEEL, SUPER_EFFECTIVE - db WATER, FIRE, SUPER_EFFECTIVE - db WATER, WATER, NOT_VERY_EFFECTIVE - db WATER, GRASS, NOT_VERY_EFFECTIVE - db WATER, GROUND, SUPER_EFFECTIVE - db WATER, ROCK, SUPER_EFFECTIVE - db WATER, DRAGON, NOT_VERY_EFFECTIVE - db ELECTRIC, WATER, SUPER_EFFECTIVE - db ELECTRIC, ELECTRIC, NOT_VERY_EFFECTIVE - db ELECTRIC, GRASS, NOT_VERY_EFFECTIVE - db ELECTRIC, GROUND, NO_EFFECT - db ELECTRIC, FLYING, SUPER_EFFECTIVE - db ELECTRIC, DRAGON, NOT_VERY_EFFECTIVE - db GRASS, FIRE, NOT_VERY_EFFECTIVE - db GRASS, WATER, SUPER_EFFECTIVE - db GRASS, GRASS, NOT_VERY_EFFECTIVE - db GRASS, POISON, NOT_VERY_EFFECTIVE - db GRASS, GROUND, SUPER_EFFECTIVE - db GRASS, FLYING, NOT_VERY_EFFECTIVE - db GRASS, BUG, NOT_VERY_EFFECTIVE - db GRASS, ROCK, SUPER_EFFECTIVE - db GRASS, DRAGON, NOT_VERY_EFFECTIVE - db GRASS, STEEL, NOT_VERY_EFFECTIVE - db ICE, WATER, NOT_VERY_EFFECTIVE - db ICE, GRASS, SUPER_EFFECTIVE - db ICE, ICE, NOT_VERY_EFFECTIVE - db ICE, GROUND, SUPER_EFFECTIVE - db ICE, FLYING, SUPER_EFFECTIVE - db ICE, DRAGON, SUPER_EFFECTIVE - db ICE, STEEL, NOT_VERY_EFFECTIVE - db ICE, FIRE, NOT_VERY_EFFECTIVE - db FIGHTING, NORMAL, SUPER_EFFECTIVE - db FIGHTING, ICE, SUPER_EFFECTIVE - db FIGHTING, POISON, NOT_VERY_EFFECTIVE - db FIGHTING, FLYING, NOT_VERY_EFFECTIVE - db FIGHTING, PSYCHIC, NOT_VERY_EFFECTIVE - db FIGHTING, BUG, NOT_VERY_EFFECTIVE - db FIGHTING, ROCK, SUPER_EFFECTIVE - db FIGHTING, DARK, SUPER_EFFECTIVE - db FIGHTING, STEEL, SUPER_EFFECTIVE - db POISON, GRASS, SUPER_EFFECTIVE - db POISON, POISON, NOT_VERY_EFFECTIVE - db POISON, GROUND, NOT_VERY_EFFECTIVE - db POISON, ROCK, NOT_VERY_EFFECTIVE - db POISON, GHOST, NOT_VERY_EFFECTIVE - db POISON, STEEL, NO_EFFECT - db GROUND, FIRE, SUPER_EFFECTIVE - db GROUND, ELECTRIC, SUPER_EFFECTIVE - db GROUND, GRASS, NOT_VERY_EFFECTIVE - db GROUND, POISON, SUPER_EFFECTIVE - db GROUND, FLYING, NO_EFFECT - db GROUND, BUG, NOT_VERY_EFFECTIVE - db GROUND, ROCK, SUPER_EFFECTIVE - db GROUND, STEEL, SUPER_EFFECTIVE - db FLYING, ELECTRIC, NOT_VERY_EFFECTIVE - db FLYING, GRASS, SUPER_EFFECTIVE - db FLYING, FIGHTING, SUPER_EFFECTIVE - db FLYING, BUG, SUPER_EFFECTIVE - db FLYING, ROCK, NOT_VERY_EFFECTIVE - db FLYING, STEEL, NOT_VERY_EFFECTIVE - db PSYCHIC, FIGHTING, SUPER_EFFECTIVE - db PSYCHIC, POISON, SUPER_EFFECTIVE - db PSYCHIC, PSYCHIC, NOT_VERY_EFFECTIVE - db PSYCHIC, DARK, NO_EFFECT - db PSYCHIC, STEEL, NOT_VERY_EFFECTIVE - db BUG, FIRE, NOT_VERY_EFFECTIVE - db BUG, GRASS, SUPER_EFFECTIVE - db BUG, FIGHTING, NOT_VERY_EFFECTIVE - db BUG, POISON, NOT_VERY_EFFECTIVE - db BUG, FLYING, NOT_VERY_EFFECTIVE - db BUG, PSYCHIC, SUPER_EFFECTIVE - db BUG, GHOST, NOT_VERY_EFFECTIVE - db BUG, DARK, SUPER_EFFECTIVE - db BUG, STEEL, NOT_VERY_EFFECTIVE - db ROCK, FIRE, SUPER_EFFECTIVE - db ROCK, ICE, SUPER_EFFECTIVE - db ROCK, FIGHTING, NOT_VERY_EFFECTIVE - db ROCK, GROUND, NOT_VERY_EFFECTIVE - db ROCK, FLYING, SUPER_EFFECTIVE - db ROCK, BUG, SUPER_EFFECTIVE - db ROCK, STEEL, NOT_VERY_EFFECTIVE - db GHOST, NORMAL, NO_EFFECT - db GHOST, PSYCHIC, SUPER_EFFECTIVE - db GHOST, DARK, NOT_VERY_EFFECTIVE - db GHOST, STEEL, NOT_VERY_EFFECTIVE - db GHOST, GHOST, SUPER_EFFECTIVE - db DRAGON, DRAGON, SUPER_EFFECTIVE - db DRAGON, STEEL, NOT_VERY_EFFECTIVE - db DARK, FIGHTING, NOT_VERY_EFFECTIVE - db DARK, PSYCHIC, SUPER_EFFECTIVE - db DARK, GHOST, SUPER_EFFECTIVE - db DARK, DARK, NOT_VERY_EFFECTIVE - db DARK, STEEL, NOT_VERY_EFFECTIVE - db STEEL, FIRE, NOT_VERY_EFFECTIVE - db STEEL, WATER, NOT_VERY_EFFECTIVE - db STEEL, ELECTRIC, NOT_VERY_EFFECTIVE - db STEEL, ICE, SUPER_EFFECTIVE - db STEEL, ROCK, SUPER_EFFECTIVE - db STEEL, STEEL, NOT_VERY_EFFECTIVE - - db -2 ; end - -; Foresight removes Ghost's immunities. - db NORMAL, GHOST, NO_EFFECT - db FIGHTING, GHOST, NO_EFFECT - - db -1 ; end (with Foresight) -; 34cfd |
