diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-15 08:36:58 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-09-15 08:36:58 -0400 |
| commit | aee8501a10f99a5db01870426fe9b06dc6d35acc (patch) | |
| tree | ddf8dc8186f8cca6f6736d002dab091098649eb9 /data/types | |
| parent | faffe1c1b8fbcb64a13d82530c91c995ffe4f501 (diff) | |
| parent | b78f2edbc3b3b2d01fc0590310a8d9e65648ee44 (diff) | |
Merge branch 'master' of https://github.com/pret/pokegold-spaceworld
Diffstat (limited to 'data/types')
| -rw-r--r-- | data/types/names.asm | 2 | ||||
| -rw-r--r-- | data/types/search_strings.asm | 2 | ||||
| -rw-r--r-- | data/types/search_types.asm | 2 | ||||
| -rw-r--r-- | data/types/type_matchups.asm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/data/types/names.asm b/data/types/names.asm index 7036847..601f2a0 100644 --- a/data/types/names.asm +++ b/data/types/names.asm @@ -50,4 +50,4 @@ TypeNames:: .Ghost: db "ゴースト@" .Metal: db "メタル@" .Dragon: db "ドラゴン@" -.Dark: db "あく@"
\ No newline at end of file +.Dark: db "あく@" diff --git a/data/types/search_strings.asm b/data/types/search_strings.asm index 905f478..5d33134 100644 --- a/data/types/search_strings.asm +++ b/data/types/search_strings.asm @@ -17,4 +17,4 @@ PokedexTypeSearchStrings:: db "むし @" ; BUG db "いわ @" ; ROCK db "ゴースト@" ; GHOST - db "ドラゴン@" ; DRAGON
\ No newline at end of file + db "ドラゴン@" ; DRAGON diff --git a/data/types/search_types.asm b/data/types/search_types.asm index ed41650..abcb0db 100644 --- a/data/types/search_types.asm +++ b/data/types/search_types.asm @@ -17,4 +17,4 @@ PokedexTypeSearchConversionTable:: db TYPE_BUG db TYPE_ROCK db TYPE_GHOST - db TYPE_DRAGON
\ No newline at end of file + db TYPE_DRAGON diff --git a/data/types/type_matchups.asm b/data/types/type_matchups.asm index e23227a..cebecfd 100644 --- a/data/types/type_matchups.asm +++ b/data/types/type_matchups.asm @@ -110,4 +110,4 @@ TypeMatchups: ; 3506d db TYPE_NORMAL, TYPE_GHOST, NO_EFFECT db -1 ; end -; 3519b
\ No newline at end of file +; 3519b |