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

manager28.c: split out rodata and rename functions

This commit is contained in:
Ibot02 2021-01-18 16:39:53 +01:00
parent 0dab5bbc99
commit bbfd834855
5 changed files with 5594 additions and 5577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/non_matching/manager28/sub_0805C94C.inc → asm/non_matching/manager28/Manager28_Init.inc
View File

@ -16,7 +16,7 @@ _0805C962:
cmp r0, r1 cmp r0, r1
bge _0805C962 bge _0805C962
add r0, r4, #0 add r0, r4, #0
bl sub_0805CA6C bl Manager28_FindMatchingEntities
add r5, r0, #0 add r5, r0, #0
cmp r5, #0x1 cmp r5, #0x1
ble _0805C9A8 ble _0805C9A8

5556
data/data_08108C94.s
View File

File diff suppressed because it is too large Load Diff

5558
data/data_08108D30.s Normal file
View File

File diff suppressed because it is too large Load Diff

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/manager28.o(.rodata);
data/data_08108D30.o(.rodata);
src/item.o(.rodata); src/item.o(.rodata);
data/data_0811BD44.o(.rodata); data/data_0811BD44.o(.rodata);
data/room_headers.o(.rodata); data/room_headers.o(.rodata);

53
src/manager/manager28.c
View File

@ -9,33 +9,46 @@ typedef struct {
Entity* unk_20[8]; Entity* unk_20[8];
} Manager28; } Manager28;
extern void (* const gUnk_08108D28[])(Manager28*); void Manager28_Main(Manager28*);
void Manager28_Init(Manager28*);
void sub_0805C934(Manager28*);
void sub_0805C94C(Manager28*);
void sub_0805C9BC(Manager28*); void sub_0805C9BC(Manager28*);
u32 sub_0805CA6C(Manager28*); u32 Manager28_FindMatchingEntities(Manager28*);
Entity* sub_0805CAF0(EntityData*); Entity* Manager28_FindMatchingEntity(EntityData*);
void sub_0805CB48(Manager28*); void Manager28_RemoveDeletedEntities(Manager28*);
void sub_0805C934(Manager28* this) { void (* const gUnk_08108D28[])(Manager28*) = {
Manager28_Init,
Manager28_Main
};
enum Manager28_Action {
Init = 0,
Main = 1
};
enum Manager28_InitState {
DoInit = 0,
DoNotInit = 1
};
void Manager28_Entry(Manager28* this) {
gUnk_08108D28[this->manager.action](this); gUnk_08108D28[this->manager.action](this);
} }
NONMATCH("asm/non_matching/manager28/sub_0805C94C.inc", void sub_0805C94C(Manager28* this)) { NONMATCH("asm/non_matching/manager28/Manager28_Init.inc", void Manager28_Init(Manager28* this)) {
if (!this->manager.unk_0a) { if (this->manager.unk_0a == DoInit) {
s32 tmp2; s32 tmp2;
int tmp4; int tmp4;
for (tmp4 = 0; tmp4 < 8; tmp4++) { for (tmp4 = 0; tmp4 < 8; tmp4++) {
this->unk_20[tmp4] = 0; this->unk_20[tmp4] = 0;
} }
tmp2 = sub_0805CA6C(this);//maybe 2 params? tmp2 = Manager28_FindMatchingEntities(this);
if (tmp2 > 1) { if (tmp2 > 1) {
Manager28* tmp3 = (Manager28*) GetEmptyManager(); Manager28* tmp3 = (Manager28*) GetEmptyManager();
if (tmp3) { if (tmp3) {
tmp3->manager.type = 9; tmp3->manager.type = 9;
tmp3->manager.subtype = 0x28; tmp3->manager.subtype = 0x28;
tmp3->manager.unk_0a = 1; tmp3->manager.unk_0a = DoNotInit;
tmp3->manager.unk_0e = tmp2; tmp3->manager.unk_0e = tmp2;
for (tmp4 = 0; tmp4 < 8; tmp4++) { for (tmp4 = 0; tmp4 < 8; tmp4++) {
tmp3->unk_20[tmp4] = this->unk_20[tmp4]; tmp3->unk_20[tmp4] = this->unk_20[tmp4];
@ -45,18 +58,18 @@ NONMATCH("asm/non_matching/manager28/sub_0805C94C.inc", void sub_0805C94C(Manage
} }
DeleteManager(&this->manager); DeleteManager(&this->manager);
} else { } else {
this->manager.action = 1; this->manager.action = Main;
this->manager.unk_0f = 0; this->manager.unk_0f = 0;
} }
} }
END_NONMATCH END_NONMATCH
void sub_0805C9BC(Manager28* this) { void Manager28_Main(Manager28* this) {
s32 n; s32 n;
s32 i; s32 i;
s32 j; s32 j;
Entity* tmp; Entity* tmp;
sub_0805CB48(this); Manager28_RemoveDeletedEntities(this);
n = this->manager.unk_0e - 1; n = this->manager.unk_0e - 1;
if ((this->manager.unk_0f++) & 1) { if ((this->manager.unk_0f++) & 1) {
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -75,7 +88,7 @@ void sub_0805C9BC(Manager28* this) {
} }
} }
u32 sub_0805CA6C(Manager28* this) { u32 Manager28_FindMatchingEntities(Manager28* this) {
u32 re = 0; u32 re = 0;
EntityData * tmp = GetCurrentRoomProperty(this->manager.unk_0b); EntityData * tmp = GetCurrentRoomProperty(this->manager.unk_0b);
if (!tmp) return 0; if (!tmp) return 0;
@ -83,7 +96,7 @@ u32 sub_0805CA6C(Manager28* this) {
Entity* tmp2; Entity* tmp2;
u32 i; u32 i;
if (tmp->type != 3) continue; if (tmp->type != 3) continue;
tmp2 = sub_0805CAF0(tmp); tmp2 = Manager28_FindMatchingEntity(tmp);
if (!tmp2) continue; if (!tmp2) continue;
for (i = 0; i < re; i++) { for (i = 0; i < re; i++) {
if (this->unk_20[i] == tmp2) break; if (this->unk_20[i] == tmp2) break;
@ -95,7 +108,7 @@ u32 sub_0805CA6C(Manager28* this) {
return re; return re;
} }
Entity* sub_0805CAF0(EntityData* unk1) { Entity* Manager28_FindMatchingEntity(EntityData* unk1) {
u32 x, y; u32 x, y;
Entity* i; Entity* i;
LinkedList* tmp; LinkedList* tmp;
@ -114,12 +127,12 @@ Entity* sub_0805CAF0(EntityData* unk1) {
return 0; return 0;
} }
void sub_0805CB48(Manager28* this) { void Manager28_RemoveDeletedEntities(Manager28* this) {
s32 i; s32 i;
for (i = 0; i < this->manager.unk_0e; i++) { for (i = 0; i < this->manager.unk_0e; i++) {
if (this->unk_20[i]->next == 0) { if (this->unk_20[i]->next == 0) {
if (this->manager.unk_0e-1 == i) { if (this->manager.unk_0e-1 == i) {
this->unk_20[i] = this->unk_20[i]->next; this->unk_20[i] = 0;
} else { } else {
this->unk_20[i] = this->unk_20[this->manager.unk_0e-1]; this->unk_20[i] = this->unk_20[this->manager.unk_0e-1];
} }