summaryrefslogtreecommitdiff
path: root/macros/text.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-22 15:57:02 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-22 15:57:02 -0400
commitc8960dd2c8043d9a10e961379996fa18fef34033 (patch)
tree7103b7349bc60badb883fb9385c213bcdfcad71b /macros/text.asm
parentd5ddd9e54ec2422d6f1cd7c561c1750512d0a81d (diff)
Various annotations
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts. Renamed several functions in home. Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
Diffstat (limited to 'macros/text.asm')
-rw-r--r--macros/text.asm17
1 files changed, 8 insertions, 9 deletions
diff --git a/macros/text.asm b/macros/text.asm
index 8174c5200..3a3efe48e 100644
--- a/macros/text.asm
+++ b/macros/text.asm
@@ -12,19 +12,19 @@ page EQUS "db $50," ; Start a new Pokedex page.
dex EQUS "db $e8, $50" ; End a Pokedex entry.
-TX_RAM: MACRO
- db 1
- dw \1
- ENDM
+TX_RAM EQU 1
+TX_FAR EQU $16
-TX_FAR: MACRO
- db $16
+text_jump: MACRO
+ db TX_FAR
dw \1
db BANK(\1)
ENDM
-
-text_from_ram EQUS "TX_RAM"
+text_from_ram: MACRO
+ db TX_RAM
+ dw \1
+ ENDM
text_dunno1: macro
db 5
@@ -81,4 +81,3 @@ current_day: macro
db $15
endm
-text_jump EQUS "TX_FAR"