Merge branch 'master' of https://github.com/GriffinRichards/pokefirered into clone-union

This commit is contained in:
GriffinR
2022-08-10 13:48:30 -04:00
1146 changed files with 40526 additions and 38156 deletions
+8 -8
View File
@@ -1,19 +1,19 @@
.set LOCALID_SS_ANNE, 1
SSAnne_Exterior_MapScripts:: @ 8160840
SSAnne_Exterior_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, SSAnne_Exterior_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, SSAnne_Exterior_OnFrame
.byte 0
SSAnne_Exterior_OnTransition:: @ 816084B
SSAnne_Exterior_OnTransition::
setworldmapflag FLAG_WORLD_MAP_SSANNE_EXTERIOR
end
SSAnne_Exterior_OnFrame:: @ 816084F
SSAnne_Exterior_OnFrame::
map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_ExitSSAnne
.2byte 0
SSAnne_Exterior_ExitSSAnne:: @ 8160859
SSAnne_Exterior_ExitSSAnne::
lockall
getplayerxy VAR_0x8004, VAR_0x8005
compare VAR_0x8005, 6
@@ -34,17 +34,17 @@ SSAnne_Exterior_ExitSSAnne:: @ 8160859
releaseall
end
SSAnne_Exterior_WalkDown:: @ 81608A1
SSAnne_Exterior_WalkDown::
applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_WalkDown
waitmovement 0
return
SSAnne_Exterior_WalkInPlaceDown:: @ 81608AC
SSAnne_Exterior_WalkInPlaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
waitmovement 0
return
SSAnne_Exterior_Movement_Exit:: @ 81608B7
SSAnne_Exterior_Movement_Exit::
walk_up
walk_up
walk_up
@@ -56,7 +56,7 @@ SSAnne_Exterior_Movement_Exit:: @ 81608B7
walk_up
step_end
SSAnne_Exterior_Movement_WalkDown:: @ 81608C1
SSAnne_Exterior_Movement_WalkDown::
walk_down
walk_down
walk_down