diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/area.h | 12 | ||||
| -rw-r--r-- | include/functions.h | 8 | ||||
| -rw-r--r-- | include/player.h | 14 | ||||
| -rw-r--r-- | include/room.h | 2 | ||||
| -rw-r--r-- | include/structures.h | 6 |
5 files changed, 22 insertions, 20 deletions
diff --git a/include/area.h b/include/area.h index e1648f8c..e6e749d7 100644 --- a/include/area.h +++ b/include/area.h @@ -34,13 +34,13 @@ typedef struct { u8 unk_0c_4 : 4; u8 filler3[2]; u16 field_0x10; - u16 curPortalX; - u16 curPortalY; - u8 curPortalExitDirection; - u8 curPortalType; - u8 field_0x18; + u16 portal_x; + u16 portal_y; + u8 portal_exit_dir; + u8 portal_type; + u8 portal_mode; // u8 filler3[7]; - bool8 playShrinkSeq; + bool8 portal_in_use; u8 unk1A; u8 filler2[13]; u8 inventoryGfxIdx; diff --git a/include/functions.h b/include/functions.h index acfa617d..c2ded725 100644 --- a/include/functions.h +++ b/include/functions.h @@ -187,7 +187,7 @@ extern bool32 sub_08077EC8(ItemBehavior*); extern bool32 sub_08077EFC(ItemBehavior*); extern bool32 sub_08077F10(ItemBehavior*); extern bool32 sub_08077F24(ItemBehavior*, u32); -extern void sub_08077F50(ItemBehavior*, u32); +extern void PlayerCancelHoldItem(ItemBehavior*, u32); extern bool32 sub_08077FEC(u32); extern void sub_08078180(void); extern void sub_080784C8(); @@ -204,8 +204,8 @@ extern void sub_08078AC0(u32, u32, u32); extern void sub_08078B48(void); extern void sub_08078E84(Entity*, Entity*); extern void sub_08078FB0(Entity*); -extern void sub_08079184(); -extern void sub_0807919C(); +extern void PlayerDropHeldObject(); +extern void PlayerResetStateFromFusion(); extern void sub_080792BC(s32, u32, u32); extern u32 sub_0807953C(void); extern void sub_08079BD8(Entity*); @@ -246,7 +246,7 @@ extern void sub_080A2AF4(Entity*, s32, s32); extern void sub_080A2CC0(Entity*, u16**, u16*); extern void sub_080A57F4(void); extern void sub_080A71C4(u32, u32, u32, u32); -extern void sub_080A7C18(u32, u32, u32); +extern void InitItemGetSequence(u32, u32, u32); extern void sub_080ADD70(void); extern bool32 sub_080AE4CC(Entity*, u32, u32, u32); extern void sub_080AE58C(Entity*, u32, u32); diff --git a/include/player.h b/include/player.h index fdb3d2d8..6f00b872 100644 --- a/include/player.h +++ b/include/player.h @@ -316,9 +316,10 @@ extern Entity* gPlayerClones[]; extern PlayerState gPlayerState; extern Entity gPlayerEntity; +void DoPlayerAction(Entity*); bool32 CheckInitPauseMenu(void); void SetPlayerControl(PlayerControlMode mode); -void ResetPlayer(void); +void ResetPlayerItem(void); void ResetPlayerVelocity(void); void ResetPlayerAnimationAndAction(void); void SetPlayerActionNormal(void); @@ -342,21 +343,21 @@ void ModRupees(s32 delta); // playerUtils.c void DeleteClones(void); void sub_08077728(u32); -void sub_08077B20(void); +void PutAwayItems(void); void sub_08079E58(s32 speed, u32 direction); void RespawnPlayer(void); u32 GetSurfaceCalcType(Entity*, u32, u32); void UpdatePlayerMovement(void); void EnablePlayerDraw(Entity*); void sub_080797EC(void); -void sub_08079258(void); +void PlayerMinishSetNormalAndCollide(void); u32 sub_08079B24(void); void sub_08079708(Entity*); void sub_08079744(Entity*); void sub_0807AE20(Entity*); u32 sub_0807A894(Entity*); u32 sub_080797C4(void); -void sub_08078F24(void); +void CheckPlayerVelocity(void); void sub_0807B068(Entity*); u32 sub_0807A2F8(u32); void sub_08077698(/* PlayerEntity* */); @@ -365,14 +366,15 @@ u32 sub_08079550(void); u32 sub_080782C0(void); bool32 sub_080793E4(u32); bool32 sub_08079C30(Entity*); -void sub_08077AEC(void); +void ResetLantern(void); bool32 CheckQueuedAction(void); void UpdatePlayerSkills(void); u32 sub_0807AC54(Entity*); void sub_080792D8(void); u32 sub_08078F74(Entity*); void sub_0807879C(Entity*); -void sub_0807921C(); +void PlayerSetNormalAndCollide(void); +bool32 PlayerTryDropItem(ItemBehavior* arg0, u32 unk); // player.s extern u32 PlayerCheckNEastTile(); diff --git a/include/room.h b/include/room.h index 3ab02772..33f95d68 100644 --- a/include/room.h +++ b/include/room.h @@ -205,7 +205,7 @@ typedef enum { BIG_CHEST, BOMBABLE_WALL, SIGN, - TILE_ENTITY_6, + TILE_EZLO_HINT, MUSIC_SETTER, TILE_ENTITY_8, DARKNESS, diff --git a/include/structures.h b/include/structures.h index 00e83b72..7fc1210f 100644 --- a/include/structures.h +++ b/include/structures.h @@ -208,7 +208,7 @@ typedef struct { extern PriorityHandler gPriorityHandler; extern struct { - u8 unk0; + u8 disabled; u8 unk1; u8 unk2[0xf]; u8 unk11; @@ -218,8 +218,8 @@ extern struct { u8 unk15; s8 unk16; u8 unk17; -} gUnk_02034490; -static_assert(sizeof(gUnk_02034490) == 0x18); +} gPauseMenuOptions; +static_assert(sizeof(gPauseMenuOptions) == 0x18); typedef struct { u8 unk00 : 1; |