Port script_pokemon_util_80A0058

8 files changed, 22 insertions, 22 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 21fdffe43..13bba19f8 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -871,7 +871,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
 	specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
 	compare_var_to_value VAR_RESULT, 0
 	goto_if ne, EventScript_1A4F20
-	special CheckForAlivePartyMons
+	special HasEnoughMonsForDoubleBattle
 	compare_var_to_value VAR_RESULT, 0
 	goto_if ne, EventScript_1A4F19
 	special PlayTrainerEncounterMusic
@@ -923,7 +923,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
 	specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1A4FB0
-	special CheckForAlivePartyMons
+	special HasEnoughMonsForDoubleBattle
 	compare_var_to_value VAR_RESULT, 0
 	goto_if ne, EventScript_1A4FB1
 	special PlayTrainerEncounterMusic
@@ -1617,7 +1617,7 @@ EventScript_1A65CE:: @ 81A65CE
 	waitfieldeffect 25
 	applymovement VAR_LAST_TALKED, Movement_1A75ED
 	waitmovement 0
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	return
 
 EventScript_1A65EC:: @ 81A65EC
@@ -2161,7 +2161,7 @@ EventScript_FadeOut_Heal_FadeIn:: @ 81A6C26
 	fadescreen 1
 	playfanfare MUS_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	fadescreen 0
 	return
 
@@ -8644,7 +8644,7 @@ EventScript_1BB519:: @ 81BB519
 	end
 
 EventScript_1BB51A:: @ 81BB51A
-	special CheckForAlivePartyMons
+	special HasEnoughMonsForDoubleBattle
 	compare_var_to_value VAR_RESULT, 0
 	goto_if ne, EventScript_1BB533
 	setvar VAR_0x8004, 2
@@ -8693,7 +8693,7 @@ EventScript_1BB54C:: @ 81BB54C
 	end
 
 EventScript_1BB5B3:: @ 81BB5B3
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	special SavePlayerParty
 	special LoadPlayerBag
 	copyvar VAR_0x406F, VAR_0x8004
@@ -9019,7 +9019,7 @@ UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF
 gUnknown_81BB8DB:: @ 81BB8DB
 UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB
 	fadescreen 1
-	special sub_80A0334
+	special ChooseHalfPartyForBattle
 	waitstate
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1BB94F
@@ -9032,7 +9032,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB
 gUnknown_81BB8F8:: @ 81BB8F8
 UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8
 	fadescreen 1
-	special sub_80A0334
+	special ChooseHalfPartyForBattle
 	waitstate
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1BB94F
@@ -9045,7 +9045,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8
 gUnknown_81BB915:: @ 81BB915
 UnknownMap_00_03_EventScript_1BB915:: @ 81BB915
 	fadescreen 1
-	special sub_80A0334
+	special ChooseHalfPartyForBattle
 	waitstate
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1BB94F
@@ -9058,7 +9058,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915
 gUnknown_81BB932:: @ 81BB932
 UnknownMap_00_03_EventScript_1BB932:: @ 81BB932
 	fadescreen 1
-	special sub_80A0334
+	special ChooseHalfPartyForBattle
 	waitstate
 	compare_var_to_value VAR_RESULT, 0
 	goto_if eq, EventScript_1BB94F
@@ -9217,7 +9217,7 @@ EventScript_1BBA94:: @ 81BBA94
 	goto_if eq, EventScript_1BB82F
 	msgbox gUnknown_81BD86A
 	closemessage
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 6
 	copyvar VAR_0x406F, VAR_0x8004
 	special HelpSystem_Disable
@@ -9368,7 +9368,7 @@ EventScript_1BBCF4:: @ 81BBCF4
 	end
 
 EventScript_1BBCF5:: @ 81BBCF5
-	special CheckForAlivePartyMons
+	special HasEnoughMonsForDoubleBattle
 	compare_var_to_value VAR_RESULT, 0
 	goto_if ne, EventScript_1BBD0E
 	setvar VAR_0x8004, 1
