label BounceUpdate asm

1 files changed, 12 insertions, 2 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);