mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-15 12:59:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
theo3
2022-03-17 19:13:56 -07:00
parent 3357984494
commit ef470547e0
279 changed files with 848 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/beedle.c
+1 -1
View File
@@ -67,7 +67,7 @@ void sub_0806336C(Entity* this) {
void sub_08063390(Entity* this) {
GetNextFrame(this);
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
this->action = 1;
InitializeAnimation(this, GetAnimationState(this));
sub_08078778(this);
src/npc/bladeBrothers.c
+3 -3
View File
@@ -53,7 +53,7 @@ void sub_08068A1C(Entity* this) {
int offset;
this->type2 = this->type;
if (gRoomTransition.player_status.field_0x24[8] != 0) {
if (gRoomTransition.entity_update_type != 0) {
offset = 6;
bVar1 = 3;
@@ -105,7 +105,7 @@ void sub_08068AA4(Entity* this) {
}
void sub_08068ADC(Entity* this) {
if (gRoomTransition.player_status.field_0x24[8] == 2) {
if (gRoomTransition.entity_update_type == 2) {
GetNextFrame(this);
}
sub_0806FD3C(this);
@@ -146,7 +146,7 @@ void sub_08068B84(Entity* this) {
if (p = this->actionDelay, gUnk_08111618[p]) {
ForceEquipItem(gUnk_08111618[this->actionDelay], 0);
}
sub_0805ED14(gUnk_081115EC[this->actionDelay]);
InitPlayerMacro(gUnk_081115EC[this->actionDelay]);
}
void sub_08068BB4(Entity* this) {
src/npc/brocco.c
+1 -1
View File
@@ -47,7 +47,7 @@ void sub_08063584(Entity* this) {
if (this->field_0xf != 0) {
UpdateAnimationSingleFrame(this);
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
this->field_0xf = 0;
}
}
src/npc/castorWildsStatue.c
+1 -1
View File
@@ -32,7 +32,7 @@ void CastorWildsStatue(Entity* this) {
}
void sub_080673C0(Entity* this) {
if (gRoomTransition.player_status.field_0x24[8] != 0) {
if (gRoomTransition.entity_update_type != 0) {
this->action = 3;
} else {
this->action = 1;
src/npc/cat.c
+4 -4
View File
@@ -102,7 +102,7 @@ void sub_080678AC(Entity* this) {
sub_08067AAC(this);
} else {
UpdateAnimationSingleFrame(this);
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
sub_08067B34(this);
}
}
@@ -137,7 +137,7 @@ void sub_08067904(Entity* this) {
void sub_0806797C(Entity* this) {
UpdateAnimationSingleFrame(this);
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
sub_08067B08(this);
}
}
@@ -166,7 +166,7 @@ void sub_08067A0C(Entity* this) {
u8 tmp;
UpdateAnimationSingleFrame(this);
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
if (sub_08067D20(this) != 0) {
sub_08067B80(this, 5);
this->actionDelay = this->actionDelay + 0x14;
@@ -186,7 +186,7 @@ void sub_08067A0C(Entity* this) {
void sub_08067A78(Entity* this) {
UpdateAnimationSingleFrame(this);
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
sub_08067AAC(this);
}
}
src/npc/cucco.c
+1 -1
View File
@@ -78,7 +78,7 @@ void Cucco_Idle(Entity* this) {
InitAnimationForceUpdate(this, (Random() & 1) + 2);
}
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
this->action = 1;
this->subAction = 0;
}
src/npc/dog.c
+2 -2
View File
@@ -119,7 +119,7 @@ void sub_08069D00(Entity* this) {
this->field_0x6a.HALF.HI = 8;
sub_0806A028(this);
if (0x1f < this->animIndex) {
if ((this->frame & 0x80) == 0) {
if ((this->frame & ANIM_DONE) == 0) {
return;
}
this->field_0x6a.HALF.HI = 8;
@@ -197,7 +197,7 @@ void sub_08069E50(Entity* this) {
sub_0806A028(this);
UpdateAnimationSingleFrame(this);
if (this->animIndex > 0x1f) {
if ((this->frame & 0x80) == 0) {
if ((this->frame & ANIM_DONE) == 0) {
return;
}
this->field_0x6a.HALF.HI = 8;
src/npc/drLeft.c
+1 -1
View File
@@ -40,7 +40,7 @@ void sub_0806BFD8(Entity* this) {
}
void sub_0806C00C(Entity* this, ScriptExecutionContext* context) {
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
context->condition = 1;
} else {
context->condition = 0;
src/npc/festari.c
+1 -1
View File
@@ -45,7 +45,7 @@ void sub_0805FE48(Entity* this) {
}
UpdateAnimationSingleFrame(this);
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
switch (this->animIndex) {
case 8:
case 10:
src/npc/goronMerchant.c
+2 -2
View File
@@ -25,7 +25,7 @@ void GoronMerchant(Entity* this) {
}
void sub_08069584(Entity* this) {
if (gRoomTransition.player_status.field_0x24[8] != 0) {
if (gRoomTransition.entity_update_type != 0) {
this->action = 3;
} else {
this->action = 1;
@@ -59,7 +59,7 @@ void sub_080695E8(Entity* this) {
}
void sub_0806961C(Entity* this) {
if (gRoomTransition.player_status.field_0x24[8] == 2) {
if (gRoomTransition.entity_update_type == 2) {
UpdateAnimationSingleFrame(this);
}
sub_0806FD3C(this);
src/npc/gregal.c
+1 -1
View File
@@ -97,7 +97,7 @@ void sub_0806CC08(Entity* this) {
}
void sub_0806CCB4(Entity* this, ScriptExecutionContext* context) {
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
context->condition = 1;
} else {
context->condition = 0;
src/npc/mailbox.c
+1 -1
View File
@@ -40,7 +40,7 @@ void sub_08063220(Entity* this) {
void sub_08063254(Entity* this, u32 unused) {
sub_08063280(this, unused);
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
this->action = 3;
MessageFromTarget(0);
}
src/npc/mama.c
+1 -1
View File
@@ -61,7 +61,7 @@ void Mama_Head(Entity* this) {
void sub_0806C4A8(Entity* this, ScriptExecutionContext* context) {
s32 tmp;
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
tmp = GetAnimationState(this);
if (tmp < 0) {
tmp = 3;
src/npc/minishEzlo.c
+1 -1
View File
@@ -34,7 +34,7 @@ void sub_0806305C(Entity* this) {
this->spriteRendering.b0 = 3;
*(u32*)&this->field_0x6c = 0x100;
this->field_0x70.WORD = 0x100;
sub_0805EC9C(this, 0x100, 0x100, 0x0);
SetAffineInfo(this, 0x100, 0x100, 0x0);
InitAnimationForceUpdate(this, 0x10);
this->field_0x80.HWORD = 0x10;
SoundReq(SFX_PLY_SHRINKING);
src/npc/npc5.c
+8 -8
View File
@@ -270,7 +270,7 @@ void sub_08060D78(Entity* this) {
void sub_08060DD0(Entity* this) {
UpdateAnimationSingleFrame(this);
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
this->action = 1;
sub_08060E70(this, 0);
}
@@ -296,7 +296,7 @@ void sub_08060DFC(Entity* this) {
void sub_08060E34(Entity* this) {
UpdateAnimationSingleFrame(this);
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
this->action = 2;
this->animationState = DirectionToAnimationState(GetFacingDirection(this, &gPlayerEntity)) * 2;
sub_08060E70(this, 8);
@@ -323,7 +323,7 @@ void sub_08060E94(Entity* this) {
void sub_08060EDC(Entity* this) {
s32 tmp;
if (((u32)this->animIndex - 0x20 < 0x10) && ((this->frame & 0x80) == 0)) {
if (((u32)this->animIndex - 0x20 < 0x10) && ((this->frame & ANIM_DONE) == 0)) {
UpdateAnimationSingleFrame(this);
} else {
tmp = GetFacingDirection(this, &gPlayerEntity) + this->animationState * -4;
@@ -337,7 +337,7 @@ void sub_08060EDC(Entity* this) {
}
} else {
if ((this->animationState & 1) == 0) {
if (((this->frame & 0x80) != 0) && (0xf >= (u32)this->animIndex - 0x20)) {
if (((this->frame & ANIM_DONE) != 0) && (0xf >= (u32)this->animIndex - 0x20)) {
sub_08060E70(this, 0);
} else {
sub_08060E94(this);
@@ -528,7 +528,7 @@ u32 sub_08061230(Entity* this) {
}
} else {
UpdateAnimationSingleFrame(this);
if ((this->frame & 0x80) == 0) {
if ((this->frame & ANIM_DONE) == 0) {
return 1;
}
((UnkHeap*)this->myHeap)->unk_0 &= 0xfe;
@@ -551,7 +551,7 @@ void sub_08061358(Entity* this) {
switch (this->subAction) {
case 0:
UpdateAnimationSingleFrame(this);
if ((this->frame & 0x80) == 0) {
if ((this->frame & ANIM_DONE) == 0) {
return;
}
this->subAction = 1;
@@ -576,7 +576,7 @@ void sub_08061358(Entity* this) {
break;
case 2:
UpdateAnimationSingleFrame(this);
if ((this->frame & 0x80) == 0) {
if ((this->frame & ANIM_DONE) == 0) {
return;
}
this->animationState = ((this->frame & 0x18) >> 2);
@@ -914,7 +914,7 @@ void sub_08061B58(Entity* this) {
this->action = 1;
InitAnimationForceUpdate(this, 2);
}
if (gRoomTransition.player_status.field_0x24[8] == 2) {
if (gRoomTransition.entity_update_type == 2) {
UpdateAnimationSingleFrame(this);
}
sub_0806FD3C(this);
src/npc/npc9.c
+1 -1
View File
@@ -29,7 +29,7 @@ void sub_08062B14(Entity* this) {
void sub_08062B48(Entity* this) {
GetNextFrame(this);
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
MessageFromTarget(0xa01); // invalid
this->action++;
}
src/npc/pina.c
+1 -1
View File
@@ -49,7 +49,7 @@ void sub_08063AC0(Entity* this) {
if (this->field_0xf != 0) {
UpdateAnimationSingleFrame(this);
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
this->field_0xf = 0;
}
}
src/npc/rem.c
+8 -8
View File
@@ -73,7 +73,7 @@ void sub_0806A410(Entity* this) {
}
break;
case 1:
if (((this->frame & 0x80) != 0)) {
if (((this->frame & ANIM_DONE) != 0)) {
sub_0806A9B0(this, *(ScriptExecutionContext**)&this->cutsceneBeh);
}
break;
@@ -88,14 +88,14 @@ void sub_0806A458(Entity* this) {
}
break;
case 1:
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
this->subAction = 2;
InitializeAnimation(this, 10);
ClearLocalFlag(0x62);
}
break;
case 2:
if (((this->frame & 0x80) != 0)) {
if (((this->frame & ANIM_DONE) != 0)) {
this->action = 1;
this->subAction = 0;
this->actionDelay = 0x3c;
@@ -108,7 +108,7 @@ void sub_0806A458(Entity* this) {
void sub_0806A4CC(Entity* this) {
switch (this->subAction) {
case 0:
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
if ((u8)(this->animIndex - 8) < 2) {
this->subAction = 1;
this->field_0x6a.HWORD = 1;
@@ -120,7 +120,7 @@ void sub_0806A4CC(Entity* this) {
}
break;
case 1:
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
this->subAction = 2;
InitializeAnimation(this, GetAnimationState(this));
}
@@ -143,7 +143,7 @@ void sub_0806A550(Entity* this) {
gActiveScriptInfo.syncFlags |= 0x100;
SoundReq(SFX_CHEST_OPEN);
}
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
this->action = 5;
this->subAction = 0;
InitializeAnimation(this, 0xd);
@@ -157,7 +157,7 @@ void nullsub_503(Entity* this) {
void sub_0806A5C0(Entity* this) {
GetNextFrame(this);
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
InitializeAnimation(this, (Random() & 3) + 4);
}
}
@@ -301,7 +301,7 @@ void sub_0806A890(Entity* this) {
SetDefaultPriority(this, PRIO_MESSAGE);
}
GetNextFrame(this);
if ((this->frame & 0x80) != 0) {
if ((this->frame & ANIM_DONE) != 0) {
DeleteThisEntity();
}
}
src/npc/smith.c
+1 -1
View File
@@ -104,7 +104,7 @@ void sub_080661B0(Entity* this) {
void sub_080661BC(Entity* this) {
if (this->animIndex == 0xc) {
UpdateAnimationSingleFrame(this);
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
this->field_0x80.HWORD = GetAnimationState(this) + 8;
InitAnimationForceUpdate(this, this->field_0x80.HWORD);
}
src/npc/townMinish.c
+1 -1
View File
@@ -70,7 +70,7 @@ void sub_0806AC3C(Entity* this) {
if (!(this->field_0x68.HALF.HI & 7)) {
this->animationState = sub_0806F5B0(this->field_0x68.HALF.HI);
InitializeAnimation(this, (this->animationState / 2) ^ 2);
InitializeAnimation(this, AnimationStateFlip90(this->animationState / 2));
}
}
src/npc/vaatiReborn.c
+2 -2
View File
@@ -130,7 +130,7 @@ void VaatiRebornAction1(Entity* this) {
}
break;
case 1:
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
this->subAction = 2;
ChangeObjPalette(this, 0x13f);
InitAnimationForceUpdate(this, this->subAction - 1);
@@ -153,7 +153,7 @@ void VaatiRebornAction1(Entity* this) {
}
break;
case 3:
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
SetRoomFlag(0);
DeleteThisEntity();
}
src/npc/zelda.c
+1 -1
View File
@@ -152,7 +152,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) {
break;
case 4:
UpdateAnimationSingleFrame(this);
if (this->frame & 0x80) {
if (this->frame & ANIM_DONE) {
gActiveScriptInfo.flags |= 1;
return;
}