diff options
| author | yenatch <yenatch@gmail.com> | 2017-05-28 14:15:22 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-05-28 14:15:22 -0400 |
| commit | f748d34aa389b9e80fc6cab81e6efb1867327f7b (patch) | |
| tree | 92343b604a0df54d4ecf549ee85d4273a1784352 /text | |
| parent | fd7cf5987a6e4958d63645c76e994c96b51fcc4c (diff) | |
| parent | 288902139f00a9113ea9b360eb00d3109727dcfe (diff) | |
Merge remote-tracking branch 'origin/master' into c-tools
Diffstat (limited to 'text')
| -rwxr-xr-x | text/trainer_class_names.asm | 2 | ||||
| -rw-r--r-- | text/types.asm | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/text/trainer_class_names.asm b/text/trainer_class_names.asm index daa7e08a9..555e6c652 100755 --- a/text/trainer_class_names.asm +++ b/text/trainer_class_names.asm @@ -64,4 +64,4 @@ db "LEADER@" db "OFFICER@" db "ROCKET@" - db "MYSTICALMAN@"
\ No newline at end of file + db "MYSTICALMAN@" diff --git a/text/types.asm b/text/types.asm index 7084b58eb..adc1b17ef 100644 --- a/text/types.asm +++ b/text/types.asm @@ -85,9 +85,8 @@ GetTypeName: ; 50964 ld hl, TypeNames ld e, a ld d, 0 -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld h, [hl] ld l, a |