Merge pull request #420 from DizzyEggg/bored

Get rid of static functions in includ and add req macro arguments

1 files changed, 85 insertions, 85 deletions

diff --git a/asm/macros/battle_ai_script.inc b/asm/macros/battle_ai_script.inc
index 28f60be46..4c7646d6f 100644
--- a/asm/macros/battle_ai_script.inc
+++ b/asm/macros/battle_ai_script.inc
@@ -1,206 +1,206 @@
-	.macro if_random_less_than param0, param1
+	.macro if_random_less_than param0:req, param1:req
 	.byte 0x0
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_random_greater_than param0, param1
+	.macro if_random_greater_than param0:req, param1:req
 	.byte 0x1
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_random_equal param0, param1
+	.macro if_random_equal param0:req, param1:req
 	.byte 0x2
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_random_not_equal param0, param1
+	.macro if_random_not_equal param0:req, param1:req
 	.byte 0x3
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro score param0
+	.macro score param0:req
 	.byte 0x4
 	.byte \param0
 	.endm
 
-	.macro if_hp_less_than battler, param1, param2
+	.macro if_hp_less_than battler:req, param1:req, param2:req
 	.byte 0x5
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_hp_more_than battler, param1, param2
+	.macro if_hp_more_than battler:req, param1:req, param2:req
 	.byte 0x6
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_hp_equal battler, param1, param2
+	.macro if_hp_equal battler:req, param1:req, param2:req
 	.byte 0x7
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_hp_not_equal battler, param1, param2
+	.macro if_hp_not_equal battler:req, param1:req, param2:req
 	.byte 0x8
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_status battler, status1, param2
+	.macro if_status battler:req, status1:req, param2:req
 	.byte 0x9
 	.byte \battler
 	.4byte \status1
 	.4byte \param2
 	.endm
 
-	.macro if_not_status battler, status1, param2
+	.macro if_not_status battler:req, status1:req, param2:req
 	.byte 0xa
 	.byte \battler
 	.4byte \status1
 	.4byte \param2
 	.endm
 
-	.macro if_status2 battler, status2, param2
+	.macro if_status2 battler:req, status2:req, param2:req
 	.byte 0xb
 	.byte \battler
 	.4byte \status2
 	.4byte \param2
 	.endm
 
-	.macro if_not_status2 battler, status2, param2
+	.macro if_not_status2 battler:req, status2:req, param2:req
 	.byte 0xc
 	.byte \battler
 	.4byte \status2
 	.4byte \param2
 	.endm
 
-	.macro if_status3 battler, status3, param2
+	.macro if_status3 battler:req, status3:req, param2:req
 	.byte 0xd
 	.byte \battler
 	.4byte \status3
 	.4byte \param2
 	.endm
 
-	.macro if_not_status3 battler, status3, param2
+	.macro if_not_status3 battler:req, status3:req, param2:req
 	.byte 0xe
 	.byte \battler
 	.4byte \status3
 	.4byte \param2
 	.endm
 
-	.macro if_side_affecting battler, sidestatus, param2
+	.macro if_side_affecting battler:req, sidestatus:req, param2:req
 	.byte 0xf
 	.byte \battler
 	.4byte \sidestatus
 	.4byte \param2
 	.endm
 
-	.macro if_not_side_affecting battler, sidestatus, param2
+	.macro if_not_side_affecting battler:req, sidestatus:req, param2:req
 	.byte 0x10
 	.byte \battler
 	.4byte \sidestatus
 	.4byte \param2
 	.endm
 
