1 files changed, 76 insertions, 76 deletions
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index 685e44d58..5192176a7 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -6,16 +6,16 @@ LavaridgeTown_MapScripts:: @ 814E4A3
 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
 	setflag 2066
 	checkflag 139
-	callif 1, LavaridgeTown_EventScript_14E4DF
+	call_if 1, LavaridgeTown_EventScript_14E4DF
 	call LavaridgeTown_EventScript_1A014E
 	call LavaridgeTown_EventScript_1A0172
 	compare 0x4053, 2
-	callif 1, LavaridgeTown_EventScript_14E4D0
+	call_if 1, LavaridgeTown_EventScript_14E4D0
 	end
 
 LavaridgeTown_EventScript_14E4D0:: @ 814E4D0
-	movespriteperm 8, 11, 9
-	movespriteperm 7, 11, 9
+	setobjectxyperm 8, 11, 9
+	setobjectxyperm 7, 11, 9
 	return
 
 LavaridgeTown_EventScript_14E4DF:: @ 814E4DF
@@ -29,56 +29,56 @@ LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3
 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED
 	lockall
 	setvar 0x8008, 1
-	setdooropened 12, 15
-	doorchange
-	reappear 8
-	move 8, LavaridgeTown_Movement_14E70E
-	waitmove 0
-	setdoorclosed 12, 15
-	doorchange
-	move 8, LavaridgeTown_Movement_1A083F
-	waitmove 0
-	move 255, LavaridgeTown_Movement_1A0843
-	move 8, LavaridgeTown_Movement_1A0833
-	waitmove 0
-	move 8, LavaridgeTown_Movement_1A0835
-	waitmove 0
-	checkgender
+	opendoor 12, 15
+	waitdooranim
+	addobject 8
+	applymovement 8, LavaridgeTown_Movement_14E70E
+	waitmovement 0
+	closedoor 12, 15
+	waitdooranim
+	applymovement 8, LavaridgeTown_Movement_1A083F
+	waitmovement 0
+	applymovement 255, LavaridgeTown_Movement_1A0843
+	applymovement 8, LavaridgeTown_Movement_1A0833
+	waitmovement 0
+	applymovement 8, LavaridgeTown_Movement_1A0835
+	waitmovement 0
+	checkplayergender
 	compare RESULT, 0
-	callif 1, LavaridgeTown_EventScript_14E56B
+	call_if 1, LavaridgeTown_EventScript_14E56B
 	compare RESULT, 1
-	callif 1, LavaridgeTown_EventScript_14E570
+	call_if 1, LavaridgeTown_EventScript_14E570
 	compare 0x8008, 1
-	callif 1, LavaridgeTown_EventScript_14E68F
-	checkgender
+	call_if 1, LavaridgeTown_EventScript_14E68F
+	checkplayergender
 	compare RESULT, 0
-	jumpeq LavaridgeTown_EventScript_14E5AB
+	goto_if_eq LavaridgeTown_EventScript_14E5AB
 	compare RESULT, 1
-	jumpeq LavaridgeTown_EventScript_14E5D0
+	goto_if_eq LavaridgeTown_EventScript_14E5D0
 	end
 
 LavaridgeTown_EventScript_14E56B:: @ 814E56B
-	playmusic 415, 1
+	playbgm 415, 1
 	return
 
 LavaridgeTown_EventScript_14E570:: @ 814E570
-	playmusic 421, 1
+	playbgm 421, 1
 	return
 
 LavaridgeTown_EventScript_14E575:: @ 814E575
 	lock
 	faceplayer
 	setvar 0x8008, 0
-	checkgender
+	checkplayergender
 	compare RESULT, 0
-	callif 1, LavaridgeTown_EventScript_14E56B
+	call_if 1, LavaridgeTown_EventScript_14E56B
 	compare RESULT, 1
-	callif 1, LavaridgeTown_EventScript_14E570
-	checkgender
+	call_if 1, LavaridgeTown_EventScript_14E570
+	checkplayergender
 	compare RESULT, 0
-	jumpeq LavaridgeTown_EventScript_14E5AB
+	goto_if_eq LavaridgeTown_EventScript_14E5AB
 	compare RESULT, 1
-	jumpeq LavaridgeTown_EventScript_14E5D0
+	goto_if_eq LavaridgeTown_EventScript_14E5D0
 	end
 
 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB
@@ -86,7 +86,7 @@ LavaridgeTown_EventScript_14E5AB:: @ 814E5AB
 	giveitem ITEM_GO_GOGGLES
 	setflag 221
 	msgbox LavaridgeTown_Text_16BE7D, 4
-	jump LavaridgeTown_EventScript_14E5F5
+	goto LavaridgeTown_EventScript_14E5F5
 	end
 
 LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
@@ -94,28 +94,28 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
 	giveitem ITEM_GO_GOGGLES
 	setflag 221
 	msgbox LavaridgeTown_Text_16C020, 4
-	jump LavaridgeTown_EventScript_14E5F5
+	goto LavaridgeTown_EventScript_14E5F5
 	end
 
 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5
-	closebutton
+	closemessage
 	compare 0x8008, 1
-	callif 1, LavaridgeTown_EventScript_14E646
+	call_if 1, LavaridgeTown_EventScript_14E646
 	compare 0x8008, 0
-	callif 1, LavaridgeTown_EventScript_14E64E
-	disappear 8
-	reappear 7
-	pause 30
+	call_if 1, LavaridgeTown_EventScript_14E64E
+	removeobject 8
+	addobject 7
+	delay 30
 	compare 0x8008, 1
-	callif 1, LavaridgeTown_EventScript_14E69A
+	call_if 1, LavaridgeTown_EventScript_14E69A
 	compare 0x8008, 0
