aboutsummaryrefslogtreecommitdiffstats
path: root/macros.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-24 18:54:06 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-24 18:54:06 -0400
commit87b20762d539888b031aba92b574108f5f817815 (patch)
tree6a431083c23d83935f920ea0360574be365796b5 /macros.asm
parentUpdate hidden object functions and include them in main (diff)
downloadpokeyellow-87b20762d539888b031aba92b574108f5f817815.tar.gz
pokeyellow-87b20762d539888b031aba92b574108f5f817815.tar.xz
pokeyellow-87b20762d539888b031aba92b574108f5f817815.zip
Numerous changes (see below)
* Fix build errors from previous commit * Fix predef text pointers * Disassemble hidden object data and additional accessory functions
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/macros.asm b/macros.asm
index c4318278..f153e379 100644
--- a/macros.asm
+++ b/macros.asm
@@ -342,11 +342,11 @@ add_tx_pre: MACRO
ENDM
db_tx_pre: MACRO
- db \1_id
+ db (\1_id - TextPredefs) / 2 + 1
ENDM
tx_pre_id: MACRO
- ld a, \1_id ; - TextPredefs) / 2 + 1
+ ld a, (\1_id - TextPredefs) / 2 + 1
ENDM
tx_pre: MACRO