diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm_fieldmap.h | 2 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 4 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/asm_fieldmap.h b/include/asm_fieldmap.h index afc1fac7c..10d8c8f6d 100644 --- a/include/asm_fieldmap.h +++ b/include/asm_fieldmap.h @@ -6,7 +6,7 @@ void sub_8055FC0(void); u8 MapGridGetZCoordAt(); bool8 MapGridIsImpassableAt(s16, s16); int MapGridGetMetatileIdAt(int, int); -int MapGridGetMetatileBehaviorAt(int x, int y); // return: (u8|u16|int) args: (int|s16|s32) +u32 MapGridGetMetatileBehaviorAt(int x, int y); // return: (u8|u16|int) args: (int|s16|s32) u8 MapGridGetMetatileLayerTypeAt(/*TODO: arg types*/); void MapGridSetMetatileIdAt(u32, u32, u16); void save_serialize_map(void); diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 9e2e7a489..0095c229f 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -71,7 +71,7 @@ u8 GetPlayerAvatarGraphicsIdByStateId(u8 a); // GetPlayerAvatarGenderByGraphicsId // PartyHasMonWithSurf // IsPlayerSurfingNorth -// IsPlayerFacingSurfableFishableWater +bool8 IsPlayerFacingSurfableFishableWater(void); // ClearPlayerAvatarInfo void SetPlayerAvatarStateMask(u8 a); // GetPlayerAvatarGraphicsIdByCurrentState @@ -91,7 +91,7 @@ void InitPlayerAvatar(s16 a, s16 b, u8 c, u8 d); // sub_805A178 // sub_805A1B8 void sub_805A20C(u8 a); -// StartFishing +void StartFishing(u8 a); // Fishing1 // Fishing2 // Fishing3 diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 9bcd9c3e7..3759d9d15 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -58,7 +58,8 @@ struct WarpEvent struct CoordEvent { s16 x, y; - u8 filler_4[0x2]; + u8 filler_4; + u8 filler_5; u16 trigger; u16 index; u8 filler_A[0x2]; @@ -76,7 +77,7 @@ struct BgEvent struct MapEvents { - u8 mapObjectCount; + u32 mapObjectCount; u8 warpCount; u8 coordEventCount; u8 bgEventCount; |