falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clang format

This commit is contained in:
21aslade 2021-08-22 12:50:45 -06:00
parent 723c063ee0
commit d1b63497a7
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/object/book.c
View File

@ -102,8 +102,7 @@ void sub_0809B4A8(Entity* this) {
gPlayerEntity.y.HALF.LO = 0; gPlayerEntity.y.HALF.LO = 0;
gPlayerEntity.direction = gPlayerEntity.animationState << 2; gPlayerEntity.direction = gPlayerEntity.animationState << 2;
EnqueueSFX(0x10f); EnqueueSFX(0x10f);
} } else {
else {
this->actionDelay = 0x16; this->actionDelay = 0x16;
} }
} }
@ -114,8 +113,7 @@ void sub_0809B524(Entity* this) {
this->action = 3; this->action = 3;
this->y.HALF.HI += 32; this->y.HALF.HI += 32;
this->height.HALF.HI -= 32; this->height.HALF.HI -= 32;
} } else {
else {
this->action = 1; this->action = 1;
this->actionDelay = 22; this->actionDelay = 22;
this->field_0x80.HALF.LO = 24; this->field_0x80.HALF.LO = 24;
@ -146,8 +144,7 @@ void sub_0809B56C(Entity* this) {
void sub_0809B5B4(Entity* this) { void sub_0809B5B4(Entity* this) {
if (gPlayerState.flags.all & 0x80) { if (gPlayerState.flags.all & 0x80) {
sub_0800445C(this); sub_0800445C(this);
} } else if (sub_08017850(this)) {
else if (sub_08017850(this)) {
CreateItemEntity(this->type + 0x39, 0, 0); CreateItemEntity(this->type + 0x39, 0, 0);
DeleteThisEntity(); DeleteThisEntity();
} }
@ -159,9 +156,15 @@ void sub_0809B5EC(Entity* this) {
case 0: { case 0: {
Entity* parent; Entity* parent;
parent = FindEntityByID(7, 26, 7); parent = FindEntityByID(7, 26, 7);
if (!parent) return; if (!parent) {
if (parent->x.HALF.HI < this->x.HALF.HI) return; return;
if (parent->animationState != 4) return; }
if (parent->x.HALF.HI < this->x.HALF.HI) {
return;
}
if (parent->animationState != 4) {
return;
}
this->parent = parent; this->parent = parent;
this->subAction = 1; this->subAction = 1;
@ -176,12 +179,11 @@ void sub_0809B5EC(Entity* this) {
sub_0809B6B0(this->parent, this); sub_0809B6B0(this->parent, this);
break; break;
} }
default: return; default:
return;
} }
} else {
}
else {
switch (this->subAction) { switch (this->subAction) {
default: { default: {
DeleteThisEntity(); DeleteThisEntity();
@ -227,12 +229,7 @@ void sub_0809B6B0(Entity* parent, Entity* this) {
} }
void (*const BookActionFuncs[])(Entity*) = { void (*const BookActionFuncs[])(Entity*) = {
sub_0809B3C4, sub_0809B3C4, sub_0809B4A8, sub_0809B524, sub_0809B56C, sub_0809B5B4, sub_0809B5EC,
sub_0809B4A8,
sub_0809B524,
sub_0809B56C,
sub_0809B5B4,
sub_0809B5EC
}; };
const s8 gUnk_08123D94[] = { -22, -20, -20, -20 }; const s8 gUnk_08123D94[] = { -22, -20, -20, -20 };