Declare Pokédex type search data; add more comments

4 files changed, 102 insertions, 9 deletions

diff --git a/data/types/names.asm b/data/types/names.asm
new file mode 100644
index 0000000..07ebec7
--- /dev/null
+++ b/data/types/names.asm
@@ -0,0 +1,53 @@
+INCLUDE "constants.asm"
+
+SECTION "TypeNames", ROMX[$40DD], BANK[$14]
+
+TypeNames::
+	dw .Normal   ; NORMAL
+	dw .Fighting ; FIGHTING
+	dw .Flying   ; FLYING
+	dw .Poison   ; POISON
+	dw .Ground   ; GROUND
+	dw .Rock     ; ROCK
+	dw .Bird     ; BIRD
+	dw .Bug      ; BUG
+	dw .Ghost    ; GHOST
+	dw .Metal    ; METAL
+	dw .Normal   ; 0A
+	dw .Normal   ; 0B
+	dw .Normal   ; 0C
+	dw .Normal   ; 0D
+	dw .Normal   ; 0E
+	dw .Normal   ; 0F
+	dw .Normal   ; 10
+	dw .Normal   ; 11
+	dw .Normal   ; 12
+	dw .Unknown  ; UNKNOWN
+	dw .Fire     ; FIRE
+	dw .Water    ; WATER
+	dw .Grass    ; GRASS
+	dw .Electric ; ELECTRIC
+	dw .Psychic  ; PSYCHIC
+	dw .Ice      ; ICE
+	dw .Dragon   ; DRAGON
+	dw .Dark     ; DARK
+
+.Normal:   db "ノーマル@"
+.Fighting: db "かくとう@"
+.Flying:   db "ひこう@"
+.Poison:   db "どく　@"
+.Unknown:  db "？？？@"
+.Fire:     db "ほのお@"
+.Water:    db "みず　@"
+.Grass:    db "くさ　@"
+.Electric: db "でんき@"
+.Psychic:  db "エスパー@"
+.Ice:      db "こおり@"
+.Ground:   db "じめん@"
+.Rock:     db "いわ@"
+.Bird:     db "とり@"
+.Bug:      db "むし@"
+.Ghost:    db "ゴースト@"
+.Metal:    db "メタル@"
+.Dragon:   db "ドラゴン@"
+.Dark:     db "あく@"
diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm
new file mode 100644
index 0000000..c36a249
--- /dev/null
+++ b/data/types/search_strings.asm
@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "PokedexTypeSearchStrings", ROMX[$4ECC], BANK[$10]
+
+PokedexTypeSearchStrings::
+	db "ノーマル@" ; NORMAL
+	db "ほのお　@" ; FIRE
+	db "みず　　@" ; WATER
+	db "くさ　　@" ; GRASS
+	db "でんき　@" ; ELECTRIC
+	db "こおり　@" ; ICE
+	db "かくとう@" ; FIGHTING
+	db "どく　　@" ; POISON
+	db "じめん　@" ; GROUND
+	db "ひこう　@" ; FLYING
+	db "エスパー@" ; PSYCHIC
+	db "むし　　@" ; BUG
+	db "いわ　　@" ; ROCK
+	db "ゴースト@" ; GHOST
+	db "ドラゴン@" ; DRAGON
diff --git a/data/types/search_types.asm b/data/types/search_types.asm
new file mode 100644
index 0000000..fbaa70d
--- /dev/null
+++ b/data/types/search_types.asm
@@ -0,0 +1,20 @@
+INCLUDE "constants.asm"
+
+SECTION "PokedexTypeSearchConversionTable", ROMX[$5068], BANK[$10]
+
+PokedexTypeSearchConversionTable::
+	db TYPE_NORMAL
+	db TYPE_FIRE
+	db TYPE_WATER
+	db TYPE_GRASS
+	db TYPE_ELECTRIC
+	db TYPE_ICE
+	db TYPE_FIGHTING
+	db TYPE_POISON
+	db TYPE_GROUND
+	db TYPE_FLYING
+	db TYPE_PSYCHIC
+	db TYPE_BUG
+	db TYPE_ROCK
+	db TYPE_GHOST
+	db TYPE_DRAGON
diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm
index a965da0..2c1f22c 100644
--- a/data/types/type_matchups.asm
+++ b/data/types/type_matchups.asm
@@ -20,14 +20,14 @@ TypeMatchups: ; 3506d
 	db TYPE_WATER,    TYPE_GROUND,   SUPER_EFFECTIVE

 	db TYPE_WATER,    TYPE_ROCK,     SUPER_EFFECTIVE

 	db TYPE_WATER,    TYPE_DRAGON,   NOT_VERY_EFFECTIVE

-	db TYPE_WATER,    TYPE_STEEL,    SUPER_EFFECTIVE

