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 /engine/pokemon/types.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/pokemon/types.asm')
| -rw-r--r-- | engine/pokemon/types.asm | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/engine/pokemon/types.asm b/engine/pokemon/types.asm index dc0df61ae..4e2ca3e45 100644 --- a/engine/pokemon/types.asm +++ b/engine/pokemon/types.asm @@ -1,4 +1,4 @@ -PrintMonTypes: ; 5090d +PrintMonTypes: ; Print one or both types of [wCurSpecies] ; on the stats screen at hl. @@ -37,10 +37,8 @@ PrintMonTypes: ; 5090d add hl, bc ld bc, NAME_LENGTH_JAPANESE - 1 jp ByteFill -; 5093a - -PrintMoveType: ; 5093a +PrintMoveType: ; Print the type of move b at hl. push hl @@ -57,8 +55,7 @@ PrintMoveType: ; 5093a ld b, a - -PrintType: ; 50953 +PrintType: ; Print type b at hl. ld a, b @@ -75,10 +72,8 @@ PrintType: ; 50953 pop hl jp PlaceString -; 50964 - -GetTypeName: ; 50964 +GetTypeName: ; Copy the name of type [wd265] to wStringBuffer1. ld a, [wd265] @@ -93,7 +88,5 @@ GetTypeName: ; 50964 ld de, wStringBuffer1 ld bc, MOVE_NAME_LENGTH jp CopyBytes -; 5097b - INCLUDE "data/types/names.asm" |