summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/npc/npc4E.c2
-rw-r--r--src/npc/rem.c6
-rw-r--r--src/object/greatFairy.c2
-rw-r--r--src/object/object6A.c6
-rw-r--r--src/script.c78
5 files changed, 47 insertions, 47 deletions
diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c
index 41c83e06..7d4f915c 100644
--- a/src/npc/npc4E.c
+++ b/src/npc/npc4E.c
@@ -17,7 +17,7 @@ typedef struct {
extern void sub_08078850(Entity*, u32, u8 /* TODO this is a s8 in beedle.c*/, gUnk_0810C89C_struct*);
-extern void script_Object3ELeftStoneOpening; // Cutscene data type?
+extern void script_Object3ELeftStoneOpening; // Cutscene data type?
extern void script_Object3ERightStoneOpening; // Cutscene data type?
const Hitbox gUnk_08114154;
diff --git a/src/npc/rem.c b/src/npc/rem.c
index 493ce944..2a929f36 100644
--- a/src/npc/rem.c
+++ b/src/npc/rem.c
@@ -132,7 +132,7 @@ void sub_0806A550(Entity* this) {
if (this->frame == 1) {
this->frame = 0;
sub_08080964(8, 2);
- gActiveScriptInfo.unk_00 |= 0x100;
+ gActiveScriptInfo.syncFlags |= 0x100;
SoundReq(SFX_CHEST_OPEN);
}
if ((this->frame & 0x80) != 0) {
@@ -173,7 +173,7 @@ void sub_0806A630(Entity* this) {
this->action = 1;
InitializeAnimation(this, 0x12);
}
- if ((gActiveScriptInfo.unk_00 & 0x100) != 0) {
+ if ((gActiveScriptInfo.syncFlags & 0x100) != 0) {
GetNextFrame(this);
}
if (this->frame == 1) {
@@ -192,7 +192,7 @@ void sub_0806A830(Entity* this) {
InitializeAnimation(this, 0x14);
SetDefaultPriority(this, PRIO_MESSAGE);
}
- if ((gActiveScriptInfo.unk_00 & 0x200) != 0) {
+ if ((gActiveScriptInfo.syncFlags & 0x200) != 0) {
DeleteThisEntity();
}
GetNextFrame(this);
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index db393026..ccb1adbf 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -183,7 +183,7 @@ void GreatFairy_WingsUpdate(Entity* this) {
this->action = 2;
sub_0805EC60(this);
gRoomVars.animFlags |= 32;
- gActiveScriptInfo.unk_00 |= 4;
+ gActiveScriptInfo.syncFlags |= 4;
} else {
sub_0805EC9C(this, this->speed, 256, 0);
}
diff --git a/src/object/object6A.c b/src/object/object6A.c
index b1005e1e..9b674aea 100644
--- a/src/object/object6A.c
+++ b/src/object/object6A.c
@@ -873,7 +873,7 @@ void sub_08095954(Object6AEntity* this) {
EnqueueSFX(292);
super->frame &= ~1;
} else {
- gActiveScriptInfo.unk_00 |= 0x100;
+ gActiveScriptInfo.syncFlags |= 0x100;
}
}
@@ -1069,7 +1069,7 @@ void sub_08095D8C(Object6AEntity* this, ScriptExecutionContext* ctx) {
}
void sub_08095DBC(Object6AEntity* this) {
- if (gActiveScriptInfo.unk_00 & 0x10)
+ if (gActiveScriptInfo.syncFlags & 0x10)
DeleteThisEntity();
if (super->type2 == 0) {
if (super->action == 0) {
@@ -1085,7 +1085,7 @@ void sub_08095DBC(Object6AEntity* this) {
super->spriteRendering.b3 = gUnk_08114F30[super->spriteRendering.b3];
ResolveEntityOnTop(super, super);
}
- if ((super->type2 & 0x80) == 0 && gActiveScriptInfo.unk_00 & 0x20000) {
+ if ((super->type2 & 0x80) == 0 && gActiveScriptInfo.syncFlags & 0x20000) {
super->type2 = -1;
super->zVelocity = 0x40000;
super->speed = 0xC000;
diff --git a/src/script.c b/src/script.c
index a05c3629..e7fcdafb 100644
--- a/src/script.c
+++ b/src/script.c
@@ -28,7 +28,7 @@ void ScriptCommand_JumpAbsoluteTable(Entity* entity, ScriptExecutionContext* con
void ScriptCommand_Call(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_CallWithArg(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_LoadRoomEntityList(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_TestBit(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckSyncFlagAndClear(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_CheckInventory1(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_CheckInventory2(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_CheckLocalFlag(Entity* entity, ScriptExecutionContext* context);
@@ -41,10 +41,10 @@ void ScriptCommand_CheckEntityInteractType(Entity* entity, ScriptExecutionContex
void ScriptCommand_0807E30C(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_HasRupees(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_0807E3BC(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E3E8(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckTextboxResult(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_CheckKinstoneFused(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_BuyItem(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E48C(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_CheckBottleContaining(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_HasRoomItemForSale(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_0807E4CC(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_0807E4EC(Entity* entity, ScriptExecutionContext* context);
@@ -54,8 +54,8 @@ void ScriptCommand_0807E564(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_EntityHasHeight(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_ComparePlayerAction(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_ComparePlayerAnimationState(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E5F8(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807E610(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetSyncFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_ClearSyncFlag(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_SetLocalFlag(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_SetLocalFlagByBank(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_ClearLocalFlag(Entity* entity, ScriptExecutionContext* context);
@@ -64,12 +64,12 @@ void ScriptCommand_ClearGlobalFlag(Entity* entity, ScriptExecutionContext* conte
void ScriptCommand_SetRoomFlag(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_ClearRoomFlag(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_Wait(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_WaitForSomething(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_WaitForSomething2(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_WaitForSyncFlag(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_WaitForSyncFlagAndClear(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_WaitPlayerGetItem(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_WaitForPlayerAction0x17(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_WaitFor_1(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_WaitFor_2(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_WaitForFadeFinish(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_0807E778(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_SetFadeMask(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_0807E79C(Entity* entity, ScriptExecutionContext* context);
@@ -143,7 +143,7 @@ void ScriptCommand_StopBgm(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_ModRupees(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_ModHealth(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_IncreaseMaxHealth(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_0807F034(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_GivePlayerItem(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_0807F050(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_GetInventoryValue(Entity* entity, ScriptExecutionContext* context);
void ScriptCommand_0807F078(Entity* entity, ScriptExecutionContext* context);
@@ -481,7 +481,7 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) {
ScriptCommand_Call,
ScriptCommand_CallWithArg,
ScriptCommand_LoadRoomEntityList,
- ScriptCommand_TestBit,
+ ScriptCommand_CheckSyncFlagAndClear,
ScriptCommand_CheckInventory1,
ScriptCommand_CheckInventory2,
ScriptCommand_HasRoomItemForSale,
@@ -495,10 +495,10 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) {
ScriptCommand_0807E30C,
ScriptCommand_HasRupees,
ScriptCommand_0807E3BC,
- ScriptCommand_0807E3E8,
+ ScriptCommand_CheckTextboxResult,
ScriptCommand_CheckKinstoneFused,
ScriptCommand_BuyItem,
- ScriptCommand_0807E48C,
+ ScriptCommand_CheckBottleContaining,
ScriptCommand_0807E4CC,
ScriptCommand_0807E4EC,
ScriptCommand_0807E514,
@@ -507,8 +507,8 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) {
ScriptCommand_EntityHasHeight,
ScriptCommand_ComparePlayerAction,
ScriptCommand_ComparePlayerAnimationState,
- ScriptCommand_0807E5F8,
- ScriptCommand_0807E610,
+ ScriptCommand_SetSyncFlag,
+ ScriptCommand_ClearSyncFlag,
ScriptCommand_SetLocalFlag,
ScriptCommand_SetLocalFlagByBank,
ScriptCommand_ClearLocalFlag,
@@ -517,12 +517,12 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) {
ScriptCommand_SetRoomFlag,
ScriptCommand_ClearRoomFlag,
ScriptCommand_Wait,
- ScriptCommand_WaitForSomething,
- ScriptCommand_WaitForSomething2,
+ ScriptCommand_WaitForSyncFlag,
+ ScriptCommand_WaitForSyncFlagAndClear,
ScriptCommand_WaitPlayerGetItem,
ScriptCommand_WaitForPlayerAction0x17,
ScriptCommand_WaitFor_1,
- ScriptCommand_WaitFor_2,
+ ScriptCommand_WaitForFadeFinish,
ScriptCommand_0807E778,
ScriptCommand_SetFadeMask,
ScriptCommand_0807E79C,
@@ -597,7 +597,7 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) {
ScriptCommand_ModRupees,
ScriptCommand_ModHealth,
ScriptCommand_IncreaseMaxHealth,
- ScriptCommand_0807F034,
+ ScriptCommand_GivePlayerItem,
ScriptCommand_0807F050,
ScriptCommand_GetInventoryValue,
ScriptCommand_0807F078,
@@ -613,7 +613,7 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) {
if (context->wait) {
context->wait--;
} else {
- struct_02033280* activeScriptInfo = &gActiveScriptInfo;
+ ActiveScriptInfo* activeScriptInfo = &gActiveScriptInfo;
activeScriptInfo->flags = 0;
do {
u32 cmd = GetNextScriptCommandHalfword(context->scriptInstructionPointer);
@@ -713,14 +713,14 @@ void ScriptCommand_LoadRoomEntityList(Entity* entity, ScriptExecutionContext* co
LoadRoomEntityList((EntityData*)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer));
}
-void ScriptCommand_TestBit(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_CheckSyncFlagAndClear(Entity* entity, ScriptExecutionContext* context) {
u32 flag = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
u32 set = 0;
- u32 field = gActiveScriptInfo.unk_00;
+ u32 field = gActiveScriptInfo.syncFlags;
if ((field & flag) == flag)
set = 1;
context->condition = set;
- gActiveScriptInfo.unk_00 = field & ~flag;
+ gActiveScriptInfo.syncFlags = field & ~flag;
gActiveScriptInfo.flags |= 1;
}
@@ -831,7 +831,7 @@ void ScriptCommand_0807E3BC(Entity* entity, ScriptExecutionContext* context) {
gActiveScriptInfo.flags |= 1;
}
-void ScriptCommand_0807E3E8(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_CheckTextboxResult(Entity* entity, ScriptExecutionContext* context) {
context->condition = !gUnk_02000040.unk_01;
gActiveScriptInfo.flags |= 1;
}
@@ -861,7 +861,7 @@ void ScriptCommand_BuyItem(Entity* entity, ScriptExecutionContext* context) {
gActiveScriptInfo.flags |= 1;
}
-void ScriptCommand_0807E48C(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_CheckBottleContaining(Entity* entity, ScriptExecutionContext* context) {
context->condition = GetBottleContaining(context->scriptInstructionPointer[1]);
gActiveScriptInfo.flags |= 1;
}
@@ -914,12 +914,12 @@ void ScriptCommand_ComparePlayerAnimationState(Entity* entity, ScriptExecutionCo
gActiveScriptInfo.flags |= 1;
}
-void ScriptCommand_0807E5F8(Entity* entity, ScriptExecutionContext* context) {
- gActiveScriptInfo.unk_00 |= GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
+void ScriptCommand_SetSyncFlag(Entity* entity, ScriptExecutionContext* context) {
+ gActiveScriptInfo.syncFlags |= GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
}
-void ScriptCommand_0807E610(Entity* entity, ScriptExecutionContext* context) {
- gActiveScriptInfo.unk_00 &= ~GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
+void ScriptCommand_ClearSyncFlag(Entity* entity, ScriptExecutionContext* context) {
+ gActiveScriptInfo.syncFlags &= ~GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
}
void ScriptCommand_SetLocalFlag(Entity* entity, ScriptExecutionContext* context) {
@@ -954,19 +954,19 @@ void ScriptCommand_Wait(Entity* entity, ScriptExecutionContext* context) {
context->wait = GetNextScriptCommandHalfwordAfterCommandMetadata(context->scriptInstructionPointer);
}
-void ScriptCommand_WaitForSomething(Entity* entity, ScriptExecutionContext* context) {
- u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
- if ((gActiveScriptInfo.unk_00 & tmp) != tmp) {
+void ScriptCommand_WaitForSyncFlag(Entity* entity, ScriptExecutionContext* context) {
+ u32 flag = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
+ if ((gActiveScriptInfo.syncFlags & flag) != flag) {
gActiveScriptInfo.commandSize = 0;
}
}
-void ScriptCommand_WaitForSomething2(Entity* entity, ScriptExecutionContext* context) {
- u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
- if ((gActiveScriptInfo.unk_00 & tmp) != tmp) {
+void ScriptCommand_WaitForSyncFlagAndClear(Entity* entity, ScriptExecutionContext* context) {
+ u32 flag = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer);
+ if ((gActiveScriptInfo.syncFlags & flag) != flag) {
gActiveScriptInfo.commandSize = 0;
} else {
- gActiveScriptInfo.unk_00 &= ~tmp;
+ gActiveScriptInfo.syncFlags &= ~flag;
gActiveScriptInfo.flags |= 1;
}
}
@@ -995,7 +995,7 @@ void ScriptCommand_WaitFor_1(Entity* entity, ScriptExecutionContext* context) {
}
}
-void ScriptCommand_WaitFor_2(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_WaitForFadeFinish(Entity* entity, ScriptExecutionContext* context) {
if (gFadeControl.active) {
gActiveScriptInfo.commandSize = 0;
}
@@ -1040,7 +1040,7 @@ void ScriptCommand_0807E80C(Entity* entity, ScriptExecutionContext* context) {
sub_0807E818(0x11);
}
-void sub_0807E818(u32 unk1) {
+void sub_0807E818(u32 fadeType) {
Entity* cameraTarget = gRoomControls.cameraTarget;
u32 x, y;
if (cameraTarget) {
@@ -1050,7 +1050,7 @@ void sub_0807E818(u32 unk1) {
x = 0x78;
y = 0x50;
}
- sub_08050110(x, y, unk1, gActiveScriptInfo.unk_08);
+ sub_08050110(x, y, fadeType, gActiveScriptInfo.unk_08);
}
void ScriptCommand_0807E858(Entity* entity, ScriptExecutionContext* context) {
@@ -1489,7 +1489,7 @@ void ScriptCommand_IncreaseMaxHealth(Entity* entity, ScriptExecutionContext* con
gSave.stats.health = gSave.stats.maxHealth;
}
-void ScriptCommand_0807F034(Entity* entity, ScriptExecutionContext* context) {
+void ScriptCommand_GivePlayerItem(Entity* entity, ScriptExecutionContext* context) {
u32 tmp = 0;
if (context->scriptInstructionPointer[1] == 0x3F) {
tmp = context->intVariable;
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-21 16:45:18 +0000