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

Rename main manager functions

This commit is contained in:
octorock 2021-05-03 00:18:28 +02:00
parent fa92a42dd1
commit 256bd1a8b9
58 changed files with 210 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/manager10.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_08059570
sub_08059570: @ 0x08059570
thumb_func_start Manager10_Main
Manager10_Main: @ 0x08059570
push {r4, r5, r6, lr}
adds r4, r0, #0
ldrb r5, [r4, #0xc]

4
asm/manager12.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_080599EC
sub_080599EC: @ 0x080599EC
thumb_func_start Manager12_Main
Manager12_Main: @ 0x080599EC
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]

4
asm/manager13.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_08059DAC
sub_08059DAC: @ 0x08059DAC
thumb_func_start Manager13_Main
Manager13_Main: @ 0x08059DAC
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}

4
asm/manager14.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_08059E58
sub_08059E58: @ 0x08059E58
thumb_func_start Manager14_Main
Manager14_Main: @ 0x08059E58
push {r4, lr}
adds r4, r0, #0
ldrh r0, [r4, #0x20]

4
asm/manager16.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805AB4C
sub_0805AB4C: @ 0x0805AB4C
thumb_func_start Manager16_Main
Manager16_Main: @ 0x0805AB4C
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb

4
asm/manager17.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805AD48
sub_0805AD48: @ 0x0805AD48
thumb_func_start Manager17_Main
Manager17_Main: @ 0x0805AD48
push {lr}
ldr r2, _0805AD5C @ =gUnk_08108654
ldrb r1, [r0, #0xc]

6
asm/manager18.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805ADD8
sub_0805ADD8: @ 0x0805ADD8
thumb_func_start Manager18_Main
Manager18_Main: @ 0x0805ADD8
push {r4, lr}
adds r4, r0, #0
cmp r4, #0
@ -166,7 +166,7 @@ _0805AF06:
cmp r3, #0
beq _0805AF28
adds r0, r3, #0
bl sub_0805ADD8
bl Manager18_Main
_0805AF28:
pop {r4, pc}
.align 2, 0

4
asm/manager19.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805AF60
sub_0805AF60: @ 0x0805AF60
thumb_func_start Manager19_Main
Manager19_Main: @ 0x0805AF60
push {r4, lr}
adds r4, r0, #0
cmp r4, #0

6
asm/manager1B.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805B3B4
sub_0805B3B4: @ 0x0805B3B4
thumb_func_start Manager1B_Main
Manager1B_Main: @ 0x0805B3B4
push {r4, r5, lr}
adds r4, r0, #0
bl EntityHasDuplicateID
@ -147,7 +147,7 @@ sub_0805B4B4: @ 0x0805B4B4
bl sub_0806D0F8
_0805B4C8:
adds r0, r4, #0
bl sub_0805B3B4
bl Manager1B_Main
pop {r4, pc}
thumb_func_start sub_0805B4D0

4
asm/manager1C.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805B53C
sub_0805B53C: @ 0x0805B53C
thumb_func_start Manager1C_Main
Manager1C_Main: @ 0x0805B53C
push {lr}
ldr r2, _0805B550 @ =gUnk_08108C64
ldrb r1, [r0, #0xc]

4
asm/manager1D.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805B5C8
sub_0805B5C8: @ 0x0805B5C8
thumb_func_start Manager1D_Main
Manager1D_Main: @ 0x0805B5C8
push {lr}
ldr r2, _0805B5DC @ =gUnk_08108C80
ldrb r1, [r0, #0xc]

4
asm/manager1F.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805B6F4
sub_0805B6F4: @ 0x0805B6F4
thumb_func_start Manager1F_Main
Manager1F_Main: @ 0x0805B6F4
push {lr}
ldr r2, _0805B708 @ =gUnk_08108C94
ldrb r1, [r0, #0xc]

4
asm/manager21.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805B820
sub_0805B820: @ 0x0805B820
thumb_func_start Manager21_Main
Manager21_Main: @ 0x0805B820
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}

6
asm/manager22.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805B8EC
sub_0805B8EC: @ 0x0805B8EC
thumb_func_start Manager22_Main
Manager22_Main: @ 0x0805B8EC
push {r4, r5, r6, lr}
adds r5, r0, #0
ldr r4, _0805B964 @ =gArea
@ -345,7 +345,7 @@ _0805BB82:
bl DeepFindEntityByID
cmp r0, #0
beq _0805BBAE
bl sub_0805B8EC
bl Manager22_Main
ldr r0, _0805BBB8 @ =gScreen
ldrh r1, [r0]
movs r3, #0x80

4
asm/manager23.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805BC74
sub_0805BC74: @ 0x0805BC74
thumb_func_start Manager23_Main
Manager23_Main: @ 0x0805BC74
push {lr}
ldr r2, _0805BC88 @ =gUnk_08108CCC
ldrb r1, [r0, #0xa]

4
asm/manager24.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805BF18
sub_0805BF18: @ 0x0805BF18
thumb_func_start Manager24_Main
Manager24_Main: @ 0x0805BF18
push {lr}
ldr r2, _0805BF2C @ =gUnk_08108CDC
ldrb r1, [r0, #0xc]

4
asm/manager25.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805C61C
sub_0805C61C: @ 0x0805C61C
thumb_func_start Manager25_Main
Manager25_Main: @ 0x0805C61C
push {r4, r5, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]

4
asm/manager29.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805CB90
sub_0805CB90: @ 0x0805CB90
thumb_func_start Manager29_Main
Manager29_Main: @ 0x0805CB90
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xc]

4
asm/manager2A.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805CFC0
sub_0805CFC0: @ 0x0805CFC0
thumb_func_start Manager2A_Main
Manager2A_Main: @ 0x0805CFC0
push {r4, lr}
adds r1, r0, #0
ldrb r0, [r1, #0xc]

4
asm/manager2B.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805D014
sub_0805D014: @ 0x0805D014
thumb_func_start Manager2B_Main
Manager2B_Main: @ 0x0805D014
push {lr}
ldr r2, _0805D028 @ =gUnk_08108D30
ldrb r1, [r0, #0xc]

4
asm/manager2C.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805D174
sub_0805D174: @ 0x0805D174
thumb_func_start Manager2C_Main
Manager2C_Main: @ 0x0805D174
push {r4, r5, lr}
adds r5, r0, #0
ldrb r1, [r5, #0xc]

4
asm/manager2D.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805D1FC
sub_0805D1FC: @ 0x0805D1FC
thumb_func_start Manager2D_Main
Manager2D_Main: @ 0x0805D1FC
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, _0805D240 @ =0x00004014

4
asm/manager2F.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805D3C8
sub_0805D3C8: @ 0x0805D3C8
thumb_func_start Manager2F_Main
Manager2F_Main: @ 0x0805D3C8
push {r4, lr}
adds r4, r0, #0
cmp r4, #0

4
asm/manager31.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805D630
sub_0805D630: @ 0x0805D630
thumb_func_start Manager31_Main
Manager31_Main: @ 0x0805D630
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8

4
asm/manager32.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805D7A4
sub_0805D7A4: @ 0x0805D7A4
thumb_func_start Manager32_Main
Manager32_Main: @ 0x0805D7A4
push {r4, lr}
adds r4, r0, #0
ldr r1, _0805D7D4 @ =gUnk_08108D7C

4
asm/manager33.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805DAE8
sub_0805DAE8: @ 0x0805DAE8
thumb_func_start Manager33_Main
Manager33_Main: @ 0x0805DAE8
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}

4
asm/manager34.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805DB94
sub_0805DB94: @ 0x0805DB94
thumb_func_start Manager34_Main
Manager34_Main: @ 0x0805DB94
push {r4, lr}
adds r4, r0, #0
ldr r1, _0805DBB0 @ =gUnk_08108D8C

4
asm/manager35.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805DC84
sub_0805DC84: @ 0x0805DC84
thumb_func_start Manager35_Main
Manager35_Main: @ 0x0805DC84
push {lr}
ldr r2, _0805DC98 @ =gUnk_08108D98
ldrb r1, [r0, #0xc]

4
asm/manager36.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805DDB4
sub_0805DDB4: @ 0x0805DDB4
thumb_func_start Manager36_Main
Manager36_Main: @ 0x0805DDB4
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0xa]

4
asm/manager37.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805DE38
sub_0805DE38: @ 0x0805DE38
thumb_func_start Manager37_Main
Manager37_Main: @ 0x0805DE38
push {lr}
ldr r2, _0805DE4C @ =gUnk_08108DBC
ldrb r1, [r0, #0xa]

4
asm/manager38.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_0805E0A8
sub_0805E0A8: @ 0x0805E0A8
thumb_func_start Manager38_Main
Manager38_Main: @ 0x0805E0A8
push {lr}
ldr r2, _0805E0BC @ =gUnk_08108DE0
ldrb r1, [r0, #0xc]

4
asm/managerD.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_08058DD0
sub_08058DD0: @ 0x08058DD0
thumb_func_start ManagerD_Main
ManagerD_Main: @ 0x08058DD0
push {lr}
ldr r2, _08058DE4 @ =gUnk_08108308
ldrb r1, [r0, #0xc]

6
asm/managerF.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_08058ECC
sub_08058ECC: @ 0x08058ECC
thumb_func_start ManagerF_Main
ManagerF_Main: @ 0x08058ECC
push {lr}
ldr r2, _08058EE0 @ =gUnk_08108314
ldrb r1, [r0, #0xa]
@ -495,7 +495,7 @@ sub_08059278: @ 0x08059278
bl FindEntityByID
cmp r0, #0
beq _0805928C
bl sub_08058ECC
bl ManagerF_Main
_0805928C:
pop {pc}
.align 2, 0

110
include/manager.h
View File

@ -140,63 +140,63 @@ typedef struct {
u16 unk_06;
} UnkManager26HelperStruct;
extern void Manager1();
extern void Manager2();
extern void sub_080576C0();
extern void sub_08057854();
extern void sub_08057AD0();
extern void sub_08057CB4();
extern void Manager1_Main();
extern void Manager2_Main();
extern void Manager3_Main();
extern void Manager4_Main();
extern void Manager5_Main();
extern void Manager6_Main();
extern void Manager7_Main();
extern void sub_08057ED0();
extern void sub_080581D8();
extern void sub_08058380();
extern void sub_080585F0();
extern void sub_0805884C();
extern void sub_08058DD0(Entity*);
extern void sub_08058E60();
extern void sub_08058ECC(Entity*);
extern void sub_08059570(Entity*);
extern void sub_080599B8(Manager11*);
extern void sub_080599EC(Entity*);
extern void sub_08059DAC(Entity*);
extern void sub_08059E58(Entity*);
extern void sub_0805A280();
extern void sub_0805AB4C(Entity*);
extern void sub_0805AD48(Entity*);
extern void sub_0805ADD8();
extern void sub_0805AF60(Entity*);
extern void sub_0805B030();
extern void sub_0805B3B4(Entity*);
extern void sub_0805B53C(Entity*);
extern void sub_0805B5C8(Entity*);
extern void Manager1E_Handler();
extern void sub_0805B6F4(Entity*);
extern void sub_0805B7A0();
extern void sub_0805B820(Entity*);
extern void sub_0805B8EC(Entity*);
extern void sub_0805BC74(Entity*);
extern void sub_0805BF18(Entity*);
extern void sub_0805C61C(Entity*);
extern void sub_0805C6B8();
extern void Manager27();
extern void Manager28_Entry();
extern void sub_0805CB90(Entity*);
extern void sub_0805CFC0(Entity*);
extern void sub_0805D014(Entity*);
extern void sub_0805D174(Entity*);
extern void sub_0805D1FC(Entity*);
extern void sub_0805D250();
extern void sub_0805D3C8();
extern void Manager8_Main();
extern void Manager9_Main();
extern void ManagerA_Main();
extern void ManagerB_Main();
extern void ManagerC_Main();
extern void ManagerD_Main(Entity*);
extern void ManagerE_Main();
extern void ManagerF_Main(Entity*);
extern void Manager10_Main(Entity*);
extern void Manager11_Main(Manager11*);
extern void Manager12_Main(Entity*);
extern void Manager13_Main(Entity*);
extern void Manager14_Main(Entity*);
extern void Manager15_Main();
extern void Manager16_Main(Entity*);
extern void Manager17_Main(Entity*);
extern void Manager18_Main();
extern void Manager19_Main(Entity*);
extern void Manager1A_Main();
extern void Manager1B_Main(Entity*);
extern void Manager1C_Main(Entity*);
extern void Manager1D_Main(Entity*);
extern void Manager1E_Main();
extern void Manager1F_Main(Entity*);
extern void Manager20_Main();
extern void Manager21_Main(Entity*);
extern void Manager22_Main(Entity*);
extern void Manager23_Main(Entity*);
extern void Manager24_Main(Entity*);
extern void Manager25_Main(Entity*);
extern void Manager26_Main();
extern void Manager27_Main();
extern void Manager28_Main();
extern void Manager29_Main(Entity*);
extern void Manager2A_Main(Entity*);
extern void Manager2B_Main(Entity*);
extern void Manager2C_Main(Entity*);
extern void Manager2D_Main(Entity*);
extern void Manager2E_Main();
extern void Manager2F_Main();
extern void Manager30_Main();
extern void sub_0805D630(Entity*);
extern void sub_0805D7A4(Entity*);
extern void sub_0805DAE8(Entity*);
extern void sub_0805DB94(Entity*);
extern void sub_0805DC84(Entity*);
extern void sub_0805DDB4(Entity*);
extern void sub_0805DE38(Entity*);
extern void sub_0805E0A8(Entity*);
extern void sub_0805E0FC();
extern void Manager31_Main(Entity*);
extern void Manager32_Main(Entity*);
extern void Manager33_Main(Entity*);
extern void Manager34_Main(Entity*);
extern void Manager35_Main(Entity*);
extern void Manager36_Main(Entity*);
extern void Manager37_Main(Entity*);
extern void Manager38_Main(Entity*);
extern void Manager39_Main();
extern void (*const gManagerFunctions[58])();

18
src/manager.c
View File

@ -2,13 +2,13 @@
// TODO: change all manager arguments to be Entity* and cast to specific type later.
void (*const gManagerFunctions[])() = {
NULL, Manager1, Manager2, sub_080576C0, sub_08057854, sub_08057AD0, sub_08057CB4,
Manager7_Main, sub_08057ED0, sub_080581D8, sub_08058380, sub_080585F0, sub_0805884C, sub_08058DD0,
sub_08058E60, sub_08058ECC, sub_08059570, sub_080599B8, sub_080599EC, sub_08059DAC, sub_08059E58,
sub_0805A280, sub_0805AB4C, sub_0805AD48, sub_0805ADD8, sub_0805AF60, sub_0805B030, sub_0805B3B4,
sub_0805B53C, sub_0805B5C8, Manager1E_Handler, sub_0805B6F4, sub_0805B7A0, sub_0805B820, sub_0805B8EC,
sub_0805BC74, sub_0805BF18, sub_0805C61C, sub_0805C6B8, Manager27, Manager28_Entry, sub_0805CB90,
sub_0805CFC0, sub_0805D014, sub_0805D174, sub_0805D1FC, sub_0805D250, sub_0805D3C8, Manager30_Main,
sub_0805D630, sub_0805D7A4, sub_0805DAE8, sub_0805DB94, sub_0805DC84, sub_0805DDB4, sub_0805DE38,
sub_0805E0A8, sub_0805E0FC
NULL, Manager1_Main, Manager2_Main, Manager3_Main, Manager4_Main, Manager5_Main, Manager6_Main,
Manager7_Main, Manager8_Main, Manager9_Main, ManagerA_Main, ManagerB_Main, ManagerC_Main, ManagerD_Main,
ManagerE_Main, ManagerF_Main, Manager10_Main, Manager11_Main, Manager12_Main, Manager13_Main, Manager14_Main,
Manager15_Main, Manager16_Main, Manager17_Main, Manager18_Main, Manager19_Main, Manager1A_Main, Manager1B_Main,
Manager1C_Main, Manager1D_Main, Manager1E_Main, Manager1F_Main, Manager20_Main, Manager21_Main, Manager22_Main,
Manager23_Main, Manager24_Main, Manager25_Main, Manager26_Main, Manager27_Main, Manager28_Main, Manager29_Main,
Manager2A_Main, Manager2B_Main, Manager2C_Main, Manager2D_Main, Manager2E_Main, Manager2F_Main, Manager30_Main,
Manager31_Main, Manager32_Main, Manager33_Main, Manager34_Main, Manager35_Main, Manager36_Main, Manager37_Main,
Manager38_Main, Manager39_Main
};

2
src/manager/manager1.c
View File

@ -12,7 +12,7 @@ extern void (*const gUnk_08107C48[])(Entity*);
extern u8 gUnk_08107C40[];
void Manager1(Entity* this) {
void Manager1_Main(Entity* this) {
u8 bVar1;
u8* pbVar2;

2
src/manager/manager11.c
View File

@ -2,7 +2,7 @@
#include "manager.h"
#include "flags.h"
void sub_080599B8(Manager11* this) {
void Manager11_Main(Manager11* this) {
if (!this->manager.action) {
this->manager.action = 1;
if (CheckFlags(this->unk_3c)) {

4
src/manager/manager15.c
View File

@ -28,7 +28,7 @@ typedef struct {
extern void (*const gUnk_081085D8[])(Manager*);
void sub_0805A280(Manager* this) {
void Manager15_Main(Manager* this) {
gUnk_081085D8[this->unk_0a](this);
}
@ -477,7 +477,7 @@ void sub_0805AA58(Manager15* this) {
void sub_0805AAC8(Manager15* this) {
sub_0805AAF0(this->unk_23);
sub_0805A280(&this->manager);
Manager15_Main(&this->manager);
}
extern u16 gUnk_08108648[];

2
src/manager/manager1A.c
View File

@ -27,7 +27,7 @@ extern void (*const gUnk_08108668[])(Manager1A*);
extern u8 gGlobalGfxAndPalettes[];
void sub_0805B030(Manager1A* this) {
void Manager1A_Main(Manager1A* this) {
gUnk_08108668[this->manager.action](this);
}

2
src/manager/manager1E.c
View File

@ -21,7 +21,7 @@ void Manager1E_ObserveRegion(Manager1E*);
void (*const Manager1E_ActionFuncs[2])(Manager1E*) = { Manager1E_Init, Manager1E_ObserveRegion };
void Manager1E_Handler(Manager1E* this) {
void Manager1E_Main(Manager1E* this) {
Manager1E_ActionFuncs[this->manager.action](this);
}

2
src/manager/manager2.c
View File

@ -6,7 +6,7 @@
extern void sub_080576A0();
extern void sub_0805754C(Entity*);
void Manager2(Entity* this) {
void Manager2_Main(Entity* this) {
if (this->action == 0) {
this->action = 1;
gScreen.affine.bg3Updated = 0;

2
src/manager/manager20.c
View File

@ -18,7 +18,7 @@ typedef struct {
u16 unk_3e;
} Manager20;
void sub_0805B7A0(Manager20* this) {
void Manager20_Main(Manager20* this) {
Entity* tmp = CreateObject(this->manager.unk_0e, this->manager.unk_0a, this->manager.unk_0b);
if (!tmp)
return;

2
src/manager/manager26.c
View File

@ -22,7 +22,7 @@ void (*const gUnk_08108D04[])(Manager26*) = { sub_0805C6D0, sub_0805C7A0, sub_08
void sub_0805C7CC(Manager26*);
void sub_0805C6B8(Manager26* this) {
void Manager26_Main(Manager26* this) {
gUnk_08108D04[this->manager.action](this);
}

2
src/manager/manager27.c
View File

@ -15,7 +15,7 @@ void (*const gUnk_08108D10[])(Entity*) = { sub_0805C874, sub_0805C894, sub_0805C
const u8 gUnk_08108D20[] = { 0x6F, 0x70, 0x71, 0x72, 0x71, 0x70 };
void Manager27(Entity* this) {
void Manager27_Main(Entity* this) {
gUnk_08108D10[this->action](this);
if (CheckLocalFlagByOffset(0x300, this->type + 0x67)) {

8
src/manager/manager28.c
View File

@ -12,18 +12,18 @@ typedef struct {
} Manager28;
void Manager28_Init(Manager28*);
void Manager28_Main(Manager28*);
void Manager28_Main2(Manager28*);
u32 Manager28_FindMatchingEntities(Manager28*);
Entity* Manager28_FindMatchingEntity(EntityData*);
void Manager28_RemoveDeletedEntities(Manager28*);
void (*const Manager28_ActionFuncs[])(Manager28*) = { Manager28_Init, Manager28_Main };
void (*const Manager28_ActionFuncs[])(Manager28*) = { Manager28_Init, Manager28_Main2 };
enum Manager28_Action { Init = 0, Main = 1 };
enum Manager28_InitState { DoInit = 0, DoNotInit = 1 };
void Manager28_Entry(Manager28* this) {
void Manager28_Main(Manager28* this) {
Manager28_ActionFuncs[this->manager.action](this);
}
@ -56,7 +56,7 @@ void Manager28_Init(Manager28* this) {
}
}
void Manager28_Main(Manager28* this) {
void Manager28_Main2(Manager28* this) {
s32 n;
s32 i;
s32 j;

2
src/manager/manager2E.c
View File

@ -4,7 +4,7 @@
extern void (*const gUnk_08108D3C[])(Entity*);
extern void (*const gUnk_08108D44[])(Entity*);
void sub_0805D250(Entity* this) {
void Manager2E_Main(Entity* this) {
gUnk_08108D3C[this->type](this);
}

2
src/manager/manager3.c
View File

@ -30,7 +30,7 @@ extern u32 sub_08057810(void);
extern u32 sub_080002C0(u16, u16, u8);
extern void sub_080577AC(u32, u32, u32);
void sub_080576C0(Manager3* this) {
void Manager3_Main(Manager3* this) {
s8 tmp;
if (this->manager.action == 0) {
this->manager.action = 1;

2
src/manager/manager39.c
View File

@ -35,7 +35,7 @@ void sub_0805E18C(Manager39*); // unused?
void sub_0805E1D8(Manager39*);
void sub_0805E1F8(u32, u32);
void sub_0805E0FC(Manager39* this) {
void Manager39_Main(Manager39* this) {
gUnk_08108E28[this->manager.action](this);
if ((gRoomControls.roomID != this->unk_20) || (gTextBox.doTextBox & 0x7F)) {
sub_0805E1D8(this);

2
src/manager/manager4.c
View File

@ -7,7 +7,7 @@
extern void (*gUnk_08107C70[])(Manager*);
void sub_08057854(Manager* this) {
void Manager4_Main(Manager* this) {
gUnk_08107C70[this->action](this);
}

2
src/manager/manager5.c
View File

@ -29,7 +29,7 @@ const u16 gUnk_08108034[] = { 0, 1, -1, 0, 0, -1, 1, 0 };
void (*const gUnk_08108044[])(Manager5*) = { sub_08057AE8, sub_08057BA4, sub_08057C28 };
void sub_08057AD0(Manager5* this) {
void Manager5_Main(Manager5* this) {
gUnk_08108044[this->manager.action](this);
}

2
src/manager/manager6.c
View File

@ -5,7 +5,7 @@
extern void DoExitTransition(void*);
void sub_08057CB4(Manager6* this) {
void Manager6_Main(Manager6* this) {
u32 tmp;
Manager6WarpData* i;
if (this->manager.action == 0) {

2
src/manager/manager8.c
View File

@ -19,7 +19,7 @@ void sub_08058084(u16*, u16*);
extern u16 gMapDataTopSpecial[];
void sub_08057ED0(Manager8* this) {
void Manager8_Main(Manager8* this) {
sub_08057F20(this);
if (!this->manager.action) {
this->manager.action = 1;

2
src/manager/manager9.c
View File

@ -20,7 +20,7 @@ extern u32 gUnk_02006F00[];
const u16 gUnk_081081EC[] = { 0x30, 0x30, 0x30, 0x38 };
void sub_080581D8(Manager9* this) {
void Manager9_Main(Manager9* this) {
sub_08058210(this);
if (!this->manager.action) {
this->manager.action = 1;

2
src/manager/managerA.c
View File

@ -14,7 +14,7 @@ void sub_080585B0(ManagerA*);
void (*const gUnk_081081F4[])(ManagerA*) = { sub_08058398, sub_080583EC, sub_08058408, sub_08058514, sub_080585B0 };
void sub_08058380(ManagerA* this) {
void ManagerA_Main(ManagerA* this) {
gUnk_081081F4[this->manager.action](this);
}

6
src/manager/managerB.c
View File

@ -18,7 +18,7 @@
void (*const ManagerB_ActionFuncs[])(Manager*);
void sub_080585F0(Manager* this) {
void ManagerB_Main(Manager* this) {
// make a distincion if this is a controller (volumeMasterTarget = 0) or a helper (volumeMasterTarget = 1)
ManagerB_ActionFuncs[this->unk_0a](this);
}
@ -27,7 +27,7 @@ enum ManagerB_State { Init, WaitForFlag, WaitForDone };
void (*const ManagerB_StateFuncs[])(ManagerB*);
void ManagerB_Main(ManagerB* this) {
void ManagerB_Main2(ManagerB* this) {
// make a distinction based on the state of this controller
ManagerB_StateFuncs[this->manager.action](this);
}
@ -192,6 +192,6 @@ void ReplaceMonitoredEntity(Entity* old, Entity* new) {
}
}
void (*const ManagerB_ActionFuncs[])(Manager*) = { (void (*)(Manager*))ManagerB_Main,
void (*const ManagerB_ActionFuncs[])(Manager*) = { (void (*)(Manager*))ManagerB_Main2,
(void (*)(Manager*))ManagerBHelper_Main };
void (*const ManagerB_StateFuncs[])(ManagerB*) = { ManagerB_Init, ManagerB_WaitForFlag, ManagerB_WaitForDone };

2
src/manager/managerC.c
View File

@ -60,7 +60,7 @@ void nullsub_108(ManagerC*);
void (*const gUnk_0810821C[])(ManagerC*) = { sub_08058894, sub_080588CC, nullsub_108 };
void sub_0805884C(ManagerC* this) {
void ManagerC_Main(ManagerC* this) {
u32 tmp;
gUnk_0810821C[this->manager.action](this);
sub_08058BC8(this);

2
src/manager/managerE.c
View File

@ -6,7 +6,7 @@
#include "audio.h"
#include "functions.h"
void sub_08058E60(ManagerE* this) {
void ManagerE_Main(ManagerE* this) {
if (!this->manager.action) {
this->manager.action = 1;
if (CheckFlags(this->unk_3e)) {

97
src/room.c
View File

@ -3161,7 +3161,7 @@ extern EntityData gUnk_080E72E4;
void sub_0804D384(void) {
sub_0805AF60(0);
Manager19_Main(0);
if (CheckGlobalFlag(LV5_CLEAR)) {
LoadRoomEntityList(&gUnk_080E7314);
}
@ -3184,7 +3184,7 @@ u32 sub_0804D3F8() {
}
void sub_0804D3FC() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D408() {
@ -3192,7 +3192,7 @@ u32 sub_0804D408() {
}
void sub_0804D40C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D418() {
@ -3200,7 +3200,7 @@ u32 sub_0804D418() {
}
void sub_0804D41C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D428() {
@ -3208,7 +3208,7 @@ u32 sub_0804D428() {
}
void sub_0804D42C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D438() {
@ -3216,7 +3216,7 @@ u32 sub_0804D438() {
}
void sub_0804D43C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D448() {
@ -3224,7 +3224,7 @@ u32 sub_0804D448() {
}
void sub_0804D44C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D458() {
@ -3232,7 +3232,7 @@ u32 sub_0804D458() {
}
void sub_0804D45C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D468() {
@ -3240,7 +3240,7 @@ u32 sub_0804D468() {
}
void sub_0804D46C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D478() {
@ -3248,7 +3248,7 @@ u32 sub_0804D478() {
}
void sub_0804D47C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D488() {
@ -3256,7 +3256,7 @@ u32 sub_0804D488() {
}
void sub_0804D48C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D498() {
@ -3264,7 +3264,7 @@ u32 sub_0804D498() {
}
void sub_0804D49C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D4A8() {
@ -3272,7 +3272,7 @@ u32 sub_0804D4A8() {
}
void sub_0804D4AC() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D4B8() {
@ -3280,7 +3280,7 @@ u32 sub_0804D4B8() {
}
void sub_0804D4BC() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D4C8() {
@ -3288,7 +3288,7 @@ u32 sub_0804D4C8() {
}
void sub_0804D4CC() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D4D8() {
@ -3296,7 +3296,7 @@ u32 sub_0804D4D8() {
}
void sub_0804D4DC() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D4E8() {
@ -3304,7 +3304,7 @@ u32 sub_0804D4E8() {
}
void sub_0804D4EC() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D4F8() {
@ -3312,7 +3312,7 @@ u32 sub_0804D4F8() {
}
void sub_0804D4FC() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D508() {
@ -3320,7 +3320,7 @@ u32 sub_0804D508() {
}
void sub_0804D50C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D518() {
@ -3328,7 +3328,7 @@ u32 sub_0804D518() {
}
void sub_0804D51C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D528() {
@ -3336,7 +3336,7 @@ u32 sub_0804D528() {
}
void sub_0804D52C() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D538() {
@ -3351,7 +3351,7 @@ u32 sub_0804D540() {
}
void sub_0804D544() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D550() {
@ -3359,7 +3359,7 @@ u32 sub_0804D550() {
}
void sub_0804D554() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D560() {
@ -3367,7 +3367,7 @@ u32 sub_0804D560() {
}
void sub_0804D564() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D570() {
@ -3375,7 +3375,7 @@ u32 sub_0804D570() {
}
void sub_0804D574() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D580() {
@ -3383,7 +3383,7 @@ u32 sub_0804D580() {
}
void sub_0804D584() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D590() {
@ -3433,7 +3433,7 @@ u32 sub_0804D5C0() {
}
void sub_0804D5C4() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D5D0() {
@ -3441,7 +3441,7 @@ u32 sub_0804D5D0() {
}
void sub_0804D5D4() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D5E0() {
@ -3449,7 +3449,7 @@ u32 sub_0804D5E0() {
}
void sub_0804D5E4() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D5F0() {
@ -3457,7 +3457,7 @@ u32 sub_0804D5F0() {
}
void sub_0804D5F4() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D600() {
@ -3507,7 +3507,7 @@ u32 sub_0804D630() {
}
void sub_0804D634() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D640() {
@ -3517,7 +3517,7 @@ u32 sub_0804D640() {
extern EntityData gUnk_080EA09C;
void sub_0804D644(void) {
sub_0805AF60(0);
Manager19_Main(0);
if (!CheckLocalFlag(0x70)) {
LoadRoomEntityList(&gUnk_080EA09C);
}
@ -3528,7 +3528,7 @@ u32 sub_0804D664() {
}
void sub_0804D668() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D674() {
@ -3536,7 +3536,7 @@ u32 sub_0804D674() {
}
void sub_0804D678() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D684() {
@ -3544,7 +3544,7 @@ u32 sub_0804D684() {
}
void sub_0804D688() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D694() {
@ -3552,7 +3552,7 @@ u32 sub_0804D694() {
}
void sub_0804D698() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D6A4() {
@ -3560,7 +3560,7 @@ u32 sub_0804D6A4() {
}
void sub_0804D6A8() {
sub_0805AF60(0);
Manager19_Main(0);
}
u32 sub_0804D6B4() {
@ -3591,7 +3591,7 @@ u32 sub_0804D6EC() {
}
void sub_0804D6F0(void) {
sub_0805D3C8(0);
Manager2F_Main(0);
if ((gScreenTransition.field_0x38 & 1) && gScreenTransition.field_0x39) {
if (gScreenTransition.field_0x3c == 1) {
@ -5612,7 +5612,7 @@ u32 sub_0804F22C() {
}
void sub_0804F230() {
sub_0805ADD8(0);
Manager18_Main(0);
}
u32 sub_0804F23C(void) {
@ -5632,7 +5632,7 @@ extern EntityData gUnk_080F70D8;
extern EntityData gUnk_080F7088;
void sub_0804F25C(void) {
sub_0805ADD8(0);
Manager18_Main(0);
#if defined(JP) || defined(EU)
if (!CheckLocalFlag(0x6b)) {
#else
@ -5663,7 +5663,7 @@ u32 sub_0804F2E8() {
}
void sub_0804F2EC() {
sub_0805ADD8(0);
Manager18_Main(0);
}
u32 sub_0804F2F8() {
@ -5671,7 +5671,7 @@ u32 sub_0804F2F8() {
}
void sub_0804F2FC() {
sub_0805ADD8(0);
Manager18_Main(0);
}
extern u32 gUnk_080F7680;
@ -5687,7 +5687,7 @@ extern EntityData gUnk_080F7500;
extern EntityData gUnk_080F7550;
void sub_0804F330(void) {
sub_0805ADD8(0);
Manager18_Main(0);
if (gSave.unk8 > 3) {
LoadRoomEntityList(&gUnk_080F7500);
}
@ -5712,7 +5712,7 @@ extern EntityData gUnk_080F78A0;
void sub_0804F3B0(void) {
sub_0805ADD8(0);
Manager18_Main(0);
if (CheckLocalFlagByOffset(0x200, 0x8f)) {
if (!CheckGlobalFlag(INLOCK)) {
LoadRoomEntityList(&gUnk_080F77C0);
@ -5761,7 +5761,7 @@ u32 Vars_HyruleField_OutsideCastle(void) {
}
void sub_0804F4E4() {
sub_0805ADD8(0);
Manager18_Main(0);
sub_0804F578();
}
@ -5950,7 +5950,7 @@ extern EntityData gUnk_080F806C;
void Load_HyruleField_OutsideCastleWest(void) {
sub_0805ADD8(0);
Manager18_Main(0);
if ((gSave.unk8 > 3) && CheckGlobalFlag(TINGLE_TALK1ST)) {
LoadRoomEntityList(&gUnk_080F806C);
}
@ -5963,8 +5963,7 @@ u32 Vars_HyruleField_TrilbyHighlands() {
extern EntityData gUnk_080F82E0;
void Load_HyruleField_TrilbyHighlands(void) {
sub_0805ADD8(0);
Manager18_Main(0);
#if defined(JP) || defined(EU)
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x9b)) {
#else
@ -5982,7 +5981,7 @@ extern EntityData gUnk_080F8430;
void sub_0804FA68(void) {
sub_0805ADD8(0);
Manager18_Main(0);
if (CheckKinstoneFused(0x21) && !CheckLocalFlagByOffset(0x200, 0x42)) {
LoadRoomEntityList(&gUnk_080F8430);
}