dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into clone-union

Browse Source
This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
parent 2b93687ade 56f8b1a47c
commit ab56ac41a1
322 changed files with 12564 additions and 12748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SSAnne_Exterior/scripts.inc
+4 -6
View File
@@ -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
@@ -40,7 +38,7 @@ SSAnne_Exterior_WalkDown::
return
SSAnne_Exterior_WalkInPlaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFasterDown
waitmovement 0
return