-	callif 1, LavaridgeTown_EventScript_14E6A5
-	disappear 7
+	call_if 1, LavaridgeTown_EventScript_14E6A5
+	removeobject 7
 	setvar 0x4053, 2
-	playmusicbattle 0
-	fadedefault
+	savebgm 0
+	fadedefaultbgm
 	compare 0x8008, 0
-	jumpeq LavaridgeTown_EventScript_14E644
+	goto_if_eq LavaridgeTown_EventScript_14E644
 	releaseall
 	end
 
@@ -124,65 +124,65 @@ LavaridgeTown_EventScript_14E644:: @ 814E644
 	end
 
 LavaridgeTown_EventScript_14E646:: @ 814E646
-	movespriteperm 7, 6, 16
+	setobjectxyperm 7, 6, 16
 	return
 
 LavaridgeTown_EventScript_14E64E:: @ 814E64E
 	compare FACING, 2
-	callif 1, LavaridgeTown_EventScript_14E67B
+	call_if 1, LavaridgeTown_EventScript_14E67B
 	compare FACING, 1
-	callif 1, LavaridgeTown_EventScript_14E680
+	call_if 1, LavaridgeTown_EventScript_14E680
 	compare FACING, 3
-	callif 1, LavaridgeTown_EventScript_14E685
+	call_if 1, LavaridgeTown_EventScript_14E685
 	compare FACING, 4
-	callif 1, LavaridgeTown_EventScript_14E68A
+	call_if 1, LavaridgeTown_EventScript_14E68A
 	return
 
 LavaridgeTown_EventScript_14E67B:: @ 814E67B
-	spritebehave 7, 8
+	setobjectmovementtype 7, 8
 	return
 
 LavaridgeTown_EventScript_14E680:: @ 814E680
-	spritebehave 7, 7
+	setobjectmovementtype 7, 7
 	return
 
 LavaridgeTown_EventScript_14E685:: @ 814E685
-	spritebehave 7, 10
+	setobjectmovementtype 7, 10
 	return
 
 LavaridgeTown_EventScript_14E68A:: @ 814E68A
-	spritebehave 7, 9
+	setobjectmovementtype 7, 9
 	return
 
 LavaridgeTown_EventScript_14E68F:: @ 814E68F
-	move 8, LavaridgeTown_Movement_14E6E8
-	waitmove 0
+	applymovement 8, LavaridgeTown_Movement_14E6E8
+	waitmovement 0
 	return
 
 LavaridgeTown_EventScript_14E69A:: @ 814E69A
-	move 7, LavaridgeTown_Movement_14E6EF
-	waitmove 0
+	applymovement 7, LavaridgeTown_Movement_14E6EF
+	waitmovement 0
 	return
 
 LavaridgeTown_EventScript_14E6A5:: @ 814E6A5
 	compare FACING, 2
-	callif 1, LavaridgeTown_EventScript_14E6D2
+	call_if 1, LavaridgeTown_EventScript_14E6D2
 	compare FACING, 1
-	callif 1, LavaridgeTown_EventScript_14E6D2
+	call_if 1, LavaridgeTown_EventScript_14E6D2
 	compare FACING, 3
-	callif 1, LavaridgeTown_EventScript_14E6DD
+	call_if 1, LavaridgeTown_EventScript_14E6DD
 	compare FACING, 4
-	callif 1, LavaridgeTown_EventScript_14E6D2
+	call_if 1, LavaridgeTown_EventScript_14E6D2
 	return
 
 LavaridgeTown_EventScript_14E6D2:: @ 814E6D2
-	move 7, LavaridgeTown_Movement_14E6FA
-	waitmove 0
+	applymovement 7, LavaridgeTown_Movement_14E6FA
+	waitmovement 0
 	return
 
 LavaridgeTown_EventScript_14E6DD:: @ 814E6DD
-	move 7, LavaridgeTown_Movement_14E703
-	waitmove 0
+	applymovement 7, LavaridgeTown_Movement_14E703
+	waitmovement 0
 	return
 
 LavaridgeTown_Movement_14E6E8:: @ 814E6E8
@@ -236,13 +236,13 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E
 	step_end
 
 LavaridgeTown_EventScript_14E710:: @ 814E710
-	specialval RESULT, player_get_direction_lower_nybble
+	specialvar RESULT, player_get_direction_lower_nybble
 	compare RESULT, 1
-	jumpeq LavaridgeTown_EventScript_14E721
+	goto_if_eq LavaridgeTown_EventScript_14E721
 	end
 
 LavaridgeTown_EventScript_14E721:: @ 814E721
-	inccounter GAME_STAT_ENTERED_HOT_SPRINGS
+	incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS
 	end
 
 LavaridgeTown_EventScript_14E724:: @ 814E724
@@ -273,19 +273,19 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A
 	lock
 	faceplayer
 	checkflag 266
-	jumpeq LavaridgeTown_EventScript_14E79E
+	goto_if_eq LavaridgeTown_EventScript_14E79E
 	msgbox LavaridgeTown_Text_16C174, 5
 	compare RESULT, 0
-	jumpeq LavaridgeTown_EventScript_14E7B2
+	goto_if_eq LavaridgeTown_EventScript_14E7B2
 	countpokemon
 	compare RESULT, 6
-	jumpeq LavaridgeTown_EventScript_14E7A8
+	goto_if_eq LavaridgeTown_EventScript_14E7A8
 	msgbox LavaridgeTown_Text_16C2B6, 4
 	setflag 266
-	fanfare 370
+	playfanfare 370
 	message LavaridgeTown_Text_16C2EA
 	waitfanfare
-	waittext
+	waitmessage
 	giveegg 360
 	release
 	end