diff options
| author | yenatch <yenatch@gmail.com> | 2015-08-17 11:58:57 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-08-17 11:58:57 -0400 |
| commit | 3cd79c55a3e1b50c8a71ad76692342e52382c700 (patch) | |
| tree | 32a9feb55a0eadc24c4690cef4fd0d26b2032f00 /macros/text.asm | |
| parent | 9974a2c7014cbe7db3d0e516580fea48001ab3df (diff) | |
| parent | 4831b4429eab57f56cce4736b6930a54f07314f7 (diff) | |
Merge pull request #309 from PikalaxALT/master
Wild data, save functions, fix missing include
Diffstat (limited to 'macros/text.asm')
| -rw-r--r-- | macros/text.asm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/macros/text.asm b/macros/text.asm index 8174c5200..97f919c7c 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 $01 +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" |