summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2018-05-31 23:29:06 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2018-05-31 23:29:06 -0400
commit4bc7905c7656fa1cf526291efc12cd3caf631060 (patch)
treea1fe3a774484b2bc0295c02892852b9b62ca163c
parentef11ebd19c8795128b40f872049e87b9b21aadbc (diff)
Fix build (sorry); forgot to use leftover pokered constants
-rw-r--r--constants/item_constants.asm4
-rwxr-xr-xhome/items.asm6
2 files changed, 7 insertions, 3 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm
index 017a58e..30af41c 100644
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -262,3 +262,7 @@ NUM_TMS = const_value - ITEM_TM01 - 2 ; discount ITEM_C8 and ITEM_E1
NUM_HMS = const_value - ITEM_HM01
NUM_TMS_HMS = NUM_TMS + NUM_HMS
+
+; leftovers from pokered
+ITEM_HM01_RED EQU $c4
+ITEM_TM01_RED EQU $c9
diff --git a/home/items.asm b/home/items.asm
index 36abfb7..5d8420b 100755
--- a/home/items.asm
+++ b/home/items.asm
@@ -52,7 +52,7 @@ GetItemName:: ; 376F
push hl
push bc
ld a, [wce37]
- cp ITEM_HM01
+ cp ITEM_HM01_RED
jr nc, .Machine
ld [wcb5b], a
@@ -78,7 +78,7 @@ GetMachineName::
push bc
ld a, [wce37]
push af
- cp ITEM_TM01
+ cp ITEM_TM01_RED
jr nc, .WriteTM
; if HM, then write "HM" and add 5 to the item ID, so we can reuse the
; TM printing code
@@ -96,7 +96,7 @@ GetMachineName::
; now get the machine number and convert it to text
ld a, [wce37]
- sub ITEM_TM01 - 1
+ sub ITEM_TM01_RED - 1
ld b, "0"
.FirstDigit
sub 10