From 14a244ad3a2e66de9690c11e6e1b5c488408427a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 22 Dec 2017 22:56:21 -0500 Subject: [PATCH] IsHM is not used within home/names.asm; group it with the other HM routines+data --- home/hm_moves.asm | 12 +++++++++++- 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