redump baserom call in contest strings

3 files changed, 87 insertions, 85 deletions

diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s
index 76c8db491..dab4253bb 100644
--- a/data/contest_ai_scripts.s
+++ b/data/contest_ai_scripts.s
@@ -53,7 +53,7 @@ ContestUnreferenced_80:
 	call ContestUnreferenced_0D
 	end
 ContestUnreferenced_0D:
-	if_user_order_more_than 1 ContestUnreferenced_end
+	if_user_order_more_than MON_2 ContestUnreferenced_end
 	if_effect_type_not_eq 2 ContestUnreferenced_end
 	if_effect_type_not_eq 3 ContestUnreferenced_end
 	score +10
@@ -66,10 +66,10 @@ ContestUnreferenced_end:
 	if_turn_eq 4 ContestUnreferenced_0F_5
 	end
 ContestUnreferenced_0F_1:
-	if_user_order_not_eq 0 ContestUnreferenced_2B_1
-	if_user_order_not_eq 1 ContestUnreferenced_2B_2
-	if_user_order_not_eq 2 ContestUnreferenced_2B_1
-	if_user_order_not_eq 3 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_1 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_2 ContestUnreferenced_2B_2
+	if_user_order_not_eq MON_3 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_4 ContestUnreferenced_2B_1
 	end
 ContestUnreferenced_2B_1:
 	if_effect_type_eq 1 ContestUnreferenced_score
@@ -80,28 +80,28 @@ ContestUnreferenced_2B_2:
 	if_effect_type_eq 1 ContestUnreferenced_score
 	end
 ContestUnreferenced_0F_2:
-	if_user_order_not_eq 0 ContestUnreferenced_2B_1
-	if_user_order_not_eq 1 ContestUnreferenced_2B_1
-	if_user_order_not_eq 2 ContestUnreferenced_2B_1
-	if_user_order_not_eq 3 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_1 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_2 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_3 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_4 ContestUnreferenced_2B_1
 	end
 ContestUnreferenced_0F_3:
-	if_user_order_not_eq 0 ContestUnreferenced_2B_1
-	if_user_order_not_eq 1 ContestUnreferenced_2B_1
-	if_user_order_not_eq 2 ContestUnreferenced_2B_1
-	if_user_order_not_eq 3 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_1 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_2 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_3 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_4 ContestUnreferenced_2B_1
 	end
 ContestUnreferenced_0F_4:
-	if_user_order_not_eq 0 ContestUnreferenced_2B_1
-	if_user_order_not_eq 1 ContestUnreferenced_2B_1
-	if_user_order_not_eq 2 ContestUnreferenced_2B_1
-	if_user_order_not_eq 3 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_1 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_2 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_3 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_4 ContestUnreferenced_2B_1
 	end
 ContestUnreferenced_0F_5:
-	if_user_order_not_eq 0 ContestUnreferenced_2B_1
-	if_user_order_not_eq 1 ContestUnreferenced_2B_1
-	if_user_order_not_eq 2 ContestUnreferenced_2B_1
-	if_user_order_not_eq 3 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_1 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_2 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_3 ContestUnreferenced_2B_1
+	if_user_order_not_eq MON_4 ContestUnreferenced_2B_1
 	end
 ContestUnreferenced_score:
 	score +10
@@ -147,7 +147,7 @@ AI_contest09_081DC2AB:
 	score +15
 	end
 AI_contest0F_1_081DC2AB:
-	if_user_order_not_eq 0 AI_contest7D_1_081DC2AB
+	if_user_order_not_eq MON_1 AI_contest7D_1_081DC2AB
 	if_random 51 AI_end_081DC2AB
 	score +20
 	end
@@ -156,7 +156,7 @@ AI_contest7D_1_081DC2AB:
 	score -10
 	end
 AI_contest0F_2_081DC2AB:
