From c58a5b8b7a8dcdf47ea87b4f43c93e00f0de5106 Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 30 Apr 2014 23:37:50 -0400 Subject: Use constants for the skipped dummy TMs. --- main.asm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/main.asm b/main.asm index 81db117f1..dd5159547 100644 --- a/main.asm +++ b/main.asm @@ -11455,9 +11455,9 @@ GetTMHMNumber:: ; d407 ld a, c ; Skip any dummy items. - cp $c3 ; TM04-05 + cp ITEM_C3 ; TM04-05 jr c, .done - cp $dc ; TM28-29 + cp ITEM_DC ; TM28-29 jr c, .skip dec a @@ -11477,13 +11477,14 @@ GetNumberedTMHM: ; d417 ld a, c ; Skip any gaps. - cp 5 + cp ITEM_C3 - (TM_01 - 1) jr c, .done - cp 29 - jr c, .skip + cp ITEM_DC - (TM_01 - 1) - 1 + jr c, .skip_one +.skip_two inc a -.skip +.skip_one inc a .done add TM_01 -- cgit v1.2.3