diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-05 22:52:27 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-05 22:52:27 -0400 |
| commit | 405889193ed592174407599df0bfd08a2d707a1b (patch) | |
| tree | 31da6c7932b28f91990add89e99388941e4400f9 /home | |
| parent | Port pokecrystal's base data and tmhm structure (diff) | |
| download | pokeyellow-405889193ed592174407599df0bfd08a2d707a1b.tar.gz pokeyellow-405889193ed592174407599df0bfd08a2d707a1b.tar.xz pokeyellow-405889193ed592174407599df0bfd08a2d707a1b.zip | |
TM/HM constants named after moves
Diffstat (limited to 'home')
| -rw-r--r-- | home/names.asm | 14 | ||||
| -rw-r--r-- | home/names2.asm | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/home/names.asm b/home/names.asm index cbc8910b..489bd040 100644 --- a/home/names.asm +++ b/home/names.asm @@ -30,7 +30,7 @@ GetItemName:: push hl push bc ld a, [wd11e] - cp HM_01 ; is this a TM/HM? + cp HM01 ; is this a TM/HM? jr nc, .Machine ld [wd0b5], a @@ -56,11 +56,11 @@ GetMachineName:: push bc ld a, [wd11e] push af - cp TM_01 ; is this a TM? [not HM] + cp TM01 ; is this a TM? [not HM] jr nc, .WriteTM -; if HM, then write "HM" and add 5 to the item ID, so we can reuse the +; if HM, then write "HM" and add NUM_HMS to the item ID, so we can reuse the ; TM printing code - add 5 + add NUM_HMS ld [wd11e], a ld hl, HiddenPrefix ; points to "HM" ld bc, 2 @@ -74,7 +74,7 @@ GetMachineName:: ; now get the machine number and convert it to text ld a, [wd11e] - sub TM_01 - 1 + sub TM01 - 1 ld b, "0" .FirstDigit sub 10 @@ -109,9 +109,9 @@ HiddenPrefix:: ; sets carry if item is HM, clears carry if item is not HM ; Input: a = item ID IsItemHM:: - cp HM_01 + cp HM01 jr c, .notHM - cp TM_01 + cp TM01 ret .notHM and a diff --git a/home/names2.asm b/home/names2.asm index 319febd3..ecf6ae63 100644 --- a/home/names2.asm +++ b/home/names2.asm @@ -19,7 +19,7 @@ GetName:: ; TM names are separate from item names. ; BUG: This applies to all names instead of just items. - cp HM_01 + cp HM01 jp nc, GetMachineName ld a, [hLoadedROMBank] |