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

Add Fairy-type and Fairy Feather

Browse source 
This adds the Fairy type and the Fairy Feather. Neither are obtainable yet, but will be with time.
This commit is contained in:
Llinos Evans 2023-10-20 19:02:50 +01:00
parent 82e264f425
commit 5c9b80e1a8
13 changed files with 47 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/types/names.asm
View file

@ -31,6 +31,7 @@ TypeNames:
dw Ice
dw Dragon
dw Dark
dw Fairy
assert_table_length TYPES_END
Normal: db "NORMAL@"
@ -52,3 +53,4 @@ Ghost: db "GHOST@"
Steel: db "STEEL@"
Dragon: db "DRAGON@"
Dark: db "DARK@"
Fairy: db "FAIRY@"

1
data/types/search_strings.asm
View file

@ -19,4 +19,5 @@ PokedexTypeSearchStrings:
db " DRAGON @"
db " DARK @"
db " STEEL @"
db " FAIRY @"
assert_table_length NUM_TYPES + 1

1
data/types/search_types.asm
View file

@ -18,4 +18,5 @@ PokedexTypeSearchConversionTable:
db DRAGON
db DARK
db STEEL
db FAIRY
assert_table_length NUM_TYPES

1
data/types/type_boost_items.asm
View file

@ -16,4 +16,5 @@ TypeBoostItems:
db HELD_DRAGON_BOOST, DRAGON ; DRAGON_SCALE
db HELD_DARK_BOOST, DARK ; BLACKGLASSES
db HELD_STEEL_BOOST, STEEL ; METAL_COAT
db HELD_FAIRY_BOOST, FAIRY ; FAIRY_FEATHER
db -1

12
data/types/type_matchups.asm
View file

@ -49,12 +49,14 @@ TypeMatchups:
db FIGHTING, ROCK, SUPER_EFFECTIVE
db FIGHTING, DARK, SUPER_EFFECTIVE
db FIGHTING, STEEL, SUPER_EFFECTIVE
db FIGHTING, FAIRY, NOT_VERY_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 POISON, FAIRY, SUPER_EFFECTIVE
db GROUND, FIRE, SUPER_EFFECTIVE
db GROUND, ELECTRIC, SUPER_EFFECTIVE
db GROUND, GRASS, NOT_VERY_EFFECTIVE
@ -83,6 +85,7 @@ TypeMatchups:
db BUG, GHOST, NOT_VERY_EFFECTIVE
db BUG, DARK, SUPER_EFFECTIVE
db BUG, STEEL, NOT_VERY_EFFECTIVE
db BUG, FAIRY, NOT_VERY_EFFECTIVE
db ROCK, FIRE, SUPER_EFFECTIVE
db ROCK, ICE, SUPER_EFFECTIVE
db ROCK, FIGHTING, NOT_VERY_EFFECTIVE
@ -97,17 +100,26 @@ TypeMatchups:
db GHOST, GHOST, SUPER_EFFECTIVE
db DRAGON, DRAGON, SUPER_EFFECTIVE
db DRAGON, STEEL, NOT_VERY_EFFECTIVE
db DRAGON, FAIRY, NO_EFFECT
db DARK, FIGHTING, NOT_VERY_EFFECTIVE
db DARK, PSYCHIC_TYPE, SUPER_EFFECTIVE
db DARK, GHOST, SUPER_EFFECTIVE
db DARK, DARK, NOT_VERY_EFFECTIVE
db DARK, STEEL, NOT_VERY_EFFECTIVE
db DARK, FAIRY, 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 STEEL, FAIRY, SUPER_EFFECTIVE
db FAIRY, FIRE, NOT_VERY_EFFECTIVE
db FAIRY, FIGHTING, SUPER_EFFECTIVE
db FAIRY, POISON, NOT_VERY_EFFECTIVE
db FAIRY, DRAGON, SUPER_EFFECTIVE
db FAIRY, DARK, SUPER_EFFECTIVE
db FAIRY, STEEL, NOT_VERY_EFFECTIVE
db -2 ; end (with Foresight)