-	if_user_order_not_eq 0 AI_contest7D_3_081DC2AB
+	if_user_order_not_eq MON_1 AI_contest7D_3_081DC2AB
 	if_turn_eq 4 AI_score_081DC2AB
 AI_contest7D_2_081DC2AB:
 	if_random 51 AI_end_081DC2AB
@@ -174,8 +174,8 @@ AI_contest7D_4_081DC2AB:
 	score +10
 	end
 AI_contest3D_081DC2AB:
-	if_move_used_count_more_than 0x00 AI_contest29_081DC2AB
-	if_user_order_not_eq 0 AI_contest7D_5_081DC2AB
+	if_move_used_count_more_than 0 AI_contest29_081DC2AB
+	if_user_order_not_eq MON_1 AI_contest7D_5_081DC2AB
 	if_excitement_not_eq 4 AI_contest7D_5_081DC2AB
 	score +30
 	end
@@ -185,7 +185,7 @@ AI_contest7D_5_081DC2AB:
 	end
 AI_contest29_081DC2AB:
 	if_effect_not_eq CONTEST_EFFECT_REPETITION_NOT_BORING AI_end_081DC2AB
-	if_user_order_not_eq 0 AI_contest7D_5_081DC2AB
+	if_user_order_not_eq MON_1 AI_contest7D_5_081DC2AB
 	if_excitement_not_eq 4 AI_contest7D_5_081DC2AB
 	score +30
 	end
@@ -198,12 +198,12 @@ CheckForCombo:
 	call AI_contest45_081DC348
 	end
 AI_contest3F_081DC348:
-	if_move_used_count_not_eq 0x00 AI_end_081DC348
+	if_move_used_count_not_eq 0 AI_end_081DC348
 	if_not_combo_starter AI_end_081DC348
-	if_user_order_eq 0 AI_contest04_1_081DC348
-	if_user_order_eq 1 AI_contest04_2_081DC348
-	if_user_order_eq 2 AI_contest04_3_081DC348
-	if_user_order_eq 3 AI_contest04_4_081DC348
+	if_user_order_eq MON_1 AI_contest04_1_081DC348
+	if_user_order_eq MON_2 AI_contest04_2_081DC348
+	if_user_order_eq MON_3 AI_contest04_3_081DC348
+	if_user_order_eq MON_4 AI_contest04_4_081DC348
 	end
 AI_contest45_081DC348:
 	if_not_combo_finisher AI_end_081DC348
@@ -289,7 +289,7 @@ ContestEffect41:
 	end
 
 ContestEffect3:
-	if_user_order_not_eq 3 ContestEffectEnd
+	if_user_order_not_eq MON_4 ContestEffectEnd
 	if_random 50 ContestEffectEnd
 	score +15
 	end
@@ -331,8 +331,8 @@ ContestEffect38_score2:
 
 ContestEffect47:
 	if_move_used_count_eq 1 ContestEffectEnd
-	if_user_order_eq 0 ContestEffect47_random
-	if_user_order_eq 1 ContestEffect47_random
+	if_user_order_eq MON_1 ContestEffect47_random
+	if_user_order_eq MON_2 ContestEffect47_random
 	if_turn_not_eq 4 ContestEffectEnd
 	if_user_has_exciting_move ContestEffectEnd
 	if_excitement_less_than 1 ContestEffectEnd
@@ -344,9 +344,9 @@ ContestEffect47_random:
 	end
 
 ContestEffect31:
-	if_user_order_eq 1 ContestEffect31_score1
-	if_user_order_eq 2 ContestEffect31_score2
-	if_user_order_eq 3 ContestEffect31_score3
+	if_user_order_eq MON_2 ContestEffect31_score1
+	if_user_order_eq MON_3 ContestEffect31_score2
+	if_user_order_eq MON_4 ContestEffect31_score3
 	end
 ContestEffect31_score1:
 	score +5
@@ -359,10 +359,10 @@ ContestEffect31_score3:
 	end
 
 ContestEffect32:
