From fac958b280056922a1828b71a04d84a36e1e807a Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 20 Sep 2020 13:58:03 -0400 Subject: - Remove trailing whitespace - Indent with single tabs, not spaces - Colons after labels - Capitalize BANK, HIGH, and LOW - dbw BANK(X), X -> dba X --- macros/maps.asm | 8 ++++---- macros/scripts.asm | 2 +- macros/text.asm | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'macros') diff --git a/macros/maps.asm b/macros/maps.asm index c340134..8ecc24f 100644 --- a/macros/maps.asm +++ b/macros/maps.asm @@ -77,10 +77,10 @@ map: MACRO ENDM warp_event: MACRO - db \2, \1 ; y, x - db \3 ; index - map_id \4 - dw \5 ; unused wOverworldMap offset + db \2, \1 ; y, x + db \3 ; index + map_id \4 + dw \5 ; unused wOverworldMap offset ENDM bg_event: MACRO diff --git a/macros/scripts.asm b/macros/scripts.asm index e392391..76aee5d 100755 --- a/macros/scripts.asm +++ b/macros/scripts.asm @@ -1,5 +1,5 @@ init_script_table: MACRO -script_id = 0 +script_id = 0 ENDM add_script: MACRO diff --git a/macros/text.asm b/macros/text.asm index 4c88458..4ce8d43 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -5,8 +5,7 @@ para EQUS "db \"\"," ; Start a new paragraph. cont EQUS "db \"\"," ; Scroll to the next line. done EQUS "db \"\"" ; End a text box. prompt EQUS "db \"\"" ; Prompt the player to end a text box (initiating some other event). -text_end EQUS "db $50" ; End control code for text processor - ; different from @ +text_end EQUS "db $50" ; End control code for text processor (different from "@") ; TODO: determine if these are in ; Pokedex text commands are only used with pokered. @@ -123,12 +122,12 @@ sound_slot_machine_start: macro cry_nidorina: macro db TX_CRY_14 endm - + enum TX_CRY_15 ; $15 cry_pigeot: macro db TX_CRY_15 endm - + enum TX_CRY_16 ; $16 cry_jugon: macro db TX_CRY_16 -- cgit v1.2.3