diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.h | 14 | ||||
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | include/enemy.h | 2 | ||||
| -rw-r--r-- | include/functions.h | 2 | ||||
| -rw-r--r-- | include/message.h | 10 |
5 files changed, 21 insertions, 11 deletions
diff --git a/include/asm.h b/include/asm.h index 391ba768..bb768be3 100644 --- a/include/asm.h +++ b/include/asm.h @@ -20,11 +20,21 @@ extern void GenericKnockback(struct Entity_*); extern u32 GetFuserId(struct Entity_*); extern u32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY); extern u32 GravityUpdate(struct Entity_* entity, u32 gravity); +enum { + BOUNCE_DONE_ALL, + BOUNCE_INIT_NEXT, + BOUNCE_AIRBORNE, +}; +u32 BounceUpdate(struct Entity_*, u32 acceleration); extern u32 CheckOnScreen(struct Entity_*); 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_*); +/** + * Basic collision, only used between player and dazed enemies. + * (Probablity leftover from Four Swords) + */ +extern void CalcCollisionStaticEntity(struct Entity_*, struct Entity_*); extern void ResetCollisionLayer(struct Entity_*); extern void sub_08004596(struct Entity_*, u32); extern u32 sub_080045B4(struct Entity_*, u32, u32); @@ -41,7 +51,7 @@ extern u32 sub_080B1B44(u32, u32); extern u32 sub_080B1A48(u32, u32, u32); extern u32 sub_080B1B18(s32, s32, u32); extern u32 sub_080B1AE0(u16, u8); -extern u32 GetTileUnderEntity(struct Entity_*); +extern u32 GetActTile(struct Entity_*); extern u32 sub_0800445C(struct Entity_*); extern u32 sub_080B1AF0(struct Entity_*, s32, s32); extern u32 GetRelativeCollisionTile(struct Entity_*, u32, u32); diff --git a/include/common.h b/include/common.h index 871e5f05..c9200c98 100644 --- a/include/common.h +++ b/include/common.h @@ -11,9 +11,9 @@ struct Entity_; typedef struct { u16 heldKeys; /**< Keys held since last frame. */ u16 newKeys; /** Keys newly pressed this frame. */ - u16 unk4; + u16 menuScrollKeys; u8 unk6; - u8 unk7; + u8 menuScrollTimer; } Input; extern Input gInput; /**< Input instance. */ diff --git a/include/enemy.h b/include/enemy.h index ba1b828b..1f13a8d0 100644 --- a/include/enemy.h +++ b/include/enemy.h @@ -43,7 +43,7 @@ bool32 sub_08049F84(Entity*, s32); Entity* sub_08049DF4(u32); u32 sub_0804A044(Entity*, Entity*, u32); s32 sub_080012DC(Entity*); -u32 sub_080044EC(Entity*, u32); + void sub_0804AA1C(Entity*); bool32 sub_08049F1C(Entity*, Entity*, s32); bool32 PlayerInRange(Entity*, u32, s32); diff --git a/include/functions.h b/include/functions.h index 49fb3f31..1caeb76d 100644 --- a/include/functions.h +++ b/include/functions.h @@ -69,7 +69,7 @@ extern void sub_080042D0(Entity*, u32, u16); extern void sub_080043A8(Entity*); extern u32 sub_0800445C(Entity*); extern void sub_080044AE(Entity*, u32, u32); -extern u32 sub_080044EC(Entity*, u32); +extern u32 BounceUpdate(Entity*, u32); extern void sub_0800451C(Entity*); extern void sub_08004542(Entity*); extern void sub_080085B0(Entity*); diff --git a/include/message.h b/include/message.h index 32f9f582..ae739791 100644 --- a/include/message.h +++ b/include/message.h @@ -18,11 +18,11 @@ typedef struct { u8 textWindowPosY; u16 textIndex; u16 unk2; // HI? - u32 field_0xc; - u32 rupees; - u32 field_0x14; - u32 field_0x18; - u32 field_0x1c; + u32 flags; + u32 rupees; // item price, shells, minigame timer + u32 field_0x14; // number of cuccos + u32 field_0x18; // unused + u32 field_0x1c; // unused } Message; extern Message gMessage; |