diff options
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/event.asm | 14 | ||||
| -rw-r--r-- | macros/text.asm | 44 |
2 files changed, 28 insertions, 30 deletions
diff --git a/macros/event.asm b/macros/event.asm index 35a2bf80..a5f72b9d 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -496,6 +496,12 @@ loadbytec2cf: macro db \1 ; byte endm + enum farwritetext_command +farwritetext: macro + db farwritetext_command + dba \1 + endm + enum writetext_command writetext: macro db writetext_command @@ -531,14 +537,6 @@ jumptextfaceplayer: macro dw \1 ; text_pointer endm -; IF _CRYSTAL - enum farjumptext_command -farjumptext: macro - db farjumptext_command - dba \1 - endm -; ENDC - enum jumptext_command jumptext: macro db jumptext_command diff --git a/macros/text.asm b/macros/text.asm index cc7f609b..bce2fdd2 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -15,122 +15,122 @@ dex EQUS "db $e8, $50" ; End a Pokedex entry. ; TX_FAR EQU $16 enum_start 1 enum TX_RAM -text_from_ram: MACRO +text_from_ram: MACRO ; 01 db TX_RAM dw \1 ENDM enum TX_BCD -text_bcd: macro +text_bcd: macro ; 02 db TX_BCD dw \1 db \2 ENDM enum TX_MOVE -text_move: macro +text_move: macro ; 03 db TX_MOVE dw \1 ENDM enum TX_BOX -text_box: macro +text_box: macro ; 04 db TX_BOX dw \1 db \2, \3 ENDM enum TX_LOW -text_low: macro +text_low: macro ; 05 db TX_LOW endm enum WAIT_BUTTON -text_waitbutton: macro +text_waitbutton: macro ; 06 db WAIT_BUTTON endm enum TX_SCROLL -text_scroll: macro +text_scroll: macro ; 07 db TX_SCROLL endm enum START_ASM -start_asm: macro +start_asm: macro ; 08 db START_ASM endm enum TX_NUM -deciram: macro +deciram: macro ; 09 db TX_NUM dw \1 ; address dn \2, \3 ; bytes, digits endm enum TX_EXIT -interpret_data: macro +interpret_data: macro ; 0a db TX_EXIT endm enum TX_SOUND_0B -sound_dex_fanfare_50_79: macro +sound_dex_fanfare_50_79: macro ; 0b db TX_SOUND_0B endm enum TX_DOTS -limited_interpret_data: macro +limited_interpret_data: macro ; 0c db TX_DOTS db \1 endm enum TX_LINK_WAIT_BUTTON -link_wait_button: macro +link_wait_button: macro ; 0d db TX_LINK_WAIT_BUTTON endm enum TX_SOUND_0E -sound_dex_fanfare_20_49: macro +sound_dex_fanfare_20_49: macro ; 0e db TX_SOUND_0E endm enum TX_SOUND_0F -sound_item: macro +sound_item: macro ; 0f db TX_SOUND_0F endm enum TX_SOUND_10 -sound_caught_mon: macro +sound_caught_mon: macro ; 10 db TX_SOUND_10 endm enum TX_SOUND_11 -sound_dex_fanfare_80_109: macro +sound_dex_fanfare_80_109: macro ; 11 db TX_SOUND_11 endm enum TX_SOUND_12 -sound_fanfare: macro +sound_fanfare: macro ; 12 db TX_SOUND_12 endm enum TX_SOUND_13 -sound_slot_machine_start: macro +sound_slot_machine_start: macro ; 13 db TX_SOUND_13 endm enum TX_STRINGBUFFER -text_buffer: macro +text_buffer: macro ; 14 db TX_STRINGBUFFER db \1 endm enum TX_DAY -current_day: macro +current_day: macro ; 15 db TX_DAY endm enum TX_FAR -text_jump: MACRO +text_jump: MACRO ; 16 db TX_FAR dw \1 db BANK(\1) |