Merge master into ObjEvent rename

This commit is contained in:
GriffinR committed 2019-12-21 05:19:27 -05:00
commit 68cdd7b1cb
67 files changed
+1026 -822

No files matched your search

+1 -1
View File
@@ -366,7 +366,7 @@ u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
}
*mapGroup = MAP_GROUP(ROUTE132);
*y = 20;
return SS_TIDAL_LOCATION_OTHER;
return SS_TIDAL_LOCATION_CURRENTS;
}
bool32 ShouldDoWallyCall(void)