diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /data/types/search_strings.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'data/types/search_strings.asm')
| -rw-r--r-- | data/types/search_strings.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm index 7e6eb71c2..d03d2786b 100644 --- a/data/types/search_strings.asm +++ b/data/types/search_strings.asm @@ -1,4 +1,4 @@ -PokedexTypeSearchStrings: ; 40fe4 +PokedexTypeSearchStrings: ; entries correspond with PokedexTypeSearchConversionTable (see data/types/search_types.asm) db " ---- @" db " NORMAL @" @@ -18,4 +18,3 @@ PokedexTypeSearchStrings: ; 40fe4 db " DRAGON @" db " DARK @" db " STEEL @" -; 41086 |