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

cleanup

Browse Source
This commit is contained in:
theo3
2021-12-14 23:31:27 -08:00
parent 83fc028502
commit 34e69959df
198 changed files with 1578 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/beedle.c
+1 -1
View File
@@ -153,7 +153,7 @@ void sub_080634E4(Entity* this, ScriptExecutionContext* context) {
}
void sub_080634EC(Entity* this) {
gRoomVars.itemForSaleIndex = gUnk_0810C88C[this->type2];
gRoomVars.shopItemType = gUnk_0810C88C[this->type2];
}
void sub_08063504(Entity* this, ScriptExecutionContext* context) {
src/npc/bigGoron.c
+7 -7
View File
@@ -44,7 +44,7 @@ void sub_0806CF30(Entity* this) {
this->action = 1;
this->subAction = 1;
this->field_0x68.HWORD = this->x.HALF.HI;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0806D0B0(this);
sub_0807DD64(this);
} else {
@@ -133,7 +133,7 @@ void sub_0806D1D0(Entity* this) {
this->spriteSettings.draw = 3;
this->frameIndex = 0;
this->actionDelay = 0x1e;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
}
switch (this->subAction) {
@@ -174,7 +174,7 @@ void sub_0806D274(Entity* this) {
this->spritePriority.b0 = 7;
this->frameIndex = 2;
this->actionDelay = 8;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
npc = CreateNPC(0x4c, 3, 0);
if (npc != NULL) {
npc->child = this;
@@ -221,7 +221,7 @@ void sub_0806D348(Entity* this) {
this->spritePriority.b0 = 6;
this->spriteSettings.draw = 0;
this->frameIndex = 5;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
}
if (this->child->frameIndex == 4) {
this->spriteSettings.draw = 3;
@@ -239,7 +239,7 @@ void sub_0806D3C0(Entity* this) {
}
this->action = 1;
this->hitbox = &gHitbox_3;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD64(this);
} else {
this->x.HALF.HI = this->parent->x.HALF.HI;
@@ -262,7 +262,7 @@ void sub_0806D41C(Entity* this) {
sub_0806D4C0(this, 1);
sub_0806D4C0(this, 2);
sub_0806D4C0(this, 3);
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
} else {
ExecuteScriptForEntity(this, NULL);
HandleEntity0x82Actions(this);
@@ -286,7 +286,7 @@ void sub_0806D4C0(Entity* this, u32 param) {
npc->parent = this;
CopyPosition(this, npc);
ResolveEntityOnTop(this, npc);
SetDefaultPriority(npc, 2);
SetDefaultPriority(npc, PRIO_MESSAGE);
}
}
src/npc/carpenter.c
+4 -4
View File
@@ -24,7 +24,7 @@ void Carpenter(Entity* this) {
break;
this->action = 1;
this->field_0x68.HALF.HI = 0;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD64(this);
case 1:
@@ -52,14 +52,14 @@ void Carpenter(Entity* this) {
void Carpenter_Head(Entity* this) {
if (this->type < 2) {
SetExtraSpriteFrame(this, 0, this->frame & 0xffffff7f);
SetExtraSpriteFrame(this, 0, this->frame & ~0x80);
SetExtraSpriteFrame(this, 1, this->frameIndex);
SetExtraSpriteFrame(this, 2, this->frameSpriteSettings & 0x3f);
SetSpriteSubEntryOffsetData1(this, 1, 0);
SetSpriteSubEntryOffsetData2(this, 1, 2);
sub_0807000C(this);
} else {
SetExtraSpriteFrame(this, 0, this->frame & 0xffffff7f);
SetExtraSpriteFrame(this, 0, this->frame & ~0x80);
SetExtraSpriteFrame(this, 1, this->frameIndex);
SetSpriteSubEntryOffsetData1(this, 1, 0);
sub_0807000C(this);
@@ -94,7 +94,7 @@ void Carpenter_Fusion(Entity* this) {
if (LoadExtraSpriteData(this, &gUnk_08110CA8[this->type * 4]) != 0) {
this->action = this->action + 1;
this->spriteSettings.draw = 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitializeAnimation(this, (u32)this->type * 8 + 2);
}
} else {
src/npc/cat.c
+2 -2
View File
@@ -153,7 +153,7 @@ void sub_0806799C(Entity* this) {
UpdateAnimationSingleFrame(this);
if ((gMessage.doTextBox & 0x7f) == 0) {
sub_08067B08(this);
SetDefaultPriority(this, 1);
SetDefaultPriority(this, PRIO_PLAYER);
}
}
@@ -319,7 +319,7 @@ void sub_08067C44(Entity* this) {
} else {
this->action = 4;
sub_08067790(this);
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
}
this->interactType = 0;
SoundReq(SFX_VO_CAT);
src/npc/cucco.c
+1 -1
View File
@@ -21,7 +21,7 @@ void sub_0806E4B8(Entity* this) {
this->action += 1;
this->field_0x68.HALF.LO = sub_0801E99C(this);
sub_080787A8(this, this->field_0x68.HALF.LO);
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
this->subAction = 0;
sub_0806E4EC(this);
}
src/npc/cuccoChick.c
+1 -1
View File
@@ -22,7 +22,7 @@ void sub_0806E730(Entity* this) {
this->action += 1;
this->field_0x68.HALF.LO = sub_0801E99C(this);
sub_080787A8(this, this->field_0x68.HALF.LO);
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
this->subAction = 0;
sub_0806E764(this);
}
src/npc/dampe.c
+1 -1
View File
@@ -16,7 +16,7 @@ void Dampe(Entity* this) {
case 0:
this->action = 1;
this->spriteSettings.draw = 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
return;
case 1:
src/npc/dog.c
+3 -3
View File
@@ -66,7 +66,7 @@ void sub_08069B44(Entity* this) {
this->animationState = 2;
this->field_0x6a.HALF.LO = 0xff;
this->field_0x74.HALF.LO = sub_0801E99C(this);
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitAnimationForceUpdate(this, 10);
if ((this->flags & 2) != 0) {
sub_0807DD50(this);
@@ -273,7 +273,7 @@ u32 sub_08069F90(Entity* this) {
if ((this->type == 2) && (CheckLocalFlag(MACHI_02_DOG) == 0)) {
return 1;
} else {
return sub_080041A0(this, &gPlayerEntity, 0x14, 0x14);
return EntityInRectRadius(this, &gPlayerEntity, 0x14, 0x14);
}
}
@@ -362,7 +362,7 @@ void Dog_Fusion(Entity* this) {
if (sub_08069EF0(this) != 0) {
this->action += 1;
this->spriteSettings.draw = 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitializeAnimation(this, 0x23);
}
} else {
src/npc/drLeft.c
+1 -1
View File
@@ -17,7 +17,7 @@ void DrLeft(Entity* this) {
if (this->type == 0) {
if (this->action == 0) {
this->action += 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
}
ExecuteScriptForEntity(this, NULL);
src/npc/emma.c
+1 -1
View File
@@ -10,7 +10,7 @@ extern ScreenTransitionData gUnk_0813AD38;
void Emma(Entity* this) {
if (this->action == 0) {
this->action += 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
} else {
sub_0807DD94(this, 0);
src/npc/epona.c
+1 -1
View File
@@ -77,7 +77,7 @@ void sub_08065AA4(Entity* this) {
sub_0806F118(this);
} else {
this->action = 3;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_08065A50(this);
}
InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)));
src/npc/ezloCap.c → src/npc/ezlo.c
+2 -2
View File
@@ -9,10 +9,10 @@ const u8 gUnk_08114134[];
const u8 gUnk_08114144[];
// Ezlo as a cap in the Minish Woods, is destroyed as soon as link wears ezlo
void EzloCap(Entity* this) {
void Ezlo(Entity* this) {
if (this->action == 0) {
this->action += 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
}
ExecuteScriptForEntity(this, NULL);
src/npc/farmers.c
+1 -1
View File
@@ -12,7 +12,7 @@ void sub_0806BC58(Entity* this);
ASM_FUNC("asm/non_matching/farmers/Farmers.inc", void Farmers(Entity* this))
void sub_0806BC58(Entity* this) {
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
}
void Farmers_Head(Entity* this) {
src/npc/festari.c
+2 -2
View File
@@ -18,7 +18,7 @@ void Festari(Entity* this) {
void sub_0805FE10(Entity* this) {
this->action = 1;
this->spriteSettings.draw = TRUE;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
this->field_0x68.HALF.LO = sub_0801E99C(this);
sub_08078784(this, this->field_0x68.HALF.LO);
sub_0807DD50(this);
@@ -113,7 +113,7 @@ void Festari_Fusion(Entity* this) {
if (this->action == 0) {
this->action += 1;
this->spriteSettings.draw = 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitAnimationForceUpdate(this, 8);
} else {
UpdateAnimationSingleFrame(this);
src/npc/forestMinish.c
+2 -2
View File
@@ -32,7 +32,7 @@ void ForestMinish(Entity* this) {
this->spriteSettings.draw = TRUE;
this->field_0x68.HALF.HI = this->animationState = this->actionDelay << 1;
this->actionDelay = 0;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
StartCutscene(this, (u16*)gUnk_08109D18[this->type2]);
sub_0807DD50(this);
}
@@ -267,7 +267,7 @@ void ForestMinish_Fusion(Entity* this) {
if (LoadExtraSpriteData(this, &gUnk_0810A348)) {
this->action++;
this->spriteSettings.draw = TRUE;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitializeAnimation(this, 6);
}
} else {
src/npc/gentari.c
+2 -2
View File
@@ -10,7 +10,7 @@ void Gentari(Entity* this) {
case 0:
this->action = 1;
this->spriteSettings.draw = TRUE;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
this->field_0x68.HALF.LO = sub_0801E99C(this);
sub_08078784(this, this->field_0x68.HALF.LO);
sub_0807DD50(this);
@@ -36,7 +36,7 @@ void Gentari_Fusion(Entity* this) {
if (this->action == 0) {
this->action++;
this->spriteSettings.draw = TRUE;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitAnimationForceUpdate(this, 10);
} else {
UpdateAnimationSingleFrame(this);
src/npc/ghostBrothers.c
+1 -1
View File
@@ -94,7 +94,7 @@ void sub_08065D18(Entity* this) {
this->spriteSettings.draw = 1;
this->spriteRendering.alphaBlend = 1;
*(u32**)&this->field_0x6c = &gUnk_08110188;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitAnimationForceUpdate(this, 2);
gScreen.controls.layerFXControl = 0x3f40;
gScreen.controls.alphaBlend = 0x1000;
src/npc/goronMerchant.c
+12 -14
View File
@@ -8,12 +8,12 @@
#include "script.h"
#include "save.h"
extern u32 GoronMerchant_GetSalePrice(Entity*);
static u32 GoronMerchant_GetSalePrice(Entity*);
extern void (*const gUnk_08111B88[])(Entity*);
extern void (*const gUnk_08111B98[])(Entity*);
const u16 GoronMerchant_KinstonePrices[];
static const u16 sKinstonePrices[];
extern u32 sub_0801E7D0(u32);
@@ -78,8 +78,6 @@ void sub_08069654(Entity* this) {
}
void sub_08069660(Entity* this) {
u32 uVar1;
MessageNoOverlap(0x2c1c, this);
gMessage.field_0x10 = (u16)GoronMerchant_GetSalePrice(this);
}
@@ -98,16 +96,16 @@ void sub_08069684(void) {
}
void sub_080696B0(void) {
gRoomVars.itemForSaleIndex = 0;
gRoomVars.shopItemType = 0;
}
u32 GoronMerchant_GetSalePrice(Entity* this) {
static u32 GoronMerchant_GetSalePrice(Entity* this) {
u32 restockCount;
u32 temp;
u32 kinstoneType;
s32 itemForSale;
itemForSale = gRoomVars.field_0x7;
itemForSale = gRoomVars.shopItemType2;
if (itemForSale > 0x70) {
kinstoneType = 1;
} else {
@@ -129,17 +127,17 @@ u32 GoronMerchant_GetSalePrice(Entity* this) {
if (CheckGlobalFlag(GORON_KAKERA_LV5)) {
restockCount = 4;
}
return GoronMerchant_KinstonePrices[restockCount * 3 + kinstoneType];
return sKinstonePrices[restockCount * 3 + kinstoneType];
}
void GoronMerchant_TryToBuyKinstone(Entity* this, ScriptExecutionContext* context) {
s32 salePrice = GoronMerchant_GetSalePrice(this);
if (salePrice <= gSave.stats.rupees) {
if (sub_0801E7D0(gRoomVars.field_0x7) < 99) {
if (sub_0801E7D0(gRoomVars.shopItemType2) < 99) {
ModRupees(-salePrice);
sub_080A7C18(0x5c, gRoomVars.field_0x7, 0);
gRoomVars.itemForSaleIndex = 0;
gRoomVars.field_0x7 = 0;
sub_080A7C18(0x5c, gRoomVars.shopItemType2, 0);
gRoomVars.shopItemType = 0;
gRoomVars.shopItemType2 = 0;
context->condition = 1;
} else {
MessageNoOverlap(0x2c1f, this);
@@ -149,7 +147,7 @@ void GoronMerchant_TryToBuyKinstone(Entity* this, ScriptExecutionContext* contex
MessageNoOverlap(0x2c1e, this);
context->condition = 0;
}
gActiveScriptInfo.flags = gActiveScriptInfo.flags | 1;
gActiveScriptInfo.flags |= 1;
}
void (*const gUnk_08111B88[])(Entity*) = {
@@ -163,7 +161,7 @@ void (*const gUnk_08111B98[])(Entity*) = {
sub_08069654,
};
const u16 GoronMerchant_KinstonePrices[] = {
static const u16 sKinstonePrices[] = {
#ifdef EU
200,
100,
src/npc/gregal.c
+5 -5
View File
@@ -19,7 +19,7 @@ void sub_0806CAF4(Entity* this) {
if (this->action == 0) {
this->action += 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
npc = CreateNPC(0x4a, 1, 0);
if (npc != NULL) {
npc->parent = this;
@@ -46,7 +46,7 @@ void sub_0806CB80(Entity* this) {
this->action += 1;
this->animationState = 2;
this->frameIndex = 0;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
}
if (this->parent != NULL) {
this->frameIndex = (this->parent->frame & 3) + 0x21;
@@ -57,7 +57,7 @@ void sub_0806CBB4(Entity* this) {
if (this->action == 0) {
this->action += 1;
this->animationState = 2;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitializeAnimation(this, 0x11);
}
GetNextFrame(this);
@@ -74,7 +74,7 @@ void sub_0806CC08(Entity* this) {
case 0:
this->action = 1;
this->spriteSettings.draw = 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD64(this);
case 1:
if (this->interactType == 2) {
@@ -154,7 +154,7 @@ void Gregal_Fusion(Entity* this) {
if (this->action == 0) {
this->action += 1;
this->spriteSettings.draw = 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitAnimationForceUpdate(this, 6);
} else {
UpdateAnimationSingleFrame(this);
src/npc/hurdyGurdyMan.c
+3 -3
View File
@@ -20,7 +20,7 @@ void HurdyGurdyMan(Entity* this) {
if (LoadExtraSpriteData(this, &gUnk_081144F0) != 0) {
this->action = 1;
this->field_0x68.HALF.HI = 0;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
}
break;
@@ -36,7 +36,7 @@ void HurdyGurdyMan(Entity* this) {
pointerToArray = pointerToArray + 3;
}
sub_0801DFB4(this, (u32)*pointerToArray, (u32)pointerToArray[1], (u32)pointerToArray[2]);
gPlayerState.field_0x8b = 3;
gPlayerState.controlMode = CONTROL_DISABLED;
} else {
sub_0807DD94(this, NULL);
}
@@ -79,7 +79,7 @@ void HurdyGurdyMan_Fusion(Entity* this) {
if (uVar1 != 0) {
this->action += 1;
this->spriteSettings.draw = 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitializeAnimation(this, 10);
}
} else {
src/npc/kingGustaf.c
+1 -1
View File
@@ -11,7 +11,7 @@ void KingGustaf(Entity* this) {
this->action += 1;
this->spriteRendering.alphaBlend = 1;
this->collisionLayer = 2;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
gScreen.controls.layerFXControl = 0x3f40;
gScreen.controls.alphaBlend = 0x1000;
src/npc/librari.c
+1 -1
View File
@@ -16,7 +16,7 @@ void Librari(Entity* this) {
this->animationState = this->actionDelay;
this->field_0x68.HALF.LO = sub_0801E99C(this);
sub_08078784(this, this->field_0x68.HALF.LO);
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
break;
case 1:
src/npc/mama.c
+1 -1
View File
@@ -48,7 +48,7 @@ bool32 sub_0806C454(Entity* this) {
if (LoadExtraSpriteData(this, &gUnk_08113754) == 0) {
return FALSE;
} else {
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
return TRUE;
}
}
src/npc/marcy.c
+1 -1
View File
@@ -9,7 +9,7 @@ extern u16 gUnk_0810C34C[];
void Marcy(Entity* this) {
if (this->action == 0) {
this->action += 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD64(this);
}
sub_0807DD94(this, NULL);
src/npc/mayorHagen.c
+1 -1
View File
@@ -19,7 +19,7 @@ void MayorHagen(Entity* this) {
this->action = 1;
this->field_0x68.HALF.HI = 0;
this->field_0x68.HALF.LO = sub_0801E99C(this);
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
break;
case 1:
src/npc/melari.c
+1 -1
View File
@@ -65,7 +65,7 @@ void sub_08068780(Entity* this) {
this->action = 1;
this->spriteSettings.draw = TRUE;
this->animationState = this->type;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
break;
case 1:
src/npc/minishEzlo.c
+1 -1
View File
@@ -12,7 +12,7 @@ void MinishEzlo(Entity* this) {
}
this->action += 1;
this->animationState = this->actionDelay * 2;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
}
ExecuteScriptForEntity(this, NULL);
src/npc/mutoh.c
+1 -1
View File
@@ -23,7 +23,7 @@ void Mutoh(Entity* this) {
if (LoadExtraSpriteData(this, &gUnk_08110C00)) {
this->action = 1;
this->spriteSettings.draw = TRUE;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
}
break;
src/npc/percy.c
+1 -1
View File
@@ -79,7 +79,7 @@ void sub_0806B41C(Entity* this) {
if (this->field_0x68.HALF.LO == 33)
tmp += 3;
sub_0801DFB4(this, tmp[0], tmp[1], tmp[2]);
gPlayerState.field_0x8b = 3;
gPlayerState.controlMode = CONTROL_DISABLED;
} else {
sub_0807DD94(this, NULL);
}
src/npc/pita.c
+1 -1
View File
@@ -15,7 +15,7 @@ extern u32 sub_080028F4(const u8*);
void Pita(Entity* this) {
if (this->action == 0) {
this->action += 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
ResolveEntityOnTop(this, this);
this->hitbox = &gUnk_0810C428;
sub_0807DD64(this);
src/npc/rem.c
+3 -3
View File
@@ -55,7 +55,7 @@ void sub_0806A3D8(Entity* this) {
this->action = 1;
this->actionDelay = 0xb4;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0806A8C8(this);
uVar1 = StartCutscene(this, &script_08012F0C);
*(ScriptExecutionContext**)&this->cutsceneBeh = uVar1;
@@ -196,7 +196,7 @@ void sub_0806A830(Entity* this) {
if (this->action == 0) {
this->action = 1;
InitializeAnimation(this, 0x14);
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
}
if ((gActiveScriptInfo.unk_00 & 0x200) != 0) {
DeleteThisEntity();
@@ -215,7 +215,7 @@ void sub_0806A890(Entity* this) {
if (this->action == 0) {
this->action = 1;
InitializeAnimation(this, 0x15);
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
}
GetNextFrame(this);
if ((this->frame & 0x80) != 0) {
src/npc/stockwell.c
+1 -1
View File
@@ -28,7 +28,7 @@ void sub_08065080(Entity* this) {
this->action = 1;
this->spriteSettings.draw = 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitializeAnimation(this, 4);
sub_08078778(this);
#ifndef EU
src/npc/syrup.c
+1 -1
View File
@@ -27,7 +27,7 @@ void sub_0806A1F8(Entity* this) {
iVar1 = LoadExtraSpriteData(this, paVar2);
if (iVar1) {
this->action = 1;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
InitializeAnimation(this, 0);
}
src/npc/teachers.c
+1 -1
View File
@@ -18,7 +18,7 @@ void Teachers(Entity* this) {
this->spriteSettings.draw = TRUE;
this->animationState = this->actionDelay;
this->field_0x68.HALF.HI = 0;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
}
break;
src/npc/townMinish.c
+1 -1
View File
@@ -57,7 +57,7 @@ void sub_0806AC3C(Entity* this) {
if (this->animIndex <= 3) {
s32 unk;
Entity* link = &gPlayerEntity;
if (sub_080041A0(this, link, 0x18, 0x18)) {
if (EntityInRectRadius(this, link, 0x18, 0x18)) {
unk = GetFacingDirection(this, link) & 0x1e;
} else {
unk = this->animationState * 4;
src/npc/vaati.c
+1 -1
View File
@@ -27,7 +27,7 @@ void VaatiAction0(Entity* this) {
this->spriteSettings.draw = 1;
this->field_0x68.HALF.LO = 0;
this->field_0x68.HALF.HI = 0;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD64(this);
VaatiAction1(this);
}
src/npc/wheaton.c
+1 -1
View File
@@ -9,7 +9,7 @@ void Wheaton(Entity* this) {
if (this->action == 0) {
this->action++;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
ResolveEntityOnTop(this, this);
src/npc/zelda.c
+1 -1
View File
@@ -23,7 +23,7 @@ void sub_08066CCC(Entity* this) {
this->action = 1;
this->spriteSettings.draw = 1;
PrependEntityToList(this, 7);
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
sub_0807DD50(this);
}
src/npc/zeldaFollower.c
+1 -1
View File
@@ -16,7 +16,7 @@ void ZeldaFollower(Entity* this) {
this->animationState = 4;
this->field_0x68.HALF.LO = 0;
this->field_0x68.HALF.HI = 0;
SetDefaultPriority(this, 2);
SetDefaultPriority(this, PRIO_MESSAGE);
InitAnimationForceUpdate(this, 0);
sub_0806854C(this, NULL);
}