diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-19 01:04:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 01:04:35 -0400 |
| commit | 5d6e7a31da8f018c1a69e9e57eca0657ec19c283 (patch) | |
| tree | 3ce548fbada787a8d2dc686ef6612f06e2b9fc3a /include/fieldmap.h | |
| parent | 9effc97f69d46af00e45420661a775c5977049c8 (diff) | |
| parent | 3d96e954c845659f5184e99856ddf61ce1375b2f (diff) | |
Merge pull request #788 from kazblox/master
Fix NONMATCHINGs and actual English Debug support
Diffstat (limited to 'include/fieldmap.h')
| -rw-r--r-- | include/fieldmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h index cc2a29914..cdac9f79c 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -13,7 +13,7 @@ extern struct BackupMapLayout gUnknown_03004870; struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection); int GetMapBorderIdAt(int x, int y); int CanCameraMoveInDirection(int direction); -u32 GetBehaviorByMetatileId(u16 metatile); +u16 GetBehaviorByMetatileId(u16 metatile); void MapGridSetMetatileEntryAt(int, int, u16); void not_trainer_hill_battle_pyramid(void); @@ -31,7 +31,7 @@ u32 MapGridGetMetatileIdAt(int, int); u32 MapGridGetMetatileBehaviorAt(int x, int y); // return: (u8|u16|int) args: (int|s16|s32) u8 MapGridGetMetatileLayerTypeAt(int, int); void MapGridSetMetatileIdAt(int, int, u16); -u32 GetBehaviorByMetatileId(u16 metatile); +u16 GetBehaviorByMetatileId(u16 metatile); void save_serialize_map(void); void sub_8056670(); bool8 CameraMove(int, int); |