mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-05 05:39:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix paths

Browse Source
This commit is contained in:
octorock
2022-12-21 23:40:27 +01:00
parent ec0678872f
commit c280188436
179 changed files with 1080 additions and 1076 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/cutsceneMiscObject.c
+1 -1
View File
@@ -714,7 +714,7 @@ void sub_0809567C(CutsceneMiscObjectEntity* this) {
super->action = 3;
super->subAction = 1;
super->speed = 0x400;
super->direction = sub_080045DA(super->x.WORD - ((s16)this->px << 16), super->y.WORD - ((s16)this->py << 16));
super->direction = CalculateDirectionFromOffsets(super->x.WORD - ((s16)this->px << 16), super->y.WORD - ((s16)this->py << 16));
}
void sub_080956B4(CutsceneMiscObjectEntity* this) {
src/object/fileScreenObjects.c
+1 -1
View File
@@ -545,7 +545,7 @@ static u32 sub_0808EF6C(Entity* this) {
var7 = this->field_0x6c.HWORD;
}
this->speed = var7;
this->direction = sub_080045DA(var0, var2) >> 3;
this->direction = CalculateDirectionFromOffsets(var0, var2) >> 3;
LinearMoveUpdate(this);
return 1;
}
src/object/fourElements.c
+1 -1
View File
@@ -166,6 +166,6 @@ void sub_080A0444(FourElementsEntity* this) {
void sub_080A0464(FourElementsEntity* this, ScriptExecutionContext* context) {
Entity* element = FindEntityByID(6, FOUR_ELEMENTS, 6);
if (element != NULL) {
sub_0807DEDC(super, context, element->x.HALF.HI, element->y.HALF.HI + 0x18);
LookAt(super, context, element->x.HALF.HI, element->y.HALF.HI + 0x18);
}
}
src/object/keyStealingTakkuri.c
+2 -2
View File
@@ -420,7 +420,7 @@ void sub_0809E0D4(KeyStealingTakkuriEntity* this, ScriptExecutionContext* contex
entity = &gPlayerEntity;
}
context->unk_18++;
sub_0807DEDC(super, context, entity->x.HALF.HI, entity->y.HALF.HI);
LookAt(super, context, entity->x.HALF.HI, entity->y.HALF.HI);
SoundReq(SFX_123);
gActiveScriptInfo.commandSize = 0;
} else {
@@ -436,7 +436,7 @@ void sub_0809E0D4(KeyStealingTakkuriEntity* this, ScriptExecutionContext* contex
varY2 = varY;
if (--context->unk_19 == 0) {
context->unk_19 = 8;
super->direction = sub_080045DA(varX2 - super->x.HALF.HI, varY2 - super->y.HALF.HI);
super->direction = CalculateDirectionFromOffsets(varX2 - super->x.HALF.HI, varY2 - super->y.HALF.HI);
}
varX3 = super->x.HALF.HI - varX2;
varY3 = super->y.HALF.HI - varY2;
src/object/kinstoneSpark.c
+1 -1
View File
@@ -82,7 +82,7 @@ void sub_080A0AF0(Entity* this) {
}
void sub_080A0B28(Entity* this, ScriptExecutionContext* context) {
sub_0807DEDC(this, context, this->x.HALF.HI, this->y.HALF.HI);
LookAt(this, context, this->x.HALF.HI, this->y.HALF.HI);
this->y.HALF.HI -= 0xb0;
this->spriteSettings.draw = 0;
}
src/object/objectA2.c
+1 -1
View File
@@ -117,5 +117,5 @@ void sub_0809F448(Entity* this) {
break;
}
this->speed = (tmp > 0 ? tmp : -tmp) / (tmp2->unk_1 << 8);
this->direction = sub_080045DA(tmp, 0) >> 3;
this->direction = CalculateDirectionFromOffsets(tmp, 0) >> 3;
}
src/object/octorokBossObject.c
+2 -2
View File
@@ -171,7 +171,7 @@ void OctorokBossObject_Action1(Entity* this) {
return;
}
case 1:
this->direction = sub_080045DA(GET_HELPER(this)->tailObjects[this->timer]->x.WORD - this->x.WORD,
this->direction = CalculateDirectionFromOffsets(GET_HELPER(this)->tailObjects[this->timer]->x.WORD - this->x.WORD,
GET_HELPER(this)->tailObjects[this->timer]->y.WORD - this->y.WORD);
LinearMoveAngle(this, this->speed, this->direction);
if (EntityInRectRadius(this, GET_HELPER(this)->tailObjects[this->timer], 2, 2) == 0) {
@@ -197,7 +197,7 @@ void OctorokBossObject_Action1(Entity* this) {
case 2:
if (this->parent->type2 == 3) {
Entity* object = GET_HELPER(this->parent)->mouthObject;
this->direction = sub_080045DA(object->x.WORD - this->x.WORD, object->y.WORD - this->y.WORD);
this->direction = CalculateDirectionFromOffsets(object->x.WORD - this->x.WORD, object->y.WORD - this->y.WORD);
LinearMoveAngle(this, 0x280, this->direction);
if (sub_0806FC80(this, this->parent, 0x48) == 0) {
return;
src/object/specialFx.c
+1 -1
View File
@@ -201,7 +201,7 @@ void sub_080845DC(SpecialFxObject* this) {
void sub_080845F8(SpecialFxObject* this) {
if (((8 - (super->x.HALF.HI & 0xF)) | (8 - (super->y.HALF.HI & 0xF))) != 0) {
super->direction = sub_080045DA((8 - (super->x.HALF.HI & 0xF)), (8 - (super->y.HALF.HI & 0xF))) >> 3;
super->direction = CalculateDirectionFromOffsets((8 - (super->x.HALF.HI & 0xF)), (8 - (super->y.HALF.HI & 0xF))) >> 3;
LinearMoveUpdate(super);
}
sub_08084630(this);