falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile Eyegore

This commit is contained in:
octorock 2022-02-09 12:31:15 +01:00
parent 8f76bdda64
commit 24e168dd2d
10 changed files with 783 additions and 1304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1243
asm/enemy/eyegore.s
View File

File diff suppressed because it is too large Load Diff

293
asm/non_matching/eyegore/sub_08031024.inc Normal file
View File

@ -0,0 +1,293 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
adds r7, r0, #0
movs r1, #1
bl sub_08049FDC
rsbs r1, r0, #0
orrs r1, r0
lsrs r1, r1, #0x1f
adds r2, r7, #0
adds r2, #0x79
ldrb r0, [r2]
cmp r0, #0
bne _08031084
cmp r1, #0
beq _08031074
movs r1, #0x2e
ldrsh r0, [r7, r1]
ldr r2, [r7, #0x48]
movs r1, #0
ldrsb r1, [r2, r1]
adds r0, r0, r1
movs r3, #0x32
ldrsh r1, [r7, r3]
ldrb r2, [r2, #1]
lsls r2, r2, #0x18
asrs r2, r2, #0x18
adds r1, r1, r2
ldr r2, _08031070 @ =gUnk_020000B0
ldr r3, [r2]
movs r4, #0x2e
ldrsh r2, [r3, r4]
movs r4, #0x32
ldrsh r3, [r3, r4]
b _080311E8
.align 2, 0
_08031070: .4byte gUnk_020000B0
_08031074:
movs r0, #1
strb r0, [r2]
adds r0, r7, #0
adds r0, #0x78
strb r1, [r0]
movs r1, #0x2e
ldrsh r0, [r7, r1]
b _080311D8
_08031084:
cmp r1, #0
beq _0803108E
movs r0, #0
strb r0, [r2]
b _080311EE
_0803108E:
adds r0, r7, #0
adds r0, #0x78
ldrb r2, [r0]
adds r1, r2, #0
mov sl, r0
cmp r1, #0
bne _0803109E
b _080311D4
_0803109E:
cmp r1, #1
bne _080310E2
movs r0, #0x80
orrs r0, r2
mov r3, sl
strb r0, [r3]
movs r4, #0x2e
ldrsh r0, [r7, r4]
movs r2, #0x32
ldrsh r1, [r7, r2]
adds r2, r7, #0
adds r2, #0x74
ldrh r2, [r2]
adds r3, r7, #0
adds r3, #0x76
ldrh r3, [r3]
bl CalculateDirectionTo
strb r0, [r7, #0x15]
adds r0, #4
movs r2, #0x18
ands r0, r2
adds r1, r7, #0
adds r1, #0x7b
strb r0, [r1]
ldrb r3, [r7, #0x15]
cmp r0, r3
bhs _080310DC
adds r0, #8
ands r0, r2
b _080310F0
_080310DC:
subs r0, #8
ands r0, r2
b _080310F0
_080310E2:
movs r0, #2
ands r0, r2
cmp r0, #0
beq _080310F2
ldrb r0, [r7, #0x15]
movs r1, #0x10
eors r0, r1
_080310F0:
strb r0, [r7, #0x15]
_080310F2:
mov r4, sl
ldrb r2, [r4]
movs r0, #0x70
ands r0, r2
lsls r0, r0, #0x18
cmp r0, #0
beq _08031120
lsrs r0, r0, #0x19
movs r1, #0x8f
ands r1, r2
orrs r0, r1
strb r0, [r4]
movs r1, #0x10
ands r0, r1
cmp r0, #0
beq _080311EE
adds r0, r7, #0
adds r0, #0x7b
ldrb r0, [r0]
strb r0, [r7, #0x15]
movs r0, #0
strb r0, [r4]
b _080311EE
_08031120:
movs r0, #0x7b
adds r0, r0, r7
mov sb, r0
ldrb r4, [r0]
lsrs r4, r4, #1
movs r1, #0x2e
ldrsh r0, [r7, r1]
ldr r5, _080311B4 @ =gUnk_080CE2C0
adds r1, r4, r5
ldrb r1, [r1]
lsls r1, r1, #0x18
asrs r1, r1, #0x18
adds r0, r0, r1
movs r2, #0x32
ldrsh r1, [r7, r2]
adds r2, r4, #1
adds r2, r2, r5
ldrb r2, [r2]
lsls r2, r2, #0x18
asrs r2, r2, #0x18
adds r1, r1, r2
movs r3, #0x38
adds r3, r3, r7
mov r8, r3
ldrb r2, [r3]
bl GetTileTypeByPos
adds r6, r0, #0
movs r1, #0x2e
ldrsh r0, [r7, r1]
adds r1, r4, #2
adds r1, r1, r5
ldrb r1, [r1]
lsls r1, r1, #0x18
asrs r1, r1, #0x18
adds r0, r0, r1
movs r2, #0x32
ldrsh r1, [r7, r2]
adds r4, #3
adds r4, r4, r5
movs r2, #0
ldrsb r2, [r4, r2]
adds r1, r1, r2
mov r3, r8
ldrb r2, [r3]
bl GetTileTypeByPos
adds r1, r0, #0
ldr r2, _080311B8 @ =gUnk_080B3E80
adds r6, r6, r2
ldrb r0, [r6]
mov r3, sb
cmp r0, #0
bne _08031194
adds r0, r1, r2
ldrb r0, [r0]
cmp r0, #0
beq _080311C8
_08031194:
movs r0, #1
cmp r0, #0
beq _080311C8
ldrb r0, [r7, #0x15]
lsrs r0, r0, #3
ldrb r4, [r7, #0x14]
cmp r0, r4
bne _080311BC
mov r0, sl
ldrb r1, [r0]
movs r0, #0x20
orrs r0, r1
mov r1, sl
strb r0, [r1]
b _080311EE
.align 2, 0
_080311B4: .4byte gUnk_080CE2C0
_080311B8: .4byte gUnk_080B3E80
_080311BC:
mov r2, sl
ldrb r1, [r2]
movs r0, #0x40
orrs r0, r1
strb r0, [r2]
b _080311EE
_080311C8:
ldrb r0, [r3]
movs r1, #0
strb r0, [r7, #0x15]
mov r3, sl
strb r1, [r3]
b _080311EE
_080311D4:
movs r4, #0x2e
ldrsh r0, [r7, r4]
_080311D8:
movs r2, #0x32
ldrsh r1, [r7, r2]
adds r2, r7, #0
adds r2, #0x74
ldrh r2, [r2]
adds r3, r7, #0
adds r3, #0x76
ldrh r3, [r3]
_080311E8:
bl CalculateDirectionTo
strb r0, [r7, #0x15]
_080311EE:
ldrb r0, [r7, #0x15]
adds r0, #4
movs r1, #0x18
ands r0, r1
asrs r0, r0, #3
ldrb r3, [r7, #0x14]
cmp r0, r3
bne _0803120C
adds r1, r7, #0
adds r1, #0x7a
movs r0, #1
strb r0, [r1]
ldrb r0, [r7, #0x14]
adds r1, #5
b _08031232
_0803120C:
adds r1, r7, #0
adds r1, #0x7a
movs r0, #0
strb r0, [r1]
ldrb r0, [r7, #0x15]
ldrb r2, [r7, #0x14]
lsls r1, r2, #3
subs r0, r0, r1
movs r1, #0x1f
ands r0, r1
cmp r0, #0x10
bls _08031228
subs r0, r2, #1
b _0803122A
_08031228:
adds r0, r2, #1
_0803122A:
movs r1, #3
ands r0, r1
adds r1, r7, #0
adds r1, #0x7f
_08031232:
strb r0, [r1]
ldrb r0, [r7, #0x15]
adds r0, #4
movs r1, #0x18
ands r0, r1
movs r1, #0
strb r0, [r7, #0x15]
strh r1, [r7, #0x2c]
strh r1, [r7, #0x30]
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
.syntax divided

22
assets/assets.json
View File

@ -25412,26 +25412,6 @@
"size": 12,
"type": "animation"
},
{
"path": "eyegore/gUnk_080CE2BC.bin",
"start": 844476,
"size": 4
},
{
"path": "eyegore/gUnk_080CE2C0.bin",
"start": 844480,
"size": 52
},
{
"path": "eyegore/gUnk_080CE2F4.bin",
"start": 844532,
"size": 16
},
{
"path": "eyegore/gUnk_080CE304.bin",
"start": 844548,
"size": 8
},
{
"path": "animations/gSpriteAnimations_Rope_0.bin",
"start": 844924,
@ -51283,4 +51263,4 @@
},
"size": 129
}
]
]

34
data/const/enemy/eyegore.s
View File

@ -1,34 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CE288:: @ 080CE288
.4byte sub_08030A3C
.4byte sub_08030A54
.4byte sub_08001324
.4byte sub_08030B34
.4byte sub_08001242
.4byte nullsub_18
gUnk_080CE2A0:: @ 080CE2A0
.4byte sub_08030B78
.4byte sub_08030BEC
.4byte sub_08030C0C
.4byte sub_08030C70
.4byte sub_08030CD0
.4byte sub_08030D68
.4byte sub_08030E20
gUnk_080CE2BC:: @ 080CE2BC
.incbin "eyegore/gUnk_080CE2BC.bin"
gUnk_080CE2C0:: @ 080CE2C0
.incbin "eyegore/gUnk_080CE2C0.bin"
gUnk_080CE2F4:: @ 080CE2F4
.incbin "eyegore/gUnk_080CE2F4.bin"
gUnk_080CE304:: @ 080CE304
.incbin "eyegore/gUnk_080CE304.bin"

2
include/enemy.h
View File

@ -176,7 +176,7 @@ void WizzrobeWind();
void WizzrobeFire();
void WizzrobeIce();
void Armos();
void Eyegore(Entity*);
void Eyegore();
void Rope(Entity*);
void SmallPesto(Entity*);
void AcroBandit(Entity*);

1
include/functions.h
View File

@ -175,4 +175,5 @@ extern u32 sub_080041DC(Entity*, u32, u32);
extern void sub_080AE58C(Entity*, u32, u32);
extern u32 sub_0800132C(Entity*, Entity*);
extern bool32 sub_080AE4CC(Entity*, u32, u32, u32);
extern void sub_08008796(Entity*, u32, u32, u32);
#endif

4
linker.ld
View File

@ -368,7 +368,7 @@ SECTIONS {
src/enemy/code_080300AC.o(.text);
asm/enemy/code_080300AC.o(.text);
src/enemy/armos.o(.text);
asm/enemy/eyegore.o(.text);
src/enemy/eyegore.o(.text);
src/enemy/rope.o(.text);
src/enemy/smallPesto.o(.text);
src/enemy/acroBandits.o(.text);
@ -1021,7 +1021,7 @@ SECTIONS {
data/animations/enemy/wizzrobeIce.o(.rodata);
src/enemy/armos.o(.rodata);
data/animations/enemy/armos.o(.rodata);
data/const/enemy/eyegore.o(.rodata);
src/enemy/eyegore.o(.rodata);
data/animations/enemy/eyegore.o(.rodata);
data/const/enemy/rope.o(.rodata);
data/animations/enemy/rope.o(.rodata);

485
src/enemy/eyegore.c Normal file
View File

@ -0,0 +1,485 @@
/**
* @file eyegore.c
* @ingroup Enemies
*
* @brief Eyegore enemy
*/
#define NENT_DEPRECATED
#include "global.h"
#include "enemy.h"
#include "functions.h"
#include "fade.h"
#include "object.h"
typedef struct {
/*0x00*/ Entity base;
/*0x68*/ u8 unk_68[0x5];
/*0x6d*/ u8 unk_6d;
/*0x6e*/ u8 unk_6e[0x6];
/*0x74*/ u16 unk_74;
/*0x76*/ u16 unk_76;
/*0x78*/ u8 unk_78;
/*0x79*/ u8 unk_79;
/*0x7a*/ u8 unk_7a;
/*0x7b*/ u8 unk_7b;
/*0x7c*/ u16 unk_7c;
/*0x7e*/ u8 unk_7e;
/*0x7f*/ u8 unk_7f;
/*0x80*/ u16 unk_80;
/*0x82*/ u16 unk_82;
/*0x84*/ u16 unk_84;
/*0x86*/ u16 unk_86;
} EyegoreEntity;
extern Entity* sub_08017A90(Entity*, Entity*);
extern Entity* gUnk_020000B0;
extern Hitbox gUnk_080FD308;
extern const u8 gUnk_080B3E80[];
void sub_08031344(EyegoreEntity*);
void sub_08031344(EyegoreEntity*);
void sub_08031320(EyegoreEntity*);
void sub_08030F00(EyegoreEntity*);
void sub_08030E58(EyegoreEntity*);
void sub_08030FB4(EyegoreEntity*);
void sub_08031024(EyegoreEntity*);
void sub_08030E3C(EyegoreEntity*);
void sub_08031250(EyegoreEntity*);
void sub_08030E70(EyegoreEntity*);
void sub_08030E80(EyegoreEntity*);
void Eyegore_OnTick(EyegoreEntity*);
void Eyegore_OnCollision(EyegoreEntity*);
void Eyegore_OnDeath(EyegoreEntity*);
void Eyegore_OnGrabbed(EyegoreEntity*);
void Eyegore_Init(EyegoreEntity*);
void Eyegore_Action1(EyegoreEntity*);
void Eyegore_Action2(EyegoreEntity*);
void Eyegore_Action3(EyegoreEntity*);
void Eyegore_Action4(EyegoreEntity*);
void Eyegore_Action5(EyegoreEntity*);
void Eyegore_Action6(EyegoreEntity*);
void (*const Eyegore_Functions[])(EyegoreEntity*) = {
Eyegore_OnTick,
Eyegore_OnCollision,
(void (*)(EyegoreEntity*))sub_08001324,
Eyegore_OnDeath,
(void (*)(EyegoreEntity*))sub_08001242,
Eyegore_OnGrabbed,
};
void Eyegore(EyegoreEntity* this) {
EnemyFunctionHandler(super, (EntityActionArray)&Eyegore_Functions);
}
void Eyegore_OnTick(EyegoreEntity* this) {
static void (*const Eyegore_Actions[])(EyegoreEntity*) = {
Eyegore_Init, Eyegore_Action1, Eyegore_Action2, Eyegore_Action3,
Eyegore_Action4, Eyegore_Action5, Eyegore_Action6,
};
Eyegore_Actions[super->action](this);
}
void Eyegore_OnCollision(EyegoreEntity* this) {
u32 tmp;
if ((super->bitfield == 0x95) || (super->bitfield == 0x8e)) {
Entity* entity = super->field_0x4c;
tmp = (((entity->direction + 4) & 0x18) ^ 0x10) >> 3;
if (tmp == super->animationState) {
if ((tmp & 1) != 0) {
if (0x10 < ((entity->y.HALF.HI + entity->z.HALF.HI) - (super->y.HALF.HI + super->z.HALF.HI)) + 0x14U) {
} else {
if (super->bitfield == 0x8e) {
super->health = 0;
} else {
super->health--;
}
super->iframes = 0x10;
EnqueueSFX(SFX_HIT);
sub_08031344(this);
}
} else {
if ((entity->x.HALF.HI - super->x.HALF.HI) + 8U <= 0x10) {
if (super->action == 1) {
sub_08031320(this);
EnqueueSFX(SFX_BUTTON_PRESS);
sub_08031344(this);
} else {
if (super->bitfield == 0x8e) {
super->health = 0;
} else {
super->health--;
}
super->iframes = 0x0f;
EnqueueSFX(SFX_HIT);
sub_08031344(this);
}
}
}
}
}
if (super->health == 0) {
super->flags &= ~ENT_COLLIDE;
super->iframes = 0x78;
}
sub_0804AA30(super, Eyegore_Functions);
}
void Eyegore_OnDeath(EyegoreEntity* this) {
if (this->unk_7e != 0) {
this->unk_7e--;
GravityUpdate(super, 0x1c00);
} else {
if ((super->field_0x3a & 2) == 0) {
CreateFx(super, FX_GIANT_EXPLOSION4, 0);
}
sub_0804A7D4(super);
}
}
void Eyegore_OnGrabbed(EyegoreEntity* this) {
}
void Eyegore_Init(EyegoreEntity* this) {
sub_0804A720(super);
super->action = 1;
super->animationState = 2;
super->x.HALF.HI &= 0xfff0;
super->y.HALF.HI = (super->y.HALF.HI & 0xfff0) + 0xc;
this->unk_6d |= 8;
this->unk_74 = super->x.HALF.HI;
this->unk_76 = super->y.HALF.HI;
this->unk_7e = 0x3c;
sub_08030F00(this);
if (this->unk_7c != 0) {
super->flags &= ~ENT_COLLIDE;
InitializeAnimation(super, 10);
} else {
InitializeAnimation(super, 0xe);
}
}
void Eyegore_Action1(EyegoreEntity* this) {
if ((this->unk_7c != 0) && CheckFlags(this->unk_7c)) {
sub_08031320(this);
}
}
void Eyegore_Action2(EyegoreEntity* this) {
if (super->actionDelay != 0) {
super->actionDelay--;
} else {
if (sub_08049FDC(super, 1)) {
super->action = 3;
super->actionDelay = 0x3c;
super->direction = (CalculateDirectionTo(super->x.HALF.HI + super->hitbox->offset_x,
super->y.HALF.HI + super->hitbox->offset_y,
gUnk_020000B0->x.HALF.HI, gUnk_020000B0->y.HALF.HI) +
4) &
0x18;
InitializeAnimation(super, 10);
}
}
}
void Eyegore_Action3(EyegoreEntity* this) {
static const u8 gUnk_080CE2BC[] = {
0,
255,
0,
1,
};
if (super->actionDelay != 0) {
super->spriteOffsetX = gUnk_080CE2BC[--super->actionDelay & 3];
} else {
GetNextFrame(super);
if ((super->frame & 0x80) != 0) {
super->flags |= ENT_COLLIDE;
super->animationState = 2;
sub_08030E58(this);
InitializeAnimation(super, 2);
sub_08030FB4(this);
}
}
}
void Eyegore_Action4(EyegoreEntity* this) {
GetNextFrame(super);
switch (super->frame & 7) {
case 1:
sub_08031024(this);
sub_08030E3C(this);
break;
case 2:
if ((super->frame & 0x80) != 0) {
super->animationState = this->unk_7f;
InitializeAnimation(super, super->animationState + 4);
}
if (this->unk_7a != 0) {
sub_08031250(this);
}
if (GravityUpdate(super, 0x1c00) == 0) {
sub_08030E70(this);
}
break;
default:
if ((super->frame & 0x80) != 0) {
InitializeAnimation(super, super->animationState);
if ((this->unk_79 & 0x80) != 0) {
super->action = 5;
this->unk_7a = 0;
}
}
break;
}
}
void Eyegore_Action5(EyegoreEntity* this) {
GetNextFrame(super);
switch (super->frame & 7) {
case 1:
if (super->animationState != 2) {
if (super->animationState >= 3) {
this->unk_7f = (super->animationState - 1) & 3;
} else {
this->unk_7f = (super->animationState + 1) & 3;
}
}
sub_08030E3C(this);
break;
case 2:
if ((super->frame & 0x80) != 0) {
super->animationState = this->unk_7f;
InitializeAnimation(super, super->animationState + 4);
}
if (GravityUpdate(super, 0x1c00) == 0) {
sub_08030E70(this);
}
break;
default:
if ((super->frame & 0x80) != 0) {
InitializeAnimation(super, super->animationState);
if (sub_08049FDC(super, 1)) {
sub_08030E58(this);
} else {
if (super->animationState == 2) {
super->action = 6;
super->flags &= ~ENT_COLLIDE;
InitializeAnimation(super, 0xe);
sub_08030F00(this);
}
}
break;
}
}
}
void Eyegore_Action6(EyegoreEntity* this) {
GetNextFrame(super);
if ((super->frame & 0x80) != 0) {
super->action = 2;
}
}
void sub_08030E3C(EyegoreEntity* this) {
super->frame = 0;
super->zVelocity = 0x11800;
EnqueueSFX(SFX_157);
}
void sub_08030E58(EyegoreEntity* this) {
super->action = 4;
this->unk_7a = 0;
this->unk_79 = 0;
this->unk_78 = 0;
}
void sub_08030E70(EyegoreEntity* this) {
sub_08030E80(this);
EnqueueSFX(SFX_158);
}
const s8 gUnk_080CE2C0[] = {
// This has to be before gUnk_080CE2F4.
-8, -10, 8, -10, 16, -4, 16, 4, -8, 10, 8, 10, -16, -4, -16, 4, 9, 0, 10, 0, 11, 0, 12, 0, 13, 0,
14, 0, 15, 0, 16, 0, 17, 0, 18, 0, 19, 0, 20, 0, 21, 0, 22, 0, 23, 0, 24, 0, 25, 0, 0, 64,
};
void sub_08030E80(EyegoreEntity* this) {
static const s8 gUnk_080CE2F4[] = {
-11, 9, 11, 9, -9, -2, -8, 10, -11, -1, 11, -1, 9, -2, 8, 10,
};
u32 tmp = super->animationState << 2;
Entity* effect = CreateObject(SPECIAL_FX, 2, 0);
if (effect != NULL) {
CopyPosition(super, effect);
effect->x.HALF.HI += gUnk_080CE2F4[tmp + 0];
effect->y.HALF.HI += gUnk_080CE2F4[tmp + 1];
}
effect = CreateObject(SPECIAL_FX, 2, 0);
if (effect != NULL) {
CopyPosition(super, effect);
effect->x.HALF.HI += gUnk_080CE2F4[tmp + 2];
effect->y.HALF.HI += gUnk_080CE2F4[tmp + 3];
}
}
void sub_08030F00(EyegoreEntity* this) {
u32 position = COORD_TO_TILE_OFFSET(super, 8, 0x14);
u16 tileIndex = GetTileIndex(position, super->collisionLayer);
this->unk_80 = tileIndex;
tileIndex = GetTileIndex(position + 1, super->collisionLayer);
this->unk_82 = tileIndex;
tileIndex = GetTileIndex(position + 0x40, super->collisionLayer);
this->unk_84 = tileIndex;
tileIndex = GetTileIndex(position + 0x41, super->collisionLayer);
this->unk_86 = tileIndex;
SetTile(0x4022, position, super->collisionLayer);
SetTile(0x4022, position + 1, super->collisionLayer);
SetTile(0x4022, position + 0x40, super->collisionLayer);
SetTile(0x4022, position + 0x41, super->collisionLayer);
}
void sub_08030FB4(EyegoreEntity* this) {
u32 position = COORD_TO_TILE_OFFSET(super, 8, 0x14);
SetTile(this->unk_80, position, super->collisionLayer);
SetTile(this->unk_82, position + 1, super->collisionLayer);
SetTile(this->unk_84, position + 0x40, super->collisionLayer);
SetTile(this->unk_86, position + 0x41, super->collisionLayer);
}
NONMATCH("asm/non_matching/eyegore/sub_08031024.inc", void sub_08031024(EyegoreEntity* this)) {
u32 uVar5;
bool32 boolresult;
u32 uVar8;
u32 tmp, tmp2;
u32 res = sub_08049FDC(super, 1);
boolresult = BOOLCAST(res);
if (this->unk_79 == 0) {
if (boolresult != 0) {
super->direction = CalculateDirectionTo(super->x.HALF.HI + super->hitbox->offset_x,
super->y.HALF.HI + super->hitbox->offset_y,
gUnk_020000B0->x.HALF.HI, gUnk_020000B0->y.HALF.HI);
} else {
this->unk_79 = 1;
this->unk_78 = (boolresult >> 0x1f);
super->direction = CalculateDirectionTo(super->x.HALF.HI, super->y.HALF.HI, this->unk_74, this->unk_76);
}
} else {
if (boolresult != 0) {
this->unk_79 = 0;
} else {
if (this->unk_78 != 0) {
if (this->unk_78 == 1) {
this->unk_78 |= 0x80;
super->direction =
CalculateDirectionTo(super->x.HALF.HI, super->y.HALF.HI, this->unk_74, this->unk_76);
this->unk_7b = (super->direction + 4) & 0x18;
if (this->unk_7b < super->direction) {
super->direction = (this->unk_7b + 8) & 0x18;
} else {
super->direction = (this->unk_7b - 8) & 0x18;
}
} else if ((this->unk_78 & 2) != 0) {
super->direction ^= 0x10;
}
tmp = (this->unk_78 & 0x70) * 0x1000000;
if (tmp != 0) {
tmp >>= 0x19;
this->unk_78 = tmp | (this->unk_78 & 0x8f);
if ((tmp & 0x10) != 0) {
super->direction = this->unk_7b;
this->unk_78 = 0;
}
} else {
tmp2 = this->unk_7b >> 1;
uVar5 = GetTileTypeByPos(super->x.HALF.HI + gUnk_080CE2C0[tmp2 + 0],
super->y.HALF.HI + gUnk_080CE2C0[tmp2 + 1], super->collisionLayer);
uVar8 = GetTileTypeByPos(super->x.HALF.HI + ((s8*)gUnk_080CE2C0)[tmp2 + 2],
super->y.HALF.HI + ((s8*)gUnk_080CE2C0)[tmp2 + 3], super->collisionLayer);
if (!(((gUnk_080B3E80[uVar5] == 0) && (gUnk_080B3E80[uVar8] == 0)) ||
((this->unk_7b | 1) & 1) == 0)) { // TODO || false, here something is missing?
if (super->direction >> 3 == super->animationState) {
this->unk_78 |= 0x20;
} else {
this->unk_78 |= 0x40;
}
} else {
super->direction = this->unk_7b;
this->unk_78 = 0;
}
}
} else {
super->direction = CalculateDirectionTo(super->x.HALF.HI, super->y.HALF.HI, this->unk_74, this->unk_76);
}
}
}
if (((super->direction + 4) & 0x18) >> 3 == super->animationState) {
this->unk_7a = 1;
this->unk_7f = super->animationState;
} else {
this->unk_7a = 0;
if (((super->direction + super->animationState * -8) & 0x1f) >= 0x11U) {
this->unk_7f = (super->animationState - 1) & 3;
} else {
this->unk_7f = (super->animationState + 1) & 3;
}
}
super->direction = (super->direction + 4) & 0x18;
super->x.HALF.LO = 0;
super->y.HALF.LO = 0;
}
END_NONMATCH
void sub_08031250(EyegoreEntity* this) {
u32 tmp2;
u32 tmp = (u32)super->animationState * 4;
sub_08008796(super, 9, super->x.HALF.HI + gUnk_080CE2C0[tmp], super->y.HALF.HI + gUnk_080CE2C0[tmp + 1]);
sub_08008796(super, 9, super->x.HALF.HI + gUnk_080CE2C0[tmp + 2], super->y.HALF.HI + gUnk_080CE2C0[tmp + 3]);
if (this->unk_79 != 0) {
tmp2 = 0;
if ((super->x.HALF.HI - (u32)this->unk_74) + 2 < 5) {
super->x.HALF.HI = this->unk_74;
tmp2 = 0x80;
}
if ((super->y.HALF.HI - (u32)this->unk_76) + 2 < 5) {
super->y.HALF.HI = this->unk_76;
this->unk_79 = tmp2 | this->unk_79;
}
if (((this->unk_79 & 0x80) == 0) && (ProcessMovement(super) == 0)) {
if ((this->unk_78 & 0x80) != 0) {
this->unk_78 = 0x82;
} else {
this->unk_78 = 1;
}
}
} else {
ProcessMovement(super);
}
}
void sub_08031320(EyegoreEntity* this) {
super->action = 2;
super->flags &= ~ENT_COLLIDE;
super->actionDelay = 0x1e;
super->hitbox = (Hitbox*)&gUnk_080FD308;
InitializeAnimation(super, 10);
}
void sub_08031344(EyegoreEntity* this) {
static const s8 gUnk_080CE304[] = {
0, -6, -14, -14, 0, -28, 14, -14,
};
Entity* entity = sub_08017A90(super->field_0x4c, super);
if (entity != NULL) {
const s8* ptr = &gUnk_080CE304[entity->animationState * 2];
entity->spriteOffsetX = ptr[0];
entity->spriteOffsetY = ptr[1];
}
}

1
src/enemy/helmasaur.c
View File

@ -9,7 +9,6 @@
#include "object.h"
#include "functions.h"
extern void sub_08008796(Entity*, u32, u32, u32);
extern u32 sub_0804A024(Entity*, u32, u32);
extern Entity gUnk_0200D654;

2
src/playerItem/playerItemBomb.c
View File

@ -11,8 +11,6 @@ extern void (*const gUnk_080B77D8[])(Entity*);
extern void sub_08079BD8(Entity*);
extern void sub_08008796(Entity*, u32, u32, u32);
void PlayerItemBomb(Entity* this) {
u8 uVar1, uVar2;