Merge branch 'master' into continue_union_room

asm/macros/battle_script.inc

@@ -403,6 +403,38 @@
 	.byte \param0
 	.byte \param1
 	.endm
+	
+	@ Help macros for 5 uses of moveend command
+	
+	@ All cases
+	.macro moveendall
+	setbyte sMOVEEND_STATE, 0
+	moveend 0, 0
+	.endm
+	
+	@ Chosen case
+	.macro moveendcase case:req
+	setbyte sMOVEEND_STATE, \case
+	moveend 1, 0
+	.endm
+	
+	@ All cases from (inclusive)
+	.macro moveendfrom from:req
+	setbyte sMOVEEND_STATE, \from
+	moveend 0, 0
+	.endm
+	
+	@ All cases from 0 to (not inclusive)
+	.macro moveendto to:req
+	setbyte sMOVEEND_STATE, 0
+	moveend 2, \to
+	.endm
+	
+	@ Cases from (inclusive) to (not inclusive)
+	.macro moveendfromto from:req, to:req
+	setbyte sMOVEEND_STATE, \from
+	moveend 2, \to
+	.endm
 
 	.macro typecalc2
 	.byte 0x4a

asm/union_room.s

@@ -5,8 +5,6 @@
 
 	.text
 
-    @ file boundary?
-
 	thumb_func_start sub_8018424
 sub_8018424: @ 8018424
 	push {lr}