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 manager32

This commit is contained in:
Tal Hayon 2022-04-18 23:35:29 +03:00
parent ddc0882309
commit 6bae4ae861
4 changed files with 13 additions and 23 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": "manager32/gUnk_08108D74.bin",
"start": 1084788,
"size": 8
},
{ {
"path": "manager36/gUnk_08108DA8.bin", "path": "manager36/gUnk_08108DA8.bin",
"start": 1084840, "start": 1084840,

14
data/const/manager/manager32.s
View File

@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08108D74:: @ 08108D74
.incbin "manager32/gUnk_08108D74.bin"
gUnk_08108D7C:: @ 08108D7C
.4byte sub_0805D7DC
.4byte sub_0805D860
.4byte sub_0805D900
.4byte sub_0805D98C

2
linker.ld
View File

@ -1140,7 +1140,7 @@ SECTIONS {
src/manager/manager2B.o(.rodata); src/manager/manager2B.o(.rodata);
src/manager/manager2E.o(.rodata); src/manager/manager2E.o(.rodata);
src/manager/manager31.o(.rodata); src/manager/manager31.o(.rodata);
data/const/manager/manager32.o(.rodata); src/manager/manager32.o(.rodata);
data/const/manager/manager34.o(.rodata); data/const/manager/manager34.o(.rodata);
data/const/manager/manager35.o(.rodata); data/const/manager/manager35.o(.rodata);
data/const/manager/manager36.o(.rodata); data/const/manager/manager36.o(.rodata);

15
src/manager/manager32.c
View File

@ -13,18 +13,27 @@ typedef struct {
u32 field_0x28; u32 field_0x28;
} Manager32; } Manager32;
extern void (*const gUnk_08108D7C[])(Manager32*);
void sub_0805D9D8(Manager32*); void sub_0805D9D8(Manager32*);
void sub_0805D98C(Manager32*);
void sub_0805D900(Manager32*);
void sub_0805D860(Manager32*);
void sub_0805D7DC(Manager32*);
void sub_0805DA08(u32, u32, u32); void sub_0805DA08(u32, u32, u32);
extern u8 gUnk_08108D74[]; static const u8 gUnk_08108D74[] = { 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x0 };
extern struct BgAffineDstData gUnk_02017AA0[]; extern struct BgAffineDstData gUnk_02017AA0[];
extern u8 gUnk_03003DE4[0xC]; extern u8 gUnk_03003DE4[0xC];
extern void sub_0805622C(struct BgAffineDstData*, u32, u32); extern void sub_0805622C(struct BgAffineDstData*, u32, u32);
void Manager32_Main(Manager32* this) { void Manager32_Main(Manager32* this) {
gUnk_08108D7C[this->manager.action](this); static void (*const actionFuncs[])(Manager32*) = {
sub_0805D7DC,
sub_0805D860,
sub_0805D900,
sub_0805D98C,
};
actionFuncs[this->manager.action](this);
this->field_0x24 = gRoomTransition.frameCount << 4; this->field_0x24 = gRoomTransition.frameCount << 4;
sub_0805D9D8(this); sub_0805D9D8(this);
sub_0805DA08(this->field_0x20, this->field_0x28, this->field_0x24); sub_0805DA08(this->field_0x20, this->field_0x28, this->field_0x24);