diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-22 22:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-22 22:56:21 -0500 |
| commit | 14a244ad3a2e66de9690c11e6e1b5c488408427a (patch) | |
| tree | 6c72c29f0cd93818d9564670e2f4d6f3948de224 | |
| parent | b423e3b90bb85ef7e5cf501d832db707c9b1fde3 (diff) | |
IsHM is not used within home/names.asm; group it with the other HM routines+data
| -rw-r--r-- | home/hm_moves.asm | 12 | ||||
| -rw-r--r-- | home/names.asm | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/home/hm_moves.asm b/home/hm_moves.asm index 082005186..c4233d094 100644 --- a/home/hm_moves.asm +++ b/home/hm_moves.asm @@ -1,4 +1,14 @@ -; HM moves can't be forgotten +; HM moves can't be forgotten + +IsHM:: ; 34df + cp HM01 + jr c, .NotHM + scf + ret +.NotHM: + and a + ret +; 34e7 IsHMMove:: ; 34e7 ld hl, .HMMoves diff --git a/home/names.asm b/home/names.asm index 7aa02f8ad..b8c82fb89 100644 --- a/home/names.asm +++ b/home/names.asm @@ -258,16 +258,6 @@ GetTMHMName:: ; 3487 db "@" ; 34df -IsHM:: ; 34df - cp HM01 - jr c, .NotHM - scf - ret -.NotHM: - and a - ret -; 34e7 - INCLUDE "home/hm_moves.asm" GetMoveName:: ; 34f8 |