more labels

2 files changed, 93 insertions, 86 deletions

diff --git a/asm/macros/contest_ai_script.s b/asm/macros/contest_ai_script.s
index efbf78e19..f32d7f500 100755
--- a/asm/macros/contest_ai_script.s
+++ b/asm/macros/contest_ai_script.s
@@ -44,22 +44,29 @@
 	.4byte \addr
 	.endm
 
-@ 0B
-@ 0C
+	.macro get_user_order
+	.byte 0x0B
+	.endm
+
+	.macro if_user_order_less_than param addr
+	.byte 0x0C
+	.byte \param
+	.4byte \addr
+	.endm
 
-	.macro contest_0D param addr
+	.macro if_user_order_more_than param addr
 	.byte 0x0D
 	.byte \param
 	.4byte \addr
 	.endm
 	
-	.macro contest_0E param addr
+	.macro if_user_order_eq param addr
 	.byte 0x0E
 	.byte \param
 	.4byte \addr
 	.endm
 
-	.macro contest_0F param addr
+	.macro if_user_order_not_eq param addr
 	.byte 0x0F
 	.byte \param
 	.4byte \addr
diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s
index aa88bb787..55bef540d 100644
--- a/data/contest_ai_scripts.s
+++ b/data/contest_ai_scripts.s
@@ -47,7 +47,7 @@ ContestUnreferenced_80:
 	contest_80 ContestUnreferenced_0D
 	end
 ContestUnreferenced_0D:
-	contest_0D 0x01 ContestUnreferenced_end
+	if_user_order_more_than 0x01 ContestUnreferenced_end
 	contest_2C 0x02 ContestUnreferenced_end
 	contest_2C 0x03 ContestUnreferenced_end
 	score 0x0A 
@@ -60,10 +60,10 @@ ContestUnreferenced_end:
 	contest_04 0x04 ContestUnreferenced_0F_5
 	end
 ContestUnreferenced_0F_1:
-	contest_0F 0x00 ContestUnreferenced_2B_1
-	contest_0F 0x01 ContestUnreferenced_2B_2
-	contest_0F 0x02 ContestUnreferenced_2B_1
-	contest_0F 0x03 ContestUnreferenced_2B_1 
+	if_user_order_not_eq 0x00 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x01 ContestUnreferenced_2B_2
+	if_user_order_not_eq 0x02 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x03 ContestUnreferenced_2B_1 
 	end
 ContestUnreferenced_2B_1:
 	contest_2B 0x01 ContestUnreferenced_score
@@ -74,28 +74,28 @@ ContestUnreferenced_2B_2:
 	contest_2B 0x01 ContestUnreferenced_score
 	end
 ContestUnreferenced_0F_2:
-	contest_0F 0x00 ContestUnreferenced_2B_1
-	contest_0F 0x01 ContestUnreferenced_2B_1
-	contest_0F 0x02 ContestUnreferenced_2B_1
-	contest_0F 0x03 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x00 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x01 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x02 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x03 ContestUnreferenced_2B_1
 	end
 ContestUnreferenced_0F_3:
-	contest_0F 0x00 ContestUnreferenced_2B_1
-	contest_0F 0x01 ContestUnreferenced_2B_1
-	contest_0F 0x02 ContestUnreferenced_2B_1
-	contest_0F 0x03 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x00 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x01 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x02 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x03 ContestUnreferenced_2B_1
 	end
 ContestUnreferenced_0F_4:
-	contest_0F 0x00 ContestUnreferenced_2B_1
-	contest_0F 0x01 ContestUnreferenced_2B_1
-	contest_0F 0x02 ContestUnreferenced_2B_1
-	contest_0F 0x03 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x00 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x01 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x02 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x03 ContestUnreferenced_2B_1
 	end
 ContestUnreferenced_0F_5:
-	contest_0F 0x00 ContestUnreferenced_2B_1
-	contest_0F 0x01 ContestUnreferenced_2B_1
-	contest_0F 0x02 ContestUnreferenced_2B_1
-	contest_0F 0x03 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x00 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x01 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x02 ContestUnreferenced_2B_1
+	if_user_order_not_eq 0x03 ContestUnreferenced_2B_1
 	end
 ContestUnreferenced_score:
 	score 0x0A 
@@ -141,7 +141,7 @@ AI_contest09_081DC2AB:
 	score 0x0F 
 	end
 AI_contest0F_1_081DC2AB:
-	contest_0F 0x00 AI_contest7D_1_081DC2AB
+	if_user_order_not_eq 0x00 AI_contest7D_1_081DC2AB
 	if_random 0x33 AI_end_081DC2AB
 	score 0x14 
 	end
@@ -150,7 +150,7 @@ AI_contest7D_1_081DC2AB:
 	score 0xF6 
 	end
 AI_contest0F_2_081DC2AB:
-	contest_0F 0x00 AI_contest7D_3_081DC2AB
+	if_user_order_not_eq 0x00 AI_contest7D_3_081DC2AB
 	contest_04 0x04 AI_score_081DC2AB
 AI_contest7D_2_081DC2AB:
 	if_random 0x33 AI_end_081DC2AB
@@ -169,7 +169,7 @@ AI_contest7D_4_081DC2AB:
 	end
 AI_contest3D_081DC2AB:
 	contest_3D 0x00 AI_contest29_081DC2AB
-	contest_0F 0x00 AI_contest7D_5_081DC2AB
+	if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB
 	contest_0A 0x04 AI_contest7D_5_081DC2AB
 	score 0x1E 
 	end
@@ -179,7 +179,7 @@ AI_contest7D_5_081DC2AB:
 	end
 AI_contest29_081DC2AB:
 	contest_29 0x03 AI_end_081DC2AB
-	contest_0F 0x00 AI_contest7D_5_081DC2AB
+	if_user_order_not_eq 0x00 AI_contest7D_5_081DC2AB
 	contest_0A 0x04 AI_contest7D_5_081DC2AB
 	score 0x1E 
 	end
@@ -194,10 +194,10 @@ Unknown_081DC348:
 AI_contest3F_081DC348:
 	contest_3F 0x00 AI_end_081DC348
 	contest_42 AI_end_081DC348
-	contest_0E 0x00 AI_contest04_1_081DC348
-	contest_0E 0x01 AI_contest04_2_081DC348
-	contest_0E 0x02 AI_contest04_3_081DC348
-	contest_0E 0x03 AI_contest04_4_081DC348
+	if_user_order_eq 0x00 AI_contest04_1_081DC348
+	if_user_order_eq 0x01 AI_contest04_2_081DC348
+	if_user_order_eq 0x02 AI_contest04_3_081DC348
+	if_user_order_eq 0x03 AI_contest04_4_081DC348
 	end
 AI_contest45_081DC348:
 	contest_45 AI_end_081DC348
@@ -283,7 +283,7 @@ ContestEffect41:
 	end
 
 ContestEffect3:
-	contest_0F 0x03 ContestEffectEnd
+	if_user_order_not_eq 0x03 ContestEffectEnd
 	if_random 0x32 ContestEffectEnd
 	score 0x0F
 	end
@@ -325,8 +325,8 @@ ContestEffect38_score2:
 
 ContestEffect47:
 	if_move_used_count_eq 1 ContestEffectEnd
-	contest_0E 0x00 ContestEffect47_random
-	contest_0E 0x01 ContestEffect47_random
+	if_user_order_eq 0x00 ContestEffect47_random
+	if_user_order_eq 0x01 ContestEffect47_random
 	contest_05 0x04 ContestEffectEnd
 	if_user_has_exciting_move ContestEffectEnd
 	contest_07 0x01 ContestEffectEnd
@@ -338,9 +338,9 @@ ContestEffect47_random:
 	end
 
 ContestEffect31:
-	contest_0E 0x01 ContestEffect31_score1
-	contest_0E 0x02 ContestEffect31_score2
-	contest_0E 0x03 ContestEffect31_score3
+	if_user_order_eq 0x01 ContestEffect31_score1
+	if_user_order_eq 0x02 ContestEffect31_score2
+	if_user_order_eq 0x03 ContestEffect31_score3
 	end
 ContestEffect31_score1:
 	score 0x05
@@ -353,10 +353,10 @@ ContestEffect31_score3:
 	end
 
 ContestEffect32:
-	contest_0E 0x00 ContestEffect32_score1
-	contest_0E 0x01 ContestEffect32_score2
-	contest_0E 0x02 ContestEffect32_score3
-	contest_0E 0x03 ContestEffect32_score5
+	if_user_order_eq 0x00 ContestEffect32_score1
+	if_user_order_eq 0x01 ContestEffect32_score2
+	if_user_order_eq 0x02 ContestEffect32_score3
+	if_user_order_eq 0x03 ContestEffect32_score5
 	end
 ContestEffect32_score1:
 	score 0xF6
@@ -390,8 +390,8 @@ ContestEffect32_score7:
 	end
 
 ContestEffect46:
-	contest_0E 0x00 ContestEffect46_05
-	contest_0D 0x00 ContestEffect46_score4
+	if_user_order_eq 0x00 ContestEffect46_05
+	if_user_order_more_than 0x00 ContestEffect46_score4
 	end
 ContestEffect46_05:
 	contest_05 0x00 ContestEffect46_score1
@@ -416,7 +416,7 @@ ContestEffect46_score4:
 	end
 
 ContestEffect27:
-	contest_0E 0x00 ContestEffectEnd
+	if_user_order_eq 0x00 ContestEffectEnd
 	contest_7F ContestEffect27_55_1
 	end
 ContestEffect27_55_1:
@@ -429,20 +429,20 @@ ContestEffect27_55_1:
 ContestEffect27_score1:
 	if_random 0x7D ContestEffect27_55_2
 	score 0x05 
-	contest_0D 0x01 ContestEffect27_55_2
+	if_user_order_more_than 0x01 ContestEffect27_55_2
 	end
 ContestEffect27_score2:
 	if_random 0x7D ContestEffect27_55_2
 	score 0x0A 
-	contest_0D 0x01 ContestEffect27_55_2
+	if_user_order_more_than 0x01 ContestEffect27_55_2
 	end
 ContestEffect27_score3:
 	if_random 0x7D ContestEffect27_55_2
 	score 0x0F 
-	contest_0D 0x01 ContestEffect27_55_2
+	if_user_order_more_than 0x01 ContestEffect27_55_2
 	end
 ContestEffect27_noscore:
-	contest_0D 0x01 ContestEffect27_55_2
+	if_user_order_more_than 0x01 ContestEffect27_55_2
 	end
 ContestEffect27_55_2:
 	contest_55 0x01 ContestEffect27_noscore2
@@ -454,20 +454,20 @@ ContestEffect27_55_2:
 ContestEffect27_score4:
 	if_random 0x7D ContestEffect27_55_3
 	score 0x05 
-	contest_0D 0x02 ContestEffect27_55_3
+	if_user_order_more_than 0x02 ContestEffect27_55_3
 	end
 ContestEffect27_score5:
 	if_random 0x7D ContestEffect27_55_3
 	score 0x0A 
-	contest_0D 0x02 ContestEffect27_55_3
+	if_user_order_more_than 0x02 ContestEffect27_55_3
 	end
 ContestEffect27_score6:
 	if_random 0x7D ContestEffect27_55_3
 	score 0x0F 
-	contest_0D 0x02 ContestEffect27_55_3
+	if_user_order_more_than 0x02 ContestEffect27_55_3
 	end
 ContestEffect27_noscore2:
-	contest_0D 0x02 ContestEffect27_55_3
+	if_user_order_more_than 0x02 ContestEffect27_55_3
 	end
 ContestEffect27_55_3:
 	contest_55 0x02 ContestEffect27_end
@@ -492,7 +492,7 @@ ContestEffect27_end:
 	end
 
 ContestEffect16or17:
-	contest_0E 0x00 ContestEffectEnd
+	if_user_order_eq 0x00 ContestEffectEnd
 	contest_7F ContestEffect16or17_55
 	end
 ContestEffect16or17_55:
@@ -504,7 +504,7 @@ ContestEffect16or17_55:
 	score 0x08 
 	end
 ContestEffect16or17_0E_1:
-	contest_0E 0x01 ContestEffectEnd
+	if_user_order_eq 0x01 ContestEffectEnd
 	contest_55 0x01 ContestEffect16or17_0E_2
 	contest_51 0x01 0x01 ContestEffect16or17_0E_2
 	if_random 0x7D ContestEffect16or17_0E_2
@@ -513,7 +513,7 @@ ContestEffect16or17_0E_1:
 	score 0x08 
 	end
 ContestEffect16or17_0E_2:
-	contest_0E 0x02 ContestEffectEnd
+	if_user_order_eq 0x02 ContestEffectEnd
 	contest_55 0x02 ContestEffectEnd
 	contest_51 0x02 0x01 ContestEffectEnd
 	if_random 0x7D ContestEffectEnd
@@ -523,7 +523,7 @@ ContestEffect16or17_0E_2:
 	end
 
 ContestEffect26:
-	contest_0E 0x03 ContestEffectEnd
+	if_user_order_eq 0x03 ContestEffectEnd
 	contest_7F ContestEffect26_55
 	end
 ContestEffect26_55:
@@ -534,7 +534,7 @@ ContestEffect26_55:
 	score 0x05 
 	end
 ContestEffect26_0E_1:
-	contest_0E 0x02 ContestEffectEnd
+	if_user_order_eq 0x02 ContestEffectEnd
 	contest_55 0x02 ContestEffect26_0E_2
 	contest_51 0x02 0x00 ContestEffect26_0E_2
 	score 0x05 
@@ -542,7 +542,7 @@ ContestEffect26_0E_1:
 	score 0x05
 	end
 ContestEffect26_0E_2:
-	contest_0E 0x01 ContestEffectEnd
+	if_user_order_eq 0x01 ContestEffectEnd
 	contest_55 0x01 ContestEffectEnd
 	contest_51 0x01 0x00 ContestEffectEnd
 	score 0x05 