-	.macro if_less_than param0, param1
+	.macro if_less_than param0:req, param1:req
 	.byte 0x11
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_more_than param0, param1
+	.macro if_more_than param0:req, param1:req
 	.byte 0x12
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_equal param0, param1
+	.macro if_equal param0:req, param1:req
 	.byte 0x13
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_equal param0, param1
+	.macro if_not_equal param0:req, param1:req
 	.byte 0x14
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_less_than_ptr param0, param1
+	.macro if_less_than_ptr param0:req, param1:req
 	.byte 0x15
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_more_than_ptr param0, param1
+	.macro if_more_than_ptr param0:req, param1:req
 	.byte 0x16
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_equal_ptr param0, param1
+	.macro if_equal_ptr param0:req, param1:req
 	.byte 0x17
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_equal_ptr param0, param1
+	.macro if_not_equal_ptr param0:req, param1:req
 	.byte 0x18
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_move param0, param1
+	.macro if_move param0:req, param1:req
 	.byte 0x19
 	.2byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_move param0, param1
+	.macro if_not_move param0:req, param1:req
 	.byte 0x1a
 	.2byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_in_bytes param0, param1
+	.macro if_in_bytes param0:req, param1:req
 	.byte 0x1b
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_in_bytes param0, param1
+	.macro if_not_in_bytes param0:req, param1:req
 	.byte 0x1c
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_in_hwords param0, param1
+	.macro if_in_hwords param0:req, param1:req
 	.byte 0x1d
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_in_hwords param0, param1
+	.macro if_not_in_hwords param0:req, param1:req
 	.byte 0x1e
 	.4byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_user_has_attacking_move param0
+	.macro if_user_has_attacking_move param0:req
 	.byte 0x1f
 	.4byte \param0
 	.endm
 
-	.macro if_user_has_no_attacking_moves param0
+	.macro if_user_has_no_attacking_moves param0:req
 	.byte 0x20
 	.4byte \param0
 	.endm
@@ -209,7 +209,7 @@
 	.byte 0x21
 	.endm
 
-	.macro get_type param0
+	.macro get_type param0:req
 	.byte 0x22
 	.byte \param0
 	.endm
@@ -222,30 +222,30 @@
 	.byte 0x24
 	.endm
 
-	.macro get_last_used_bank_move battler
+	.macro get_last_used_bank_move battler:req
 	.byte 0x25
 	.byte \battler
 	.endm
 
-	.macro if_equal_ param0, param1
+	.macro if_equal_ param0:req, param1:req
 	.byte 0x26
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_equal_ param0, param1
+	.macro if_not_equal_ param0:req, param1:req
 	.byte 0x27
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_user_goes param0, param1
+	.macro if_user_goes param0:req, param1:req
 	.byte 0x28
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_user_doesnt_go param0, param1
+	.macro if_user_doesnt_go param0:req, param1:req
 	.byte 0x29
 	.byte \param0
 	.4byte \param1
@@ -259,7 +259,7 @@
 	.byte 0x2b
 	.endm
 
-	.macro count_usable_party_mons battler
+	.macro count_usable_party_mons battler:req
 	.byte 0x2c
 	.byte \battler
 	.endm
@@ -272,7 +272,7 @@
 	.byte 0x2e
 	.endm
 
-	.macro get_ability battler
+	.macro get_ability battler:req
 	.byte 0x2f
 	.byte \battler
 	.endm
@@ -281,7 +281,7 @@
 	.byte 0x30
 	.endm
 
-	.macro if_type_effectiveness param0, param1
+	.macro if_type_effectiveness param0:req, param1:req
 	.byte 0x31
 	.byte \param0
 	.4byte \param1
@@ -295,14 +295,14 @@
 	.byte 0x33
 	.endm
 
-	.macro if_status_in_party battler, status1, param2
+	.macro if_status_in_party battler:req, status1:req, param2:req
 	.byte 0x34
 	.byte \battler
 	.4byte \status1
 	.4byte \param2
 	.endm
 
-	.macro if_status_not_in_party battler, status1, param2
+	.macro if_status_not_in_party battler:req, status1:req, param2:req
 	.byte 0x35
 	.byte \battler
 	.4byte \status1
@@ -313,19 +313,19 @@
 	.byte 0x36
 	.endm
 
