diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-20 19:54:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-20 19:54:16 -0500 |
| commit | 7b7f4bb7d6f5d29b40e15aa4c6285c6885359e0d (patch) | |
| tree | 8da3f8fae8c1c165e3435ee079f48631479b7611 /include/fieldmap.h | |
| parent | c6207577802db057298917089e427a6ab9e6edf9 (diff) | |
| parent | 8bf4b1a917786c683ac30278108f74d31961274d (diff) | |
Merge pull request #636 from huderlem/assets
Map organization
Diffstat (limited to 'include/fieldmap.h')
| -rw-r--r-- | include/fieldmap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h index a85f5b101..e77342b72 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -2,7 +2,7 @@ #define GUARD_FIELDMAP2_H #include "event_object_movement.h" -extern struct BackupMapData gUnknown_03004870; +extern struct BackupMapLayout gUnknown_03004870; struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection); int GetMapBorderIdAt(int x, int y); int CanCameraMoveInDirection(int direction); @@ -35,9 +35,9 @@ struct MapConnection *sub_8056BA0(s16 x, s16 y); // fieldmap.c void sub_8056C50(u16, u16); void sav1_camera_get_focus_coords(u16 *x, u16 *y); void GetCameraCoords(u16*, u16*); -void sub_8056D28(struct MapData *pData); -void sub_8056D38(struct MapData *pData); -void apply_map_tileset2_palette(struct MapData *pData); +void sub_8056D28(struct MapLayout *pData); +void sub_8056D38(struct MapLayout *pData); +void apply_map_tileset2_palette(struct MapLayout *pData); void copy_map_tileset1_tileset2_to_vram(/*TODO: arg types*/); void apply_map_tileset1_tileset2_palette(/*TODO: arg types*/); |