Merge branch 'master' into event-vars

1 files changed, 26 insertions, 26 deletions

diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index dd8514912..3f2d80e82 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -110,7 +110,7 @@ SootopolisCity_EventScript_1E5805:: @ 81E5805
 	compare VAR_0x40CA, 1
 	goto_if_eq SootopolisCity_EventScript_1E583E
 	compare VAR_0x40CA, 1
-	goto_if_le SootopolisCity_EventScript_27207A
+	goto_if_le Common_EventScript_SetWeather15
 	return
 
 SootopolisCity_EventScript_1E583D:: @ 81E583D
@@ -219,8 +219,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	setvar VAR_0x8004, 0
 	special sub_813B7D8
 	waitstate
-	applymovement 10, SootopolisCity_Movement_2725A4
-	applymovement 9, SootopolisCity_Movement_2725A8
+	applymovement 10, Common_Movement_WalkInPlaceLeft
+	applymovement 9, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 60
 	waitse
@@ -319,8 +319,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	setvar VAR_0x8004, 0
 	special sub_813B7D8
 	waitstate
-	applymovement 10, SootopolisCity_Movement_2725A4
-	applymovement 9, SootopolisCity_Movement_2725A8
+	applymovement 10, Common_Movement_WalkInPlaceLeft
+	applymovement 9, Common_Movement_WalkInPlaceRight
 	waitmovement 0
 	delay 60
 	waitse
@@ -730,7 +730,7 @@ SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8
 	goto_if_eq SootopolisCity_EventScript_1E5F10
 	msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, SootopolisCity_Movement_2725A2
+	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -751,7 +751,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
 	addvar VAR_RESULT, 133
 	giveitem_std VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY
 	msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT
 	random 2
@@ -764,7 +764,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
 SootopolisCity_EventScript_1E5F79:: @ 81E5F79
 	giveitem_std ITEM_FIGY_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT
 	release
 	end
@@ -772,7 +772,7 @@ SootopolisCity_EventScript_1E5F79:: @ 81E5F79
 SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A
 	giveitem_std ITEM_IAPAPA_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_272054
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT
 	release
 	end
@@ -792,13 +792,13 @@ SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8
 
 SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2
 	lockall
-	applymovement 2, SootopolisCity_Movement_27259E
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x405E, 5
 	goto_if_eq SootopolisCity_EventScript_1E600D
 	msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT
 	closemessage
-	applymovement 2, SootopolisCity_Movement_2725A2
+	applymovement 2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -838,7 +838,7 @@ SootopolisCity_EventScript_1E6038:: @ 81E6038
 SootopolisCity_EventScript_1E6065:: @ 81E6065
 	msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT
 	closemessage
-	applymovement 8, SootopolisCity_Movement_2725A2
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -855,7 +855,7 @@ SootopolisCity_EventScript_1E6084:: @ 81E6084
 
 SootopolisCity_EventScript_1E608E:: @ 81E608E
 	lockall
-	applymovement 4, SootopolisCity_Movement_27259E
+	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x405E, 5
 	goto_if_eq SootopolisCity_EventScript_1E60D9
@@ -865,7 +865,7 @@ SootopolisCity_EventScript_1E608E:: @ 81E608E
 	goto_if_le SootopolisCity_EventScript_1E60CF
 	msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, SootopolisCity_Movement_2725A2
+	applymovement 4, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -882,7 +882,7 @@ SootopolisCity_EventScript_1E60D9:: @ 81E60D9
 
 SootopolisCity_EventScript_1E60E3:: @ 81E60E3
 	lockall
-	applymovement 5, SootopolisCity_Movement_27259E
+	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x405E, 5
 	goto_if_eq SootopolisCity_EventScript_1E612D
@@ -893,7 +893,7 @@ SootopolisCity_EventScript_1E60E3:: @ 81E60E3
 	goto_if_le SootopolisCity_EventScript_1E6141
 	msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, SootopolisCity_Movement_2725A2
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -927,7 +927,7 @@ EventScript_ClosedSootopolisDoor:: @ 81E615D
 
 SootopolisCity_EventScript_1E6166:: @ 81E6166
 	lockall
-	applymovement 7, SootopolisCity_Movement_27259E
+	applymovement 7, Common_Movement_FacePlayer
 	waitmovement 0
 	call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC
 	compare VAR_0x405E, 2
@@ -1261,13 +1261,13 @@ SootopolisCity_Movement_1E635A: @ 81E635A
 
 SootopolisCity_EventScript_1E635D:: @ 81E635D
 	lockall
-	applymovement 15, SootopolisCity_Movement_27259E
+	applymovement 15, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x405E, 5
 	goto_if_eq SootopolisCity_EventScript_1E6388
 	msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT
 	closemessage
-	applymovement 15, SootopolisCity_Movement_2725A2
+	applymovement 15, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -1284,17 +1284,17 @@ SootopolisCity_EventScript_1E6393:: @ 81E6393
 	goto_if_eq SootopolisCity_EventScript_1E63C7
 	msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT
 	closemessage
-	applymovement 14, SootopolisCity_Movement_27259E
+	applymovement 14, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT
 	closemessage
-	applymovement 14, SootopolisCity_Movement_2725A2
+	applymovement 14, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SootopolisCity_EventScript_1E63C7:: @ 81E63C7
-	applymovement 14, SootopolisCity_Movement_27259E
+	applymovement 14, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT
 	releaseall
@@ -1302,13 +1302,13 @@ SootopolisCity_EventScript_1E63C7:: @ 81E63C7
 
 SootopolisCity_EventScript_1E63DB:: @ 81E63DB
 	lockall
-	applymovement 13, SootopolisCity_Movement_27259E
+	applymovement 13, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x405E, 5
 	goto_if_eq SootopolisCity_EventScript_1E6406
 	msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT
 	closemessage
-	applymovement 13, SootopolisCity_Movement_2725A2
+	applymovement 13, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -1321,13 +1321,13 @@ SootopolisCity_EventScript_1E6406:: @ 81E6406
 
 SootopolisCity_EventScript_1E6411:: @ 81E6411
 	lockall
-	applymovement 12, SootopolisCity_Movement_27259E
+	applymovement 12, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x405E, 5
 	goto_if_eq SootopolisCity_EventScript_1E643C
 	msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT
 	closemessage
-	applymovement 12, SootopolisCity_Movement_2725A2
+	applymovement 12, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end