summaryrefslogtreecommitdiff
path: root/macros.asm
diff options
context:
space:
mode:
Diffstat (limited to 'macros.asm')
-rw-r--r--macros.asm60
1 files changed, 30 insertions, 30 deletions
diff --git a/macros.asm b/macros.asm
index 661fde0c..43ffa0ad 100644
--- a/macros.asm
+++ b/macros.asm
@@ -1,16 +1,4 @@
-text EQUS "db $00," ; Start writing text.
-next EQUS "db $4e," ; Move a line down.
-line EQUS "db $4f," ; Start writing at the bottom line.
-para EQUS "db $51," ; Start a new paragraph.
-cont EQUS "db $55," ; Scroll to the next line.
-done EQUS "db $57" ; End a text box.
-prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event).
-
-page EQUS "db $49," ; Start a new Pokedex page.
-dex EQUS "db $5f, $50" ; End a Pokedex entry.
-
-
percent EQUS "* $ff / 100"
lb: MACRO ; r, hi, lo
@@ -231,7 +219,17 @@ RGB: MACRO
ENDM
; text macros
-; text engine command $1
+text EQUS "db $00," ; Start writing text.
+next EQUS "db $4e," ; Move a line down.
+line EQUS "db $4f," ; Start writing at the bottom line.
+para EQUS "db $51," ; Start a new paragraph.
+cont EQUS "db $55," ; Scroll to the next line.
+done EQUS "db $57" ; End a text box.
+prompt EQUS "db $58" ; Prompt the player to end a text box (initiating some other event).
+
+page EQUS "db $49," ; Start a new Pokedex page.
+dex EQUS "db $5f, $50" ; End a Pokedex entry.
+
TX_RAM: MACRO
; prints text to screen
; \1: RAM address to read from
@@ -247,17 +245,10 @@ TX_BCD: MACRO
db \2
ENDM
-TX_CURSOR: MACRO
-; Move cursor to (\1, \2)
-; \1: X coord (0 - 19)
-; \2: Y coord (0 - 17)
- db $3
- dwCoord \1, \2
- ENDM
-
-TX_LINE EQUS "db $05"
-TX_BUTTON_SOUND EQUS "db $06"
-TX_ASM EQUS "db $08"
+TX_LINE EQUS "db $05"
+TX_BLINK EQUS "db $06"
+;TX_SCROLL EQUS "db $07"
+TX_ASM EQUS "db $08"
TX_NUM: MACRO
; print a big-endian decimal number.
@@ -269,15 +260,24 @@ TX_NUM: MACRO
db \2 << 4 | \3
ENDM
-TX_SFX_ITEM EQUS "db $0b"
-TX_WAIT_BUTTON EQUS "db $0d"
-TX_SFX_CONGRATS EQUS "db $10"
-TX_SFX_KEY_ITEM EQUS "db $11"
+TX_DELAY EQUS "db $0a"
+TX_SFX_ITEM_1 EQUS "db $0b"
+TX_SFX_LEVEL_UP EQUS "db $0b"
+;TX_ELLIPSES EQUS "db $0c"
+TX_WAIT EQUS "db $0d"
+;TX_SFX_DEX_RATING EQUS "db $0e"
+TX_SFX_ITEM_2 EQUS "db $10"
+TX_SFX_KEY_ITEM EQUS "db $11"
+TX_SFX_CAUGHT_MON EQUS "db $12"
+TX_SFX_DEX_PAGE_ADDED EQUS "db $13"
+TX_CRY_NIDORINA EQUS "db $14"
+TX_CRY_PIDGEOT EQUS "db $15"
+;TX_CRY_DEWGONG EQUS "db $16"
TX_FAR: MACRO
-; 17AAAABB (call text at BB:AAAA)
db $17
- dab \1
+ dw \1
+ db BANK(\1)
ENDM
TX_VENDING_MACHINE EQUS "db $f5"