Finish decompiling object49.c

This commit is contained in:
Marcus Huderle
2020-08-05 17:46:53 -05:00
parent 1912771187
commit 1cbdcf5a36
9 changed files with 165 additions and 409 deletions
+1 -7
View File
@@ -1,12 +1,12 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
#include "trig.h"
#include "random.h"
#include "link.h"
// Lakitu
extern void EnemyFunctionHandler(Entity *, void (*const funcs[])(Entity*));
extern void SetChildOffset(Entity *, u32, u32, u32);
// sub_0803C758
extern void sub_0803CAD0(Entity *);
@@ -41,7 +41,6 @@ extern void sub_0803CB64(Entity *);
extern void sub_0803CB34(Entity *);
// sub_0803CA0C
extern u32 sub_08003FC4(Entity *, u32);
extern void sub_0803CC08(Entity *this);
// sub_0803CA4C
@@ -51,12 +50,7 @@ extern u32 sub_080041A0(Entity *, Entity *, u32, u32);
// sub_0803CA84
extern u32 GetFacingDirection(Entity *, Entity *);
// sub_0803CAD0
extern u8 sub_080045D4(s16, s16, u16, u16);
extern void sub_080AEFE0(Entity *);
// sub_0803CB64
extern void PositionRelative(Entity *, Entity *, u32, u32);
extern void sub_08004488(u32);
typedef struct {
+3 -5
View File
@@ -1,13 +1,11 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
extern void EnemyFunctionHandler(Entity*, void (*const func[])(Entity*));
extern void sub_0804AA30(Entity*, void (*const func[][])(Entity*));
extern void sub_0804A7D4(Entity*);
extern void sub_0804A720(Entity*);
extern void sub_08045678(Entity*);
extern void sub_080AEFE0(void);
extern u32 sub_08003FC4(Entity*, u32);
extern void sub_08045678(Entity*);
extern void (*const gUnk_080D1868[])(Entity*);
@@ -25,7 +23,7 @@ void sub_080455BC(Entity *this)
void sub_080455D4(Entity *this)
{
sub_0804AA30(this, &gUnk_080D1868);
sub_0804AA30(this, gUnk_080D1868);
}
void sub_080455E4(Entity *this)
@@ -53,7 +51,7 @@ void sub_08045618(Entity *this)
void sub_08045654(Entity *this)
{
sub_080AEFE0();
sub_080AEFE0(this);
GetNextFrame(this);
if (sub_08003FC4(this, 0x1800) == 0) {
sub_08045678(this);