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

manager26 and manager27: split out rodata

This commit is contained in:
Ibot02 2021-01-21 20:24:49 +01:00
parent ba81e992a1
commit 44915bff1f
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/data_08108C94.s
View File

@ -24,15 +24,3 @@ gUnk_08108CE8:: @ 08108CE8
gUnk_08108CFC:: @ 08108CFC gUnk_08108CFC:: @ 08108CFC
.incbin "baserom.gba", 0x108CFC, 0x0000008 .incbin "baserom.gba", 0x108CFC, 0x0000008
gUnk_08108D04:: @ 08108D04
.incbin "baserom.gba", 0x108D04, 0x000000C
gUnk_08108D10:: @ 08108D10
.incbin "baserom.gba", 0x108D10, 0x000000C
gUnk_08108D1C:: @ 08108D1C
.incbin "baserom.gba", 0x108D1C, 0x0000004
gUnk_08108D20:: @ 08108D20
.incbin "baserom.gba", 0x108D20, 0x0000008

2
linker.ld
View File

@ -1009,6 +1009,8 @@ SECTIONS {
data/data_08108308.o(.rodata); data/data_08108308.o(.rodata);
src/manager/manager1E.o(.rodata); src/manager/manager1E.o(.rodata);
data/data_08108C94.o(.rodata); data/data_08108C94.o(.rodata);
src/manager/manager26.o(.rodata);
src/manager/manager27.o(.rodata);
src/manager/manager28.o(.rodata); src/manager/manager28.o(.rodata);
data/data_08108D30.o(.rodata); data/data_08108D30.o(.rodata);
src/item.o(.rodata); src/item.o(.rodata);

10
src/manager/manager26.c
View File

@ -22,9 +22,15 @@ typedef struct {
u16 unk_06; u16 unk_06;
} UnkManager26HelperStruct; } UnkManager26HelperStruct;
extern void (* const gUnk_08108D04[])(Manager26*); void sub_0805C6D0(Manager26*);
void sub_0805C7A0(Manager26*);
void sub_0805C7C4(Manager26*);
extern void * GetCurrentRoomProperty(u32); void (* const gUnk_08108D04[])(Manager26*) = {
sub_0805C6D0,
sub_0805C7A0,
sub_0805C7C4
};
void sub_0805C7CC(Manager26*); void sub_0805C7CC(Manager26*);

18
src/manager/manager27.c
View File

@ -5,9 +5,22 @@
extern u32 sub_0805C920(Entity*); extern u32 sub_0805C920(Entity*);
extern void LoadPaletteGroup(u32); extern void LoadPaletteGroup(u32);
extern void (*const gUnk_08108D10[])(Entity*);
extern u8 gUnk_08108D20[]; void sub_0805C874(Entity*);
void sub_0805C894(Entity*);
void sub_0805C8B4(Entity*);
void sub_0805C908(Entity*);
void (*const gUnk_08108D10[])(Entity*) = {
sub_0805C874,
sub_0805C894,
sub_0805C8B4,
sub_0805C908
};
const u8 gUnk_08108D20[] = {
0x6F, 0x70, 0x71, 0x72, 0x71, 0x70
};
void Manager27(Entity* this) { void Manager27(Entity* this) {
@ -33,7 +46,6 @@ void sub_0805C874(Entity* this) {
} }
void sub_0805C894(Entity* this) { void sub_0805C894(Entity* this) {
if (sub_0805C920(this)) { if (sub_0805C920(this)) {
this->action = 2; this->action = 2;
this->actionDelay = 1; this->actionDelay = 1;