Merge branch 'master' into clone-union

This commit is contained in:
GriffinR
2022-08-17 15:41:50 -04:00
committed by GitHub
322 changed files with 12564 additions and 12748 deletions
+5 -5
View File
@@ -1,11 +1,12 @@
.set LOCALID_BOULDER, 5
VictoryRoad_1F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_1F_OnLoad
map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition
.byte 0
VictoryRoad_1F_OnLoad::
compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
call_if_ne VictoryRoad_1F_EventScript_SetRockBarrier
call_if_ne VAR_MAP_SCENE_VICTORY_ROAD_1F, 100, VictoryRoad_1F_EventScript_SetRockBarrier
end
VictoryRoad_1F_EventScript_SetRockBarrier::
@@ -19,14 +20,13 @@ VictoryRoad_1F_OnTransition::
VictoryRoad_1F_EventScript_FloorSwitch::
lockall
compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed
goto_if_eq VAR_MAP_SCENE_VICTORY_ROAD_1F, 100, VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed
setmetatile 12, 14, METATILE_Cave_Floor_Ledge_Top, 0
setmetatile 12, 15, METATILE_Cave_Floor_Ledge_Bottom, 0
playse SE_ICE_BREAK
special DrawWholeMapView
waitse
moveobjectoffscreen 5
copyobjectxytoperm LOCALID_BOULDER
setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
releaseall
end