+	db TYPE_WATER,    TYPE_METAL,    SUPER_EFFECTIVE

 	db TYPE_ELECTRIC, TYPE_WATER,    SUPER_EFFECTIVE

 	db TYPE_ELECTRIC, TYPE_ELECTRIC, NOT_VERY_EFFECTIVE

 	db TYPE_ELECTRIC, TYPE_GRASS,    NOT_VERY_EFFECTIVE

 	db TYPE_ELECTRIC, TYPE_GROUND,   NO_EFFECT

 	db TYPE_ELECTRIC, TYPE_FLYING,   SUPER_EFFECTIVE

 	db TYPE_ELECTRIC, TYPE_DRAGON,   NOT_VERY_EFFECTIVE

-	db TYPE_ELECTRIC, TYPE_STEEL,    SUPER_EFFECTIVE

+	db TYPE_ELECTRIC, TYPE_METAL,    SUPER_EFFECTIVE

 	db TYPE_GRASS,    TYPE_FIRE,     NOT_VERY_EFFECTIVE

 	db TYPE_GRASS,    TYPE_WATER,    SUPER_EFFECTIVE

 	db TYPE_GRASS,    TYPE_GRASS,    NOT_VERY_EFFECTIVE

@@ -52,14 +52,14 @@ TypeMatchups: ; 3506d
 	db TYPE_FIGHTING, TYPE_BUG,      NOT_VERY_EFFECTIVE

 	db TYPE_FIGHTING, TYPE_ROCK,     SUPER_EFFECTIVE

 	db TYPE_FIGHTING, TYPE_GHOST,    NO_EFFECT

-	db TYPE_FIGHTING, TYPE_STEEL,    NOT_VERY_EFFECTIVE

+	db TYPE_FIGHTING, TYPE_METAL,    NOT_VERY_EFFECTIVE

 	db TYPE_POISON,   TYPE_GRASS,    SUPER_EFFECTIVE

 	db TYPE_POISON,   TYPE_POISON,   NOT_VERY_EFFECTIVE

 	db TYPE_POISON,   TYPE_GROUND,   NOT_VERY_EFFECTIVE

 	db TYPE_POISON,   TYPE_BUG,      SUPER_EFFECTIVE

 	db TYPE_POISON,   TYPE_ROCK,     NOT_VERY_EFFECTIVE

 	db TYPE_POISON,   TYPE_GHOST,    NOT_VERY_EFFECTIVE

-	db TYPE_POISON,   TYPE_STEEL,    NOT_VERY_EFFECTIVE

+	db TYPE_POISON,   TYPE_METAL,    NOT_VERY_EFFECTIVE

 	db TYPE_GROUND,   TYPE_FIRE,     SUPER_EFFECTIVE

 	db TYPE_GROUND,   TYPE_ELECTRIC, SUPER_EFFECTIVE

 	db TYPE_GROUND,   TYPE_GRASS,    NOT_VERY_EFFECTIVE

@@ -90,7 +90,7 @@ TypeMatchups: ; 3506d
 	db TYPE_ROCK,     TYPE_GROUND,   NOT_VERY_EFFECTIVE

 	db TYPE_ROCK,     TYPE_FLYING,   SUPER_EFFECTIVE

 	db TYPE_ROCK,     TYPE_BUG,      SUPER_EFFECTIVE

-	db TYPE_ROCK,     TYPE_STEEL,    NOT_VERY_EFFECTIVE

+	db TYPE_ROCK,     TYPE_METAL,    NOT_VERY_EFFECTIVE

 	db TYPE_GHOST,    TYPE_NORMAL,   NO_EFFECT

 	db TYPE_GHOST,    TYPE_PSYCHIC,  SUPER_EFFECTIVE

 	db TYPE_GHOST,    TYPE_DARK,     NOT_VERY_EFFECTIVE

@@ -99,10 +99,10 @@ TypeMatchups: ; 3506d
 	db TYPE_DARK,     TYPE_PSYCHIC,  SUPER_EFFECTIVE

 	db TYPE_DARK,     TYPE_GHOST,    SUPER_EFFECTIVE

 	db TYPE_DARK,     TYPE_DARK,     SUPER_EFFECTIVE

-	db TYPE_STEEL,    TYPE_WATER,    NOT_VERY_EFFECTIVE

-	db TYPE_STEEL,    TYPE_ELECTRIC, NOT_VERY_EFFECTIVE

-	db TYPE_STEEL,    TYPE_ROCK,     SUPER_EFFECTIVE

-	db TYPE_STEEL,    TYPE_STEEL,    NO_EFFECT

+	db TYPE_METAL,    TYPE_WATER,    NOT_VERY_EFFECTIVE

+	db TYPE_METAL,    TYPE_ELECTRIC, NOT_VERY_EFFECTIVE

+	db TYPE_METAL,    TYPE_ROCK,     SUPER_EFFECTIVE

+	db TYPE_METAL,    TYPE_METAL,    NO_EFFECT

 

 	db -2 ; end (with Foresight)