-	.macro if_effect param0, param1
+	.macro if_effect param0:req, param1:req
 	.byte 0x37
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_not_effect param0, param1
+	.macro if_not_effect param0:req, param1:req
 	.byte 0x38
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_stat_level_less_than battler, stat, param2, param3
+	.macro if_stat_level_less_than battler:req, stat:req, param2:req, param3:req
 	.byte 0x39
 	.byte \battler
 	.byte \stat
@@ -333,7 +333,7 @@
 	.4byte \param3
 	.endm
 
-	.macro if_stat_level_more_than battler, stat, param2, param3
+	.macro if_stat_level_more_than battler:req, stat:req, param2:req, param3:req
 	.byte 0x3a
 	.byte \battler
 	.byte \stat
@@ -341,7 +341,7 @@
 	.4byte \param3
 	.endm
 
-	.macro if_stat_level_equal battler, stat, param2, param3
+	.macro if_stat_level_equal battler:req, stat:req, param2:req, param3:req
 	.byte 0x3b
 	.byte \battler
 	.byte \stat
@@ -349,7 +349,7 @@
 	.4byte \param3
 	.endm
 
-	.macro if_stat_level_not_equal battler, stat, param2, param3
+	.macro if_stat_level_not_equal battler:req, stat:req, param2:req, param3:req
 	.byte 0x3c
 	.byte \battler
 	.byte \stat
@@ -357,52 +357,52 @@
 	.4byte \param3
 	.endm
 
-	.macro if_can_faint param0
+	.macro if_can_faint param0:req
 	.byte 0x3d
 	.4byte \param0
 	.endm
 
-	.macro if_cant_faint param0
+	.macro if_cant_faint param0:req
 	.byte 0x3e
 	.4byte \param0
 	.endm
 
-	.macro if_has_move battler, param1, param2
+	.macro if_has_move battler:req, param1:req, param2:req
 	.byte 0x3f
 	.byte \battler
 	.2byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_doesnt_have_move battler, param1, param2
+	.macro if_doesnt_have_move battler:req, param1:req, param2:req
 	.byte 0x40
 	.byte \battler
 	.2byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_has_move_with_effect battler, param1, param2
+	.macro if_has_move_with_effect battler:req, param1:req, param2:req
 	.byte 0x41
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_doesnt_have_move_with_effect battler, param1, param2
+	.macro if_doesnt_have_move_with_effect battler:req, param1:req, param2:req
 	.byte 0x42
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_any_move_disabled_or_encored battler, param1, param2
+	.macro if_any_move_disabled_or_encored battler:req, param1:req, param2:req
 	.byte 0x43
 	.byte \battler
 	.byte \param1
 	.4byte \param2
 	.endm
 
-	.macro if_curr_move_disabled_or_encored param0, param1
+	.macro if_curr_move_disabled_or_encored param0:req, param1:req
 	.byte 0x44
 	.byte \param0
 	.4byte \param1
@@ -412,7 +412,7 @@
 	.byte 0x45
 	.endm
 
-	.macro if_random_safari_flee param0
+	.macro if_random_safari_flee param0:req
 	.byte 0x46
 	.4byte \param0
 	.endm
@@ -421,22 +421,22 @@
 	.byte 0x47
 	.endm
 
-	.macro get_hold_effect battler
+	.macro get_hold_effect battler:req
 	.byte 0x48
 	.byte \battler
 	.endm
 
-	.macro get_gender battler
+	.macro get_gender battler:req
 	.byte 0x49
 	.byte \battler
 	.endm
 
-	.macro is_first_turn_for battler
+	.macro is_first_turn_for battler:req
 	.byte 0x4a
 	.byte \battler
 	.endm
 
-	.macro get_stockpile_count battler
+	.macro get_stockpile_count battler:req
 	.byte 0x4b
 	.byte \battler
 	.endm
@@ -445,7 +445,7 @@
 	.byte 0x4c
 	.endm
 
-	.macro get_used_held_item battler
+	.macro get_used_held_item battler:req
 	.byte 0x4d
 	.byte \battler
 	.endm
