naming stuff

This commit is contained in:
Henny022p
2021-03-08 00:52:06 +01:00
parent 3e71687184
commit 9bef8b068c
36 changed files with 93 additions and 93 deletions
+1 -1
View File
@@ -149,7 +149,7 @@ void sub_0806346C(Entity* this) {
}
void sub_080634E4(Entity* this, ScriptExecutionContext* context) {
context->unk_04 = this->type2;
context->intVariable = this->type2;
}
void sub_080634EC(Entity* this) {
+1 -1
View File
@@ -70,5 +70,5 @@ void Carpenter_Head(Entity* this) {
}
void sub_080672B0(Entity* this, ScriptExecutionContext* context) {
InitializeAnimation(this, context->unk_04 + (this->animationState >> 1) + this->type * 8);
InitializeAnimation(this, context->intVariable + (this->animationState >> 1) + this->type * 8);
}
+2 -2
View File
@@ -108,12 +108,12 @@ void NPC4E(Entity* this) {
void sub_0806DA04(Entity* this, ScriptExecutionContext* context) {
// TODO gUnk_0811415C should be a gUnk_0810C89C_struct[], but then a lot of bytes everywhere are wrong?
gUnk_0810C89C_struct* a = (gUnk_0810C89C_struct*)&(
(gUnk_0810C89C_struct*)gUnk_0811415C)[context->unk_04]; // cast necessary to no longer make it a const* ?
(gUnk_0810C89C_struct*)gUnk_0811415C)[context->intVariable]; // cast necessary to no longer make it a const* ?
sub_08078850(this, 1, a->unk_04, a);
}
void sub_0806DA1C(Entity* this, ScriptExecutionContext* context) {
sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->unk_04], (u32)(gUnk_081141E4[context->unk_04]));
sub_0808091C((ScreenTransitionData*)(gUnk_081141A4)[context->intVariable], (u32)(gUnk_081141E4[context->intVariable]));
}
// Returns the kinstone id?
+1 -1
View File
@@ -225,7 +225,7 @@ void sub_080602BC(Entity* this) {
}
void sub_0806030C(Entity* this, ScriptExecutionContext* context) {
ModBombs(context->unk_04);
ModBombs(context->intVariable);
}
void sub_08060318() {
+4 -4
View File
@@ -219,15 +219,15 @@ void sub_08064044() {
}
void sub_08064050(Entity* this, ScriptExecutionContext* context) {
context->unk_04 = 0;
context->intVariable = 0;
switch (this->type2) {
case 0x11:
context->unk_04 = 1;
context->intVariable = 1;
break;
case 0x12:
context->unk_04 = 2;
context->intVariable = 2;
break;
case 0x13:
context->unk_04 = 3;
context->intVariable = 3;
}
}
+1 -1
View File
@@ -45,7 +45,7 @@ void sub_0806C280() {
}
void sub_0806C2A0(Entity* this, ScriptExecutionContext* context) {
switch (context->unk_04) {
switch (context->intVariable) {
case 0:
DoFade(0xd, 4);
break;
+1 -1
View File
@@ -224,7 +224,7 @@ void sub_0806AEE4(Entity* this) {
}
void sub_0806AF60(Entity* this, ScriptExecutionContext* context) {
InitializeAnimation(this, context->unk_04 + (this->animationState / 2));
InitializeAnimation(this, context->intVariable + (this->animationState / 2));
}
void sub_0806AF70(Entity* this, ScriptExecutionContext* context) {
+1 -1
View File
@@ -257,7 +257,7 @@ void sub_08061FB0(Entity* this) {
void sub_08061FB8(Entity* this, ScriptExecutionContext* context) {
u8* temp = gUnk_0810B748;
sub_08078850(this, 1, temp[context->unk_04], &gUnk_0810B740[context->unk_04]);
sub_08078850(this, 1, temp[context->intVariable], &gUnk_0810B740[context->intVariable]);
}
void sub_08061FD8(Entity* this) {