Merge branch 'master' into doc-overworld

This commit is contained in:
GriffinR authored and GitHub committed 2020-07-08 15:51:58 -04:00
commit ebb6c4ee66
498 files changed
+8011 -7053

No files matched your search

+1 -1
View File
@@ -43,9 +43,9 @@ void CopyPrimaryTilesetToVram(const struct MapLayout *);
void CopySecondaryTilesetToVram(const struct MapLayout *);
struct MapHeader const *const GetMapHeaderFromConnection(struct MapConnection *connection);
struct MapConnection *GetConnectionAtCoords(s16 x, s16 y);
void MapGridSetMetatileImpassabilityAt(int x, int y, bool32 impassable);
// field_region_map.c
void FieldInitRegionMap(MainCallback callback);
void sub_8088B94(int x, int y, int a2);
#endif //GUARD_FIELDMAP_H