diff options
author | pikalaxalt <PikalaxALT@gmail.com> | 2016-04-10 14:42:14 -0400 |
---|---|---|
committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-04-10 14:42:14 -0400 |
commit | bf73772a560ddfdf0b404ba3f85eb26542031b7b (patch) | |
tree | ee3cbc2fb2be1b2353ebd4c9887de2d69a91d2f2 /macros | |
parent | 46ead9b8498fe7191735bd99f667dd1f9147f969 (diff) |
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
Diffstat (limited to 'macros')
-rw-r--r-- | macros/text.asm | 2 | ||||
-rwxr-xr-x | macros/trade_anim.asm | 2 | ||||
-rwxr-xr-x | macros/wram.asm | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/macros/text.asm b/macros/text.asm index 37ce72d98..cc7f609b6 100644 --- a/macros/text.asm +++ b/macros/text.asm @@ -19,7 +19,7 @@ text_from_ram: MACRO db TX_RAM dw \1 ENDM - + enum TX_BCD text_bcd: macro db TX_BCD diff --git a/macros/trade_anim.asm b/macros/trade_anim.asm index eeaf1589f..04d3b7d0e 100755 --- a/macros/trade_anim.asm +++ b/macros/trade_anim.asm @@ -167,7 +167,7 @@ endm ; Mobile enum_start 1 - + enum mobiletradeanim_showgivemon_command mobiletradeanim_showgivemon: macro db mobiletradeanim_showgivemon_command ; 01 diff --git a/macros/wram.asm b/macros/wram.asm index 175fc4dea..1b296bb04 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -202,11 +202,11 @@ endm hall_of_fame: MACRO \1:: \1WinCount:: ds 1 -\1Mon1:: hof_mon \1Mon1 -\1Mon2:: hof_mon \1Mon2 -\1Mon3:: hof_mon \1Mon3 -\1Mon4:: hof_mon \1Mon4 -\1Mon5:: hof_mon \1Mon5 +\1Mon1:: hof_mon \1Mon1 +\1Mon2:: hof_mon \1Mon2 +\1Mon3:: hof_mon \1Mon3 +\1Mon4:: hof_mon \1Mon4 +\1Mon5:: hof_mon \1Mon5 \1Mon6:: hof_mon \1Mon6 \1End:: ds 1 ENDM |