@@ -462,7 +462,7 @@
 	.byte 0x50
 	.endm
 
-	.macro get_protect_count battler
+	.macro get_protect_count battler:req
 	.byte 0x51
 	.byte \battler
 	.endm
@@ -491,12 +491,12 @@
 	.byte 0x57
 	.endm
 
-	.macro call param0
+	.macro call param0:req
 	.byte 0x58
 	.4byte \param0
 	.endm
 
-	.macro goto param0
+	.macro goto param0:req
 	.byte 0x59
 	.4byte \param0
 	.endm
@@ -505,46 +505,46 @@
 	.byte 0x5a
 	.endm
 
-	.macro if_level_cond param0, param1
+	.macro if_level_cond param0:req, param1:req
 	.byte 0x5b
 	.byte \param0
 	.4byte \param1
 	.endm
 
-	.macro if_target_taunted param0
+	.macro if_target_taunted param0:req
 	.byte 0x5c
 	.4byte \param0
 	.endm
 
-	.macro if_target_not_taunted param0
+	.macro if_target_not_taunted param0:req
 	.byte 0x5d
 	.4byte \param0
 	.endm
 
-	.macro if_target_is_ally param0
+	.macro if_target_is_ally param0:req
 	.byte 0x5e
 	.4byte \param0
 	.endm
 
-	.macro is_of_type battler, type
+	.macro is_of_type battler:req, type:req
 	.byte 0x5f
 	.byte \battler
 	.byte \type
 	.endm
 
-	.macro check_ability battler, ability
+	.macro check_ability battler:req, ability:req
 	.byte 0x60
 	.byte \battler
 	.byte \ability
 	.endm
 
-	.macro if_flash_fired battler, param1
+	.macro if_flash_fired battler:req, param1:req
 	.byte 0x61
 	.byte \battler
 	.4byte \param1
 	.endm
 
-	.macro if_holds_item battler, param1, param2
+	.macro if_holds_item battler:req, param1:req, param2:req
 	.byte 0x62
 	.byte \battler
 	.2byte \param1
@@ -572,48 +572,48 @@
 	get_type AI_TYPE2_TARGET
 	.endm
 	
-	.macro if_ability battler, ability, ptr
+	.macro if_ability battler:req, ability:req, ptr:req
 	check_ability \battler, \ability
 	if_equal 1, \ptr
 	.endm
 	
-	.macro if_no_ability battler, ability, ptr
+	.macro if_no_ability battler:req, ability:req, ptr:req
 	check_ability \battler, \ability
 	if_equal 0, \ptr
 	.endm
 	
-	.macro if_type battler, type, ptr
+	.macro if_type battler:req, type:req, ptr:req
 	is_of_type \battler, \type
 	if_equal 1, \ptr
 	.endm
 
-	.macro if_no_type battler, type, ptr
+	.macro if_no_type battler:req, type:req, ptr:req
 	is_of_type \battler, \type
 	if_equal 0, \ptr
 	.endm
 	
-	.macro if_target_faster ptr
+	.macro if_target_faster ptr:req
 	if_user_goes 1, \ptr
 	.endm
 	
-	.macro if_user_faster ptr
+	.macro if_user_faster ptr:req
 	if_user_goes 0, \ptr
 	.endm
 	
-	.macro if_double_battle ptr
+	.macro if_double_battle ptr:req
 	is_double_battle
 	if_equal 1, \ptr
 	.endm
 	
-	.macro if_not_double_battle ptr
+	.macro if_not_double_battle ptr:req
 	is_double_battle
 	if_equal 0, \ptr
 	.endm
 
-	.macro if_any_move_disabled battler, ptr
+	.macro if_any_move_disabled battler:req, ptr:req
 	if_any_move_disabled_or_encored \battler, 0, \ptr
 	.endm
 	
-	.macro if_any_move_encored battler, ptr
+	.macro if_any_move_encored battler:req, ptr:req
 	if_any_move_disabled_or_encored \battler, 1, \ptr
 	.endm