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/VictoryRoad_2F/scripts.inc
+9 -10
View File
@@ -1,12 +1,13 @@
.set LOCALID_BOULDER1, 11
.set LOCALID_BOULDER2, 12
VictoryRoad_2F_MapScripts::
map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_2F_OnLoad
.byte 0
VictoryRoad_2F_OnLoad::
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier1
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier2
call_if_ne VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100, VictoryRoad_2F_EventScript_SetRockBarrier1
call_if_ne VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100, VictoryRoad_2F_EventScript_SetRockBarrier2
end
VictoryRoad_2F_EventScript_SetRockBarrier1::
@@ -21,14 +22,13 @@ VictoryRoad_2F_EventScript_SetRockBarrier2::
VictoryRoad_2F_EventScript_FloorSwitch1::
lockall
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed
goto_if_eq VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100, VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed
setmetatile 13, 10, METATILE_Cave_Floor_Ledge_Top, 0
setmetatile 13, 11, METATILE_Cave_Floor_Ledge_Bottom, 0
playse SE_ICE_BREAK
special DrawWholeMapView
waitse
moveobjectoffscreen 11
copyobjectxytoperm LOCALID_BOULDER1
setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
releaseall
end
@@ -39,14 +39,13 @@ VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed::
VictoryRoad_2F_EventScript_FloorSwitch2::
lockall
compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed
goto_if_eq VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100, VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed
setmetatile 33, 16, METATILE_Cave_Floor_Ledge_Top, 0
setmetatile 33, 17, METATILE_Cave_Floor_Ledge_Bottom, 0
playse SE_ICE_BREAK
special DrawWholeMapView
waitse
moveobjectoffscreen 12
copyobjectxytoperm LOCALID_BOULDER2
setvar VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
releaseall
end