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

+1 -2
View File
@@ -4,8 +4,7 @@ Route18_MapScripts::
.byte 0
Route18_OnTransition::
compare VAR_MAP_SCENE_ROUTE16, 1
call_if_eq Route18_OnTransitionCyclingRoad
call_if_eq VAR_MAP_SCENE_ROUTE16, 1, Route18_OnTransitionCyclingRoad
end
Route18_OnTransitionCyclingRoad::