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

entity changes, textbox changes

Browse Source
This commit is contained in:
theo3
2021-11-04 20:56:03 -07:00
parent 9ef31544e2
commit 9cfbb3a27a
321 changed files with 1765 additions and 1716 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/beedle.c
+2 -2
View File
@@ -53,14 +53,14 @@ void sub_08063314(Entity* this) {
InitializeAnimation(this, offset);
}
if (this->interactType != '\0') {
TextboxNoOverlapFollow(this->actionDelay + 0xA01);
MessageFromTarget(this->actionDelay + 0xA01);
this->action++;
}
sub_0806ED78(this);
}
void sub_0806336C(Entity* this) {
if ((gTextBox.doTextBox & 0x7F) == 0) {
if ((gMessage.doTextBox & 0x7F) == 0) {
this->action++;
InitializeAnimation(this, 8);
}
src/npc/bigGoron.c
+1 -1
View File
@@ -184,7 +184,7 @@ void sub_0806D274(Entity* this) {
case 0:
case 1:
default:
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
this->frameIndex = 2;
break;
}
src/npc/bladeBrothers.c
+10 -10
View File
@@ -87,7 +87,7 @@ void sub_08068A4C(Entity* this) {
if (this->interactType != 0) {
this->interactType = 0;
this->action = 2;
TextboxNoOverlapFollow(0);
MessageFromTarget(0);
}
}
@@ -307,42 +307,42 @@ switchD_08068d12_caseD_0:
// Introduction dialoague
void sub_08068DB8(Entity* this) {
TextboxNoOverlap(gUnk_08111664[this->actionDelay], this);
MessageNoOverlap(gUnk_08111664[this->actionDelay], this);
}
// Ask to teach dialoague
void sub_08068DD0(Entity* this) {
TextboxNoOverlap(gUnk_0811167A[this->actionDelay], this);
MessageNoOverlap(gUnk_0811167A[this->actionDelay], this);
}
// Technique Dialogue
void sub_08068DE8(Entity* this) {
TextboxNoOverlap(gUnk_08111690[this->actionDelay], this);
MessageNoOverlap(gUnk_08111690[this->actionDelay], this);
}
// Posession dialogue
void sub_08068E00(Entity* this) {
TextboxNoOverlap(gUnk_081116A6[this->actionDelay], this);
MessageNoOverlap(gUnk_081116A6[this->actionDelay], this);
}
void sub_08068E18(Entity* this) {
TextboxNoOverlap(gUnk_081116BC[this->actionDelay], this);
MessageNoOverlap(gUnk_081116BC[this->actionDelay], this);
}
void sub_08068E30(Entity* this) {
TextboxNoOverlap(gUnk_081116D2[this->actionDelay], this);
MessageNoOverlap(gUnk_081116D2[this->actionDelay], this);
}
void sub_08068E48(Entity* this) {
TextboxNoOverlap(gUnk_081116E8[this->actionDelay], this);
MessageNoOverlap(gUnk_081116E8[this->actionDelay], this);
}
void sub_08068E60(Entity* this) {
TextboxNoOverlap(gUnk_081116FE[this->actionDelay], this);
MessageNoOverlap(gUnk_081116FE[this->actionDelay], this);
}
void sub_08068E78(Entity* this) {
TextboxNoOverlap(gUnk_08111714[this->actionDelay], this);
MessageNoOverlap(gUnk_08111714[this->actionDelay], this);
}
void sub_08068E90(Entity* this) {
src/npc/brocco.c
+1 -1
View File
@@ -34,7 +34,7 @@ void sub_0806355C(Entity* this) {
ASM_FUNC("asm/non_matching/brocco/sub_08063584.inc", void sub_08063584(Entity* this))
void sub_08063608(Entity* this) {
u8 tmp = gTextBox.doTextBox & 0x7f;
u8 tmp = gMessage.doTextBox & 0x7f;
if (tmp == 0) {
this->action = 1;
this->field_0xf = tmp;
src/npc/carpenter.c
+1 -1
View File
@@ -77,7 +77,7 @@ void sub_080672C8(Entity* this) {
tmp = CheckGlobalFlag(TABIDACHI);
dialog = BOOLCAST(tmp);
}
TextboxNoOverlap(gUnk_08110CE8[(dialog * 2 + this->type * 6) / 2], this);
MessageNoOverlap(gUnk_08110CE8[(dialog * 2 + this->type * 6) / 2], this);
}
void sub_08067304(Entity* this) {
src/npc/castleMaid.c
+2 -2
View File
@@ -80,7 +80,7 @@ NONMATCH("asm/non_matching/castleMaid/sub_08064570.inc", void sub_08064570(Entit
}
break;
case 2:
if ((gTextBox.doTextBox & 0x7f) != 0) {
if ((gMessage.doTextBox & 0x7f) != 0) {
return;
}
this->action = 1;
@@ -111,7 +111,7 @@ void sub_0806464C(Entity* this) {
} else {
tmp = 1;
}
TextboxNoOverlap(gUnk_0810F88C[tmp], this);
MessageNoOverlap(gUnk_0810F88C[tmp], this);
}
void sub_08064688(Entity* this) {
src/npc/cat.c
+2 -2
View File
@@ -151,7 +151,7 @@ void sub_0806797C(Entity* this) {
void sub_0806799C(Entity* this) {
UpdateAnimationSingleFrame(this);
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
sub_08067B08(this);
sub_0805E3A0(this, 1);
}
@@ -272,7 +272,7 @@ void sub_08067C44(Entity* this) {
s32 iVar4;
u32 uVar5;
uVar5 = -((s32) - (gPlayerState.flags.all & 0x80) >> 0x1f);
uVar5 = -((s32) - (gPlayerState.flags & 0x80) >> 0x1f);
if (uVar5 != this->field_0x68.HALF.HI) {
if (uVar5 == 0) {
sub_08078778(this);
src/npc/cow.c
+2 -2
View File
@@ -181,7 +181,7 @@ void Cow_ShowDialogue(Entity* ent) {
void sub_0806920C(Entity* ent) {
// TODO: figure out what bitfield flag this is
u32 var0 = gPlayerState.flags.all & 0x80;
u32 var0 = gPlayerState.flags & 0x80;
u32 var1 = -var0 >> 0x1F;
if (var1 != ent->field_0x6c.HALF.HI) {
@@ -200,7 +200,7 @@ void sub_0806924C(Entity* ent) {
s8 itype = ent->interactType;
if (itype != 0) {
// TODO: figure out what bitfield flag this is
if ((gPlayerState.flags.all & 0x80) != 0) {
if ((gPlayerState.flags & 0x80) != 0) {
if (itype == 2) {
ent->action = 4;
sub_0806F118(ent);
src/npc/cucco.c
+1 -1
View File
@@ -59,7 +59,7 @@ void sub_0806E648(Entity* this) {
void sub_0806E65C(Entity* this) {
if (this->interactType != 0) {
if ((gPlayerState.flags.all & 0x80) != 0) {
if ((gPlayerState.flags & 0x80) != 0) {
if (this->interactType == 2) {
this->action = 4;
sub_0806F118(this);
src/npc/cuccoChick.c
+3 -3
View File
@@ -53,7 +53,7 @@ void sub_0806E824(Entity* this) {
void sub_0806E838(Entity* this) {
if (this->interactType != 0) {
if ((gPlayerState.flags.all & 0x80) != 0) {
if ((gPlayerState.flags & 0x80) != 0) {
if (this->interactType == 2) {
this->action = 3;
sub_0806F118(this);
@@ -69,7 +69,7 @@ void sub_0806E838(Entity* this) {
}
void sub_0806E884(Entity* this) {
TextboxNoOverlap(0xdb6, this);
MessageNoOverlap(0xdb6, this);
}
void CuccoChick_Fusion(Entity* this) {
@@ -79,7 +79,7 @@ void CuccoChick_Fusion(Entity* this) {
this->frameIndex = 1;
} else {
if (sub_08003FC4(this, 0x3000) == 0) {
this->field_0x20 = 0x10000;
this->hVelocity = 0x10000;
}
}
}
src/npc/dampe.c
+2 -2
View File
@@ -66,7 +66,7 @@ void sub_0806BE84(Entity* this, ScriptExecutionContext* context) {
if (GetInventoryValue(0x3C) >= 2) {
msgIndex = 2;
}
TextboxNoOverlap(gUnk_08113344[msgIndex], this);
MessageNoOverlap(gUnk_08113344[msgIndex], this);
}
void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) {
@@ -83,7 +83,7 @@ void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) {
msgIndex = 2;
}
TextboxNoOverlap(gUnk_0811334A[msgIndex], this);
MessageNoOverlap(gUnk_0811334A[msgIndex], this);
}
void sub_0806BEFC() {
src/npc/dog.c
+9 -9
View File
@@ -71,7 +71,7 @@ void sub_08069B44(Entity* this) {
if ((this->flags & 2) != 0) {
sub_0807DD50(this);
}
if (((this->type == 0) && ((gPlayerState.flags.all & 0x80) == 0)) && (GetInventoryValue(0x36) != 2)) {
if (((this->type == 0) && ((gPlayerState.flags & 0x80) == 0)) && (GetInventoryValue(0x36) != 2)) {
this->action = 4;
}
#if defined(JP) || defined(EU)
@@ -87,7 +87,7 @@ void sub_08069B44(Entity* this) {
void sub_08069C40(Entity* this) {
UpdateAnimationSingleFrame(this);
if (sub_08069F90(this) != 0) {
if ((gPlayerState.flags.all & 0x80) != 0) {
if ((gPlayerState.flags & 0x80) != 0) {
sub_08069CB8(this);
} else {
this->animationState = GetAnimationState(this);
@@ -282,14 +282,14 @@ u32 sub_08069F90(Entity* this) {
}
void sub_08069FBC(Entity* this) {
u32 tmp = (gPlayerState.flags.all & 0x80) != 0 ? 0x24 : 0x20;
u32 tmp = (gPlayerState.flags & 0x80) != 0 ? 0x24 : 0x20;
if ((this->animationState == 1) || (this->animationState == 3)) {
this->field_0x6a.HALF.HI = tmp;
}
}
void sub_08069FE8(Entity* this) {
u32 tmp = -((s32) - (gPlayerState.flags.all & 0x80) >> 0x1f);
u32 tmp = -((s32) - (gPlayerState.flags & 0x80) >> 0x1f);
if (tmp != this->field_0x6a.HALF.LO) {
if (tmp == 0) {
sub_08078778(this);
@@ -302,7 +302,7 @@ void sub_08069FE8(Entity* this) {
void sub_0806A028(Entity* this) {
if (this->interactType != 0) {
if ((gPlayerState.flags.all & 0x80) != 0) {
if ((gPlayerState.flags & 0x80) != 0) {
if (this->interactType == 2) {
this->action = 6;
sub_0806F118(this);
@@ -326,7 +326,7 @@ void sub_0806A080(Entity* this) {
void sub_0806A0A4(Entity* this) {
s32 dialog;
if ((gPlayerState.flags.all & 0x80) != 0) {
if ((gPlayerState.flags & 0x80) != 0) {
dialog = 4;
#if defined(JP) || defined(EU)
if (CheckLocalFlag(0xcc) == 0) {
@@ -364,12 +364,12 @@ void sub_0806A0A4(Entity* this) {
}
}
}
TextboxNoOverlap(gUnk_08111F74[(u32)gSave.unk8 * 5 + dialog], this);
MessageNoOverlap(gUnk_08111F74[(u32)gSave.unk8 * 5 + dialog], this);
}
void sub_0806A144(Entity* this) {
s32 dialog = 4;
if ((gPlayerState.flags.all & 0x80) != 0) {
if ((gPlayerState.flags & 0x80) != 0) {
dialog = 3;
if ((GetInventoryValue(0x46) == 0) && (CheckGlobalFlag(0x29) != 0)) {
if (CheckLocalFlag(0x85) == 0) {
@@ -379,7 +379,7 @@ void sub_0806A144(Entity* this) {
}
}
}
TextboxNoOverlap(gUnk_08111FD8[dialog], this);
MessageNoOverlap(gUnk_08111FD8[dialog], this);
}
void Dog_Fusion(Entity* this) {
src/npc/drLeft.c
+1 -1
View File
@@ -77,7 +77,7 @@ void sub_0806C038(Entity* this) {
}
}
}
TextboxNoOverlap(gUnk_081133A4[index], this);
MessageNoOverlap(gUnk_081133A4[index], this);
}
void sub_0806C09C(Entity* this) {
src/npc/epona.c
+3 -3
View File
@@ -38,7 +38,7 @@ void sub_08065A00(Entity* this) {
}
void sub_08065A10(Entity* this) {
if ((gTextBox.doTextBox & 0x7F) == 0) {
if ((gMessage.doTextBox & 0x7F) == 0) {
this->action = 1;
InitAnimationForceUpdate(this, this->animationState / 2);
}
@@ -58,7 +58,7 @@ void sub_08065A50(Entity* this) {
void sub_08065A64(Entity* this) {
u32 uVar2;
uVar2 = -(gPlayerState.flags.all & 0x80) >> 0x1f;
uVar2 = -(gPlayerState.flags & 0x80) >> 0x1f;
if (uVar2 != this->field_0x68.HALF.HI) {
if (uVar2 == 0) {
sub_08078778(this);
@@ -71,7 +71,7 @@ void sub_08065A64(Entity* this) {
void sub_08065AA4(Entity* this) {
if (this->interactType != 0) {
if (gPlayerState.flags.all & 0x80) {
if (gPlayerState.flags & 0x80) {
if (this->interactType == 2) {
this->action = 4;
sub_0806F118(this);
src/npc/forestMinish.c
+3 -3
View File
@@ -149,7 +149,7 @@ void sub_080601D4(Entity* this) {
temp = CheckKinstoneFused(0x17);
uVar2 = BOOLCAST(temp);
}
TextboxNoOverlap(gUnk_0810A354[uVar2], this);
MessageNoOverlap(gUnk_0810A354[uVar2], this);
}
void sub_08060208(Entity* this) {
@@ -197,7 +197,7 @@ void sub_08060270(Entity* this) {
SetLocalFlag(0x76);
}
}
TextboxNoOverlap(gUnk_0810A35A[index], this);
MessageNoOverlap(gUnk_0810A35A[index], this);
}
void sub_080602BC(Entity* this) {
@@ -213,7 +213,7 @@ void sub_080602BC(Entity* this) {
index = 0;
}
}
TextboxNoOverlap(gUnk_0810A362[index], this);
MessageNoOverlap(gUnk_0810A362[index], this);
}
void sub_0806030C(Entity* this, ScriptExecutionContext* context) {
src/npc/ghostBrothers.c
+1 -1
View File
@@ -115,7 +115,7 @@ void sub_08065F20(Entity* this) {
UpdateAnimationSingleFrame(this);
if (this->interactType != 0) {
this->interactType = 0;
TextboxNoOverlapFollow(0);
MessageFromTarget(0);
this->animIndex += 1;
if (gUnk_0811033C[this->animIndex] == 0) {
this->animIndex = 0;
src/npc/gorman.c
+1 -1
View File
@@ -99,7 +99,7 @@ void sub_08069888(Entity* this) {
} else {
index = 5;
}
TextboxNoOverlap(gUnk_08111C50[index], this);
MessageNoOverlap(gUnk_08111C50[index], this);
}
ASM_FUNC("asm/non_matching/gorman/sub_0806991C.inc", void sub_0806991C(Entity* this, ScriptExecutionContext* context))
src/npc/goron.c
+2 -2
View File
@@ -41,13 +41,13 @@ void sub_08069328(Entity* this) {
this->action = 2;
sub_0805E47C(this);
InitAnimationForceUpdate(this, 8);
TextboxNoOverlapFollow(this->actionDelay + (0x90 << 5));
MessageFromTarget(this->actionDelay + (0x90 << 5));
}
}
void sub_08069390(Entity* this) {
UpdateAnimationSingleFrame(this);
if ((gTextBox.doTextBox & 0x7F) == 0) {
if ((gMessage.doTextBox & 0x7F) == 0) {
this->action = 1;
this->interactType = 0;
sub_0805E584(this);
src/npc/goronMerchant.c
+6 -6
View File
@@ -52,9 +52,9 @@ void sub_080695AC(Entity* this) {
void sub_080695E8(Entity* this) {
UpdateAnimationSingleFrame(this);
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
this->action = 1;
this->interactType = gTextBox.doTextBox & 0x7f;
this->interactType = gMessage.doTextBox & 0x7f;
sub_0805E584(this);
InitAnimationForceUpdate(this, this->animationState);
}
@@ -80,8 +80,8 @@ void sub_08069654(Entity* this) {
void sub_08069660(Entity* this) {
u32 uVar1;
TextboxNoOverlap(0x2c1c, this);
gTextBox.field_0x10 = (u16)GoronMerchant_GetSalePrice(this);
MessageNoOverlap(0x2c1c, this);
gMessage.field_0x10 = (u16)GoronMerchant_GetSalePrice(this);
}
void sub_08069684(void) {
@@ -142,11 +142,11 @@ void GoronMerchant_TryToBuyKinstone(Entity* this, ScriptExecutionContext* contex
gRoomVars.field_0x7 = 0;
context->condition = 1;
} else {
TextboxNoOverlap(0x2c1f, this);
MessageNoOverlap(0x2c1f, this);
context->condition = 0;
}
} else {
TextboxNoOverlap(0x2c1e, this);
MessageNoOverlap(0x2c1e, this);
context->condition = 0;
}
gActiveScriptInfo.flags = gActiveScriptInfo.flags | 1;
src/npc/guard.c
+2 -2
View File
@@ -107,7 +107,7 @@ void sub_08063E54(Entity* this) {
}
void sub_08063E6C(Entity* this) {
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
this->action = 1;
InitializeAnimation(this, this->animationState + 4);
}
@@ -160,7 +160,7 @@ void sub_08063F20(Entity* this) {
}
void sub_08063F78(Entity* this) {
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
this->action = this->action - 1;
InitializeAnimation(this, (this->animationState >> 1) + 4 + *(s8*)&this->field_0x70);
}
src/npc/kid.c
+4 -4
View File
@@ -70,7 +70,7 @@ void sub_08062130(Entity* this) {
}
void sub_08062194(Entity* this) {
TextboxNoOverlapFollow(0);
MessageFromTarget(0);
this->action = 1;
this->interactType = 0;
}
@@ -132,7 +132,7 @@ NONMATCH("asm/non_matching/kid/sub_080621AC.inc", void sub_080621AC(Entity* this
break;
case 2:
GetNextFrame(this);
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
this->action = 1;
}
break;
@@ -203,13 +203,13 @@ END_NONMATCH
NONMATCH("asm/non_matching/kid/sub_08062634.inc", void sub_08062634(Entity* this)) {
u32 a = this->type2;
u32 b = (Random() & 1);
TextboxNoOverlap(*((u16*)gUnk_0810BDE8 + b + a * 2), this);
MessageNoOverlap(*((u16*)gUnk_0810BDE8 + b + a * 2), this);
}
END_NONMATCH
NONMATCH("asm/non_matching/kid/sub_0806265C.inc", void sub_0806265C(Entity* this, ScriptExecutionContext* context)) {
if (gSave.unk8 == 0) {
TextboxNoOverlap(0, this);
MessageNoOverlap(0, this);
} else {
ShowNPCDialogue(this, &gUnk_0810BE10[this->type * 9 + gSave.unk8]);
}
src/npc/kingDaltus.c
+1 -1
View File
@@ -90,7 +90,7 @@ void sub_0806673C(Entity* this) {
} else {
index = 3;
}
TextboxNoOverlap(gUnk_081104F8[index], this);
MessageNoOverlap(gUnk_081104F8[index], this);
}
void KingDaltus_Fusion(Entity* this) {
src/npc/kingGustaf.c
+2 -2
View File
@@ -16,12 +16,12 @@ void KingGustaf(Entity* this) {
gScreen.controls.layerFXControl = 0x3f40;
gScreen.controls.alphaBlend = 0x1000;
this->speed = 0x1000;
this->field_0x20 = 0;
this->hVelocity = 0;
} else {
sub_0807DD94(this, 0);
speed = 0x100;
speed *= this->speed;
speed += this->field_0x20;
speed += this->hVelocity;
speed >>= 0x10;
if (speed > 0x10) {
speed = 0x10;
src/npc/librari.c
+2 -2
View File
@@ -55,7 +55,7 @@ void sub_0806B260(Entity* this, ScriptExecutionContext* context) {
} else {
index = 3;
}
TextboxNoOverlap(gUnk_08112D48[index], this);
MessageNoOverlap(gUnk_08112D48[index], this);
}
extern u16 gUnk_08112D50[];
@@ -82,7 +82,7 @@ void sub_0806B2B4(Entity* this) {
} else {
index = 0;
}
TextboxNoOverlap(gUnk_08112D50[index], this);
MessageNoOverlap(gUnk_08112D50[index], this);
}
void Librari_Fusion(Entity* this) {
src/npc/librarians.c
+1 -1
View File
@@ -57,5 +57,5 @@ void sub_0806BBB0(Entity* this) {
} else {
tmp = 2;
}
TextboxNoOverlap(gUnk_08113078[tmp], this);
MessageNoOverlap(gUnk_08113078[tmp], this);
}
src/npc/mailbox.c
+1 -1
View File
@@ -42,7 +42,7 @@ void sub_08063254(Entity* this, u32 unused) {
sub_08063280(this, unused);
if ((this->frames.all & 0x80) != 0) {
this->action = 3;
TextboxNoOverlapFollow(0);
MessageFromTarget(0);
}
}
src/npc/marcy.c
+1 -1
View File
@@ -50,7 +50,7 @@ void sub_08062D18(Entity* this, ScriptExecutionContext* context) {
tmp = 3;
}
TextboxNoOverlap(gUnk_0810C34C[tmp], this);
MessageNoOverlap(gUnk_0810C34C[tmp], this);
if (tmp == 0) {
context->condition = TRUE;
} else {
src/npc/melari.c
+1 -1
View File
@@ -50,7 +50,7 @@ void sub_08068730(Entity* this) {
}
if (this->interactType != 0) {
this->interactType = 0;
TextboxNoOverlapFollow(this->actionDelay + 0x1200);
MessageFromTarget(this->actionDelay + 0x1200);
}
}
src/npc/ministerPotho.c
+1 -1
View File
@@ -92,7 +92,7 @@ void sub_08066904(Entity* this) {
} else {
index = 3;
}
TextboxNoOverlap(gUnk_08110650[index], this);
MessageNoOverlap(gUnk_08110650[index], this);
}
void MinisterPotho_Fusion(Entity* this) {
src/npc/mountainMinish.c
+2 -2
View File
@@ -50,7 +50,7 @@ void sub_08067E88(Entity* this) {
if (this->interactType != 0) {
this->interactType = 0;
this->action = 2;
TextboxNoOverlapFollow(this->actionDelay + 0x1200);
MessageFromTarget(this->actionDelay + 0x1200);
}
}
@@ -86,7 +86,7 @@ NONMATCH("asm/non_matching/mountainMinish/sub_08068190.inc", void sub_08068190(E
}
// TODO unable to devide the array access variables by two without breaking everything
TextboxNoOverlap(gUnk_0811130E[uVar2 * 2 + uVar3 * 8], this);
MessageNoOverlap(gUnk_0811130E[uVar2 * 2 + uVar3 * 8], this);
}
END_NONMATCH
src/npc/mutoh.c
+1 -1
View File
@@ -60,7 +60,7 @@ void sub_080670B4(Entity* this) {
uVar1 = CheckGlobalFlag(TABIDACHI);
uVar2 = BOOLCAST(uVar1);
}
TextboxNoOverlap(gUnk_08110C0C[uVar2], this);
MessageNoOverlap(gUnk_08110C0C[uVar2], this);
}
void sub_080670E4(Entity* this) {
src/npc/npc23.c
+1 -1
View File
@@ -39,7 +39,7 @@ void sub_080662F8(Entity* this) {
void sub_08066358(Entity* this) {
if (this->interactType != 0) {
this->interactType = 0;
TextboxNoOverlapFollow(0);
MessageFromTarget(0);
if ((this->type2 & 0x10) != 0) {
this->action = 3;
this->subAction = 0;
src/npc/npc5.c
+2 -2
View File
@@ -392,7 +392,7 @@ NONMATCH("asm/non_matching/npc5/sub_08061170.inc", bool32 sub_08061170(Entity* t
this->action = 6;
tmp = (sub_08079FD4(this, 1) * 0x10 - 4);
// tmp <<= 0xc;
this->field_0x20 = tmp;
this->hVelocity = tmp;
this->speed = 0x100;
this->direction = direction;
this->animationState = direction >> 2;
@@ -867,7 +867,7 @@ NONMATCH("asm/non_matching/npc5/sub_08061B18.inc", void sub_08061B18(Entity* thi
if ((((Tmp**)&this->field_0x68))[++this->actionDelay]->unk_2 == 0) {
this->actionDelay = 0;
}
TextboxNoOverlap((u32)*puVar2, this);
MessageNoOverlap((u32)*puVar2, this);
break;
}
}
src/npc/npc9.c
+2 -2
View File
@@ -30,13 +30,13 @@ void sub_08062B14(Entity* this) {
void sub_08062B48(Entity* this) {
GetNextFrame(this);
if ((this->frames.b.f3) != 0) {
TextboxNoOverlapFollow(0xa01);
MessageFromTarget(0xa01);
this->action++;
}
}
void sub_08062B70(Entity* this) {
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
InitializeAnimation(this, 2);
this->action = 1;
sub_0805E584(this);
src/npc/percy.c
+6 -6
View File
@@ -49,7 +49,7 @@ void sub_0806B3CC(Entity* this) {
GetNextFrame(this);
if (this->interactType != 0) {
this->interactType = 0;
TextboxNoOverlapFollow(0);
MessageFromTarget(0);
}
sub_0806ED78(this);
}
@@ -107,7 +107,7 @@ void sub_0806B504(Entity* this) {
SetLocalFlag(0x86);
}
TextboxNoOverlap(gUnk_08112E54[idx], this);
MessageNoOverlap(gUnk_08112E54[idx], this);
}
void sub_0806B540(Entity* this) {
@@ -116,7 +116,7 @@ void sub_0806B540(Entity* this) {
context = *(ScriptExecutionContext**)&this->cutsceneBeh;
switch (context->unk_18) {
case 0:
TextboxNoOverlap(0x2312, this);
MessageNoOverlap(0x2312, this);
if (CheckLocalFlag(0x3f) != 0) {
return;
}
@@ -124,13 +124,13 @@ void sub_0806B540(Entity* this) {
SetLocalFlag(0x3f);
break;
case 1:
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
context->unk_18 = 2;
TextboxNoOverlap(0x2315, this);
MessageNoOverlap(0x2315, this);
}
break;
case 2:
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
context->unk_18 = 3;
if (gSave.stats.filler3[0] != 0) {
sub_080A7C18(0x58, 0, 0);
src/npc/picolyteBottle.c
+3 -3
View File
@@ -109,10 +109,10 @@ void sub_0806E1FC(Entity* this) {
void sub_0806E20C(void) {
if (gScreenTransition.field_0x6 != 0) {
TextboxNoOverlapFollow(0x421f);
gTextBox.field_0x10 = gScreenTransition.field_0x6;
MessageFromTarget(0x421f);
gMessage.field_0x10 = gScreenTransition.field_0x6;
} else {
TextboxNoOverlapFollow(0x4220);
MessageFromTarget(0x4220);
}
}
src/npc/pina.c
+1 -1
View File
@@ -36,7 +36,7 @@ void sub_08063A98(Entity* this) {
ASM_FUNC("asm/non_matching/pina/sub_08063AC0.inc", void sub_08063AC0(Entity* this))
void sub_08063B44(Entity* this) {
u8 tmp = gTextBox.doTextBox & 0x7f;
u8 tmp = gMessage.doTextBox & 0x7f;
if (tmp == 0) {
this->action = 1;
this->field_0xf = tmp;
src/npc/pita.c
+1 -1
View File
@@ -61,7 +61,7 @@ bool32 sub_08062EDC(Entity* this, ScriptExecutionContext* context) {
tmp = sub_080028F4(gUnk_0810C435);
tmp2 = gUnk_0810C43D[tmp];
sub_080A7C18(0x5c, tmp2, 1);
TextboxNoOverlap(0x3c05, this);
MessageNoOverlap(0x3c05, this);
context->condition = TRUE;
return TRUE;
}
src/npc/postman.c
+4 -4
View File
@@ -65,7 +65,7 @@ void sub_0806045C(Entity* this) {
case 1:
case 2:
this->action = 2;
TextboxNoOverlapFollow(0);
MessageFromTarget(0);
break;
default:
bVar1 = this->knockbackDirection;
@@ -140,7 +140,7 @@ void sub_08060528(Entity* this) {
break;
case 2:
UpdateAnimationSingleFrame(this);
if ((gTextBox.doTextBox & 0x7f) != 0) {
if ((gMessage.doTextBox & 0x7f) != 0) {
break;
}
this->action = 1;
@@ -156,7 +156,7 @@ void sub_08060528(Entity* this) {
if (0 < (s16)this->field_0x6a.HWORD) {
if ((s16)this->field_0x6a.HWORD > 0x12b) {
this->field_0x6a.HWORD = 0;
this->field_0x20 = 0x20000;
this->hVelocity = 0x20000;
this->field_0x6c.HALF.HI = 1;
sub_080788E0(this);
EnqueueSFX(0x7c);
@@ -165,7 +165,7 @@ void sub_08060528(Entity* this) {
}
}
sub_08003FC4(this, 0x1800);
if (((this->field_0x6c.HALF.HI != 0) && (this->field_0x20 == 0)) && this->height.WORD == 0) {
if (((this->field_0x6c.HALF.HI != 0) && (this->hVelocity == 0)) && this->height.WORD == 0) {
this->field_0x6c.HALF.HI = 0;
sub_080606C0(this);
}
src/npc/rem.c
+1 -1
View File
@@ -302,7 +302,7 @@ void sub_0806AA18(Entity* this) {
} else {
index = 0x440d;
}
TextboxNoOverlap(index, this);
MessageNoOverlap(index, this);
}
ASM_FUNC("asm/non_matching/rem/sub_0806AA50.inc", void sub_0806AA50(Entity* this, ScriptExecutionContext* context))
src/npc/smallTownMinish.c
+1 -1
View File
@@ -20,7 +20,7 @@ void SmallTownMinish(Entity* this) {
} else {
sub_0807DD94(this, NULL);
}
if ((gPlayerState.flags.all & 0x80) != 0) {
if ((gPlayerState.flags & 0x80) != 0) {
this->spriteSettings.b.draw = 1;
} else {
this->spriteSettings.b.draw = 0;
src/npc/smith.c
+1 -1
View File
@@ -91,7 +91,7 @@ void sub_08066118(Entity* this) {
}
if (this->interactType != 0) {
this->action = 2;
TextboxNoOverlapFollow(0);
MessageFromTarget(0);
}
}
src/npc/stamp.c
+2 -2
View File
@@ -41,13 +41,13 @@ void sub_08062C24(Entity* ent) {
GetNextFrame(ent);
if ((ent->frames.all & 128) != 0) {
InitializeAnimation(ent, 4);
TextboxNoOverlapFollow(2561);
MessageFromTarget(2561);
ent->action++;
}
}
void sub_08062C54(Entity* ent) {
if ((gTextBox.doTextBox & 127) == 0) {
if ((gMessage.doTextBox & 127) == 0) {
ent->action = 1;
InitializeAnimation(ent, 0);
sub_0805E584(ent);
src/npc/stockwell.c
+9 -9
View File
@@ -42,8 +42,8 @@ ASM_FUNC("asm/non_matching/stockwell/sub_080650CC.inc", void sub_080650CC(Entity
void sub_080651AC(Entity* this) {
GetNextFrame(this);
if ((gTextBox.doTextBox & 0x7f) == 0) {
this->interactType = gTextBox.doTextBox & 0x7f;
if ((gMessage.doTextBox & 0x7f) == 0) {
this->interactType = gMessage.doTextBox & 0x7f;
this->action = 1;
InitializeAnimation(this, 4);
}
@@ -67,7 +67,7 @@ void sub_080651F8(Entity* this) {
void sub_0806522C(Entity* this) {
if (--this->actionDelay == 0) {
++this->subAction;
TextboxNoOverlap(0x2c16, this);
MessageNoOverlap(0x2c16, this);
}
}
@@ -90,12 +90,12 @@ void sub_08065250(Entity* this) {
void sub_0806528C(Entity* this) {
if (--this->actionDelay == 0) {
++this->subAction;
TextboxNoOverlap(0x2c18, this);
MessageNoOverlap(0x2c18, this);
}
}
void sub_080652B0(Entity* this) {
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
this->subAction += 1;
this->actionDelay = 10;
gRoomVars.greatFairyState = this->field_0xf;
@@ -109,22 +109,22 @@ void sub_080652E4(Entity* this) {
} else {
if (gPlayerEntity.action != 8) {
this->subAction += 1;
TextboxNoOverlap(0x2c19, this);
MessageNoOverlap(0x2c19, this);
}
}
}
void sub_08065314(Entity* this) {
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
this->subAction += 1;
MenuFadeIn(3, 3);
}
}
void sub_08065338(Entity* this) {
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
this->action = 1;
this->subAction = gTextBox.doTextBox & 0x7f;
this->subAction = gMessage.doTextBox & 0x7f;
gRoomVars.greatFairyState = this->field_0xf;
InitializeAnimation(this, 4);
}
src/npc/sturgeon.c
+2 -2
View File
@@ -66,7 +66,7 @@ void sub_08064B44(Entity* this) {
ASM_FUNC("asm/non_matching/sturgeon/sub_08064B88.inc", void sub_08064B88(Entity* this))
void sub_08064C2C(Entity* this) {
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
this->action = 1;
InitializeAnimation(this, (u32)this->field_0xf);
}
@@ -104,7 +104,7 @@ void sub_08064CD8(Entity* this) {
flag = CheckLocalFlag(0x73);
tmp = BOOLCAST(flag);
}
TextboxNoOverlap(gUnk_0810FA54[tmp], this);
MessageNoOverlap(gUnk_0810FA54[tmp], this);
}
void sub_08064D08(Entity* this) {
src/npc/talon.c
+2 -2
View File
@@ -92,7 +92,7 @@ void sub_08065680(Entity* this) {
}
void sub_080656A4(Entity* this) {
if ((gTextBox.doTextBox & 0x7F) == 0) {
if ((gMessage.doTextBox & 0x7F) == 0) {
this->action = this->field_0x68.HALF.HI;
InitAnimationForceUpdate(this, this->field_0x6a.HALF.LO);
}
@@ -115,7 +115,7 @@ void sub_080656D4(Entity* this) {
this->field_0x68.HALF.HI = this->action;
this->action = 3;
this->interactType = 0;
TextboxNoOverlap(*(u32*)(*(u32*)&this->cutsceneBeh.HWORD + 4), this);
MessageNoOverlap(*(u32*)(*(u32*)&this->cutsceneBeh.HWORD + 4), this);
label:
sub_0806574C(this);
}
src/npc/tingleSiblings.c
+1 -1
View File
@@ -33,7 +33,7 @@ void sub_08064DA0(Entity* this) {
if (this->interactType != 0) {
this->action = 2;
InitAnimationForceUpdate(this, 6);
TextboxNoOverlapFollow(0);
MessageFromTarget(0);
}
}
src/npc/townMinish.c
+8 -8
View File
@@ -122,7 +122,7 @@ void sub_0806ACC4(Entity* this) {
}
break;
case 2:
if (gTextBox.doTextBox & 0x7f)
if (gMessage.doTextBox & 0x7f)
break;
this->action = 1;
@@ -223,12 +223,12 @@ void sub_0806AF60(Entity* this, ScriptExecutionContext* context) {
}
void sub_0806AF70(Entity* this, ScriptExecutionContext* context) {
this->field_0x20 = 0x24000;
this->hVelocity = 0x24000;
}
void sub_0806AF78(Entity* this, ScriptExecutionContext* context) {
sub_08003FC4(this, 0x1800);
if (0 <= this->height.WORD && this->field_0x20 < 1) {
if (0 <= this->height.WORD && this->hVelocity < 1) {
this->height.WORD = 0;
sub_0806AF70(this, context);
}
@@ -273,7 +273,7 @@ void sub_0806B004(Entity* this, ScriptExecutionContext* context) {
SetLocalFlag(0x6a);
}
}
TextboxNoOverlap(gUnk_08112C40[idx], this);
MessageNoOverlap(gUnk_08112C40[idx], this);
}
void sub_0806B064(Entity* this) {
@@ -285,7 +285,7 @@ void sub_0806B064(Entity* this) {
idx = 2;
}
}
TextboxNoOverlap(gUnk_08112C4A[idx], this);
MessageNoOverlap(gUnk_08112C4A[idx], this);
}
void sub_0806B098(Entity* this) {
@@ -299,7 +299,7 @@ void sub_0806B098(Entity* this) {
idx = BOOLCAST(f);
}
}
TextboxNoOverlap(gUnk_08112C50[(this->type2 - 7) * 3 + idx], this);
MessageNoOverlap(gUnk_08112C50[(this->type2 - 7) * 3 + idx], this);
}
void sub_0806B0E0(Entity* this) {
@@ -310,7 +310,7 @@ void sub_0806B0E0(Entity* this) {
idx = 1;
}
TextboxNoOverlap(gUnk_08112C5C[idx], this);
MessageNoOverlap(gUnk_08112C5C[idx], this);
}
void sub_0806B134(Entity* this) {
@@ -329,7 +329,7 @@ void sub_0806B134(Entity* this) {
if (5 < gSave.unk8) {
idx = 3;
}
TextboxNoOverlap(gUnk_08112C60[idx], this);
MessageNoOverlap(gUnk_08112C60[idx], this);
}
void TownMinish_Fusion(Entity* this) {
src/npc/townsperson.c
+5 -5
View File
@@ -70,7 +70,7 @@ void sub_08061C00(Entity* this) {
sub_0806ED78(this);
if (this->interactType != 0) {
this->interactType = 0;
TextboxNoOverlapFollow(this->type2 + 0xa01);
MessageFromTarget(this->type2 + 0xa01);
}
}
@@ -141,7 +141,7 @@ void sub_08061D64(Entity* this) {
void sub_08061E24(Entity* this) {
GetNextFrame(this);
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
this->action = 1;
InitializeAnimation(this, this->field_0x68.HALF.HI);
}
@@ -254,7 +254,7 @@ void sub_08061FE4(Entity* this) {
}
void sub_08061FF4(Entity* this) {
TextboxNoOverlap(gUnk_0810B790[this->type], this);
MessageNoOverlap(gUnk_0810B790[this->type], this);
}
void sub_0806200C(Entity* this) {
@@ -270,7 +270,7 @@ void sub_0806200C(Entity* this) {
index = 1;
}
}
TextboxNoOverlap(gUnk_0810B7BA[index], this);
MessageNoOverlap(gUnk_0810B7BA[index], this);
}
void sub_08062048(Entity* this) {
@@ -283,7 +283,7 @@ void sub_08062048(Entity* this) {
}
ShowNPCDialogue(this, gUnk_0810B7C0 + this->type * 0x8 + iVar1);
} else {
TextboxNoOverlap(0, this);
MessageNoOverlap(0, this);
}
}
src/npc/vaatiReborn.c
+1 -1
View File
@@ -103,7 +103,7 @@ void VaatiRebornAction1(Entity* this) {
break;
}
CopyPosition(this, entity);
TextboxNoOverlapFollow(0x1634);
MessageFromTarget(0x1634);
this->subAction = this->subAction + 1;
DeleteThisEntity();
return;
src/npc/windTribespeople.c
+8 -8
View File
@@ -69,7 +69,7 @@ void sub_0806C7D4(Entity* this) {
}
void sub_0806C834(Entity* this) {
if ((gTextBox.doTextBox & 0x7f) == 0) {
if ((gMessage.doTextBox & 0x7f) == 0) {
--this->action;
InitializeAnimation(this, (this->animationState / 2) + 4);
}
@@ -140,7 +140,7 @@ void sub_0806C944(Entity* this) {
iVar2 = 1;
}
}
TextboxNoOverlap(gUnk_08113B0C[iVar2], this);
MessageNoOverlap(gUnk_08113B0C[iVar2], this);
}
void sub_0806C978(Entity* this) {
@@ -148,7 +148,7 @@ void sub_0806C978(Entity* this) {
u32 flagAsBool;
flag = CheckGlobalFlag(0x58);
flagAsBool = BOOLCAST(flag);
TextboxNoOverlap(gUnk_08113B12[flagAsBool], this);
MessageNoOverlap(gUnk_08113B12[flagAsBool], this);
}
void sub_0806C99C(Entity* this) {
@@ -160,7 +160,7 @@ void sub_0806C99C(Entity* this) {
if (CheckLocalFlag(99) != 0) {
flagAsBool += 1;
}
TextboxNoOverlap(gUnk_08113B16[flagAsBool], this);
MessageNoOverlap(gUnk_08113B16[flagAsBool], this);
}
void sub_0806C9D0(Entity* this) {
@@ -168,7 +168,7 @@ void sub_0806C9D0(Entity* this) {
if (CheckLocalFlag(100) == 0) {
tmp = 1;
}
TextboxNoOverlap(gUnk_08113B1E[tmp], this);
MessageNoOverlap(gUnk_08113B1E[tmp], this);
}
void sub_0806C9F8(Entity* this) {
@@ -176,15 +176,15 @@ void sub_0806C9F8(Entity* this) {
u32 flagAsBool;
flag = CheckGlobalFlag(0x58);
flagAsBool = BOOLCAST(flag);
TextboxNoOverlap(gUnk_08113B22[flagAsBool], this);
MessageNoOverlap(gUnk_08113B22[flagAsBool], this);
}
void sub_0806CA1C(Entity* this) {
TextboxNoOverlap(0x251b, this);
MessageNoOverlap(0x251b, this);
}
void sub_0806CA2C(Entity* this) {
TextboxNoOverlap(0x2527, this);
MessageNoOverlap(0x2527, this);
}
void sub_0806CA3C(Entity* this) {
src/npc/zelda.c
+2 -2
View File
@@ -129,7 +129,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) {
UpdateAnimationSingleFrame(this);
if (this->frames.all & 1) {
context->unk_18++;
this->field_0x20 = 0x20000;
this->hVelocity = 0x20000;
this->frames.all &= 0xFE;
SoundReq(SFX_PLY_JUMP);
}
@@ -140,7 +140,7 @@ void sub_08066E80(Entity* this, ScriptExecutionContext* context) {
if (!(this->frames.all & 1)) {
UpdateAnimationSingleFrame(this);
}
if (this->field_0x20 < 0) {
if (this->hVelocity < 0) {
context->unk_18++;
}
break;