-	if_user_order_eq 0 ContestEffect32_score1
-	if_user_order_eq 1 ContestEffect32_score2
-	if_user_order_eq 2 ContestEffect32_score3
-	if_user_order_eq 3 ContestEffect32_score5
+	if_user_order_eq MON_1 ContestEffect32_score1
+	if_user_order_eq MON_2 ContestEffect32_score2
+	if_user_order_eq MON_3 ContestEffect32_score3
+	if_user_order_eq MON_4 ContestEffect32_score5
 	end
 ContestEffect32_score1:
 	score -10
@@ -396,8 +396,8 @@ ContestEffect32_score7:
 	end
 
 ContestEffect46:
-	if_user_order_eq 0 ContestEffect46_05
-	if_user_order_more_than 0 ContestEffect46_score4
+	if_user_order_eq MON_1 ContestEffect46_05
+	if_user_order_more_than MON_1 ContestEffect46_score4
 	end
 ContestEffect46_05:
 	if_turn_not_eq 0 ContestEffect46_score1
@@ -422,7 +422,7 @@ ContestEffect46_score4:
 	end
 
 ContestEffect27:
-	if_user_order_eq 0 ContestEffectEnd
+	if_user_order_eq MON_1 ContestEffectEnd
 	jump ContestEffect27_55_1
 	end
 ContestEffect27_55_1:
@@ -435,20 +435,20 @@ ContestEffect27_55_1:
 ContestEffect27_score1:
 	if_random 125 ContestEffect27_55_2
 	score +5
-	if_user_order_more_than 1 ContestEffect27_55_2
+	if_user_order_more_than MON_2 ContestEffect27_55_2
 	end
 ContestEffect27_score2:
 	if_random 125 ContestEffect27_55_2
 	score +10
-	if_user_order_more_than 1 ContestEffect27_55_2
+	if_user_order_more_than MON_2 ContestEffect27_55_2
 	end
 ContestEffect27_score3:
 	if_random 125 ContestEffect27_55_2
 	score +15
-	if_user_order_more_than 1 ContestEffect27_55_2
+	if_user_order_more_than MON_2 ContestEffect27_55_2
 	end
 ContestEffect27_noscore:
-	if_user_order_more_than 1 ContestEffect27_55_2
+	if_user_order_more_than MON_2 ContestEffect27_55_2
 	end
 ContestEffect27_55_2:
 	contest_55 0x01 ContestEffect27_noscore2
@@ -460,20 +460,20 @@ ContestEffect27_55_2:
 ContestEffect27_score4:
 	if_random 125 ContestEffect27_55_3
 	score +5
-	if_user_order_more_than 2 ContestEffect27_55_3
+	if_user_order_more_than MON_3 ContestEffect27_55_3
 	end
 ContestEffect27_score5:
 	if_random 125 ContestEffect27_55_3
 	score +10
-	if_user_order_more_than 2 ContestEffect27_55_3
+	if_user_order_more_than MON_3 ContestEffect27_55_3
 	end
 ContestEffect27_score6:
 	if_random 125 ContestEffect27_55_3
 	score +15
-	if_user_order_more_than 2 ContestEffect27_55_3
+	if_user_order_more_than MON_3 ContestEffect27_55_3
 	end
 ContestEffect27_noscore2:
-	if_user_order_more_than 2 ContestEffect27_55_3
+	if_user_order_more_than MON_3 ContestEffect27_55_3
 	end
 ContestEffect27_55_3:
 	contest_55 0x02 ContestEffect27_end
@@ -498,7 +498,7 @@ ContestEffect27_end:
 	end
 
 ContestEffect16or17:
-	if_user_order_eq 0 ContestEffectEnd
+	if_user_order_eq MON_1 ContestEffectEnd
 	jump ContestEffect16or17_55
 	end
 ContestEffect16or17_55:
@@ -510,7 +510,7 @@ ContestEffect16or17_55:
 	score +8
 	end
 ContestEffect16or17_0E_1:
