diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/fieldmap.h | 22 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 5 |
2 files changed, 14 insertions, 13 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h index d2eada760..4568c7258 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -25,24 +25,22 @@ void GetCameraCoords(u16*, u16*); bool8 MapGridIsImpassableAt(s32, s32); s32 GetMapBorderIdAt(s32, s32); bool32 CanCameraMoveInDirection(s32); -u32 GetBehaviorByMetatileIdAndMapLayout(const struct MapLayout *mapLayout, u16 metatile, u8 attr); -const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection); +const struct MapHeader * GetMapHeaderFromConnection(struct MapConnection * connection); struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y); void Fieldmap_ApplyGlobalTintToPaletteSlot(u8 slot, u8 count); - -void save_serialize_map(void); -u32 GetMetatileAttributeFromRawMetatileBehavior(u32 original, u8 bit); -u32 MapGridGetMetatileAttributeAt(s16 x, s16 y, u8 attr); +void SaveMapView(void); +u32 ExtractMetatileAttribute(u32 attributes, u8 attributeType); +u32 MapGridGetMetatileAttributeAt(s16 x, s16 y, u8 attributeType); void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 arg2); bool8 CameraMove(s32 x, s32 y); -void copy_map_tileset1_tileset2_to_vram(struct MapLayout const * mapLayout); -void apply_map_tileset1_tileset2_palette(struct MapLayout const * mapLayout); +void CopyMapTilesetsToVram(struct MapLayout const * mapLayout); +void LoadMapTilesetPalettes(struct MapLayout const * mapLayout); void InitMap(void); -void copy_map_tileset2_to_vram_2(const struct MapLayout * mapLayout); -void apply_map_tileset2_palette(const struct MapLayout * mapLayout); +void CopySecondaryTilesetToVramUsingHeap(const struct MapLayout * mapLayout); +void LoadSecondaryTilesetPalette(const struct MapLayout * mapLayout); void InitMapFromSavedGame(void); -void copy_map_tileset1_to_vram(const struct MapLayout *mapLayout); -void copy_map_tileset2_to_vram(const struct MapLayout *mapLayout); +void CopyPrimaryTilesetToVram(const struct MapLayout *mapLayout); +void CopySecondaryTilesetToVram(const struct MapLayout *mapLayout); void GetCameraFocusCoords(u16 *x, u16 *y); void SetCameraFocusCoords(u16 x, u16 y); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 7544fe418..c57146445 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -3,6 +3,7 @@ #define OBJECT_EVENTS_COUNT 16 +#define METATILE_BEHAVIOR_MASK 0x00FF #define METATILE_COLLISION_MASK 0x0C00 #define METATILE_ID_MASK 0x03FF #define METATILE_ID_UNDEFINED 0x03FF @@ -42,7 +43,9 @@ enum enum { - CONNECTION_SOUTH = 1, + CONNECTION_INVALID = -1, + CONNECTION_NONE, + CONNECTION_SOUTH, CONNECTION_NORTH, CONNECTION_WEST, CONNECTION_EAST, |