diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-07-23 11:16:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-23 11:16:08 -0700 |
| commit | ccba86d292a0e4c8a0e07325ac4fb25e5a58dc89 (patch) | |
| tree | fbe0b96a06f46a457e7c4ed54fa889d82746879b /include | |
| parent | aabd340b51c818bc5c46017298b59747be2e4bf6 (diff) | |
| parent | 461841290a4f8f85bae303e0d2f4315830b34c6e (diff) | |
Merge pull request #536 from hatal175/various
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.h | 2 | ||||
| -rw-r--r-- | include/player.h | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/asm.h b/include/asm.h index 34d77cc6..f14e6f01 100644 --- a/include/asm.h +++ b/include/asm.h @@ -21,7 +21,7 @@ extern u32 sub_08002632(struct Entity_*); extern u32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY); extern u32 GravityUpdate(struct Entity_*, u32); extern u32 CheckOnScreen(struct Entity_*); -extern u32 EntityInRectRadius(struct Entity_*, struct Entity_*, u32, u32); +extern bool32 EntityInRectRadius(struct Entity_*, struct Entity_*, u32, u32); extern void UpdateAnimationVariableFrames(struct Entity_*, u32); extern u32 sub_080043E8(struct Entity_*); extern void sub_08004484(struct Entity_*, struct Entity_*); diff --git a/include/player.h b/include/player.h index 94ec3435..ad55ec05 100644 --- a/include/player.h +++ b/include/player.h @@ -154,7 +154,7 @@ enum PlayerItemId { PL_ITEM_CELL_OVERWRITE_SET2, }; -enum SurfaceType { +typedef enum { SURFACE_NORMAL, SURFACE_PIT, SURFACE_2, @@ -200,7 +200,7 @@ enum SurfaceType { SURFACE_AUTO_LADDER, SURFACE_CLIMB_WALL, SURFACE_2C, -}; +} SurfaceType; typedef enum { SKILL_NONE = 0, @@ -255,7 +255,8 @@ typedef struct { /*0x1d*/ u8 gustJarSpeed; /*0x1e*/ u8 dash_state; /*0x1f*/ u8 field_0x1f[3]; - /*0x22*/ u16 field_0x22[2]; + /*0x22*/ u16 tilePosition; + /*0x24*/ u16 tileType; /*0x26*/ u8 swim_state; /*0x27*/ u8 field_0x27[5]; /*0x2c*/ Entity* item; @@ -376,7 +377,7 @@ void sub_08077728(u32); void PutAwayItems(void); void sub_08079E58(s32 speed, u32 direction); void RespawnPlayer(void); -u32 GetSurfaceCalcType(Entity*, s32, s32); +SurfaceType GetSurfaceCalcType(Entity*, s32, s32); void UpdatePlayerMovement(void); void EnablePlayerDraw(Entity*); void sub_080797EC(void); |