Rename several script commands

maps/Route33.asm

@@ -13,7 +13,7 @@ TrainerHikerAnthony:
 
 HikerAnthony2Script:
 	writecode VAR_CALLERID, PHONE_HIKER_ANTHONY
-	talkaftercancel
+	end_if_just_battled
 	loadfont
 	checkflag ENGINE_ANTHONY
 	iftrue UnknownScript_0x1ac051
@@ -61,7 +61,7 @@ UnknownScript_0x1ac051:
 	checkflag ENGINE_FLYPOINT_OLIVINE
 	iftrue .LoadFight1
 .LoadFight0
-	loadtrainer HIKER, ANTHONY2
+	scriptedtrainerdata HIKER, ANTHONY2
 	startbattle
 	returnafterbattle
 	loadvar wAnthonyFightCount, 1
@@ -69,7 +69,7 @@ UnknownScript_0x1ac051:
 	end
 
 .LoadFight1
-	loadtrainer HIKER, ANTHONY1
+	scriptedtrainerdata HIKER, ANTHONY1
 	startbattle
 	returnafterbattle
 	loadvar wAnthonyFightCount, 2
@@ -77,7 +77,7 @@ UnknownScript_0x1ac051:
 	end
 
 .LoadFight2
-	loadtrainer HIKER, ANTHONY3
+	scriptedtrainerdata HIKER, ANTHONY3
 	startbattle
 	returnafterbattle
 	loadvar wAnthonyFightCount, 3
@@ -85,7 +85,7 @@ UnknownScript_0x1ac051:
 	end
 
 .LoadFight3
-	loadtrainer HIKER, ANTHONY4
+	scriptedtrainerdata HIKER, ANTHONY4
 	startbattle
 	returnafterbattle
 	loadvar wAnthonyFightCount, 4
@@ -93,7 +93,7 @@ UnknownScript_0x1ac051:
 	end
 
 .LoadFight4
-	loadtrainer HIKER, ANTHONY5
+	scriptedtrainerdata HIKER, ANTHONY5
 	startbattle
 	returnafterbattle
 	clearflag ENGINE_ANTHONY
@@ -101,8 +101,8 @@ UnknownScript_0x1ac051:
 
 UnknownScript_0x1ac0c5:
 	writetext UnknownText_0x1ac180
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 UnknownScript_0x1ac0cb: