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 manager1B

This commit is contained in:
Tal Hayon 2022-04-18 23:08:52 +03:00
parent 46b82dce97
commit 1bb08eca42
4 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
assets/assets.json
View File

@ -32723,21 +32723,6 @@
"start": 1084332, "start": 1084332,
"size": 124 "size": 124
}, },
{
"path": "manager1B/gUnk_08108C28.bin",
"start": 1084456,
"size": 28
},
{
"path": "manager1B/gUnk_08108C44.bin",
"start": 1084484,
"size": 16
},
{
"path": "manager1B/gUnk_08108C5C.bin",
"start": 1084508,
"size": 8
},
{ {
"path": "manager1C/gUnk_08108C6C.bin", "path": "manager1C/gUnk_08108C6C.bin",
"start": 1084524, "start": 1084524,

18
data/const/manager/manager1B.s
View File

@ -1,18 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108C28:: @ 08108C28
.incbin "manager1B/gUnk_08108C28.bin"
gUnk_08108C44:: @ 08108C44
.incbin "manager1B/gUnk_08108C44.bin"
gUnk_08108C54:: @ 08108C54
.4byte sub_0805B448
.4byte sub_0805B474
gUnk_08108C5C:: @ 08108C5C
.incbin "manager1B/gUnk_08108C5C.bin"

2
linker.ld
View File

@ -1126,7 +1126,7 @@ SECTIONS {
src/manager/manager17.o(.rodata); src/manager/manager17.o(.rodata);
src/manager/manager18.o(.rodata); src/manager/manager18.o(.rodata);
data/const/manager/manager1A.o(.rodata); data/const/manager/manager1A.o(.rodata);
data/const/manager/manager1B.o(.rodata); src/manager/manager1B.o(.rodata);
data/const/manager/manager1C.o(.rodata); data/const/manager/manager1C.o(.rodata);
data/const/manager/manager1D.o(.rodata); data/const/manager/manager1D.o(.rodata);
src/manager/manager1E.o(.rodata); src/manager/manager1E.o(.rodata);

18
src/manager/manager1B.c
View File

@ -9,19 +9,24 @@ typedef struct {
u32 field_0x20; u32 field_0x20;
} Manager1B; } Manager1B;
extern u8 gUnk_08108C28[];
extern void (*const gUnk_08108C54[])(Manager1B*);
void sub_0805B4B4(Manager1B*); void sub_0805B4B4(Manager1B*);
void sub_0805B448(Manager1B*);
void sub_0805B474(Manager1B*);
void sub_0806D0F8(void); // in bigGoron? void sub_0806D0F8(void); // in bigGoron?
extern u8 gUnk_08108C5C[]; static const u8 gUnk_08108C28[] = { 0x14, 0x0, 0x0, 0x0, 0x15, 0x0, 0x0, 0x0, 0x14, 0x0, 0xd8, 0x0, 0x2f, 0x0,
extern u16 gUnk_08108C44[]; 0x70, 0x0, 0x4b, 0x0, 0x0, 0x0, 0x4e, 0x0, 0x0, 0x0, 0x4d, 0x1, 0x0, 0x0 };
static const u16 gUnk_08108C44[] = { 0, 0, -0x28, 0x70, 0, 0, 0, 0 };
void Manager1B_Main(Manager1B* this) { void Manager1B_Main(Manager1B* this) {
static void (*const gUnk_08108C54[])(Manager1B*) = {
sub_0805B448,
sub_0805B474,
};
s32 iVar3; s32 iVar3;
u8* tmp; const u8* tmp;
if (EntityHasDuplicateID((Entity*)this) != 0) { if (EntityHasDuplicateID((Entity*)this) != 0) {
DeleteThisEntity(); DeleteThisEntity();
@ -66,6 +71,7 @@ void sub_0805B4B4(Manager1B* this) {
} }
void sub_0805B4D0(u32 param_1) { void sub_0805B4D0(u32 param_1) {
static const u8 gUnk_08108C5C[] = { 0x14, 0x15, 0x14, 0x2f, 0x4b, 0x4e, 0x4d, 0 };
s32 iVar1; s32 iVar1;
u32 uVar2; u32 uVar2;