diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /engine/types.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'engine/types.asm')
| -rw-r--r-- | engine/types.asm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engine/types.asm b/engine/types.asm index 375bfe434..931e98b92 100644 --- a/engine/types.asm +++ b/engine/types.asm @@ -35,7 +35,7 @@ PrintMonTypes: ; 5090d ld [hl], a inc bc add hl, bc - ld bc, 5 + ld bc, NAME_LENGTH_JAPANESE - 1 jp ByteFill ; 5093a @@ -91,11 +91,9 @@ GetTypeName: ; 50964 ld h, [hl] ld l, a ld de, StringBuffer1 - ld bc, 13 + ld bc, MOVE_NAME_LENGTH jp CopyBytes ; 5097b -INCLUDE "data/type_names.asm" - -; 50a28 +INCLUDE "data/types/names.asm" |