From 439efda1ba940b010786be1186007355adf23965 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Tue, 31 May 2016 15:55:39 -0400
Subject: Champion's room; resolve predefs

---
 macros.asm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'macros.asm')

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
-- 
cgit v1.3.1-sl0p