Merge branch 'master' into movement-action

2022-08-15 12:54:47 +08:00
parent 7233b2ed0a b3c2c7291f
commit 2644dd9c21
286 changed files with 8970 additions and 9432 deletions
@@ -16,10 +16,8 @@ SSAnne_Exterior_OnFrame::
 SSAnne_Exterior_ExitSSAnne::
 	lockall
 	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8005, 6
-	call_if_le SSAnne_Exterior_WalkDown
-	compare VAR_0x8005, 7
-	call_if_ge SSAnne_Exterior_WalkInPlaceDown
+	call_if_le VAR_0x8005, 6, SSAnne_Exterior_WalkDown
+	call_if_ge VAR_0x8005, 7, SSAnne_Exterior_WalkInPlaceDown
 	fadenewbgm MUS_SURF
 	delay 50
 	special DoSSAnneDepartureCutscene
@@ -29,7 +27,7 @@ SSAnne_Exterior_ExitSSAnne::
 	waitmovement 0
 	setvar VAR_MAP_SCENE_VERMILION_CITY, 2
 	setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
-	warp MAP_VERMILION_CITY, 255, 23, 34
+	warp MAP_VERMILION_CITY, 23, 34
 	waitstate
 	releaseall
 	end