mirror of https://github.com/zeldaret/tmc.git
Merge pull request #345 from octorock/object97
This commit is contained in:
notyourav
GitHub
commit
db8dfd44b2
File diff suppressed because it is too large
Load Diff
|
|
@ -45776,36 +45776,6 @@
|
|||
"start": 1196172,
|
||||
"size": 36
|
||||
},
|
||||
{
|
||||
"path": "object97/gUnk_08124128.bin",
|
||||
"start": 1196328,
|
||||
"size": 5
|
||||
},
|
||||
{
|
||||
"path": "object97/gUnk_0812412D.bin",
|
||||
"start": 1196333,
|
||||
"size": 5
|
||||
},
|
||||
{
|
||||
"path": "object97/gUnk_08124132.bin",
|
||||
"start": 1196338,
|
||||
"size": 20
|
||||
},
|
||||
{
|
||||
"path": "object97/gUnk_08124146.bin",
|
||||
"start": 1196358,
|
||||
"size": 10
|
||||
},
|
||||
{
|
||||
"path": "object97/gUnk_08124158.bin",
|
||||
"start": 1196376,
|
||||
"size": 32
|
||||
},
|
||||
{
|
||||
"path": "object97/gUnk_08124178.bin",
|
||||
"start": 1196408,
|
||||
"size": 20
|
||||
},
|
||||
{
|
||||
"path": "animations/gSpriteAnimations_Object98_0.bin",
|
||||
"start": 1196436,
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
.align 2
|
||||
|
||||
gUnk_081240C0:: @ 081240C0
|
||||
.4byte sub_0809D9C0
|
||||
.4byte sub_0809DB40
|
||||
.4byte sub_0809DC68
|
||||
.4byte sub_0809DE38
|
||||
.4byte sub_0809E038
|
||||
.4byte sub_0809DBCC
|
||||
|
||||
gUnk_081240D8:: @ 081240D8
|
||||
.4byte sub_0809D9D8
|
||||
.4byte sub_0809DA2C
|
||||
.4byte sub_0809DA64
|
||||
.4byte sub_0809DAB4
|
||||
.4byte sub_0809DB14
|
||||
|
||||
gUnk_081240EC:: @ 081240EC
|
||||
.4byte sub_0809DB58
|
||||
.4byte sub_0809DB88
|
||||
|
||||
gUnk_081240F4:: @ 081240F4
|
||||
.4byte sub_0809DBE4
|
||||
.4byte sub_0809DC14
|
||||
.4byte sub_0809DB88
|
||||
|
||||
gUnk_08124100:: @ 08124100
|
||||
.4byte sub_0809DC80
|
||||
.4byte sub_0809DD0C
|
||||
.4byte sub_0809DD34
|
||||
.4byte sub_0809DD78
|
||||
.4byte sub_0809DDBC
|
||||
.4byte sub_0809DDE4
|
||||
|
||||
gUnk_08124118:: @ 08124118
|
||||
.4byte sub_0809DE50
|
||||
.4byte sub_0809DF00
|
||||
.4byte sub_0809DFA0
|
||||
.4byte sub_0809DFE0
|
||||
|
||||
gUnk_08124128:: @ 08124128
|
||||
.incbin "object97/gUnk_08124128.bin"
|
||||
|
||||
gUnk_0812412D:: @ 0812412D
|
||||
.incbin "object97/gUnk_0812412D.bin"
|
||||
|
||||
gUnk_08124132:: @ 08124132
|
||||
.incbin "object97/gUnk_08124132.bin"
|
||||
|
||||
gUnk_08124146:: @ 08124146
|
||||
.incbin "object97/gUnk_08124146.bin"
|
||||
|
||||
gUnk_08124150:: @ 08124150
|
||||
.4byte sub_0809E050
|
||||
.4byte sub_0809E088
|
||||
|
||||
gUnk_08124158:: @ 08124158
|
||||
.incbin "object97/gUnk_08124158.bin"
|
||||
|
||||
gUnk_08124178:: @ 08124178
|
||||
.incbin "object97/gUnk_08124178.bin"
|
||||
|
|
@ -171,4 +171,5 @@ extern void sub_08000148(u32, u32, u32);
|
|||
extern void sub_0805457C(Entity*, s32);
|
||||
extern Entity* sub_080A2A3C(Entity*, u32, u32, u32);
|
||||
extern void sub_0806FCF4(Entity*, s32, s32, s32);
|
||||
extern u32 sub_080041DC(Entity*, u32, u32);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ typedef enum {
|
|||
WIND_TRIBE_FLAG,
|
||||
BIRD,
|
||||
OBJECT_96,
|
||||
OBJECT_97,
|
||||
KEY_STEALING_TAKKURI,
|
||||
OBJECT_98,
|
||||
OBJECT_99,
|
||||
HUGE_ACORN,
|
||||
|
|
@ -377,7 +377,7 @@ void Lamp(Entity*);
|
|||
void WindTribeFlag(Entity*);
|
||||
void Bird(Entity*);
|
||||
void Object96(Entity*);
|
||||
void Object97(Entity*);
|
||||
void KeyStealingTakkuri();
|
||||
void Object98(Entity*);
|
||||
void Object99(Entity*);
|
||||
void MacroAcorn(Entity*);
|
||||
|
|
|
|||
|
|
@ -798,7 +798,7 @@ SECTIONS {
|
|||
src/object/bird.o(.text);
|
||||
asm/object/bird.o(.text);
|
||||
asm/object/object96.o(.text);
|
||||
asm/object/object97.o(.text);
|
||||
src/object/keyStealingTakkuri.o(.text);
|
||||
asm/object/object98.o(.text);
|
||||
asm/object/object99.o(.text);
|
||||
asm/object/macroAcorn.o(.text);
|
||||
|
|
@ -1549,7 +1549,7 @@ SECTIONS {
|
|||
data/const/object/bird.o(.rodata);
|
||||
data/animations/object/bird.o(.rodata);
|
||||
data/const/object/object96.o(.rodata);
|
||||
data/const/object/object97.o(.rodata);
|
||||
src/object/keyStealingTakkuri.o(.rodata);
|
||||
data/const/object/object98.o(.rodata);
|
||||
data/animations/object/object98.o(.rodata);
|
||||
data/const/object/macroAcorn.o(.rodata);
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ u32 sub_0806F58C(Entity*, Entity*);
|
|||
u32 sub_0806FCA0(Entity*, Entity*);
|
||||
void UnloadHitbox(Entity*);
|
||||
extern u32 sub_08007DD6(u32, const u16*);
|
||||
extern u32 sub_080041DC(Entity*, u32, u32);
|
||||
u32 PointInsideRadius(s32 x, s32 y, s32 radius);
|
||||
extern void sub_0806FEE8(struct_gUnk_020000C0_1*, u32, u32, u32);
|
||||
void sub_0806FEFC(struct_gUnk_020000C0_1*, Entity*);
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ typedef struct {
|
|||
} NPCData;
|
||||
extern NPCData* gUnk_08001A7C[];
|
||||
|
||||
u32 sub_080041DC(Entity*, u32, u32);
|
||||
u32 sub_0806EF88(Entity*);
|
||||
|
||||
static void sub_0806EF14(Entity*);
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ void (*const gObjectFunctions[])(Entity*) = {
|
|||
[WIND_TRIBE_FLAG] = WindTribeFlag,
|
||||
[BIRD] = Bird,
|
||||
[OBJECT_96] = Object96,
|
||||
[OBJECT_97] = Object97,
|
||||
[KEY_STEALING_TAKKURI] = KeyStealingTakkuri,
|
||||
[OBJECT_98] = Object98,
|
||||
[OBJECT_99] = Object99,
|
||||
[HUGE_ACORN] = MacroAcorn,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,584 @@
|
|||
/**
|
||||
* @file keyStealingTakkuri.c
|
||||
* @ingroup Objects
|
||||
*
|
||||
* @brief Key Stealing Takkuri object
|
||||
*/
|
||||
|
||||
#define NENT_DEPRECATED
|
||||
#include "global.h"
|
||||
#include "object.h"
|
||||
#include "functions.h"
|
||||
|
||||
typedef struct {
|
||||
/*0x00*/ Entity base;
|
||||
/*0x68*/ u16 unk_68;
|
||||
/*0x6a*/ u16 unk_6a;
|
||||
/*0x6c*/ u16 unk_6c;
|
||||
/*0x6e*/ u8 unk_6e;
|
||||
} KeyStealingTakkuriEntity;
|
||||
|
||||
extern void (*const KeyStealingTakkuri_Types[])(KeyStealingTakkuriEntity*);
|
||||
extern void (*const KeyStealingTakkuri_Type0_Actions[])(KeyStealingTakkuriEntity*);
|
||||
extern void (*const KeyStealingTakkuri_Type1_Actions[])(KeyStealingTakkuriEntity*);
|
||||
extern void (*const KeyStealingTakkuri_Type5_Actions[])(KeyStealingTakkuriEntity*);
|
||||
extern void (*const KeyStealingTakkuri_Type2_Actions[])(KeyStealingTakkuriEntity*);
|
||||
extern void (*const KeyStealingTakkuri_Type3_Actions[])(KeyStealingTakkuriEntity*);
|
||||
extern const u8 gUnk_08124128[];
|
||||
extern const u8 gUnk_0812412D[];
|
||||
extern const u16 gUnk_08124132[];
|
||||
extern const u8 gUnk_08124146[];
|
||||
extern void (*const KeyStealingTakkuri_Type4_Actions[])(KeyStealingTakkuriEntity*);
|
||||
typedef struct {
|
||||
s16 unk_0;
|
||||
s16 unk_2;
|
||||
u8 unk_4;
|
||||
u8 unk_5;
|
||||
u8 unk_6;
|
||||
} TmpStruct;
|
||||
extern const TmpStruct gUnk_08124158[];
|
||||
extern const u16 gUnk_08124178[];
|
||||
|
||||
void sub_0809E1C8(KeyStealingTakkuriEntity*, u32);
|
||||
void sub_0809E1F0(KeyStealingTakkuriEntity*);
|
||||
void sub_0809E210(KeyStealingTakkuriEntity*);
|
||||
void KeyStealingTakkuri_Type1_Init(KeyStealingTakkuriEntity*);
|
||||
void KeyStealingTakkuri_Type1_Action1(KeyStealingTakkuriEntity*);
|
||||
void sub_0809E238(KeyStealingTakkuriEntity*);
|
||||
void sub_0809E29C(KeyStealingTakkuriEntity*);
|
||||
u32 sub_0809E2C4(KeyStealingTakkuriEntity*, u32);
|
||||
void KeyStealingTakkuri_Type3_Action3(KeyStealingTakkuriEntity*);
|
||||
|
||||
void KeyStealingTakkuri(KeyStealingTakkuriEntity* this) {
|
||||
KeyStealingTakkuri_Types[super->type](this);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type0(KeyStealingTakkuriEntity* this) {
|
||||
KeyStealingTakkuri_Type0_Actions[super->action](this);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type0_Init(KeyStealingTakkuriEntity* this) {
|
||||
Entity* entity;
|
||||
super->action++;
|
||||
super->collisionLayer = 1;
|
||||
super->actionDelay = 0x1e;
|
||||
super->field_0xf = 0;
|
||||
super->spriteRendering.b3 = 1;
|
||||
super->speed = 0;
|
||||
super->direction = 0x18;
|
||||
InitAnimationForceUpdate(super, 1);
|
||||
entity = FindNextDuplicateID(super, 6);
|
||||
if (entity != NULL) {
|
||||
entity->parent = super;
|
||||
super->child = entity;
|
||||
} else {
|
||||
SetGlobalFlag(HAKA_KEY_LOST);
|
||||
DeleteThisEntity();
|
||||
}
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type0_Action1(KeyStealingTakkuriEntity* this) {
|
||||
if (--super->actionDelay == 0) {
|
||||
super->action++;
|
||||
super->y.WORD += 0x100000;
|
||||
super->z.WORD -= 0x100000;
|
||||
InitAnimationForceUpdate(super, 3);
|
||||
}
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type0_Action2(KeyStealingTakkuriEntity* this) {
|
||||
Entity* child = super->child;
|
||||
sub_0809E1C8(this, GetFacingDirection(super, child));
|
||||
sub_0809E1F0(this);
|
||||
if ((s32)sub_080041DC(super, child->x.HALF.HI, child->y.HALF.HI) * 0x10 < super->speed) {
|
||||
super->action++;
|
||||
super->actionDelay = 0x10;
|
||||
super->field_0xf = 1;
|
||||
InitAnimationForceUpdate(super, 2);
|
||||
}
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type0_Action3(KeyStealingTakkuriEntity* this) {
|
||||
sub_0809E1C8(this, sub_080045B4(super, gRoomControls.origin_x + 0x78, gRoomControls.origin_y + 0xa8));
|
||||
if (super->actionDelay != 0) {
|
||||
super->actionDelay--;
|
||||
super->speed -= 0x80;
|
||||
}
|
||||
sub_0809E1F0(this);
|
||||
if ((s32)sub_080041DC(super, gRoomControls.origin_x + 0x78, gRoomControls.origin_y + 0xa8) * 0x10 < super->speed) {
|
||||
super->action++;
|
||||
}
|
||||
sub_0809E210(this);
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type0_Action4(KeyStealingTakkuriEntity* this) {
|
||||
sub_0809E1F0(this);
|
||||
if (!CheckOnScreen(super)) {
|
||||
SetGlobalFlag(HAKA_KEY_LOST);
|
||||
(super->child)->parent = NULL;
|
||||
DeleteThisEntity();
|
||||
}
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type1(KeyStealingTakkuriEntity* this) {
|
||||
KeyStealingTakkuri_Type1_Actions[super->action](this);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type1_Init(KeyStealingTakkuriEntity* this) {
|
||||
super->action++;
|
||||
super->collisionLayer = 2;
|
||||
super->spriteRendering.b3 = 2;
|
||||
UpdateSpriteForCollisionLayer(super);
|
||||
InitAnimationForceUpdate(super, 0x3c);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type1_Action1(KeyStealingTakkuriEntity* this) {
|
||||
Entity* parent = super->parent;
|
||||
if (parent != NULL) {
|
||||
if (parent->next == NULL) {
|
||||
DeleteThisEntity();
|
||||
}
|
||||
if (parent->field_0xf != 0) {
|
||||
PositionRelative(parent, super, 0, 0x80000);
|
||||
}
|
||||
super->spriteSettings.draw = parent->spriteSettings.draw;
|
||||
} else {
|
||||
DeleteThisEntity();
|
||||
}
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type5(KeyStealingTakkuriEntity* this) {
|
||||
KeyStealingTakkuri_Type5_Actions[super->action](this);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type5_Init(KeyStealingTakkuriEntity* this) {
|
||||
KeyStealingTakkuri_Type1_Init(this);
|
||||
super->spriteSettings.draw = 1;
|
||||
super->direction = 0x18;
|
||||
super->speed = 0x100;
|
||||
super->zVelocity = 0x20000;
|
||||
super->actionDelay = 1;
|
||||
SoundReq(SFX_RUPEE_BOUNCE);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type5_Action1(KeyStealingTakkuriEntity* this) {
|
||||
LinearMoveUpdate(super);
|
||||
if (sub_080044EC(super, 0x2000) < 2) {
|
||||
if (super->actionDelay != 0) {
|
||||
super->actionDelay--;
|
||||
super->zVelocity = 0x10000;
|
||||
} else {
|
||||
super->action++;
|
||||
super->collisionLayer = gPlayerEntity.collisionLayer;
|
||||
UpdateSpriteForCollisionLayer(super);
|
||||
}
|
||||
SoundReq(SFX_RUPEE_BOUNCE);
|
||||
}
|
||||
KeyStealingTakkuri_Type1_Action1(this);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type2(KeyStealingTakkuriEntity* this) {
|
||||
KeyStealingTakkuri_Type2_Actions[super->action](this);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type2_Init(KeyStealingTakkuriEntity* this) {
|
||||
Entity* entity;
|
||||
|
||||
super->action++;
|
||||
super->collisionLayer = 2;
|
||||
super->actionDelay = 0x1e;
|
||||
super->field_0xf = 1;
|
||||
super->spriteRendering.b3 = 1;
|
||||
super->speed = 0;
|
||||
super->direction = 0x18;
|
||||
super->y.WORD += 0x100000;
|
||||
super->z.WORD -= 0x100000;
|
||||
this->unk_68 = super->x.HALF.HI;
|
||||
this->unk_6a = super->y.HALF.HI;
|
||||
this->unk_6c = 0;
|
||||
this->unk_6e = 0;
|
||||
UpdateSpriteForCollisionLayer(super);
|
||||
InitAnimationForceUpdate(super, 3);
|
||||
entity = FindNextDuplicateID(super, 6);
|
||||
if (entity != NULL) {
|
||||
entity->parent = super;
|
||||
super->child = entity;
|
||||
} else {
|
||||
SetGlobalFlag(HAKA_KEY_LOST);
|
||||
DeleteThisEntity();
|
||||
}
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type2_Action1(KeyStealingTakkuriEntity* this) {
|
||||
if (--super->actionDelay == 0) {
|
||||
super->action++;
|
||||
SoundReq(SFX_146);
|
||||
}
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type2_Action2(KeyStealingTakkuriEntity* this) {
|
||||
this->unk_6e += 8;
|
||||
if (0x20 < ++this->unk_6c) {
|
||||
super->action++;
|
||||
this->unk_6c = 0x20;
|
||||
SoundReq(SFX_146);
|
||||
}
|
||||
sub_0809E238(this);
|
||||
sub_0809E29C(this);
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type2_Action3(KeyStealingTakkuriEntity* this) {
|
||||
this->unk_6e += 8;
|
||||
if (--this->unk_6c == 0) {
|
||||
super->action++;
|
||||
super->actionDelay = 0x1e;
|
||||
super->spriteSettings.flipX = 0;
|
||||
} else {
|
||||
sub_0809E238(this);
|
||||
sub_0809E29C(this);
|
||||
}
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type2_Action4(KeyStealingTakkuriEntity* this) {
|
||||
if (--super->actionDelay == 0) {
|
||||
super->action++;
|
||||
SoundReq(SFX_15B);
|
||||
}
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type2_Action5(KeyStealingTakkuriEntity* this) {
|
||||
sub_0809E1C8(this, sub_080045B4(super, gRoomControls.origin_x + 0x40, gRoomControls.origin_y + 0x178));
|
||||
sub_0809E1F0(this);
|
||||
sub_0809E210(this);
|
||||
if (!CheckOnScreen(super)) {
|
||||
SetGlobalFlag(HAKA_KEY_LOST);
|
||||
(super->child)->parent = NULL;
|
||||
DeleteThisEntity();
|
||||
}
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type3(KeyStealingTakkuriEntity* this) {
|
||||
KeyStealingTakkuri_Type3_Actions[super->action](this);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type3_Init(KeyStealingTakkuriEntity* this) {
|
||||
Entity* obj;
|
||||
s32 tmp;
|
||||
const u16* ptr;
|
||||
|
||||
super->action++;
|
||||
super->collisionLayer = 2;
|
||||
super->actionDelay = 0xa;
|
||||
super->field_0xf = 0;
|
||||
super->spriteRendering.b3 = 1;
|
||||
super->speed = 0;
|
||||
super->direction = gUnk_0812412D[super->type2];
|
||||
ptr = &gUnk_08124132[super->type2 * 2];
|
||||
super->x.HALF.HI = gRoomControls.origin_x + ptr[0];
|
||||
super->y.HALF.HI = gRoomControls.origin_y + ptr[1] + 0x40;
|
||||
super->z.HALF.HI = 0xffc0;
|
||||
UpdateSpriteForCollisionLayer(super);
|
||||
InitAnimationForceUpdate(super, gUnk_08124128[super->type2]);
|
||||
obj = CreateObject(KEY_STEALING_TAKKURI, 1, 0);
|
||||
if (obj != NULL) {
|
||||
obj->parent = super;
|
||||
super->child = obj;
|
||||
PositionRelative(super, obj, 0, 0x80000);
|
||||
tmp = 0x10;
|
||||
if (super->direction == 0x18) {
|
||||
tmp = -tmp;
|
||||
}
|
||||
obj->x.HALF.HI += tmp;
|
||||
}
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type3_Action1(KeyStealingTakkuriEntity* this) {
|
||||
Entity* child;
|
||||
|
||||
switch (sub_0809E2C4(this, super->type2)) {
|
||||
case 1:
|
||||
super->action += 2;
|
||||
super->actionDelay = 0xff;
|
||||
InitAnimationForceUpdate(super, super->animIndex + 2);
|
||||
SoundReq(SFX_123);
|
||||
child = super->child;
|
||||
if (child != NULL) {
|
||||
Entity* obj = CreateObject(OBJECT_96, super->type2 + 2, 0);
|
||||
if (obj != NULL) {
|
||||
CopyPosition(child, obj);
|
||||
}
|
||||
DeleteEntityAny(child);
|
||||
super->child = NULL;
|
||||
}
|
||||
break;
|
||||
case 2:
|
||||
if (super->actionDelay == 0) {
|
||||
super->action++;
|
||||
InitAnimationForceUpdate(super, super->animIndex + 2);
|
||||
SoundReq(SFX_123);
|
||||
SoundReq(SFX_1F3);
|
||||
} else {
|
||||
super->actionDelay--;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
super->actionDelay = 0xa;
|
||||
break;
|
||||
}
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type3_Action2(KeyStealingTakkuriEntity* this) {
|
||||
Entity* child;
|
||||
|
||||
child = super->child;
|
||||
if ((child != NULL) && ((((child->x.HALF.HI - super->x.HALF.HI) ^ super->direction << 0xb) & 0x8000) != 0)) {
|
||||
super->action++;
|
||||
super->field_0xf = 1;
|
||||
SoundReq(SFX_102);
|
||||
}
|
||||
KeyStealingTakkuri_Type3_Action3(this);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type3_Action3(KeyStealingTakkuriEntity* this) {
|
||||
u32 tmp;
|
||||
Entity* child;
|
||||
|
||||
if (CheckOnScreen(super) == 0) {
|
||||
child = super->child;
|
||||
if (child != NULL) {
|
||||
child->parent = NULL;
|
||||
}
|
||||
tmp = super->actionDelay & 0x80;
|
||||
if (tmp != 0) {
|
||||
DeleteThisEntity();
|
||||
} else {
|
||||
super->action = tmp;
|
||||
super->type2 = gUnk_08124146[(Random() & 1) + (u32)super->type2 * 2];
|
||||
}
|
||||
} else {
|
||||
sub_0809E1F0(this);
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type4(KeyStealingTakkuriEntity* this) {
|
||||
KeyStealingTakkuri_Type4_Actions[super->action](this);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type4_Init(KeyStealingTakkuriEntity* this) {
|
||||
super->action++;
|
||||
super->collisionLayer = 1;
|
||||
super->spriteRendering.b3 = 1;
|
||||
super->z.HALF.HI = 0xfff0;
|
||||
sub_0807DD64(super);
|
||||
InitAnimationForceUpdate(super, 1);
|
||||
}
|
||||
|
||||
void KeyStealingTakkuri_Type4_Action1(KeyStealingTakkuriEntity* this) {
|
||||
ExecuteScriptForEntity(super, NULL);
|
||||
HandleEntity0x82Actions(super);
|
||||
UpdateAnimationSingleFrame(super);
|
||||
}
|
||||
|
||||
void sub_0809E0A0(KeyStealingTakkuriEntity* this) {
|
||||
Entity* obj = CreateObject(KEY_STEALING_TAKKURI, 5, 0);
|
||||
if (obj != NULL) {
|
||||
obj->parent = super;
|
||||
super->child = obj;
|
||||
super->field_0xf = 0;
|
||||
CopyPosition(&gPlayerEntity, obj);
|
||||
obj->z.HALF.HI = 0xfff8;
|
||||
}
|
||||
}
|
||||
|
||||
void sub_0809E0D4(KeyStealingTakkuriEntity* this, ScriptExecutionContext* context) {
|
||||
Entity* entity;
|
||||
s32 varX;
|
||||
s32 varY;
|
||||
s32 varX2;
|
||||
s32 varY2;
|
||||
s32 varX3;
|
||||
s32 varY3;
|
||||
|
||||
if (context->unk_18 == 0) {
|
||||
entity = super->child;
|
||||
if (entity != NULL) {
|
||||
if (entity->action < 2) {
|
||||
gActiveScriptInfo.commandSize = context->unk_18;
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
entity = &gPlayerEntity;
|
||||
}
|
||||
context->unk_18++;
|
||||
sub_0807DEDC(super, context, entity->x.HALF.HI, entity->y.HALF.HI);
|
||||
SoundReq(SFX_123);
|
||||
gActiveScriptInfo.commandSize = 0;
|
||||
} else {
|
||||
entity = super->child;
|
||||
if (entity != NULL) {
|
||||
varX = entity->x.HALF.HI;
|
||||
varY = entity->y.HALF.HI;
|
||||
} else {
|
||||
varX = context->x.HALF.HI;
|
||||
varY = context->y.HALF.HI;
|
||||
}
|
||||
varX2 = varX;
|
||||
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);
|
||||
}
|
||||
varX3 = super->x.HALF.HI - varX2;
|
||||
varY3 = super->y.HALF.HI - varY2;
|
||||
LinearMoveAngle(super, (s32)super->speed, (u32)super->direction);
|
||||
varX3 = (super->x.HALF.HI - varX2) * (varX3);
|
||||
varY3 = (super->y.HALF.HI - varY2) * (varY3);
|
||||
if ((varX3 < 1) && (varY3 < 1)) {
|
||||
super->x.HALF.HI = varX;
|
||||
super->y.HALF.HI = varY;
|
||||
super->field_0xf = 1;
|
||||
SoundReq(SFX_102);
|
||||
} else {
|
||||
gActiveScriptInfo.commandSize = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void sub_0809E1C8(KeyStealingTakkuriEntity* this, u32 param_2) {
|
||||
u32 tmp;
|
||||
tmp = (param_2 + 0x20);
|
||||
tmp -= super->direction;
|
||||
tmp &= 0x1f;
|
||||
if (tmp != 0) {
|
||||
if (tmp < 0x10) {
|
||||
super->direction++;
|
||||
} else {
|
||||
super->direction--;
|
||||
}
|
||||
}
|
||||
super->direction &= 0x1f;
|
||||
}
|
||||
|
||||
void sub_0809E1F0(KeyStealingTakkuriEntity* this) {
|
||||
super->speed += 0x40;
|
||||
if (super->speed > 0x400) {
|
||||
super->speed = 0x400;
|
||||
}
|
||||
LinearMoveUpdate(super);
|
||||
}
|
||||
|
||||
void sub_0809E210(KeyStealingTakkuriEntity* this) {
|
||||
gPlayerEntity.animationState = sub_0806F5B0(GetFacingDirection(&gPlayerEntity, super)) & 0xfe;
|
||||
gPlayerState.animation = 0x100;
|
||||
}
|
||||
|
||||
void sub_0809E238(KeyStealingTakkuriEntity* this) {
|
||||
s32 x = FixedMul(gSineTable[this->unk_6e], this->unk_6c);
|
||||
s32 y = FixedMul(gSineTable[this->unk_6e + 0x40], this->unk_6c);
|
||||
super->x.HALF.HI = this->unk_68 + x;
|
||||
super->y.HALF.HI = this->unk_6a - y;
|
||||
}
|
||||
|
||||
void sub_0809E29C(KeyStealingTakkuriEntity* this) {
|
||||
if ((this->unk_6e + 0x40) & 0x80) {
|
||||
super->spriteSettings.flipX = 0;
|
||||
} else {
|
||||
super->spriteSettings.flipX = 1;
|
||||
}
|
||||
}
|
||||
|
||||
u32 sub_0809E2C4(KeyStealingTakkuriEntity* this, u32 param_2) {
|
||||
s32 uVar1;
|
||||
s32 uVar2;
|
||||
const TmpStruct* tmp;
|
||||
s32 counter;
|
||||
const u16* ptr;
|
||||
s32 roomX;
|
||||
s32 roomY;
|
||||
|
||||
ptr = &gUnk_08124178[param_2 * 2];
|
||||
roomX = gPlayerEntity.x.HALF.HI - (gRoomControls.origin_x + ptr[0]);
|
||||
roomY = gPlayerEntity.y.HALF.HI - (gRoomControls.origin_y + ptr[1]);
|
||||
tmp = gUnk_08124158;
|
||||
counter = 0;
|
||||
while (counter < 4) {
|
||||
uVar1 = roomX - tmp->unk_0 + tmp->unk_4;
|
||||
uVar2 = tmp->unk_4 * 2;
|
||||
if (uVar2 > (u16)uVar1) {
|
||||
uVar1 = roomY - tmp->unk_2 + tmp->unk_5;
|
||||
uVar2 = tmp->unk_5 * 2;
|
||||
if (uVar2 > (u16)uVar1) {
|
||||
if (tmp->unk_6 == gPlayerEntity.animationState && gPlayerEntity.action == 6) {
|
||||
return 1;
|
||||
}
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
counter++;
|
||||
tmp++;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void (*const KeyStealingTakkuri_Types[])(KeyStealingTakkuriEntity*) = {
|
||||
KeyStealingTakkuri_Type0, KeyStealingTakkuri_Type1, KeyStealingTakkuri_Type2,
|
||||
KeyStealingTakkuri_Type3, KeyStealingTakkuri_Type4, KeyStealingTakkuri_Type5,
|
||||
};
|
||||
void (*const KeyStealingTakkuri_Type0_Actions[])(KeyStealingTakkuriEntity*) = {
|
||||
KeyStealingTakkuri_Type0_Init, KeyStealingTakkuri_Type0_Action1, KeyStealingTakkuri_Type0_Action2,
|
||||
KeyStealingTakkuri_Type0_Action3, KeyStealingTakkuri_Type0_Action4,
|
||||
};
|
||||
void (*const KeyStealingTakkuri_Type1_Actions[])(KeyStealingTakkuriEntity*) = {
|
||||
KeyStealingTakkuri_Type1_Init,
|
||||
KeyStealingTakkuri_Type1_Action1,
|
||||
};
|
||||
void (*const KeyStealingTakkuri_Type5_Actions[])(KeyStealingTakkuriEntity*) = {
|
||||
KeyStealingTakkuri_Type5_Init,
|
||||
KeyStealingTakkuri_Type5_Action1,
|
||||
KeyStealingTakkuri_Type1_Action1,
|
||||
};
|
||||
void (*const KeyStealingTakkuri_Type2_Actions[])(KeyStealingTakkuriEntity*) = {
|
||||
KeyStealingTakkuri_Type2_Init, KeyStealingTakkuri_Type2_Action1, KeyStealingTakkuri_Type2_Action2,
|
||||
KeyStealingTakkuri_Type2_Action3, KeyStealingTakkuri_Type2_Action4, KeyStealingTakkuri_Type2_Action5,
|
||||
};
|
||||
void (*const KeyStealingTakkuri_Type3_Actions[])(KeyStealingTakkuriEntity*) = {
|
||||
KeyStealingTakkuri_Type3_Init,
|
||||
KeyStealingTakkuri_Type3_Action1,
|
||||
KeyStealingTakkuri_Type3_Action2,
|
||||
KeyStealingTakkuri_Type3_Action3,
|
||||
};
|
||||
const u8 gUnk_08124128[] = {
|
||||
0, 0, 1, 1, 1,
|
||||
};
|
||||
const u8 gUnk_0812412D[] = {
|
||||
8, 8, 24, 24, 24,
|
||||
};
|
||||
const u16 gUnk_08124132[] = {
|
||||
56, 312, 56, 584, 216, 488, 424, 472, 392, 328,
|
||||
};
|
||||
const u8 gUnk_08124146[] = {
|
||||
3, 4, 3, 4, 0, 4, 0, 1, 1, 2,
|
||||
};
|
||||
void (*const KeyStealingTakkuri_Type4_Actions[])(KeyStealingTakkuriEntity*) = {
|
||||
KeyStealingTakkuri_Type4_Init,
|
||||
KeyStealingTakkuri_Type4_Action1,
|
||||
};
|
||||
const TmpStruct gUnk_08124158[] = {
|
||||
{ 0, 32, 32, 8, 0 },
|
||||
{ -40, 0, 8, 32, 2 },
|
||||
{ 0, -24, 32, 8, 4 },
|
||||
{ 40, 0, 8, 32, 6 },
|
||||
};
|
||||
const u16 gUnk_08124178[] = {
|
||||
64, 336, 64, 608, 208, 512, 416, 496, 384, 352,
|
||||
};
|
||||
|
|
@ -4,8 +4,6 @@
|
|||
#include "player.h"
|
||||
#include "functions.h"
|
||||
|
||||
extern u32 sub_080041DC(Entity*, u32, u32);
|
||||
|
||||
extern void (*const GleerokProjectile_Functions[])(Entity*);
|
||||
extern void (*const GleerokProjectile_Actions[])(Entity*);
|
||||
extern const s8 gUnk_08129978[];
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
#include "player.h"
|
||||
#include "functions.h"
|
||||
|
||||
extern u32 sub_080041DC(Entity*, u32, u32);
|
||||
|
||||
extern void (*const V1FireProjectile_Functions[])(Entity*);
|
||||
extern void (*const V1FireProjectile_Actions[])(Entity*);
|
||||
extern const s8 gUnk_0812A4EC[];
|
||||
|
|
|
|||
Loading…
Reference in New Issue