@@ -559,10 +559,10 @@ ContestEffect18_score1:
 	contest_7F ContestEffect18_0E
 	end
 ContestEffect18_0E:
-	contest_0E 0x00 ContestEffect18_score2
-	contest_0E 0x01 ContestEffect18_random1
-	contest_0E 0x02 ContestEffect18_random2
-	contest_0E 0x03 ContestEffect18_random3
+	if_user_order_eq 0x00 ContestEffect18_score2
+	if_user_order_eq 0x01 ContestEffect18_random1
+	if_user_order_eq 0x02 ContestEffect18_random2
+	if_user_order_eq 0x03 ContestEffect18_random3
 	end
 ContestEffect18_score2:
 	score 0xF1 
@@ -632,10 +632,10 @@ Unknown_081DC7FB:
 	end
 
 ContestEffect2_8:
-	contest_0E 0x00 ContestEffect2_8_score1
-	contest_0E 0x01 ContestEffect2_8_score2
-	contest_0E 0x02 ContestEffect2_8_score3
-	contest_0E 0x03 ContestEffect2_8_score4
+	if_user_order_eq 0x00 ContestEffect2_8_score1
+	if_user_order_eq 0x01 ContestEffect2_8_score2
+	if_user_order_eq 0x02 ContestEffect2_8_score3
+	if_user_order_eq 0x03 ContestEffect2_8_score4
 	end
 ContestEffect2_8_score1:
 	score 0xF6
@@ -654,10 +654,10 @@ ContestEffect2_8_score4:
 	end
 
 ContestEffect2_9:
-	contest_0E 0x00 ContestEffect2_9_score1
-	contest_0E 0x01 ContestEffect2_9_score2
-	contest_0E 0x02 ContestEffect2_9_score3
-	contest_0E 0x03 ContestEffect2_9_score4
+	if_user_order_eq 0x00 ContestEffect2_9_score1
+	if_user_order_eq 0x01 ContestEffect2_9_score2
+	if_user_order_eq 0x02 ContestEffect2_9_score3
+	if_user_order_eq 0x03 ContestEffect2_9_score4
 	end
 ContestEffect2_9_score1:
 	score 0xEC 
@@ -679,9 +679,9 @@ ContestEffect2_9_score4:
 	end
 
 ContestEffect2_25:
-	contest_0E 0x00 ContestEffect2_25_score1
-	contest_0E 0x01 ContestEffect2_25_score2
-	contest_0E 0x02 ContestEffect2_25_score3
+	if_user_order_eq 0x00 ContestEffect2_25_score1
+	if_user_order_eq 0x01 ContestEffect2_25_score2
+	if_user_order_eq 0x02 ContestEffect2_25_score3
 	score 0xF6 
 	end
 ContestEffect2_25_score1:
@@ -698,9 +698,9 @@ ContestEffect2_25_score3:
 	end
 
 ContestEffect2_26:
-	contest_0E 0x00 ContestEffect2_26_score1
-	contest_0E 0x01 ContestEffect2_26_score2
-	contest_0E 0x02 ContestEffect2_26_score3
+	if_user_order_eq 0x00 ContestEffect2_26_score1
+	if_user_order_eq 0x01 ContestEffect2_26_score2
+	if_user_order_eq 0x02 ContestEffect2_26_score3
 	score 0xF6 
 	end
 ContestEffect2_26_score1:
@@ -725,9 +725,9 @@ ContestEffect2_38:
 	end
 
 ContestEffect2_4:
-	contest_0E 0x00 ContestEffect2_4_score1
-	contest_0E 0x01 ContestEffect2_4_score2
-	contest_0E 0x02 ContestEffect2_4_score3
+	if_user_order_eq 0x00 ContestEffect2_4_score1
+	if_user_order_eq 0x01 ContestEffect2_4_score2
+	if_user_order_eq 0x02 ContestEffect2_4_score3
 	score 0xF6 
 	end
 ContestEffect2_4_score1:
@@ -778,10 +778,10 @@ ContestEffectEnd2:
 	end
 
 Unknown_081DCA4C:
-	contest_0E 0x00 AI_effectcheck1_081DCA4C
-	contest_0E 0x01 AI_effectcheck2_081DCA4C
-	contest_0E 0x02 AI_effectcheck3_081DCA4C
-	contest_0E 0x03 AI_effectcheck4_081DCA4C
+	if_user_order_eq 0x00 AI_effectcheck1_081DCA4C
+	if_user_order_eq 0x01 AI_effectcheck2_081DCA4C
+	if_user_order_eq 0x02 AI_effectcheck3_081DCA4C
+	if_user_order_eq 0x03 AI_effectcheck4_081DCA4C
 	end
 AI_effectcheck1_081DCA4C:
 	if_effect 0x1D AI_score1_081DCA4C