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
+7 -6
View File
@@ -1,10 +1,12 @@
.set LOCALID_BOULDER1, 7
.set LOCALID_BOULDER2, 10
VictoryRoad_3F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_3F_OnLoad
.byte 0
VictoryRoad_3F_OnLoad::
compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
call_if_ne VictoryRoad_3F_EventScript_SetRockBarrier
call_if_ne VAR_MAP_SCENE_VICTORY_ROAD_3F, 100, VictoryRoad_3F_EventScript_SetRockBarrier
end
VictoryRoad_3F_EventScript_SetRockBarrier::
@@ -14,15 +16,14 @@ VictoryRoad_3F_EventScript_SetRockBarrier::
VictoryRoad_3F_EventScript_FloorSwitch::
lockall
compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
goto_if_eq VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed
goto_if_eq VAR_MAP_SCENE_VICTORY_ROAD_3F, 100, VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed
setmetatile 12, 12, METATILE_Cave_Floor_Ledge_Top, 0
setmetatile 12, 13, METATILE_Cave_Floor_Ledge_Bottom, 0
playse SE_ICE_BREAK
special DrawWholeMapView
waitse
moveobjectoffscreen 7
moveobjectoffscreen 10
copyobjectxytoperm LOCALID_BOULDER1
copyobjectxytoperm LOCALID_BOULDER2
setvar VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
releaseall
end