clang-format

This commit is contained in:
theo
2020-06-13 17:02:27 -07:00
parent 8e1ca1936b
commit 66fcdf6186
86 changed files with 2320 additions and 2604 deletions
+22 -34
View File
@@ -2,11 +2,11 @@
#include "entity.h"
#include "textbox.h"
extern void InitializeAnimation(Entity *, u32);
extern void sub_08078778(Entity *);
extern void sub_0805E47C(Entity *);
extern void sub_08004274(Entity *);
extern void sub_0806ED78(Entity *);
extern void InitializeAnimation(Entity*, u32);
extern void sub_08078778(Entity*);
extern void sub_0805E47C(Entity*);
extern void sub_08004274(Entity*);
extern void sub_0806ED78(Entity*);
extern void TextboxTryNoOverlap(u32);
extern void sub_0805E584();
extern void sub_0807DD64();
@@ -17,18 +17,17 @@ extern void sub_0807DDE4();
extern u32 sub_0801E7F4();
extern void ShowNPCDialogue();
extern void (*gStampBehaviors1[4])(Entity*);
extern void (*gStampBehaviors2[2])(Entity*);
extern TextBox gTextBox;
extern u32 gUnk_0810C2E4;
extern void InitializeAnimation(Entity *, u32);
extern void sub_08078778(Entity *);
extern void sub_0805E47C(Entity *);
extern void sub_08004274(Entity *);
extern void sub_0806ED78(Entity *);
extern void InitializeAnimation(Entity*, u32);
extern void sub_08078778(Entity*);
extern void sub_0805E47C(Entity*);
extern void sub_08004274(Entity*);
extern void sub_0806ED78(Entity*);
extern void TextboxTryNoOverlap(u32);
extern void sub_0805E584();
extern void sub_0807DD64();
@@ -39,33 +38,28 @@ extern void sub_0807DDE4();
extern u32 sub_0801E7F4();
extern void ShowNPCDialogue();
extern void (*gStampBehaviors1[4])(Entity*);
extern void (*gStampBehaviors2[2])(Entity*);
extern TextBox gTextBox;
extern u32 gUnk_0810C2E4;
void sub_08062B98(Entity *ent)
{
void sub_08062B98(Entity* ent) {
if ((ent->flags & 2) != 0) {
gStampBehaviors2[ent->action](ent);
}
else {
} else {
gStampBehaviors1[ent->action](ent);
}
}
void sub_08062BD4(Entity *ent)
{
void sub_08062BD4(Entity* ent) {
ent->action = 1;
ent->spriteSettings.b.ss0 = 1;
InitializeAnimation(ent, 0);
sub_08078778(ent);
}
void sub_08062BF8(Entity *ent)
{
void sub_08062BF8(Entity* ent) {
sub_08004274(ent);
if (ent->interactType != 0) {
ent->interactType = 0;
@@ -75,8 +69,7 @@ void sub_08062BF8(Entity *ent)
sub_0806ED78(ent);
}
void sub_08062C24(Entity *ent)
{
void sub_08062C24(Entity* ent) {
sub_08004274(ent);
if ((ent->frames.all & 128) != 0) {
InitializeAnimation(ent, 4);
@@ -85,8 +78,7 @@ void sub_08062C24(Entity *ent)
}
}
void sub_08062C54(Entity *ent)
{
void sub_08062C54(Entity* ent) {
if ((gTextBox.doTextBox & 127) == 0) {
ent->action = 1;
InitializeAnimation(ent, 0);
@@ -94,8 +86,7 @@ void sub_08062C54(Entity *ent)
}
}
void sub_08062C7C(Entity *ent)
{
void sub_08062C7C(Entity* ent) {
ent->action = 1;
sub_0807DD64(ent);
InitializeAnimation(ent, 0);
@@ -103,24 +94,21 @@ void sub_08062C7C(Entity *ent)
sub_08062CA4(ent);
}
void sub_08062CA4(Entity *ent)
{
void sub_08062CA4(Entity* ent) {
sub_0807DDAC(ent, 0);
sub_0807DDE4(ent);
sub_08004274(ent);
}
void sub_08062CBC(Entity *ent)
{
void sub_08062CBC(Entity* ent) {
u32 uVar1;
uVar1 = sub_0801E7F4(44);
ShowNPCDialogue(ent, &gUnk_0810C2E4 + ((-uVar1 | uVar1) >> 31) * 2);
}
void sub_08062CE0(Entity *ent)
{
void sub_08062CE0(Entity* ent) {
if (ent->action == 0) {
ent->action = 1;
}
}
}