-	if_user_order_eq 1 ContestEffectEnd
+	if_user_order_eq MON_2 ContestEffectEnd
 	contest_55 0x01 ContestEffect16or17_0E_2
 	contest_51 0x01 0x01 ContestEffect16or17_0E_2
 	if_random 125 ContestEffect16or17_0E_2
@@ -519,7 +519,7 @@ ContestEffect16or17_0E_1:
 	score +8
 	end
 ContestEffect16or17_0E_2:
-	if_user_order_eq 2 ContestEffectEnd
+	if_user_order_eq MON_3 ContestEffectEnd
 	contest_55 0x02 ContestEffectEnd
 	contest_51 0x02 0x01 ContestEffectEnd
 	if_random 125 ContestEffectEnd
@@ -533,7 +533,7 @@ ContestEffect16or17_0E_2:
 	@ be encouraged.
 
 ContestEffect_FollowingMonsNervous:
-	if_user_order_eq 3, ContestEffectEnd
+	if_user_order_eq MON_4, ContestEffectEnd
 	jump ContestEffect_FollowingMonsNervous_CheckMon3
 	end
 ContestEffect_FollowingMonsNervous_CheckMon3:
@@ -544,7 +544,7 @@ ContestEffect_FollowingMonsNervous_CheckMon3:
 	score +5
 	end
 ContestEffect_FollowingMonsNervous_CheckMon2:
-	if_user_order_eq 2, ContestEffectEnd
+	if_user_order_eq MON_3, ContestEffectEnd
 	contest_55 2, ContestEffect_FollowingMonsNervous_CheckMon1
 	contest_51 2, 0, ContestEffect_FollowingMonsNervous_CheckMon1
 	score +5
@@ -552,7 +552,7 @@ ContestEffect_FollowingMonsNervous_CheckMon2:
 	score +5
 	end
 ContestEffect_FollowingMonsNervous_CheckMon1:
-	if_user_order_eq 1, ContestEffectEnd
+	if_user_order_eq MON_2, ContestEffectEnd
 	contest_55 1, ContestEffectEnd
 	contest_51 1, 0, ContestEffectEnd
 	score +5
@@ -569,10 +569,10 @@ ContestEffect18_score1:
 	jump ContestEffect18_0E
 	end
 ContestEffect18_0E:
-	if_user_order_eq 0 ContestEffect18_score2
-	if_user_order_eq 1 ContestEffect18_random1
-	if_user_order_eq 2 ContestEffect18_random2
-	if_user_order_eq 3 ContestEffect18_random3
+	if_user_order_eq MON_1 ContestEffect18_score2
+	if_user_order_eq MON_2 ContestEffect18_random1
+	if_user_order_eq MON_3 ContestEffect18_random2
+	if_user_order_eq MON_4 ContestEffect18_random3
 	end
 ContestEffect18_score2:
 	score -15
@@ -642,10 +642,10 @@ CheckForBadMove:
 	end
 
 ContestEffect2_8:
-	if_user_order_eq 0 ContestEffect2_8_score1
-	if_user_order_eq 1 ContestEffect2_8_score2
-	if_user_order_eq 2 ContestEffect2_8_score3
-	if_user_order_eq 3 ContestEffect2_8_score4
+	if_user_order_eq MON_1 ContestEffect2_8_score1
+	if_user_order_eq MON_2 ContestEffect2_8_score2
+	if_user_order_eq MON_3 ContestEffect2_8_score3
+	if_user_order_eq MON_4 ContestEffect2_8_score4
 	end
 ContestEffect2_8_score1:
 	score -10
@@ -664,10 +664,10 @@ ContestEffect2_8_score4:
 	end
 
 ContestEffect2_9:
-	if_user_order_eq 0 ContestEffect2_9_score1
-	if_user_order_eq 1 ContestEffect2_9_score2
-	if_user_order_eq 2 ContestEffect2_9_score3
-	if_user_order_eq 3 ContestEffect2_9_score4
+	if_user_order_eq MON_1 ContestEffect2_9_score1
+	if_user_order_eq MON_2 ContestEffect2_9_score2
+	if_user_order_eq MON_3 ContestEffect2_9_score3
+	if_user_order_eq MON_4 ContestEffect2_9_score4
 	end
 ContestEffect2_9_score1:
 	score -20
