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 manager13

This commit is contained in:
Tal Hayon 2022-04-18 16:36:32 +03:00
parent 0700c0e13f
commit 041635bf16
4 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/assets.json
View File

@ -32288,16 +32288,6 @@
"JP": -828
}
},
{
"path": "manager13/gUnk_081084C8.bin",
"start": 1082568,
"size": 104
},
{
"path": "manager13/gUnk_08108530.bin",
"start": 1082672,
"size": 88
},
{
"path": "manager15/gUnk_081085B8.bin",
"start": 1082808,

11
data/const/manager/manager13.s
View File

@ -1,11 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081084C8:: @ 081084C8
.incbin "manager13/gUnk_081084C8.bin"
gUnk_08108530:: @ 08108530
.incbin "manager13/gUnk_08108530.bin"

2
linker.ld
View File

@ -1120,7 +1120,7 @@ SECTIONS {
src/manager/managerF.o(.rodata);
src/manager/manager10.o(.rodata);
src/manager/manager12.o(.rodata);
data/const/manager/manager13.o(.rodata);
src/manager/manager13.o(.rodata);
src/manager/manager14.o(.rodata);
data/const/manager/manager15.o(.rodata);
data/const/manager/manager17.o(.rodata);

22
src/manager/manager13.c
View File

@ -17,9 +17,6 @@ typedef struct {
u8 _padding;
} SpawnData;
extern SpawnData gUnk_081084C8[];
extern SpawnData gUnk_08108530[];
extern u32 CheckRectOnScreen(u16, u16, u32, u32);
/*
@ -27,7 +24,24 @@ Keeps track in its bitfield of whether 0x10 x 0x10 rects at certain positions ar
Spawns OBJECT_1C objects that check this and unsets the value in the bitfield.
*/
void Manager13_Main(Manager13* this) {
SpawnData* spawnData;
static const SpawnData gUnk_081084C8[] = {
{ 0x48, 0x90, 0x0, 0x0, 0x2, 0x0 }, { 0x138, 0x30, 0x1, 0x1, 0x2, 0x0 },
{ 0x168, 0x90, 0x2, 0x2, 0x2, 0x0 }, { 0x2c8, 0x80, 0x3, 0x3, 0x2, 0x0 },
{ 0x388, 0x240, 0x4, 0x4, 0x2, 0x0 }, { 0x158, 0x1ed, 0x5, 0x5, 0x2, 0x0 },
{ 0x15a, 0x228, 0x6, 0x6, 0x2, 0x0 }, { 0x158, 0x26b, 0x7, 0x7, 0x2, 0x0 },
{ 0x198, 0x2b1, 0x8, 0x8, 0x2, 0x0 }, { 0x258, 0x2ac, 0x9, 0x9, 0x2, 0x0 },
{ 0x298, 0x21a, 0xa, 0xa, 0x2, 0x0 }, { 0x298, 0x1cb, 0xb, 0xb, 0x2, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }
};
static const SpawnData gUnk_08108530[] = {
{ 0x8, 0x30, 0x1, 0x1, 0x2, 0x0 }, { 0x38, 0x90, 0x2, 0x2, 0x2, 0x0 },
{ 0x198, 0x80, 0x3, 0x2, 0x2, 0x0 }, { 0x28, 0x1ed, 0x5, 0x5, 0x2, 0x0 },
{ 0x2a, 0x228, 0x6, 0x6, 0x2, 0x0 }, { 0x28, 0x26b, 0x7, 0x7, 0x2, 0x0 },
{ 0x68, 0x2b1, 0x8, 0x8, 0x2, 0x0 }, { 0x128, 0x2ac, 0x9, 0x9, 0x2, 0x0 },
{ 0x168, 0x21a, 0xa, 0xa, 0x2, 0x0 }, { 0x168, 0x1cb, 0xb, 0xb, 0x2, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }
};
const SpawnData* spawnData;
u32 type2;
if (this->manager.action == 0) {