Merge branch 'master' into clone-union

This commit is contained in:
GriffinR authored and GitHub committed 2022-08-17 15:41:50 -04:00
commit ab56ac41a1
322 files changed
+12564 -12748

No files matched your search

+2 -4
View File
@@ -5,10 +5,8 @@ SixIsland_PatternBush_MapScripts::
SixIsland_PatternBush_OnTransition::
setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH
getplayerxy VAR_TEMP_1, VAR_TEMP_2
compare VAR_TEMP_1, 50
call_if_ge SixIsland_PatternBush_EventScript_SetEscapeRightExit
compare VAR_TEMP_1, 49
call_if_le SixIsland_PatternBush_EventScript_SetEscapeLeftExit
call_if_ge VAR_TEMP_1, 50, SixIsland_PatternBush_EventScript_SetEscapeRightExit
call_if_le VAR_TEMP_1, 49, SixIsland_PatternBush_EventScript_SetEscapeLeftExit
end
SixIsland_PatternBush_EventScript_SetEscapeRightExit::