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

Put const data in furniture

This commit is contained in:
Tal Hayon 2022-04-18 00:12:51 +03:00
parent 8dd7d84cef
commit cd4fdf40cb
5 changed files with 62 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
assets/assets.json
View File

@ -42652,56 +42652,6 @@
"size": 31,
"type": "animation"
},
{
"path": "furniture/gUnk_08122128.bin",
"start": 1188136,
"size": 112
},
{
"path": "furniture/gUnk_08122198.bin",
"start": 1188248,
"size": 16
},
{
"path": "furniture/gUnk_081221A8.bin",
"start": 1188264,
"size": 16
},
{
"path": "furniture/gUnk_081221B8.bin",
"start": 1188280,
"size": 16
},
{
"path": "furniture/gUnk_081221C8.bin",
"start": 1188296,
"size": 16
},
{
"path": "furniture/gUnk_081221D8.bin",
"start": 1188312,
"size": 16
},
{
"path": "furniture/gUnk_081221E8.bin",
"start": 1188328,
"size": 16
},
{
"path": "furniture/gUnk_081221F8.bin",
"start": 1188344,
"size": 16
},
{
"path": "furniture/gUnk_08122208.bin",
"start": 1188360,
"size": 16
},
{
"path": "furniture/gUnk_08121EF8.bin",
"start": 1187576,
"size": 560
},
{
"path": "animations/gSpriteAnimations_MinishSizedEntrance_0.bin",
"start": 1188452,

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

@ -1,32 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08122128:: @ 08122128
.incbin "furniture/gUnk_08122128.bin"
gUnk_08122198:: @ 08122198
.incbin "furniture/gUnk_08122198.bin"
gUnk_081221A8:: @ 081221A8
.incbin "furniture/gUnk_081221A8.bin"
gUnk_081221B8:: @ 081221B8
.incbin "furniture/gUnk_081221B8.bin"
gUnk_081221C8:: @ 081221C8
.incbin "furniture/gUnk_081221C8.bin"
gUnk_081221D8:: @ 081221D8
.incbin "furniture/gUnk_081221D8.bin"
gUnk_081221E8:: @ 081221E8
.incbin "furniture/gUnk_081221E8.bin"
gUnk_081221F8:: @ 081221F8
.incbin "furniture/gUnk_081221F8.bin"
gUnk_08122208:: @ 08122208
.incbin "furniture/gUnk_08122208.bin"

8
data/const/object/furniture.s
View File

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121EF8:: @ 08121EF8
.incbin "furniture/gUnk_08121EF8.bin"

2
linker.ld
View File

@ -1428,8 +1428,6 @@ SECTIONS {
src/object/backgroundCloud.o(.rodata);
src/object/object4B.o(.rodata);
src/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);

72
src/object/furniture.c
View File

@ -118,16 +118,68 @@ typedef struct {
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 const FurnitureCfg gUnk_08121EF8[] = {
{ 0x30, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x10, 0x10, 0x0, 0x0, 0x2, 0x5, 0x0 },
{ 0x40, 0x10, 0x0, 0x0, 0x2, 0x4, 0x1 }, { 0x18, 0x10, 0x0, 0x0, 0x2, 0x5, 0x0 },
{ 0x18, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x10, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x10, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x0, 0x0, 0x0, 0x0, 0x2, 0x7, 0x8000 },
{ 0x20, 0x10, 0x0, -0x4, 0x2, 0x4, 0x0 }, { 0x40, 0x10, 0x0, 0x0, 0x3, 0x7, 0x0 },
{ 0x30, 0x10, 0x0, 0x0, 0x2, 0x5, 0x2 }, { 0x0, 0x0, 0x0, 0x3, 0x3, 0x7, 0x8000 },
{ 0x10, 0x10, 0x0, 0x0, 0x2, 0x4, 0x8 }, { 0x10, 0x10, 0x0, 0x0, 0x2, 0x4, 0x8 },
{ 0x18, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x30, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x20, 0x10, 0x0, -0x4, 0x2, 0x4, 0x0 }, { 0x18, 0x10, 0x0, 0x4, 0x2, 0x4, 0x0 },
{ 0x10, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x20, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x0, 0x0, 0x0, 0x1, 0x2, 0x4, 0x8000 }, { 0x10, 0x30, 0x0, -0x8, 0x2, 0x4, 0x4 },
{ 0x40, 0x10, 0x0, -0x8, 0x2, 0x4, 0x4 }, { 0x60, 0x20, 0x0, 0x0, 0x3, 0x7, 0x10 },
{ 0x28, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x20, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x18, 0x10, 0x0, 0x0, 0x3, 0x7, 0x2 }, { 0x0, 0x0, 0x0, 0x2, 0x2, 0x4, 0x8000 },
{ 0x10, 0x10, 0x0, 0x0, 0x2, 0x3, 0x20 }, { 0x10, 0x10, 0x0, 0x0, 0x2, 0x4, 0x20 },
{ 0x30, 0x20, 0x0, 0x0, 0x3, 0x4, 0x0 }, { 0x20, 0x10, 0x0, 0x0, 0x3, 0x7, 0x20 },
{ 0x20, 0x10, 0x0, 0x0, 0x2, 0x4, 0x100 }, { 0x0, 0x0, 0x0, 0x4, 0x2, 0x4, 0x8000 },
{ 0x18, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x18, 0x10, 0x0, 0x0, 0x2, 0x5, 0x0 },
{ 0x18, 0x10, 0x0, 0x0, 0x2, 0x5, 0x0 }, { 0x0, 0x0, 0x0, 0x5, 0x2, 0x4, 0x8000 },
{ 0x20, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x30, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x50, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x20, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x0, 0x0, 0x0, 0x7, 0x2, 0x4, 0x8000 }, { 0x30, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x38, 0x20, 0x0, 0x0, 0x2, 0x4, 0x20 }, { 0x30, 0x20, 0x0, 0x0, 0x2, 0x5, 0x0 },
{ 0x28, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x10, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x0, 0x0, 0x0, 0x6, 0x2, 0x4, 0x8000 }, { 0x30, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x20, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x30, 0x30, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x20, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x30, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x28, 0x20, 0x0, 0x0, 0x2, 0x4, 0x400 }, { 0x20, 0x10, 0x0, 0x0, 0x2, 0x6, 0x200 },
{ 0x0, 0x0, 0x0, 0x0, 0x2, 0x4, 0x20 }, { 0x0, 0x0, 0x0, 0x0, 0x2, 0x4, 0x20 },
{ 0x30, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x30, 0x10, 0x0, 0x0, 0x2, 0x6, 0x0 },
{ 0x40, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x30, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x3, 0x6, 0x10 }, { 0x30, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x30, 0x10, 0x0, 0x0, 0x2, 0x5, 0x0 }, { 0x40, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x50, 0x10, 0x0, 0x0, 0x2, 0x5, 0x0 }, { 0x40, 0x10, 0x0, 0x0, 0x2, 0x5, 0x0 },
{ 0x30, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 }, { 0x0, 0x0, 0x0, 0x8, 0x2, 0x4, 0x8000 }
};
static const FurnitureCfg gUnk_08122128[] = {
{ 0x28, 0x10, 0x0, -0x8, 0x2, 0x7, 0x20 }, { 0x28, 0x10, 0x0, -0x8, 0x2, 0x7, 0x20 },
{ 0x28, 0x10, 0x0, -0x8, 0x2, 0x7, 0x20 }, { 0x28, 0x10, 0x0, -0x8, 0x2, 0x7, 0x20 },
{ 0x20, 0x20, 0x0, 0x0, 0x2, 0x7, 0x20 }, { 0x20, 0x20, 0x0, 0x0, 0x2, 0x7, 0x20 },
{ 0x20, 0x20, 0x0, 0x0, 0x2, 0x7, 0x20 }, { 0x20, 0x20, 0x0, 0x0, 0x2, 0x7, 0x20 },
{ 0x10, 0x10, 0x0, -0x4, 0x2, 0x7, 0x20 }, { 0x10, 0x10, 0x0, -0x4, 0x2, 0x7, 0x20 },
{ 0x10, 0x10, 0x0, 0x0, 0x2, 0x7, 0x20 }, { 0x10, 0x10, 0x0, 0x0, 0x2, 0x7, 0x20 },
{ 0x10, 0x10, 0x0, 0x0, 0x2, 0x7, 0x20 }, { 0x10, 0x10, 0x0, 0x0, 0x2, 0x7, 0x20 }
};
static const FurnitureCfg gUnk_08122198[] = { { 0x10, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x10, 0x10, 0x0, 0x0, 0x2, 0x4, 0x4 } };
static const FurnitureCfg gUnk_081221A8[] = { { 0x30, 0x20, 0x0, 0x8, 0x2, 0x4, 0x0 },
{ 0x10, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 } };
static const FurnitureCfg gUnk_081221B8[] = { { 0x20, 0x10, 0x0, 0x0, 0x3, 0x7, 0x40 },
{ 0x20, 0x10, 0x0, 0x2, 0x2, 0x4, 0x80 } };
static const FurnitureCfg gUnk_081221C8[] = { { 0x18, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x18, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 } };
static const FurnitureCfg gUnk_081221D8[] = { { 0x30, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x30, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 } };
static const FurnitureCfg gUnk_081221E8[] = { { 0x28, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x20, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 } };
static const FurnitureCfg gUnk_081221F8[] = { { 0x20, 0x10, -0x2, 0x8, 0x2, 0x4, 0x0 },
{ 0x20, 0x10, 0x0, 0x0, 0x2, 0x4, 0x0 } };
static const FurnitureCfg gUnk_08122208[] = { { 0x30, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 },
{ 0x30, 0x20, 0x0, 0x0, 0x2, 0x4, 0x0 } };
static void sub_08090DC4(FurnitureEntity*);
static void sub_08090E64(FurnitureEntity*);