summaryrefslogtreecommitdiff
path: root/predef
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-04-10 14:42:14 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-04-10 14:42:14 -0400
commitbf73772a560ddfdf0b404ba3f85eb26542031b7b (patch)
treeee3cbc2fb2be1b2353ebd4c9887de2d69a91d2f2 /predef
parent46ead9b8498fe7191735bd99f667dd1f9147f969 (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 'predef')
-rw-r--r--predef/cgb.asm4
-rwxr-xr-xpredef/crystal.asm2
2 files changed, 3 insertions, 3 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm
index e945c4062..7870b9cc1 100644
--- a/predef/cgb.asm
+++ b/predef/cgb.asm
@@ -341,11 +341,11 @@ _CGB17: ; 8fca
call LoadHLPaletteIntoDE
jr .Resume
-.GetMonPalette
+.GetMonPalette:
ld bc, TempMonDVs
call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
-.Resume
+.Resume:
call WipeAttrMap
hlcoord 1, 4, AttrMap
lb bc, 7, 7
diff --git a/predef/crystal.asm b/predef/crystal.asm
index 083a5a522..83e0fb0b3 100755
--- a/predef/crystal.asm
+++ b/predef/crystal.asm
@@ -23,7 +23,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile)
; 49330 (12:5330)
.dw: ; 49330
-
+
dw MG_Mobile_Layout00
dw MG_Mobile_Layout01
dw MG_Mobile_Layout02