started naming script stuff

This commit is contained in:
Henny022p
2021-03-04 19:49:46 +01:00
committed by octorock
parent 1a8fad358a
commit a35c22e940
35 changed files with 804 additions and 779 deletions
+1 -1
View File
@@ -172,7 +172,7 @@ void sub_0806DAAC(Entity* this, u32* param_2) {
u32 uVar1;
uVar1 = CheckKinstoneFused(sub_0806DA3C(this));
param_2[5] = uVar1;
gUnk_02033280.unk_07 |= 1;
gActiveScriptInfo.flags |= 1;
}
// maybe actually execute the kinstone fusion?
+1 -1
View File
@@ -99,7 +99,7 @@ u32 sub_08069480(Entity* this) {
void sub_0806948C(Entity* this, u32* param_1) {
param_1[5] = CheckKinstoneFused((sub_08069480(this) << 24) >> 24);
gUnk_02033280.unk_07 |= 1;
gActiveScriptInfo.flags |= 1;
}
void sub_080694B0(Entity* this) {
+1 -1
View File
@@ -207,7 +207,7 @@ void sub_08060700(Entity* entity, ScriptExecutionContext* context) {
u32 x = coords->x + gRoomControls.roomOriginX;
u32 y = coords->y + gRoomControls.roomOriginY;
sub_0807DEDC(entity, context, x, y);
gUnk_02033280.unk_07 |= 1;
gActiveScriptInfo.flags |= 1;
}
void sub_0806075C(Entity* this) {
+1 -1
View File
@@ -241,7 +241,7 @@ void sub_08061E90(Entity* this, Entity* arg1) {
arg1->spriteIndex = 1;
}
if (--arg1->spriteIndex != 0) {
gUnk_02033280.unk_06 = 0;
gActiveScriptInfo.commandSize = 0;
}
}
+2 -2
View File
@@ -164,12 +164,12 @@ void sub_08066E80(Entity* ent, u8* param_2) {
case 4:
UpdateAnimationSingleFrame(ent);
if (ent->frames.b.f3) {
gUnk_02033280.unk_07 |= 1;
gActiveScriptInfo.flags |= 1;
return;
}
}
ent->field_0x80.HWORD = ent->animIndex;
gUnk_02033280.unk_06 = 0;
gActiveScriptInfo.commandSize = 0;
}
void sub_08066F94(void) {
+1 -1
View File
@@ -170,7 +170,7 @@ void GreatFairy_WingsUpdate(Entity* this) {
this->action = 2;
sub_0805EC60(this);
gRoomVars.greatFairyState |= 32;
gUnk_02033280.unk_00 |= 4;
gActiveScriptInfo.unk_00 |= 4;
} else {
sub_0805EC9C(this, this->nonPlanarMovement, 256, 0);
}
+652 -627
View File
File diff suppressed because it is too large Load Diff