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

furniture ok

This commit is contained in:
theo3 2021-12-16 21:12:43 -08:00
parent dc326a58d4
commit 28bf8b929f
7 changed files with 429 additions and 1121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1102
asm/furniture.s
View File

File diff suppressed because it is too large Load Diff

33
asm/non_matching/furniture/sub_08090E64.s Normal file
View File

@ -0,0 +1,33 @@
.syntax unified
push {r4, r5, lr}
adds r5, r0, #0
movs r0, #0x2a
movs r1, #0
movs r2, #0
bl CreateObject
adds r4, r0, #0
cmp r4, #0
beq _08090EA0
ldr r0, _08090EA4 @ =0x0000FFFE
adds r2, r0, #0
ldrb r0, [r5, #0xb]
adds r2, r2, r0
lsls r2, r2, #0x10
adds r0, r5, #0
adds r1, r4, #0
movs r3, #0
bl PositionRelative
ldrh r0, [r4, #0x36]
subs r0, #0x10
strh r0, [r4, #0x36]
adds r1, r4, #0
adds r1, #0x38
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
_08090EA0:
pop {r4, r5, pc}
.align 2, 0
_08090EA4: .4byte 0x0000FFFE
.syntax divided

18
data/animations/object/furniture.s
View File

@ -30,21 +30,3 @@ gUnk_081221F8:: @ 081221F8
gUnk_08122208:: @ 08122208
.incbin "furniture/gUnk_08122208.bin"
gUnk_08122218:: @ 08122218
.4byte sub_080905B8
.4byte sub_080909E8
gUnk_08122220:: @ 08122220
.4byte gUnk_08122128
.4byte gUnk_08122198
.4byte gUnk_081221A8
.4byte gUnk_081221B8
.4byte gUnk_081221C8
.4byte gUnk_081221D8
.4byte gUnk_081221E8
.4byte gUnk_081221F8
.4byte gUnk_08122208
gUnk_08122244:: @ 08122244
.incbin "furniture/gUnk_08122244.bin"

2
include/entity.h
View File

@ -130,6 +130,7 @@ typedef struct Entity {
/*0x62*/ u8 spriteOffsetX;
/*0x63*/ s8 spriteOffsetY;
/*0x64*/ u32* myHeap;
#ifndef NENT_DEPRECATED
/*0x68*/ union SplitHWord field_0x68;
/*0x6a*/ union SplitHWord field_0x6a;
/*0x6c*/ union SplitHWord field_0x6c;
@ -144,6 +145,7 @@ typedef struct Entity {
/*0x82*/ union SplitHWord field_0x82;
/*0x84*/ union SplitHWord cutsceneBeh;
/*0x86*/ union SplitHWord field_0x86;
#endif
} Entity;
typedef struct LinkedList {

2
include/global.h
View File

@ -50,6 +50,8 @@
#define BOOLCAST(x) ((-(x) | (x)) >> 31)
#define static_assert(cond) extern char assertion[(cond) ? 1 : -1]
#define super (&this->base)
#if NON_MATCHING
#define ASM_FUNC(path, decl)
#else

3
linker.ld
View File

@ -783,7 +783,7 @@ SECTIONS {
src/object/backgroundCloud.o(.text);
asm/object4B.o(.text);
asm/pushableFurniture.o(.text);
asm/furniture.o(.text);
src/object/furniture.o(.text);
src/object/minishSizedEntrance.o(.text);
src/object/archway.o(.text);
asm/giantRock.o(.text);
@ -1519,6 +1519,7 @@ SECTIONS {
data/const/object/pushableFurniture.o(.rodata);
data/const/object/furniture.o(.rodata);
data/animations/object/furniture.o(.rodata);
src/object/furniture.o(.rodata);
data/const/object/minishSizedEntrance.o(.rodata);
data/animations/object/minishSizedEntrance.o(.rodata);
data/const/object/object51.o(.rodata);

390
src/object/furniture.c Normal file
View File

@ -0,0 +1,390 @@
#define NENT_DEPRECATED
#include "entity.h"
#include "room.h"
#include "functions.h"
#include "object.h"
extern void sub_080001D0(u32, u32, u32);
extern u32 sub_080001DA(u32, u32);
enum {
FURNITURE_INIT,
FURNITURE_UPDATE,
};
typedef enum {
TMP,
} FurnitureFlag;
typedef enum {
TMP2,
} FurnitureType;
typedef struct {
Entity base;
/* 0x68 */ u8 pad[0x10];
/* 0x78 */ u16 tile;
/* 0x7a */ u16 unk1;
/* 0x7c */ u16 unk2;
/* 0x7e */ u16 unk3;
/* 0x80 */ u8 width;
/* 0x81 */ u8 height;
/* 0x82 */ u16 flags;
} FurnitureEntity;
typedef void(FurnitureAction)(FurnitureEntity*);
static FurnitureAction FurnitureInit;
static FurnitureAction FurnitureUpdate;
typedef struct {
u8 width;
u8 height;
s8 x;
s8 y;
u8 rendering;
u8 priority;
u16 flags;
} FurnitureCfg;
extern FurnitureCfg gUnk_08122128[];
extern FurnitureCfg gUnk_08122198[];
extern FurnitureCfg gUnk_081221A8[];
extern FurnitureCfg gUnk_081221B8[];
extern FurnitureCfg gUnk_081221C8[];
extern FurnitureCfg gUnk_081221D8[];
extern FurnitureCfg gUnk_081221E8[];
extern FurnitureCfg gUnk_081221F8[];
extern FurnitureCfg gUnk_08122208[];
extern const FurnitureCfg gUnk_08121EF8[];
static void sub_08090DC4(FurnitureEntity*);
static void sub_08090E64(FurnitureEntity*);
static void sub_08090B6C(FurnitureEntity*);
static void sub_08090E4C(FurnitureEntity*);
static void sub_08090CDC(u32, u32, u32);
void Furniture(FurnitureEntity* this) {
static FurnitureAction* const sFurnitureActions[] = {
FurnitureInit,
FurnitureUpdate,
};
sFurnitureActions[super->action](this);
}
static void FurnitureInit(FurnitureEntity* this) {
u32 i, tile, cnt;
Entity* e;
super->action = FURNITURE_UPDATE;
this->tile = COORD_TO_TILE(super);
sub_08090DC4(this);
switch (this->flags & 0x7fff) {
case 0x100:
super->collisionLayer = 2;
UpdateSpriteForCollisionLayer(super);
break;
case 0x20:
break;
case 0x40:
super->y.HALF.HI = (super->y.HALF.HI & ~0xF) | 4;
SetTile(0x4017, this->tile - 128, 1);
SetTile(0x4017, this->tile - 64, 1);
break;
case 0x80:
super->frameIndex = 0;
super->y.HALF.HI = (super->y.HALF.HI & ~0xF) | 6;
this->tile = COORD_TO_TILE(super);
SetTile(0x4026, this->tile, super->collisionLayer);
break;
case 0x200:
break;
case 0x400:
sub_08090E64(this);
if (super->type2 != 0) {
super->spriteOffsetX = 1;
this->width = 48;
}
default:
sub_08090B6C(this);
break;
}
if (this->height != 16) {
switch (this->height & 0x70) {
case 0x30:
this->tile -= 64;
sub_08090B6C(this);
this->tile = COORD_TO_TILE(super);
case 0x20:
this->tile += 64;
sub_08090B6C(this);
}
this->tile = COORD_TO_TILE(super);
}
switch (this->flags & 0x7fff) {
case 0x4:
ChangeObjPalette(super, 0x7E);
break;
case 0x2:
tile = this->tile - 129;
cnt = super->type != 26 ? 3 : 2;
for (i = 0; i < cnt; ++i, ++tile) {
SetTile(0x4026, tile, 2);
SetTile(0x4026, tile, 1);
sub_080001D0(0, tile + 64, 1);
}
break;
}
switch (super->type) {
case 1:
if (super->type2 != 0) {
super->spritePriority.b0 = 4;
}
break;
case 9:
e = CreateObject(FURNITURE, 62, 0);
if (e != NULL) {
PositionRelative(super, e, 0x100000, 0x100000);
e->frameIndex = 1;
e->updatePriority = 2;
}
break;
case 30:
sub_0807B7D8(774, this->tile + 65, 2);
break;
case 31:
super->collisionLayer = 1;
super->spriteOrientation.flipY = 2;
SetTile(0x4074, this->tile - 64, super->collisionLayer);
sub_080001D0(63, this->tile - 64, super->collisionLayer);
SetTile(0x4017, this->tile, super->collisionLayer);
SetTile(0x4017, this->tile + 64, super->collisionLayer);
break;
case 40:
if (super->type2 != 0)
super->spriteOffsetX = -4;
break;
case 59:
SetTile(0x4023, this->tile - 65, super->collisionLayer);
SetTile(0x4023, this->tile - 64, super->collisionLayer);
SetTile(0x4023, this->tile - 63, super->collisionLayer);
break;
case 60:
SetTile(0x4022, this->tile + 65, super->collisionLayer);
}
}
static void FurnitureUpdate(FurnitureEntity* this) {
switch (this->flags & 0x7FFF) {
case 0x1:
if (gPlayerEntity.y.HALF.HI < super->y.HALF.HI || gPlayerEntity.y.HALF.HI > super->y.HALF.HI + 24) {
super->spriteRendering.b3 = 2;
} else {
super->spriteRendering.b3 = 3;
}
break;
case 0x8:
if (++super->actionDelay == 16) {
super->actionDelay = 0;
super->field_0xf = (super->field_0xf + 1) & 3;
sub_08090E4C(this);
}
break;
case 0x10:
if (super->type != 62) {
if (++super->actionDelay == 20) {
super->frameIndex = (super->frameIndex + 1) & 3;
super->actionDelay = 0;
}
} else {
if (++super->actionDelay == 14) {
super->actionDelay = 0;
super->field_0xf = (super->field_0xf + 1) % 3;
super->frameIndex = super->field_0xf + 1;
}
}
break;
case 0x80:
if (gPlayerEntity.y.HALF.HI < super->y.HALF.HI + 8) {
if (gPlayerState.field_0x10[2] != 30 && GetTileTypeByEntity(super) == 0x4017) {
SetTile(0x4026, this->tile, super->collisionLayer);
SetTile(0x403D, this->tile - 64, super->collisionLayer);
SetTile(0x403D, this->tile - 128, super->collisionLayer);
}
} else {
if (gPlayerEntity.collisionLayer & 2) {
gPlayerEntity.collisionLayer = 1;
UpdateSpriteForCollisionLayer(&gPlayerEntity);
}
if (GetTileTypeByEntity(super) != 0x4017) {
SetTile(0x4017, this->tile, super->collisionLayer);
SetTile(0x4017, this->tile - 64, super->collisionLayer);
SetTile(0x4014, this->tile - 128, super->collisionLayer);
}
}
break;
}
}
static void sub_08090B6C(FurnitureEntity* this) {
s32 num;
u32 width = (u32)(this->width << 0x18) >> 0x18;
if (width != 0) {
u8 w2 = width / 8;
u32 px = super->x.HALF.HI & 0xF;
u32 tile = this->tile;
u32 cl = super->collisionLayer;
int i;
switch ((u32)w2 & 3) {
case 0:
num = w2 / 8;
if (w2 == 0xc) {
num = 2;
}
for (i = -num; i <= num; ++i) {
SetTile(0x4022, tile + i, cl);
}
if (px & 8) {
sub_08090CDC(0x4024, tile - i, cl);
sub_08090CDC(0x4025, tile + i, cl);
} else {
SetTile(0x4022, tile - i, cl);
}
break;
case 1:
num = w2 / 8;
for (i = -num; i <= num; i++) {
SetTile(0x4022, tile + i, cl);
}
if (px & 8) {
sub_08090CDC(0x4024, tile - i, cl);
if (i != 0) {
SetTile(0x4022, tile + i, cl);
}
} else {
if (i != 0) {
SetTile(0x4022, tile - i, cl);
}
sub_08090CDC(0x4025, tile + i, cl);
}
break;
case 2:
num = w2 / 4;
for (i = -num; i < num; ++i) {
SetTile(0x4022, tile + i, cl);
}
if (px & 8) {
SetTile(0x4022, tile + i, cl);
} else {
sub_08090CDC(0x4024, tile - i - 1, cl);
sub_08090CDC(0x4025, tile + i, cl);
}
break;
case 3:
num = w2 / 4;
for (i = -num; i <= num; ++i) {
SetTile(0x4022, tile + i, cl);
}
if (px & 8) {
sub_08090CDC(0x4025, tile + i, cl);
} else {
sub_08090CDC(0x4024, tile - i, cl);
}
break;
}
}
}
static void sub_08090CDC(u32 id, u32 pos, u32 layer) {
u16 cur = sub_080001DA(pos, layer);
u32 next = cur;
u32 id2;
if ((cur & 0x4000) == 0) {
SetTile(id, pos, layer);
} else {
switch (cur) {
case 0x4025:
if (id == 0x4024)
next = 0x4022;
if (id == 0x402c)
next = 0x4022;
break;
case 0x402D:
if (id == 0x402c)
next = 0x402b;
if (id == 0x4024)
next = 0x4022;
break;
case 0x4024:
if (id == 0x4025)
next = 0x4022;
if (id == 0x402d)
next = 0x4022;
break;
case 0x402C:
if (id == 0x402d)
next = 0x402b;
if (id == 0x4025)
next = 0x4022;
break;
case 0x4022:
case 0x4023:
case 0x4026:
case 0x4027:
case 0x4028:
case 0x4029:
case 0x402a:
case 0x402b:
default:
return;
}
SetTile(next, pos, layer);
}
}
static void sub_08090DC4(FurnitureEntity* this) {
static const FurnitureCfg* const sCfgTable[] = {
gUnk_08122128, gUnk_08122198, gUnk_081221A8, gUnk_081221B8, gUnk_081221C8,
gUnk_081221D8, gUnk_081221E8, gUnk_081221F8, gUnk_08122208,
};
const FurnitureCfg* cfg = &gUnk_08121EF8[super->type];
if (cfg->flags & 0x8000) {
cfg = sCfgTable[cfg->y];
cfg += super->type2;
super->frameIndex = super->type2;
}
this->width = cfg->width;
this->height = cfg->height;
super->spriteOffsetX = cfg->x;
super->spriteOffsetY = cfg->y;
super->spriteRendering.b3 = cfg->rendering;
super->spritePriority.b0 = cfg->priority;
this->flags = cfg->flags;
}
static void sub_08090E4C(FurnitureEntity* this) {
static const u32 sPalettes[] = { 0x5f, 0x60, 0x61, 0x62 };
ChangeObjPalette(super, sPalettes[super->field_0xf]);
}
static NONMATCH("asm/non_matching/furniture/sub_08090E64.s", void sub_08090E64(FurnitureEntity* this)) {
Entity* e = CreateObject(OBJECT_42, 0, 0);
u32 tmp = 0x10000 - 2;
if (e != NULL) {
PositionRelative(super, e, (tmp + super->type2) * 0x10000, 0);
e->z.HALF.HI -= 16;
e->collisionLayer = 2;
UpdateSpriteForCollisionLayer(e);
}
}
END_NONMATCH