mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-18 05:38:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #364 from hatal175/playeritem3

Browse Source
This commit is contained in:
notyourav
2022-02-10 11:28:27 -08:00
committed by GitHub
parent 8f76bdda64 4e8779c9da
commit f8d8c0fd92
8 changed files with 191 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/playerItem/playerItem3.c
+190 -12
View File
@@ -1,17 +1,32 @@
#include "entity.h"
#include "sound.h"
#include "functions.h"
extern void (*const gUnk_080B77FC[])(Entity*);
#include "asm.h"
void sub_0801B804(Entity*);
void sub_0801B864(Entity*);
Entity* sub_0801B864(Entity*);
void sub_0801B584(Entity*);
void PlayerItem3_Init(Entity*);
void sub_0801B680(Entity*);
void sub_0801B7A8(Entity*);
extern s8 gUnk_080B782E[];
extern void sub_08008782(Entity*, u32, s32, s32);
extern Entity* sub_08008782(Entity*, u32, s32, s32);
extern bool32 sub_080040E2(Entity*, u8*);
extern Hitbox gUnk_081271CC;
extern u8 gUnk_08003E44;
void PlayerItem3(Entity* this) {
gUnk_080B77FC[this->action](this);
static void (*const PlayerItem3_Actions[])(Entity*) = {
PlayerItem3_Init,
sub_0801B584,
sub_0801B680,
sub_0801B7A8,
};
// Unused
static const u16 gUnk_080B780C[] = { 0x75, 0x1, 0x76, 0x1, 0x3ac, 0x1, 0x4050, 0x1, 0x377, 0x1, 0x378, 0x1, 0x0 };
PlayerItem3_Actions[this->action](this);
if (this->animIndex != 0xb) {
if (this->animationState == 6) {
this->field_0x86.HWORD += 0x2000;
@@ -27,11 +42,148 @@ void PlayerItem3(Entity* this) {
}
}
ASM_FUNC("asm/non_matching/playerItem3/sub_0801B4C8.inc", void sub_0801B4C8(Entity* this))
void PlayerItem3_Init(Entity* this) {
u32 uVar1;
ASM_FUNC("asm/non_matching/playerItem3/sub_0801B584.inc", void sub_0801B584(Entity* this))
gPlayerState.item = this;
this->action = 1;
this->hitbox = &gUnk_081271CC;
this->frameIndex = 0xff;
this->field_0x80.HALF.LO = 0;
#ifdef EU
this->spriteVramOffset = gPlayerEntity.spriteVramOffset;
#endif
this->animIndex = 11;
this->parent = &gPlayerEntity;
this->field_0x86.HWORD = 0;
if ((this->animationState & 2) != 0) {
this->spriteSettings.flipX = ~gPlayerEntity.spriteSettings.flipX;
}
if (this->field_0x68.HALF.LO == 12) {
this->speed = 0x280;
uVar1 = 60;
} else {
this->speed = 0x200;
uVar1 = 30;
}
this->actionDelay = uVar1;
if (((s8)gPlayerState.field_0xd) >= 0) {
this->direction = gPlayerState.field_0xd;
} else {
this->direction = this->animationState << 2;
}
this->field_0x82.HALF.HI = this->direction;
if (this->collisionLayer == 2) {
this->type2 = 1;
}
LoadSwapGFX(this, 1, 3);
sub_0801766C(this);
sub_0801B584(this);
}
ASM_FUNC("asm/non_matching/playerItem3/sub_0801B680.inc", void sub_0801B680(Entity* this))
void sub_0801B584(Entity* this) {
static const s8 gUnk_080B7826[] = { 0, -8, 8, -4, 0, 8, -8, -4 };
u32 frameIndex;
int iVar2;
u32 cVar3;
sub_0801B804(this);
if ((gPlayerState.field_0x3[1] == 0) || (gPlayerState.mobility != 0) || gPlayerState.item != this ||
(gPlayerState.item == this && gPlayerEntity.action != 1)) {
if (gPlayerState.item == this) {
gPlayerState.item = NULL;
}
DeleteThisEntity();
}
if ((gPlayerEntity.frame & 1) == 0) {
if (this->field_0x68.HALF.LO == 12) {
cVar3 = 6;
} else {
cVar3 = 0;
}
frameIndex = (gPlayerEntity.frame >> 4) + cVar3;
if (this->frameIndex != frameIndex) {
this->frameIndex = frameIndex;
sub_080042D0(this, this->frameIndex, this->spriteIndex);
}
sub_08078E84(this, &gPlayerEntity);
} else {
this->action = 2;
this->spriteVramOffset = 0xd5;
COLLISION_ON(this);
this->field_0x3c |= 1;
this->flags2 = gPlayerEntity.flags2;
this->spriteIndex = 0xa6;
this->spriteSettings.flipX = 0;
this->spriteSettings.draw = 1;
iVar2 = (this->animationState >> 1) * 2;
this->x.HALF.HI += gUnk_080B7826[iVar2];
this->y.HALF.HI += gUnk_080B7826[iVar2 + 1];
InitializeAnimation(this, 0);
gPlayerState.item = NULL;
gPlayerState.field_0x3[1] |= 0x80;
}
}
void sub_0801B680(Entity* this) {
u32 uvar1;
u32 uVar6;
sub_0801B804(this);
if ((this->field_0x68.HALF.LO == 12) && (this->field_0x80.HALF.LO == 0) && ((gPlayerState.field_0xd & 0x80) == 0)) {
if (((this->field_0x82.HALF.HI - gPlayerState.field_0xd) & 0x1f) > 0x10) {
this->field_0x82.HWORD += 0x40;
this->field_0x82.HALF.HI &= 0x1f;
this->direction = this->field_0x82.HALF.HI;
} else {
this->field_0x82.HWORD -= 0x40;
this->field_0x82.HALF.HI &= 0x1f;
this->direction = this->field_0x82.HALF.HI;
}
}
LinearMoveUpdate(this);
uVar6 = 0;
if (sub_0801B864(this)) {
uvar1 = this->field_0x68.HALF.LO;
uvar1 ^= 0xc;
uVar6 = ((u32)(-uvar1 | uvar1)) >> 0x1f;
}
if (sub_080002F0(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) == 0) {
if (uVar6 == 0) {
uVar6 = sub_080040E2(this, &gUnk_08003E44);
}
}
if (uVar6 == 0) {
if (--this->actionDelay < 0xc) {
this->speed = this->speed + -0x10;
}
if (this->actionDelay == 0) {
uVar6 = 1;
}
if (this->bitfield & 0x80) {
uVar6 = 1;
}
if (uVar6 == 0) {
return;
}
if (this->field_0x68.HALF.LO == 12) {
this->actionDelay = 30;
} else {
this->actionDelay = 12;
}
} else {
this->actionDelay = 1;
}
if (uVar6) {
this->action++;
this->speed = 0x1c0;
}
}
void sub_0801B7A8(Entity* this) {
sub_0801B804(this);
@@ -50,14 +202,40 @@ void sub_0801B7A8(Entity* this) {
}
}
ASM_FUNC("asm/non_matching/playerItem3/sub_0801B804.inc", void sub_0801B804(Entity* this))
void sub_0801B804(Entity* this) {
u32 itemSlot;
u32 uVar1;
void sub_0801B864(Entity* this) {
itemSlot = IsItemEquipped(0xc);
switch (itemSlot) {
case 0:
uVar1 = 1;
break;
case 1:
uVar1 = 2;
break;
case 2:
uVar1 = 0;
break;
}
if ((uVar1 & gPlayerState.field_0x90) == 0) {
this->field_0x80.HALF.LO = 1;
gPlayerState.field_0xa &= 0x7f;
gPlayerState.keepFacing &= 0x7f;
} else {
gPlayerState.field_0xa |= 0x80;
gPlayerState.keepFacing |= 0x80;
}
}
Entity* sub_0801B864(Entity* this) {
static const s8 gUnk_080B782E[] = { 0, -6, 4, -4, 4, 0, 4, 4, 0, 4, -4, 4, -4, 0, -4, 0, 0, 0 };
s32 iVar1;
if (this->type2 == 0) {
sub_0800451C(this);
}
iVar1 = (this->direction >> 2) * 2;
sub_08008782(this, 2, gUnk_080B782E[iVar1], gUnk_080B782E[iVar1 + 1]);
return sub_08008782(this, 2, gUnk_080B782E[iVar1], gUnk_080B782E[iVar1 + 1]);
}