Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

asm/macros/field_effect_script.inc

@@ -1,19 +1,21 @@
-	.macro field_eff_loadtiles address
+@ The first .byte argument of each macro below is an index into gFieldEffectScriptFuncs
+
+	.macro field_eff_loadtiles address:req
 	.byte 0
 	.4byte \address
 	.endm
 
-	.macro field_eff_loadfadedpal address
+	.macro field_eff_loadfadedpal address:req
 	.byte 1
 	.4byte \address
 	.endm
 
-	.macro field_eff_loadpal address
+	.macro field_eff_loadpal address:req
 	.byte 2
 	.4byte \address
 	.endm
 
-	.macro field_eff_callnative address
+	.macro field_eff_callnative address:req
 	.byte 3
 	.4byte \address
 	.endm
@@ -22,20 +24,20 @@
 	.byte 4
 	.endm
 
-	.macro field_eff_loadgfx_callnative tiles_address, palette_address, function_address
+	.macro field_eff_loadgfx_callnative tiles_address:req, palette_address:req, function_address:req
 	.byte 5
 	.4byte \tiles_address
 	.4byte \palette_address
 	.4byte \function_address
 	.endm
 
-	.macro field_eff_loadtiles_callnative tiles_address, function_address
+	.macro field_eff_loadtiles_callnative tiles_address:req, function_address:req
 	.byte 6
 	.4byte \tiles_address
 	.4byte \function_address
 	.endm
 
-	.macro field_eff_loadfadedpal_callnative palette_address, function_address
+	.macro field_eff_loadfadedpal_callnative palette_address:req, function_address:req
 	.byte 7
 	.4byte \palette_address
 	.4byte \function_address