@@ -14241,7 +14241,7 @@ EventScript_1C52D7:
 	end
 
 EventScript_1C52E0:: @ 81C52E0
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 11
 	special sub_815D9E8
 	warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
index 71c8cf0ee..a713b044f 100644
--- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
@@ -45,7 +45,7 @@ EventScript_1653C5:: @ 81653C5
 OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF
 	lockall
 	fadescreen 3
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	fadescreen 2
 	msgbox gUnknown_817D450
 	setvar VAR_0x4001, 1
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 850182c08..38d85f0d1 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -488,7 +488,7 @@ Movement_1694BE:: @ 81694BE
 	step_end
 
 EventScript_1694C2:: @ 81694C2
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	msgbox gUnknown_818DE38
 	closemessage
 	playbgm MUS_RIVAL2, 0
diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc
index 85517e241..dee5b5bbd 100644
--- a/data/maps/PokemonTower_5F/scripts.inc
+++ b/data/maps/PokemonTower_5F/scripts.inc
@@ -8,7 +8,7 @@ PokemonTower_5F_EventScript_163433:: @ 8163433
 PokemonTower_5F_EventScript_16343C:: @ 816343C
 	lockall
 	fadescreen 3
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	fadescreen 2
 	msgbox gUnknown_817A1FA
 	setvar VAR_0x4001, 1
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc
index fd83fa051..f136b8de2 100644
--- a/data/maps/SevenIsland_House_Room1/scripts.inc
+++ b/data/maps/SevenIsland_House_Room1/scripts.inc
@@ -128,7 +128,7 @@ EventScript_170A11:: @ 8170A11
 EventScript_170A1E:: @ 8170A1E
 	msgbox gUnknown_81A06AB
 	fadescreen 1
-	special sub_80A0334
+	special ChooseHalfPartyForBattle
 	waitstate
 	return
 
diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc
index f2928f916..0ca956c55 100644
--- a/data/maps/SevenIsland_House_Room2/scripts.inc
+++ b/data/maps/SevenIsland_House_Room2/scripts.inc
@@ -29,7 +29,7 @@ EventScript_170A97:: @ 8170A97
 	compare_var_to_value VAR_RESULT, 2
 	call_if eq, EventScript_170B17
 	closemessage
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	applymovement 255, Movement_170B28
 	waitmovement 0
 	special LoadPlayerParty
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
index 142f33ee3..b0074f4b3 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
@@ -196,7 +196,7 @@ EventScript_164A53:: @ 8164A53
 EventScript_164AA0:: @ 8164AA0
 	copyvar VAR_0x8005, VAR_RESULT
 	setvar VAR_MAP_SCENE_TRAINER_TOWER, 1
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	msgbox gUnknown_817C8BF
 	setvar VAR_0x8004, 6
 	special sub_815D9E8
diff --git a/data/specials.inc b/data/specials.inc
index f7ca055ef..514acc0fc 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -8,7 +8,7 @@
 .set __special__, 0
 	.align 2
 gSpecials:: @ 815FD60
-	def_special sp000_heal_pokemon
+	def_special HealPlayerParty
 	def_special SetCableClubWarp
 	def_special DoCableClubWarp
 	def_special sub_807E704
@@ -49,7 +49,7 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special SavePlayerParty
 	def_special LoadPlayerParty
-	def_special sub_80A0334
+	def_special ChooseHalfPartyForBattle
 	def_special sp02A_crash_sound
 	def_special nullsub_75
 	def_special nullsub_75
@@ -69,7 +69,7 @@ gSpecials:: @ 815FD60
 	def_special ScrSpecial_GetTrainerEyeRematchFlag
 	def_special ScrSpecial_StartTrainerEyeRematch
 	def_special ShowPokemonStorageSystem
-	def_special CheckForAlivePartyMons
+	def_special HasEnoughMonsForDoubleBattle
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special nullsub_75