mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-25 10:02:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document structs for interacting with entities

Browse Source
This commit is contained in:
Catobat
2023-04-28 20:20:29 +02:00
parent b25f36e736
commit 04f4272b14
11 changed files with 82 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/cameraTarget.c
+6 -6
View File
@@ -57,7 +57,7 @@ void CameraTarget(Entity* this) {
break;
}
default:
if (gUnk_03003DF0.unk_4->unk_3 == KINSTONE_32) {
if (gPossibleInteraction.currentObject->kinstoneId == KINSTONE_32) {
if (CheckKinstoneFused(KINSTONE_32) == 0) {
uVar2 = 0;
break;
@@ -103,9 +103,9 @@ void CameraTarget_Action1(Entity* this) {
if (this->timer) {
this->timer--;
} else {
if ((gUnk_03003DF0.unk_4->entity != NULL) && ((u8)(gUnk_03003DF0.unk_4->unk_3 - 1) < 100)) {
this->child = gUnk_03003DF0.unk_4->entity;
this->interactType = gUnk_03003DF0.unk_3;
if ((gPossibleInteraction.currentObject->entity != NULL) && ((u8)(gPossibleInteraction.currentObject->kinstoneId - 1) < 100)) {
this->child = gPossibleInteraction.currentObject->entity;
this->interactType = gPossibleInteraction.currentIndex;
sub_08083A40(this);
}
}
@@ -120,7 +120,7 @@ void CameraTarget_Action2(Entity* this) {
const KinstoneWorldEvent* ptr;
if ((this->type != 1) &&
(((u8)(gUnk_03003DF0.unk_4->unk_3 - 1) >= 100 || (this->child != gUnk_03003DF0.unk_4->entity)))) {
(((u8)(gPossibleInteraction.currentObject->kinstoneId - 1) >= 100 || (this->child != gPossibleInteraction.currentObject->entity)))) {
sub_080838DC(this);
} else {
this->x = this->child->x;
@@ -129,7 +129,7 @@ void CameraTarget_Action2(Entity* this) {
if (this->frame == 1) {
this->frame = 0;
if (this->type == 0) {
bVar2 = gUnk_03003DF0.unk_4->unk_3;
bVar2 = gPossibleInteraction.currentObject->kinstoneId;
} else {
bVar2 = this->type2;
}