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 manager1F

This commit is contained in:
Tal Hayon 2022-04-18 23:21:43 +03:00
parent ea286b3285
commit 52be07a588
4 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -32723,11 +32723,6 @@
"start": 1084332, "start": 1084332,
"size": 124 "size": 124
}, },
{
"path": "manager1F/gUnk_08108C9C.bin",
"start": 1084572,
"size": 12
},
{ {
"path": "manager24/gUnk_08108CFC.bin", "path": "manager24/gUnk_08108CFC.bin",
"start": 1084668, "start": 1084668,

12
data/const/manager/manager1F.s
View File

@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108C94:: @ 08108C94
.4byte sub_0805B70C
.4byte sub_0805B744
gUnk_08108C9C:: @ 08108C9C
.incbin "manager1F/gUnk_08108C9C.bin"

2
linker.ld
View File

@ -1130,7 +1130,7 @@ SECTIONS {
src/manager/manager1C.o(.rodata); src/manager/manager1C.o(.rodata);
src/manager/manager1D.o(.rodata); src/manager/manager1D.o(.rodata);
src/manager/manager1E.o(.rodata); src/manager/manager1E.o(.rodata);
data/const/manager/manager1F.o(.rodata); src/manager/manager1F.o(.rodata);
src/manager/manager22.o(.rodata); src/manager/manager22.o(.rodata);
data/const/manager/manager23.o(.rodata); data/const/manager/manager23.o(.rodata);
data/const/manager/manager24.o(.rodata); data/const/manager/manager24.o(.rodata);

12
src/manager/manager1F.c
View File

@ -13,14 +13,17 @@ typedef struct {
u8 field_0x3d; u8 field_0x3d;
u16 field_0x3e; u16 field_0x3e;
} Manager1F; } Manager1F;
extern void (*const gUnk_08108C94[])(Manager1F*);
void sub_0805B778(Manager1F*); void sub_0805B778(Manager1F*);
void sub_0805B70C(Manager1F*);
extern u16 gUnk_08108C9C[]; void sub_0805B744(Manager1F*);
void Manager1F_Main(Manager1F* this) { void Manager1F_Main(Manager1F* this) {
gUnk_08108C94[this->manager.action](this); static void (*const actionFuncs[])(Manager1F*) = {
sub_0805B70C,
sub_0805B744,
};
actionFuncs[this->manager.action](this);
} }
void sub_0805B70C(Manager1F* this) { void sub_0805B70C(Manager1F* this) {
@ -47,5 +50,6 @@ void sub_0805B744(Manager1F* this) {
} }
void sub_0805B778(Manager1F* this) { void sub_0805B778(Manager1F* this) {
static const u16 gUnk_08108C9C[] = { 0x358, 0x359, 0x356, 0x35a, 0x35a, 0x357 };
SetTileType(gUnk_08108C9C[this->manager.unk_0a * 2 + this->manager.unk_0b], this->field_0x38, this->field_0x36); SetTileType(gUnk_08108C9C[this->manager.unk_0a * 2 + this->manager.unk_0b], this->field_0x38, this->field_0x36);
} }