From 7beb497d3aba7cd1bb34f2b1394bde80c1cd9807 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 28 Dec 2017 13:23:44 +0100 Subject: Uppercase MACRO and EQU(S) according to the style guide --- macros/scripts/text.asm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'macros/scripts/text.asm') diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index 839f78eb7..d84b5fcbc 100644 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -17,111 +17,111 @@ text_from_ram: MACRO ENDM enum TX_BCD ; $02 -text_bcd: macro +text_bcd: MACRO db TX_BCD dw \1 db \2 ENDM enum TX_MOVE ; $03 -text_move: macro +text_move: MACRO db TX_MOVE dw \1 ENDM enum TX_BOX ; $04 -text_box: macro +text_box: MACRO db TX_BOX dw \1 db \2, \3 ENDM enum TX_LOW ; $05 -text_low: macro +text_low: MACRO db TX_LOW endm enum WAIT_BUTTON ; $06 -text_waitbutton: macro +text_waitbutton: MACRO db WAIT_BUTTON endm enum TX_SCROLL ; $07 -text_scroll: macro +text_scroll: MACRO db TX_SCROLL endm enum START_ASM ; $08 -start_asm: macro +start_asm: MACRO db START_ASM endm enum TX_NUM ; $09 -deciram: macro +deciram: MACRO db TX_NUM dw \1 ; address dn \2, \3 ; bytes, digits endm enum TX_EXIT ; $0a -interpret_data: macro +interpret_data: MACRO db TX_EXIT endm enum TX_SOUND_0B ; $0b -sound_dex_fanfare_50_79: macro +sound_dex_fanfare_50_79: MACRO db TX_SOUND_0B endm enum TX_DOTS ; $0c -limited_interpret_data: macro +limited_interpret_data: MACRO db TX_DOTS db \1 endm enum TX_LINK_WAIT_BUTTON ; $0d -link_wait_button: macro +link_wait_button: MACRO db TX_LINK_WAIT_BUTTON endm enum TX_SOUND_0E ; $0e -sound_dex_fanfare_20_49: macro +sound_dex_fanfare_20_49: MACRO db TX_SOUND_0E endm enum TX_SOUND_0F ; $0f -sound_item: macro +sound_item: MACRO db TX_SOUND_0F endm enum TX_SOUND_10 ; $10 -sound_caught_mon: macro +sound_caught_mon: MACRO db TX_SOUND_10 endm enum TX_SOUND_11 ; $11 -sound_dex_fanfare_80_109: macro +sound_dex_fanfare_80_109: MACRO db TX_SOUND_11 endm enum TX_SOUND_12 ; $12 -sound_fanfare: macro +sound_fanfare: MACRO db TX_SOUND_12 endm enum TX_SOUND_13 ; $13 -sound_slot_machine_start: macro +sound_slot_machine_start: MACRO db TX_SOUND_13 endm enum TX_STRINGBUFFER ; $14 -text_buffer: macro +text_buffer: MACRO db TX_STRINGBUFFER db \1 endm enum TX_DAY ; $15 -current_day: macro +current_day: MACRO db TX_DAY endm -- cgit v1.2.3 From 50fc9c3389ae8130d3670683f22f3e49555c57a3 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 28 Dec 2017 22:31:16 +0100 Subject: endm -> ENDM --- macros/scripts/text.asm | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'macros/scripts/text.asm') diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index d84b5fcbc..f22f83551 100644 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -14,120 +14,120 @@ prompt EQUS "db \"\"" ; Prompt the player to end a text box (initiating text_from_ram: MACRO db TX_RAM dw \1 - ENDM +ENDM enum TX_BCD ; $02 text_bcd: MACRO db TX_BCD dw \1 db \2 - ENDM +ENDM enum TX_MOVE ; $03 text_move: MACRO db TX_MOVE dw \1 - ENDM +ENDM enum TX_BOX ; $04 text_box: MACRO db TX_BOX dw \1 db \2, \3 - ENDM +ENDM enum TX_LOW ; $05 text_low: MACRO db TX_LOW - endm +ENDM enum WAIT_BUTTON ; $06 text_waitbutton: MACRO db WAIT_BUTTON - endm +ENDM enum TX_SCROLL ; $07 text_scroll: MACRO db TX_SCROLL - endm +ENDM enum START_ASM ; $08 start_asm: MACRO db START_ASM - endm +ENDM enum TX_NUM ; $09 deciram: MACRO db TX_NUM dw \1 ; address dn \2, \3 ; bytes, digits - endm +ENDM enum TX_EXIT ; $0a interpret_data: MACRO db TX_EXIT - endm +ENDM enum TX_SOUND_0B ; $0b sound_dex_fanfare_50_79: MACRO db TX_SOUND_0B - endm +ENDM enum TX_DOTS ; $0c limited_interpret_data: MACRO db TX_DOTS db \1 - endm +ENDM enum TX_LINK_WAIT_BUTTON ; $0d link_wait_button: MACRO db TX_LINK_WAIT_BUTTON - endm +ENDM enum TX_SOUND_0E ; $0e sound_dex_fanfare_20_49: MACRO db TX_SOUND_0E - endm +ENDM enum TX_SOUND_0F ; $0f sound_item: MACRO db TX_SOUND_0F - endm +ENDM enum TX_SOUND_10 ; $10 sound_caught_mon: MACRO db TX_SOUND_10 - endm +ENDM enum TX_SOUND_11 ; $11 sound_dex_fanfare_80_109: MACRO db TX_SOUND_11 - endm +ENDM enum TX_SOUND_12 ; $12 sound_fanfare: MACRO db TX_SOUND_12 - endm +ENDM enum TX_SOUND_13 ; $13 sound_slot_machine_start: MACRO db TX_SOUND_13 - endm +ENDM enum TX_STRINGBUFFER ; $14 text_buffer: MACRO db TX_STRINGBUFFER db \1 - endm +ENDM enum TX_DAY ; $15 current_day: MACRO db TX_DAY - endm +ENDM enum TX_FAR ; $16 text_jump: MACRO db TX_FAR dw \1 db BANK(\1) - ENDM +ENDM -- cgit v1.2.3