Rename enemy functions

This commit is contained in:
octorock
2022-02-06 20:01:41 +01:00
parent 75c57e3124
commit d6c79aa263
121 changed files with 1141 additions and 1102 deletions
+2 -2
View File
@@ -13,9 +13,9 @@ extern void UpdateScrollVram(void);
extern u32 sub_080002D0(struct Entity_*);
extern u32 sub_080002F0(u32, u32, u32);
extern void LoadResourceAsync(const void*, u32, u32);
extern void sub_08001242(struct Entity_*);
extern void GenericConfused(struct Entity_*);
extern void sub_08001290(struct Entity_*, u32);
extern void sub_08001324(struct Entity_*);
extern void GenericKnockback(struct Entity_*);
extern u32 sub_08002632(struct Entity_*);
extern u32 CheckPlayerInRegion(u32 centerX, u32 centerY, u32 radiusX, u32 radiusY);
extern u32 GravityUpdate(struct Entity_*, u32);
+3 -3
View File
@@ -15,14 +15,14 @@
bool32 EnemyInit(Entity* this);
extern u32 GetNextFunction(Entity*);
extern void EnemyFunctionHandler(Entity*, EntityActionArray);
extern void sub_08001324(Entity*);
extern void GenericKnockback(Entity*);
extern Entity* CreateDeathFx(Entity*, u32, u32);
extern Entity* sub_0804A9FC(Entity*, u32);
extern Entity* Create0x68FX(Entity*, u32);
extern void SetChildOffset(Entity*, s32, s32, s32);
extern Entity* CreateProjectileWithParent(Entity*, u8, u8);
extern void sub_0804A7D4(Entity*);
extern void GenericDeath(Entity*);
extern void sub_08002724(void*, u8*);
extern void sub_080026C4(u8*, u8*, u8*, u32);
extern void sub_080026F2(u8*, void*, u8*, u32);
+2 -2
View File
@@ -170,7 +170,7 @@ typedef struct Entity_ {
/*0x34*/ union SplitWord z; /**< Z position, fixed point Q16.16. */
/*0x38*/ u8 collisionLayer; /**< Collision layer. */
/*0x39*/ s8 interactType;
/*0x3a*/ u8 field_0x3a;
/*0x3a*/ u8 field_0x3a; /**< 4: grabbed by GustJar */
/*0x3b*/ u8 flags2;
/*0x3c*/ u8 field_0x3c;
/*0x3d*/ s8 iframes; /**< Invulnerability frames. */
@@ -179,7 +179,7 @@ typedef struct Entity_ {
/*0x40*/ u8 hurtType; /**< behavior as a collision receiver. */
/*0x41*/ u8 bitfield;
/*0x42*/ u8 knockbackDuration; /**< Duration of knockback. */
/*0x43*/ u8 field_0x43;
/*0x43*/ u8 confusedTime; /**< Frames that this Entity is confused. */
/*0x44*/ u8 damage; /**< Damage this Entity inflicts. */
/*0x45*/ u8 health; /**< Health of this Entity. */
/*0x46*/ u16 field_0x46;
+2 -2
View File
@@ -27,7 +27,7 @@ extern void sub_0806D02C(Entity*);
extern void sub_0806FD3C(Entity*);
extern void sub_0805ED14(u32*);
extern void sub_080A7C18(u32, u32, u32);
extern void sub_0804AA30(Entity*, void (*const[])());
extern void EnemyFunctionHandlerAfterCollision(Entity*, void (*const[])());
extern void sub_0804A720(Entity*);
extern u32 sub_080AEFE0(Entity*);
extern u32 sub_08049FA0(Entity*);
@@ -148,7 +148,7 @@ extern u32 sub_08049F1C(Entity*, Entity*, u32);
extern u32 sub_08049F1C(Entity*, Entity*, u32);
extern void SoundReqClipped(Entity*, u32);
extern void SoundReqClipped(Entity*, u32);
extern void sub_08001328(Entity*);
extern void GenericKnockback2(Entity*);
extern void sub_08031E48(Entity*, Entity*);
extern void sub_08032290(Entity*);
extern void sub_08032338(Entity*);