summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-31 15:55:39 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-31 15:55:39 -0400
commit439efda1ba940b010786be1186007355adf23965 (patch)
tree0becd0b5980b180a0abd11377d1ed35ae3814bda /macros.asm
parent45cb263360f3242db5538367ebf8035632d97534 (diff)
Champion's room; resolve predefs
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/macros.asm b/macros.asm
index 54fba2d3..8f01702a 100644
--- a/macros.asm
+++ b/macros.asm
@@ -355,6 +355,10 @@ TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6"
TX_POKECENTER_NURSE EQUS "db $ff"
; Predef macro.
+predef_const: MACRO
+ const \1PredefID
+ ENDM
+
add_predef: MACRO
\1Predef::
db BANK(\1)
@@ -362,7 +366,7 @@ add_predef: MACRO
ENDM
predef_id: MACRO
- ld a, (\1Predef) ; - PredefPointers) / 3
+ ld a, (\1Predef - PredefPointers) / 3
ENDM
predef: MACRO
@@ -374,10 +378,6 @@ predef_jump: MACRO
predef_id \1
jp Predef
ENDM
-
-predef_const: MACRO
- const \1Predef
- ENDM
tx_pre_const: MACRO
const \1_id