summaryrefslogtreecommitdiff
path: root/src/object
diff options
context:
space:
mode:
authoroctorock <79596758+octorock@users.noreply.github.com>2021-12-26 23:44:43 +0100
committeroctorock <79596758+octorock@users.noreply.github.com>2021-12-27 00:11:56 +0100
commit57f00c0eae4cc00fa329df0d13752f7de096054f (patch)
treef8764779c623c1f7fc17f8a0d466c9a758a19a05 /src/object
parent2ccf89a1fb89e01f449e1d4ce734c57943fa093b (diff)
Name some script commands
Diffstat (limited to 'src/object')
-rw-r--r--src/object/greatFairy.c2
-rw-r--r--src/object/object6A.c6
2 files changed, 4 insertions, 4 deletions
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;