@@ -689,9 +689,9 @@ ContestEffect2_9_score4:
 	end
 
 ContestEffect2_25:
-	if_user_order_eq 0 ContestEffect2_25_score1
-	if_user_order_eq 1 ContestEffect2_25_score2
-	if_user_order_eq 2 ContestEffect2_25_score3
+	if_user_order_eq MON_1 ContestEffect2_25_score1
+	if_user_order_eq MON_2 ContestEffect2_25_score2
+	if_user_order_eq MON_3 ContestEffect2_25_score3
 	score -10
 	end
 ContestEffect2_25_score1:
@@ -708,9 +708,9 @@ ContestEffect2_25_score3:
 	end
 
 ContestEffect2_26:
-	if_user_order_eq 0 ContestEffect2_26_score1
-	if_user_order_eq 1 ContestEffect2_26_score2
-	if_user_order_eq 2 ContestEffect2_26_score3
+	if_user_order_eq MON_1 ContestEffect2_26_score1
+	if_user_order_eq MON_2 ContestEffect2_26_score2
+	if_user_order_eq MON_3 ContestEffect2_26_score3
 	score -10
 	end
 ContestEffect2_26_score1:
@@ -735,9 +735,9 @@ ContestEffect2_38:
 	end
 
 ContestEffect2_4:
-	if_user_order_eq 0 ContestEffect2_4_score1
-	if_user_order_eq 1 ContestEffect2_4_score2
-	if_user_order_eq 2 ContestEffect2_4_score3
+	if_user_order_eq MON_1 ContestEffect2_4_score1
+	if_user_order_eq MON_2 ContestEffect2_4_score2
+	if_user_order_eq MON_3 ContestEffect2_4_score3
 	score -10
 	end
 ContestEffect2_4_score1:
@@ -788,10 +788,10 @@ ContestEffectEnd2:
 	end
 
 CheckOrder:
-	if_user_order_eq 0 AI_effectcheck1_081DCA4C
-	if_user_order_eq 1 AI_effectcheck2_081DCA4C
-	if_user_order_eq 2 AI_effectcheck3_081DCA4C
-	if_user_order_eq 3 AI_effectcheck4_081DCA4C
+	if_user_order_eq MON_1 AI_effectcheck1_081DCA4C
+	if_user_order_eq MON_2 AI_effectcheck2_081DCA4C
+	if_user_order_eq MON_3 AI_effectcheck3_081DCA4C
+	if_user_order_eq MON_4 AI_effectcheck4_081DCA4C
 	end
 AI_effectcheck1_081DCA4C:
 	if_effect_eq CONTEST_EFFECT_BETTER_IF_FIRST AI_score1_081DCA4C
diff --git a/data/data2.s b/data/data2.s
index 5c56a5da8..127e27da8 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -13356,6 +13356,10 @@ gUnknown_083CA4C4:: @ 83CA4C4
 gUnknown_083CA4CC:: @ 83CA4CC
 	obj_pal gContest3Pal, 0xabe0
 
+	.align 2
+gUnknown_083CA4D4:: @ 83CA4D4
+	spr_template 0xABE0, 0xABE0, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
 	.include "data/text/contest_strings.s"
 
 gUnknown_083CC355:: @ 83CC355
diff --git a/data/text/contest_strings.s b/data/text/contest_strings.s
index 137902b26..4c4f37fc4 100644
--- a/data/text/contest_strings.s
+++ b/data/text/contest_strings.s
@@ -1,5 +1,3 @@
-gUnknown_083CA4D4:: @ 83CA4D4
-	.incbin "baserom.gba", 0x003ca4d4, 0x18
 ContestString_DescHighlyAppealing:
 	.string "A highly appealing move.$"
 ContestString_DescStartled1: