diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/enum.asm | 4 | ||||
| -rw-r--r-- | macros/map.asm | 9 | ||||
| -rw-r--r-- | macros/text.asm | 101 |
3 files changed, 83 insertions, 31 deletions
diff --git a/macros/enum.asm b/macros/enum.asm index 50a136ba9..933f7b183 100644 --- a/macros/enum.asm +++ b/macros/enum.asm @@ -18,6 +18,10 @@ enum: macro __enum__ = __enum__ + __enumdir__ endm +enum_set: macro +__enum__ = \1 +endm + ; Enumerate constants diff --git a/macros/map.asm b/macros/map.asm index 6133f3075..113b05898 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -74,9 +74,7 @@ map_header_2: MACRO ; label, map, border block, connections \1_SecondMapHeader:: db \3 -\2\@HEIGHT EQUS "\2_HEIGHT" -\2\@WIDTH EQUS "\2_WIDTH" - db \2\@HEIGHT, \2\@WIDTH + db \2_HEIGHT, \2_WIDTH db BANK(\1_BlockData) dw \1_BlockData db BANK(\1_MapScriptHeader) @@ -162,11 +160,6 @@ GROUP_\1 EQU const_value \1_HEIGHT EQU \2 \1_WIDTH EQU \3 ENDM -; map id, height, width -; \1\@ EQUS "GROUP_\1" -; \1\@_2 EQUS "MAP_\1" -; \1\@ EQU const_value - ; enum \1\@_2 newgroup: MACRO const_value = const_value + 1 diff --git a/macros/text.asm b/macros/text.asm index 97f919c7c..d8b6fc717 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -12,72 +12,127 @@ page EQUS "db $50," ; Start a new Pokedex page. dex EQUS "db $e8, $50" ; End a Pokedex entry. -TX_RAM EQU $01 -TX_FAR EQU $16 +; TX_RAM EQU $01 +; TX_FAR EQU $16 + enum_start 1 + enum TX_RAM +text_from_ram: MACRO + db TX_RAM + dw \1 + ENDM + + enum TX_BCD +text_bcd: macro + db TX_BCD + dw \1 + db \2 + ENDM -text_jump: MACRO - db TX_FAR + enum TX_MOVE +text_move: macro + db TX_MOVE dw \1 - db BANK(\1) ENDM -text_from_ram: MACRO - db TX_RAM + enum TX_BOX +text_box: macro + db TX_BOX dw \1 + db \2, \3 ENDM -text_dunno1: macro - db 5 + enum TX_LOW +text_low: macro + db TX_LOW endm + enum WAIT_BUTTON text_waitbutton: macro - db 6 + db WAIT_BUTTON endm -text_dunno2: macro - db 7 + enum TX_SCROLL +text_scroll: macro + db TX_SCROLL endm + enum START_ASM start_asm: macro - db 8 + db START_ASM endm + enum TX_NUM deciram: macro - db 9 - dw \1 - db \2 + db TX_NUM + dw \1 ; address + dn \2, \3 ; bytes, digits endm + enum TX_EXIT interpret_data: macro - db 10 + db TX_EXIT endm + enum TX_SOUND_0B sound0: macro - db 11 + db TX_SOUND_0B endm + enum TX_DOTS limited_interpret_data: macro - db 12 + db TX_DOTS db \1 endm + enum TX_LINK_WAIT_BUTTON +link_wait_button: macro + db TX_LINK_WAIT_BUTTON + endm + + enum TX_SOUND_0E +sound1: macro + db TX_SOUND_0E + endm + + enum TX_SOUND_0F sound0x0F: macro - db $f + db TX_SOUND_0F endm + enum TX_SOUND_10 sound0x02: macro - db $10 + db TX_SOUND_10 endm + enum TX_SOUND_11 sound0x0A: macro - db $11 + db TX_SOUND_11 endm + enum TX_SOUND_12 +sound0x12: macro + db TX_SOUND_12 + endm + + enum TX_SOUND_13 sound0x2C: macro db $13 endm + enum TX_STRINGBUFFER +text_buffer: macro + db TX_STRINGBUFFER + db \1 + endm + + enum TX_DAY current_day: macro - db $15 + db TX_DAY endm + enum TX_FAR +text_jump: MACRO + db TX_FAR + dw \1 + db BANK(\1) + ENDM |