Merge branch 'master' into documentation

This commit is contained in:
notyourav
2020-11-23 22:24:25 -08:00
committed by GitHub
12 changed files with 1950 additions and 4203 deletions
File diff suppressed because it is too large Load Diff
-1
View File
@@ -13,7 +13,6 @@ extern void sub_0804A720(Entity*);
extern void Keese_StartFly(Entity*);
extern void sub_080AEFB4(Entity*);
extern void sub_08021F24(Entity*);
extern u32 sub_0806FCB8(Entity*, s32, s32, u32);
extern u32 sub_08049FA0(Entity*);
extern u32 sub_08049EE4(Entity*);
-1
View File
@@ -15,7 +15,6 @@ extern void sub_0806AEE4(Entity*);
extern void sub_0806AFE8(Entity*, s32*);
extern s32 sub_0806EDD8(Entity*, u32, u32);
extern u32 sub_0806F5B0(u32);
extern void sub_0806F62C(Entity*, s32, s32);
extern void sub_08078784(Entity*, u32);
extern void sub_08078850(Entity*, u32, u32, u32*);
-1
View File
@@ -15,7 +15,6 @@ u32 GetAnimationState(Entity* ent);
void DeleteThisEntity(void);
extern Entity* GetEntityByType(u32, u32);
extern void sub_080686C4(Entity*, Entity*);
extern void sub_0806F62C(Entity*, u32, u32);
extern void PlaySFX(u32);
extern void SetTileType(u32, u32, u32);
-2
View File
@@ -21,8 +21,6 @@ typedef struct {
const struct_08124708 gUnk_08124708[5] = { { 0, 0x2F }, { 1, 0x20 }, { 1, 0x16 }, { 2, 0x10 }, { 3, 0x01 } };
extern u32 sub_080045DA(s32, u32);
void ObjectA2(Entity* this) {
gUnk_081246F4[this->action](this);
GetNextFrame(this);