mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-19 13:54:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

decomp vaati projectile

Browse Source
This commit is contained in:
Henny022p
2021-05-28 14:17:45 +02:00
parent dbfb827bd3
commit a0af1ae46d
6 changed files with 296 additions and 819 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/vaatiArm.c
+32 -34
View File
@@ -1329,47 +1329,45 @@ void sub_08043D08(Entity* this) {
EnqueueSFX(SFX_HIT);
}
NONMATCH("asm/non_matching/vaati/sub_08043DB0.inc", void sub_08043DB0(Entity* this)) {
void sub_08043DB0(Entity* this) {
s32 cVar1;
u32 uVar2;
Entity* pEVar2;
Entity* pEVar3;
Entity* pEVar4;
VaatiArm_HeapStruct1* iVar5;
if (((gPlayerState.flags.all & 0x80) != 0) &&
(pEVar3 = ((VaatiArm_HeapStruct*)this->myHeap)->entities[3],
uVar2 = CheckPlayerInRegion(pEVar3->x.HALF.HI - gRoomControls.roomOriginX,
pEVar3->y.HALF.HI - gRoomControls.roomOriginY + 2, 3, 3),
uVar2 != 0)) {
DoExitTransition((ScreenTransitionData*)&gUnk_080D13EC);
if ((gScreenTransition.field_0x39 & 3) != 3) {
gScreenTransition.roomID = 1;
}
cVar1 = this->field_0x7a.HWORD / 0x3c;
gScreenTransition.field_0x3d = 0x1e - cVar1;
gScreenTransition.field_0x3c = this->type2;
pEVar3 = ((VaatiArm_HeapStruct*)this->myHeap)->parent;
gScreenTransition.field_0x40 = pEVar3->x.HALF.HI;
gScreenTransition.field_0x42 = pEVar3->y.HALF.HI;
pEVar4 = ((VaatiArm_HeapStruct*)pEVar3->myHeap)->parent;
if (pEVar4 != NULL) {
gScreenTransition.field_0x44 = pEVar4->x.HALF.HI;
gScreenTransition.field_0x46 = pEVar4->y.HALF.HI;
} else {
gScreenTransition.field_0x44 = gRoomControls.roomOriginX + 0x110;
gScreenTransition.field_0x46 = gRoomControls.roomOriginY + 0x60;
}
iVar5 = (VaatiArm_HeapStruct1*)(*(int*)((VaatiArm_HeapStruct*)pEVar3->myHeap)->s1);
if (iVar5 != NULL) {
gScreenTransition.field_0x48 = iVar5[2].unk0e;
gScreenTransition.field_0x4a = iVar5[3].unk02;
} else {
gScreenTransition.field_0x48 = gRoomControls.roomOriginX + 0x110;
gScreenTransition.field_0x4a = gRoomControls.roomOriginY + 0x60;
if (((gPlayerState.flags.all & 0x80) != 0)) {
pEVar3 = ((VaatiArm_HeapStruct*)this->myHeap)->entities[3];
if (CheckPlayerInRegion(pEVar3->x.HALF.HI - gRoomControls.roomOriginX,
pEVar3->y.HALF.HI - gRoomControls.roomOriginY + 2, 3, 3)) {
DoExitTransition((ScreenTransitionData*)&gUnk_080D13EC);
if ((gScreenTransition.field_0x39 & 3) != 3) {
gScreenTransition.roomID = 1;
}
cVar1 = this->field_0x7a.HWORD;
gScreenTransition.field_0x3d = 0x1e - (cVar1 / 0x3c);
gScreenTransition.field_0x3c = this->type2;
pEVar2 = ((VaatiArm_HeapStruct*)this->myHeap)->parent;
gScreenTransition.field_0x40 = pEVar2->x.HALF.HI;
gScreenTransition.field_0x42 = pEVar2->y.HALF.HI;
pEVar4 = ((VaatiArm_HeapStruct*)pEVar2->myHeap)->parent;
if (pEVar4 != NULL) {
gScreenTransition.field_0x44 = pEVar4->x.HALF.HI;
gScreenTransition.field_0x46 = pEVar4->y.HALF.HI;
} else {
gScreenTransition.field_0x44 = gRoomControls.roomOriginX + 0x110;
gScreenTransition.field_0x46 = gRoomControls.roomOriginY + 0x60;
}
pEVar4 = (Entity*)(*(int*)((VaatiArm_HeapStruct*)pEVar2->myHeap)->s1);
if (pEVar4 != NULL) {
gScreenTransition.field_0x48 = pEVar4->x.HALF.HI;
gScreenTransition.field_0x4a = pEVar4->y.HALF.HI;
} else {
gScreenTransition.field_0x48 = gRoomControls.roomOriginX + 0x110;
gScreenTransition.field_0x4a = gRoomControls.roomOriginY + 0x60;
}
}
}
}
END_NONMATCH
void sub_08043EB8(Entity* this) {
u32 i;
src/enemy/vaatiProjectile.c
+262
View File
@@ -0,0 +1,262 @@
#include "global.h"
#include "enemy.h"
#include "random.h"
#include "functions.h"
extern bool32 PlayerInRange(Entity*, u32, u32);
extern void DoExitTransition(ScreenTransitionData*);
extern u32 sub_080002E0(u32, u32);
extern Entity* gUnk_020000B0;
extern const ScreenTransitionData gUnk_0813AB94;
bool32 sub_0803E4A0(Entity*);
void sub_0803E0C4(Entity*);
void sub_0803E0DC(Entity*);
void sub_08001328(Entity*);
void sub_0803E188(Entity*);
void nullsub_19(Entity*);
void sub_0803E1A8(Entity*);
void sub_0803E258(Entity*);
void sub_0803E2A8(Entity*);
void sub_0803E2D0(Entity*);
void sub_0803E314(Entity*);
void sub_0803E340(Entity*);
void sub_0803E370(Entity*);
void sub_0803E398(Entity*);
void sub_0803E3D4(Entity*);
void sub_0803E3FC(Entity*);
void sub_0803E444(Entity*);
void sub_0803E480(Entity*);
void sub_0803E4D8(Entity*);
void (*const gUnk_080D0648[])(Entity*) = {
sub_0803E0C4, sub_0803E0DC, sub_08001328, sub_0803E188, sub_08001242, nullsub_19,
};
void (*const gUnk_080D0660[])(Entity*) = {
sub_0803E1A8, sub_0803E258, sub_0803E2A8, sub_0803E2D0, sub_0803E314,
sub_0803E340, sub_0803E370, sub_0803E398, sub_0803E3D4, sub_0803E3FC,
};
void VaatiProjectile(Entity* this) {
if (sub_0803E4A0(this)) {
this->flags &= 0x7f;
this->currentHealth = 0;
this->parent = NULL;
}
gUnk_080D0648[GetNextFunction(this)](this);
}
void sub_0803E0C4(Entity* this) {
gUnk_080D0660[this->action](this);
}
void sub_0803E0DC(Entity* this) {
Entity* entity;
if (this->bitfield == 0x80) {
if (this->currentHealth != 0) {
this->action = 5;
this->flags = this->flags & 0x7f;
this->spritePriority.b1 = 0;
gPlayerEntity.flags &= 0x7f;
gPlayerEntity.spriteOrientation.flipY = this->spriteOrientation.flipY;
gPlayerEntity.spriteRendering.b3 = this->spriteRendering.b3;
sub_0803E444(this);
sub_08078A90(2);
entity = this->parent;
if (entity != NULL) {
entity->flags = entity->flags & 0x7f;
}
} else {
gPlayerState.flags.all &= 0xfffffeff; // using b.unk8 does not match
entity = &gPlayerEntity;
entity->flags = gPlayerEntity.flags | 0x80;
}
}
sub_0804AA30(this, gUnk_080D0648);
}
void sub_0803E188(Entity* this) {
if (this->parent != NULL) {
this->parent->field_0xf--;
this->parent = NULL;
}
sub_0804A7D4(this);
}
void nullsub_19(Entity* this) {
}
void sub_0803E1A8(Entity* this) {
Entity* entity;
if (this->type == 0) {
entity = CreateEnemy(VAATI_PROJECTILE, 1);
if (entity != NULL) {
entity->parent = this;
this->attachedEntity = entity;
if (this->type2 == 0) {
this->action = 1;
this->height.HALF.HI = -0x18;
} else {
this->action = 9;
this->height.HALF.HI = -0x80;
this->flags2 = 1;
}
InitializeAnimation(this, 0);
}
} else {
this->action = 8;
this->flags = this->flags & 0x7f;
this->spriteOffsetY = 1;
this->spriteOrientation.flipY = this->parent->spriteOrientation.flipY;
this->spriteRendering.b3 = this->parent->spriteRendering.b3;
this->spritePriority.b1 = 0;
PositionRelative(this->parent, this, 0, -0x10000);
InitializeAnimation(this, 1);
}
}
void sub_0803E258(Entity* this) {
sub_0803E480(this);
if (PlayerInRange(this, 0, 8) != 0) {
this->action = 2;
this->actionDelay = 10;
InitializeAnimation(this->attachedEntity, 2);
} else {
if (gUnk_020000B0 != NULL) {
sub_08004596(this, GetFacingDirection(this, gUnk_020000B0));
sub_0806F69C(this);
}
}
GetNextFrame(this);
}
void sub_0803E2A8(Entity* this) {
if (this->actionDelay != 0) {
this->actionDelay--;
} else {
if (++this->height.HALF.HI == 0) {
this->action = 3;
}
}
GetNextFrame(this);
}
void sub_0803E2D0(Entity* this) {
if ((this->attachedEntity->frames.b.f3) != 0) {
if (--this->height.HALF.HI <= -0x18) {
this->action = 4;
this->actionDelay = (Random() & 0xf) + 0xf;
InitializeAnimation(this->attachedEntity, 1);
}
GetNextFrame(this);
}
}
void sub_0803E314(Entity* this) {
if (--this->actionDelay == 0) {
this->action = 1;
this->direction = GetFacingDirection(this, &gPlayerEntity);
}
GetNextFrame(this);
}
void sub_0803E340(Entity* this) {
sub_0803E444(this);
if (this->actionDelay != 0) {
this->actionDelay--;
} else {
if (-0x18 < --this->height.HALF.HI) {
return;
}
this->action = 6;
this->actionDelay = 0x14;
}
}
void sub_0803E370(Entity* this) {
if (--this->actionDelay == 0) {
this->action = 7;
this->direction = 0x10;
this->speed = 0x300;
}
sub_0803E444(this);
}
void sub_0803E398(Entity* this) {
sub_0803E444(this);
sub_0806F69C(this);
sub_0803E4D8(this);
if ((gRoomControls.roomOriginY + gRoomControls.height + -0x10) <= this->y.HALF.HI) {
sub_0805E5A8();
DoExitTransition((ScreenTransitionData*)&gUnk_0813AB94);
}
}
void sub_0803E3D4(Entity* this) {
if (this->parent->next == NULL) {
DeleteThisEntity();
}
PositionRelative(this->parent, this, 0, -0x10000);
GetNextFrame(this);
}
void sub_0803E3FC(Entity* this) {
this->x.HALF.HI = gPlayerEntity.x.HALF.HI;
this->y.HALF.HI = gPlayerEntity.y.HALF.HI;
if (this->height.HALF.HI < -8) {
if (this->animIndex != 2) {
this->actionDelay = 0;
InitializeAnimation(this->attachedEntity, 2);
}
sub_0803E2A8(this);
} else {
this->height.HALF.HI += 8;
}
}
void sub_0803E444(Entity* this) {
ResetPlayer();
gPlayerState.field_0x1a[0] = gPlayerState.field_0x1a[0] | 0x80;
gPlayerState.field_0xa = gPlayerState.field_0xa | 0x80;
sub_0806FA90(this, this->field_0x4c, 0, -2);
gPlayerEntity.spriteOffsetY += 0xe;
}
void sub_0803E480(Entity* this) {
if (this->field_0x78.HWORD >= 0x4b1) {
this->speed = 0x180;
} else {
this->field_0x78.HWORD++;
}
}
bool32 sub_0803E4A0(Entity* this) {
bool32 ret;
if (gScreenTransition.field_0x39 != 0) {
if (this->parent == NULL) {
return FALSE;
}
if (this->parent->currentHealth == 0) {
return TRUE;
} else {
ret = FALSE;
if (this->parent->next == NULL) {
ret = TRUE;
}
}
} else {
return TRUE;
}
return ret;
}
void sub_0803E4D8(Entity* this) {
u32 tile;
tile = TILE(this->x.HALF.HI, this->y.HALF.HI + 8);
if (sub_080002E0(tile, gPlayerEntity.collisionLayer) != 0xff) {
SetTile(0x4074, tile, gPlayerEntity.collisionLayer);
}
}