Merge branch 'master' of https://github.com/pret/pokecrystal

# Conflicts:
#	macros/scripts/maps.asm

engine/pic_animation.asm

@@ -56,7 +56,7 @@ pokeanim: MACRO
 	rept _NARG
 ; Workaround for a bug where macro args can't come after the start of a symbol
 if !def(\1_POKEANIM)
-\1_POKEANIM equs "PokeAnim_\1_"
+\1_POKEANIM EQUS "PokeAnim_\1_"
 endc
 	db (\1_POKEANIM - PokeAnim_SetupCommands) / 2
 	shift
@@ -142,9 +142,9 @@ SetUpPokeAnim: ; d00b4
 ; d00da
 
 PokeAnim_SetupCommands: ; d00da
-setup_command: macro
+setup_command: MACRO
 \1_: dw \1
-endm
+ENDM
 	setup_command PokeAnim_Finish
 	setup_command PokeAnim_BasePic
 	setup_command PokeAnim_SetWait
@@ -586,7 +586,7 @@ x = x + 1
 endr
 y = y + 7
 endr
-endm
+ENDM
 
 PokeAnim_ConvertAndApplyBitmask: ; d036b
 	xor a
@@ -1120,7 +1120,7 @@ HOF_AnimateFrontpic: ; d066e Predef 49
 	ld l, e
 	push bc
 	push hl
-	ld de, VTiles2
+	ld de, vTiles2
 	predef GetAnimatedFrontpicPredef
 	pop hl
 	pop bc