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

Merge pull request #411 from octorock/beanstalk

This commit is contained in:
notyourav 2022-02-27 13:07:04 -08:00 committed by GitHub
parent 985b0ec16c dcb6360b4e
commit c735b300a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 363 additions and 1246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1183
asm/object/beanstalk.s
View File

File diff suppressed because it is too large Load Diff

15
assets/assets.json
View File

@ -43150,21 +43150,6 @@
"size": 6,
"type": "animation"
},
{
"path": "beanstalk/gUnk_08120DFC.bin",
"start": 1183228,
"size": 24
},
{
"path": "beanstalk/gUnk_08120E14.bin",
"start": 1183252,
"size": 40
},
{
"path": "beanstalk/gUnk_08120E3C.bin",
"start": 1183292,
"size": 20
},
{
"path": "animations/gSpriteAnimations_Beanstalk_0_0.bin",
"start": 1183372,

6
data/animations/object/beanstalk.s
View File

@ -4,6 +4,12 @@
.section .rodata
@ .align 2
gSpriteAnimations_Beanstalk_0_0:: @ 08120E8C
.include "animations/gSpriteAnimations_Beanstalk_0_0.s"
gSpriteAnimations_Beanstalk_0_1:: @ 08120ED1
.include "animations/gSpriteAnimations_Beanstalk_0_1.s"
gSpriteAnimations_Beanstalk_1_0:: @ 08120EF9
.include "animations/gSpriteAnimations_Beanstalk_1_0.s"

45
data/const/object/beanstalk.s
View File

@ -1,45 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08120DF4:: @ 08120DF4
.4byte sub_08089D1C
.4byte sub_08089F08
gUnk_08120DFC:: @ 08120DFC
.incbin "beanstalk/gUnk_08120DFC.bin"
gUnk_08120E14:: @ 08120E14
.incbin "beanstalk/gUnk_08120E14.bin"
gUnk_08120E3C:: @ 08120E3C
.incbin "beanstalk/gUnk_08120E3C.bin"
gUnk_08120E50:: @ 08120E50
.4byte sub_08089F20
.4byte nullsub_517
.4byte sub_0808A010
.4byte nullsub_517
.4byte sub_0808A0C0
.4byte sub_0808A0C0
.4byte sub_0808A0C0
.4byte sub_0808A0DC
.4byte sub_0808A208
.4byte sub_0808A2F0
gUnk_08120E78:: @ 08120E78
.4byte sub_08089F38
.4byte sub_08089F70
.4byte sub_08089FF0
gUnk_08120E84:: @ 08120E84
.4byte sub_0808A220
.4byte nullsub_518
gSpriteAnimations_Beanstalk_0_0:: @ 08120E8C
.include "animations/gSpriteAnimations_Beanstalk_0_0.s"
gSpriteAnimations_Beanstalk_0_1:: @ 08120ED1
.include "animations/gSpriteAnimations_Beanstalk_0_1.s"

1
include/functions.h
View File

@ -58,6 +58,7 @@ extern void UpdateItemAnim(ItemBehavior*);
// Unidentified
extern void sub_08000148(u32, u32, u32);
extern u32 sub_0800029C(Entity*, s32, s32);
extern u32 sub_080002A8(u32, u32, u32);
extern u32 sub_080002B4(Entity*, u32, u32);
extern u32 sub_080002B8(Entity*);

2
include/object.h
View File

@ -270,7 +270,7 @@ void Object28(Entity*);
void AmbientClouds(Entity*);
void Object2A(Entity*);
void Object2B(Entity*);
void Beanstalk(Entity*);
void Beanstalk();
void Smoke(Entity*);
void PushableRock();
void HittableLever();

4
linker.ld
View File

@ -686,7 +686,7 @@ SECTIONS {
src/object/ambientClouds.o(.text);
src/object/object2A.o(.text);
asm/object/object2B.o(.text);
asm/object/beanstalk.o(.text);
src/object/beanstalk.o(.text);
src/object/smoke.o(.text);
src/object/pushableRock.o(.text);
src/object/hittableLever.o(.text);
@ -1414,7 +1414,7 @@ SECTIONS {
data/animations/object/ambientClouds.o(.rodata);
src/object/object2A.o(.rodata);
data/animations/object/object2A.o(.rodata);
data/const/object/beanstalk.o(.rodata);
src/object/beanstalk.o(.rodata);
data/animations/object/beanstalk.o(.rodata);
data/const/object/smoke.o(.rodata);
src/object/pushableRock.o(.rodata);

353
src/object/beanstalk.c Normal file
View File

@ -0,0 +1,353 @@
/**
* @file beanstalk.c
* @ingroup Objects
*
* @brief Beanstalk object
*/
#define NENT_DEPRECATED
#include "global.h"
#include "object.h"
#include "functions.h"
typedef struct {
/*0x00*/ Entity base;
/*0x68*/ u8 unk_68[4];
/*0x6c*/ u32 unk_6c;
/*0x70*/ u16 unk_70;
/*0x72*/ u16 unk_72;
} BeanstalkEntity;
typedef struct {
u8 type;
s8 x;
s8 y;
u8 flipX;
} struct_08120DFC;
typedef struct {
u8 unk_0;
u8 unk_1;
} struct_08120E3C;
void Beanstalk_Action1(BeanstalkEntity*);
void Beanstalk_Init(BeanstalkEntity*);
void Beanstalk_Action1Type0(BeanstalkEntity*);
void Beanstalk_Action1Type1(BeanstalkEntity*);
void Beanstalk_Action1Type2(BeanstalkEntity*);
void Beanstalk_Action1Type4(BeanstalkEntity*);
void Beanstalk_Action1Type7(BeanstalkEntity*);
void Beanstalk_Action1Type8(BeanstalkEntity*);
void Beanstalk_Action1Type9(BeanstalkEntity*);
void Beanstalk_Action1Type0SubAction0(BeanstalkEntity*);
void Beanstalk_Action1Type0SubAction1(BeanstalkEntity*);
void Beanstalk_Action1Type0SubAction2(BeanstalkEntity*);
void Beanstalk_Action1Type8SubAction0(BeanstalkEntity*);
void Beanstalk_Action1Type8SubAction1(BeanstalkEntity*);
void Beanstalk(BeanstalkEntity* this) {
static void (*const Beanstalk_Actions[])(BeanstalkEntity*) = {
Beanstalk_Init,
Beanstalk_Action1,
};
Beanstalk_Actions[super->action](this);
}
const struct_08120DFC gUnk_08120DFC[] = {
{ 4, -2, 8, 0 }, { 6, 10, 16, 1 }, { 5, -4, 33, 0 }, { 6, -7, 7, 0 }, { 4, 5, 33, 1 }, { 5, 2, 37, 1 },
};
void Beanstalk_Init(BeanstalkEntity* this) {
static const struct_08120E3C gUnk_08120E14[] = {
{ 0, 3 }, { 1, 3 }, { 0, 3 }, { 2, 3 }, { 3, 2 }, { 6, 2 }, { 9, 4 }, { 0, 3 }, { 0, 4 }, { 12, 6 },
};
static const struct_08120E3C gUnk_08120E3C[] = {
{ 1, 6 }, { 2, 6 }, { 4, 3 }, { 7, 5 }, { 10, 7 },
};
Entity* obj;
const struct_08120DFC* ptr;
super->spriteRendering.b3 = 2;
super->spriteOrientation.flipY = 1;
SetDefaultPriority(super, 4);
if (super->type == 7) {
#ifndef EU
if ((super->flags & ENT_DID_INIT) == 0) {
return;
}
#endif
if (super->type2 == 0 && super->actionDelay != 0) {
if (CheckLocalFlag(super->actionDelay) == 0) {
return;
}
super->spriteOrientation.flipY = 2;
}
InitializeAnimation(super, gUnk_08120E3C[super->type2].unk_0);
super->spritePriority.b0 = gUnk_08120E3C[super->type2].unk_1;
} else {
if (super->type != 0) {
InitializeAnimation(super, gUnk_08120E14[super->type].unk_0);
} else {
LoadSwapGFX(super, 1, 2);
InitAnimationForceUpdate(super, gUnk_08120E14[super->type].unk_0);
}
super->spritePriority.b0 = gUnk_08120E14[super->type].unk_1;
}
super->action = 1;
super->spriteSettings.draw = 1;
switch (super->type) {
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
super->spriteVramOffset = 0x1c0;
super->actionDelay = 0;
break;
case 7:
switch (super->type2) {
case 0:
this->unk_6c = 0x10;
super->actionDelay = 0;
do {
obj = CreateObject(BEANSTALK, 7, 1);
super->child = obj;
if (obj != NULL) {
obj->x.HALF.HI = super->x.HALF.HI;
(super->child)->y.HALF.HI = super->y.HALF.HI - (s16)this->unk_6c;
super->field_0xf = 4;
while (--super->field_0xf != 0) {
ptr = &gUnk_08120DFC[super->actionDelay];
obj = CreateObject(BEANSTALK, 7, ptr->type - 2);
super->child = obj;
if (obj != NULL) {
obj->x.HALF.HI = super->x.HALF.HI + ptr->x;
(super->child)->y.HALF.HI = (super->y.HALF.HI - (s16)this->unk_6c) - ptr->y;
super->child->spriteSettings.flipX = ptr->flipX;
}
super->actionDelay++;
}
if (super->actionDelay > 5) {
super->actionDelay = 0;
}
}
this->unk_6c += 0x38;
} while (((s16)(super->y.HALF_U.HI - this->unk_6c)) >= gRoomControls.origin_y);
super->actionDelay = 1;
break;
case 2:
case 3:
super->spriteRendering.b3 = 1;
// fallthrough
case 4:
super->collisionLayer = 3;
}
break;
}
Beanstalk_Action1(this);
}
void Beanstalk_Action1(BeanstalkEntity* this) {
static void (*const Beanstalk_Action1Types[])(BeanstalkEntity*) = {
Beanstalk_Action1Type0, Beanstalk_Action1Type1, Beanstalk_Action1Type2, Beanstalk_Action1Type1,
Beanstalk_Action1Type4, Beanstalk_Action1Type4, Beanstalk_Action1Type4, Beanstalk_Action1Type7,
Beanstalk_Action1Type8, Beanstalk_Action1Type9,
};
Beanstalk_Action1Types[super->type](this);
}
void Beanstalk_Action1Type0(BeanstalkEntity* this) {
static void (*const Beanstalk_Action1Type0SubActions[])(BeanstalkEntity*) = {
Beanstalk_Action1Type0SubAction0,
Beanstalk_Action1Type0SubAction1,
Beanstalk_Action1Type0SubAction2,
};
Beanstalk_Action1Type0SubActions[super->subAction](this);
}
void Beanstalk_Action1Type0SubAction0(BeanstalkEntity* this) {
UpdateAnimationSingleFrame(super);
if ((super->frame & 0x80) != 0) {
if (super->actionDelay < 2) {
super->actionDelay++;
} else {
InitAnimationForceUpdate(super, 1);
super->actionDelay = 0x10;
super->subAction++;
}
}
}
void Beanstalk_Action1Type0SubAction1(BeanstalkEntity* this) {
if (super->actionDelay-- == 0) {
super->actionDelay = 0x10;
SoundReq(SFX_198);
}
UpdateAnimationSingleFrame(super);
if ((super->frame & 0x80) != 0) {
Entity* entity = CreateObject(BEANSTALK, 1, 0);
super->child = entity;
if (entity != NULL) {
entity->x.HALF.HI = super->x.HALF.HI;
(super->child)->y.HALF.HI = super->y.HALF.HI;
}
entity = CreateObject(BEANSTALK, 2, 0);
super->child = entity;
if (entity != NULL) {
entity->x.HALF.HI = super->x.HALF.HI;
(super->child)->y.HALF.HI = super->y.HALF.HI + -0x10;
}
super->spriteSettings.draw = 0;
super->subAction++;
}
}
void Beanstalk_Action1Type0SubAction2(BeanstalkEntity* this) {
if (super->actionDelay-- == 0) {
super->actionDelay = 0x10;
SoundReq(SFX_198);
}
}
void Beanstalk_Action1Type2(BeanstalkEntity* this) {
s32 tmp;
const struct_08120DFC* ptr;
GetNextFrame(super);
if ((super->frame & 1) != 0) {
ptr = &gUnk_08120DFC[super->actionDelay];
super->child = CreateObject(BEANSTALK, ptr->type, 0);
if (super->child != NULL) {
super->child->x.HALF.HI = super->x.HALF.HI + ptr->x;
super->child->y.HALF.HI = super->y.HALF.HI - ptr->y;
super->child->spriteSettings.flipX = ptr->flipX;
}
if (++super->actionDelay > 5) {
super->actionDelay = 0;
}
}
if ((super->frame & 0x80) != 0) {
super->child = CreateObject(BEANSTALK, 3, 0);
if (super->child != NULL) {
super->child->x.HALF.HI = super->x.HALF.HI;
super->child->y.HALF.HI = super->y.HALF.HI;
}
tmp = super->y.HALF.HI -= 0x38;
if (tmp * 0x10000 < 0) {
DeleteEntity(super);
}
}
}
void Beanstalk_Action1Type4(BeanstalkEntity* this) {
if ((super->frame & 0x80) == 0) {
GetNextFrame(super);
}
}
void Beanstalk_Action1Type1(BeanstalkEntity* this) {
}
void Beanstalk_Action1Type7(BeanstalkEntity* this) {
switch (super->type2) {
case 0:
if (super->actionDelay == 0) {
return;
}
this->unk_6c = gRoomControls.origin_y;
this->unk_70 = TILE(super->x.HALF.HI, this->unk_6c);
while (TRUE) {
this->unk_70 = TILE(super->x.HALF.HI, this->unk_6c);
SetTile(0x4017, this->unk_70, 2);
SetTile(0x4017, this->unk_70, 1);
this->unk_6c += 0x10;
if (this->unk_6c >= gRoomControls.origin_y + gRoomControls.height)
break;
if (this->unk_6c > super->y.HALF.HI) {
break;
}
}
super->actionDelay = 0;
return;
break;
case 1:
return;
case 2:
case 3:
case 4:
if (gPlayerState.floor_type == 0x1e) {
if (EntityInRectRadius(super, &gPlayerEntity, 0, 8)) {
if ((super->animIndex == (super->type2 - 1) * 3 + 1) && (super->actionDelay == 0)) {
super->actionDelay = 1;
InitializeAnimation(super, super->animIndex + 1);
}
} else {
super->actionDelay = 0;
}
} else {
super->actionDelay = 0;
}
GetNextFrame(super);
if ((super->frame & 0x80) != 0) {
InitializeAnimation(super, (super->type2 - 1) * 3 + 1);
}
break;
}
}
void Beanstalk_Action1Type8(BeanstalkEntity* this) {
static void (*const Beanstalk_Action1Type8SubActions[])(BeanstalkEntity*) = {
Beanstalk_Action1Type8SubAction0,
Beanstalk_Action1Type8SubAction1,
};
Beanstalk_Action1Type8SubActions[super->subAction](this);
}
void Beanstalk_Action1Type8SubAction0(BeanstalkEntity* this) {
Entity* obj;
super->spriteOrientation.flipY = 2;
this->unk_70 = COORD_TO_TILE(super);
SetTile(0x4017, this->unk_70, 1);
super->subAction = 1;
obj = CreateObjectWithParent(super, OBJECT_15, 0, 0);
if (obj != NULL) {
obj->y.HALF.HI = super->y.HALF.HI + 0x38;
obj->spriteIndex = super->spriteIndex;
obj->spriteVramOffset = super->spriteVramOffset;
obj->palette.b.b0 = super->palette.b.b0;
obj->animIndex = 2;
obj->actionDelay = 0x80;
obj->type = 1;
obj->spriteRendering.b3 = 2;
obj->spritePriority.b0 = 6;
obj->spriteOrientation.flipY = 2;
}
CreateObjectWithParent(super, BEANSTALK, 9, 0);
}
void Beanstalk_Action1Type8SubAction1(BeanstalkEntity* this) {
}
void Beanstalk_Action1Type9(BeanstalkEntity* this) {
if (super->subAction == 0) {
super->subAction = 1;
super->y.HALF.HI += 0x28;
this->unk_72 = sub_0800029C(super, 0, -0x18);
}
super->spriteOrientation.flipY = gPlayerEntity.spriteOrientation.flipY;
super->spriteRendering.b3 = gPlayerEntity.spriteRendering.b3;
if (gPlayerState.floor_type == 0x1e) {
super->spritePriority.b0 = 0;
if (sub_0800029C(super, 0, -0x18) != 0x4014) {
SetTile(0x4014, COORD_TO_TILE_OFFSET(super, 0, 0x18), 1);
}
} else {
super->spritePriority.b0 = 5;
if (this->unk_72 != sub_0800029C(super, 0, -0x18)) {
SetTile(this->unk_72, COORD_TO_TILE_OFFSET(super, 0, 0x18), 1);
}
}
}