diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-02-26 13:50:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 13:50:04 -0500 |
| commit | 9f4e2abfc685de4f771f0107bc3bf2375df81966 (patch) | |
| tree | bd4d9775c281c1533c576e6a435e9a0e481fd677 /include/fieldmap.h | |
| parent | 3b558edc7906b2a75b7d65aa396c611ce1802e62 (diff) | |
| parent | cac0681b2c11b7184545cc42d4bd209d6000b42c (diff) | |
Merge pull request #272 from PikalaxALT/fldeff_cut
fldeff_cut
Diffstat (limited to 'include/fieldmap.h')
| -rw-r--r-- | include/fieldmap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h index 406ec2959..a8e31685f 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -19,6 +19,7 @@ u32 MapGridGetMetatileBehaviorAt(int, int); u8 MapGridGetMetatileLayerTypeAt(s16 x, s16 y); void MapGridSetMetatileIdAt(int, int, u16); void MapGridSetMetatileEntryAt(int, int, u16); +u8 MapGridGetZCoordAt(s32 x, s32 y); void GetCameraCoords(u16*, u16*); bool8 MapGridIsImpassableAt(s32, s32); s32 GetMapBorderIdAt(s32, s32); @@ -29,8 +30,8 @@ struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y); void sub_8059948(u8 a0, u8 a1); void save_serialize_map(void); -u32 sub_8058F1C(u32 original, u8 bit); -u32 sub_8058F48(s16 x, s16 y, u8 z); +u32 GetMetatileAttributeFromRawMetatileBehavior(u32 original, u8 bit); +u32 MapGridGetMetatileAttributeAt(s16 x, s16 y, u8 attr); void MapGridSetMetatileImpassabilityAt(s32 x, s32 y, bool32 arg2); #endif //GUARD_FIELDMAP_H |