Unsplit managerF to avoid conflicts with the pr of Ibot02

This commit is contained in:
octorock
2021-09-26 14:57:42 +02:00
parent 9283aa5afe
commit c603199e0a
17 changed files with 475 additions and 55 deletions
+5 -2
View File
@@ -9,7 +9,9 @@ typedef struct {
u8 unk;
u8 regret;
u16 localFlagOffset;
u8 filler[10];
u8 filler[4];
u16 unk_0a;
u8 filler3[4];
u16 field_0x10;
u16 curPortalX;
u16 curPortalY;
@@ -20,7 +22,8 @@ typedef struct {
bool8 playShrinkSeq;
u8 unk1A;
u8 filler2[13];
u8 filler4[0x835];
u8 field_0x28;
u8 filler4[0x834];
u32 musicIndex;
u32 pMusicIndex;
u8 filler5[0x20];
+8
View File
@@ -281,4 +281,12 @@ extern bool32 sub_08077EFC(ItemBehavior*);
extern void sub_08078E84(Entity*, Entity*);
extern void sub_080042D0(Entity*, u32, u16);
extern u32 sub_080002A8(u32, u32, u32);
extern void CreateDustAt(u32, u32, u32);
extern void sub_080806BC(u32, u32, u32, u32);
extern void sub_080186C0(u32);
extern void sub_0801855C(void);
#endif
+10 -1
View File
@@ -103,6 +103,15 @@ typedef struct {
u16 unk_3e;
} ManagerE;
typedef struct {
Manager manager;
u8 unk_20[0x18];
s16 unk_38;
s16 unk_3a;
u16 unk_3c;
u16 unk_3e;
} ManagerF;
typedef struct Manager11 {
Manager manager;
u8 unk_20[0x1C];
@@ -154,7 +163,7 @@ extern void ManagerB_Main();
extern void ManagerC_Main();
extern void ManagerD_Main();
extern void ManagerE_Main();
extern void ManagerF_Main();
extern void sub_08058ECC(ManagerF*);
extern void Manager10_Main();
extern void Manager11_Main(Manager11*);
extern void Manager12_Main();
+6 -2
View File
@@ -23,7 +23,8 @@ typedef struct {
/*0x0C*/ s16 roomScrollY;
/*0x0E*/ u8 unk5;
/*0x0F*/ u8 unk6;
/*0x10*/ u8 filler[4];
/*0x10*/ u8 unk_10;
/*0x11*/ u8 filler[3];
/*0x14*/ u8 screenShakeMagnitude;
/*0x15*/ u8 unk7;
/*0x16*/ u16 screenShakeTime;
@@ -37,7 +38,10 @@ typedef struct {
} RoomControls;
typedef struct {
u8 filler[4];
u8 field_0x0;
u8 filler_0x1;
u8 field_0x2;
u8 field_0x3;
u8 field_0x4;
u8 filler1[1];
u8 itemForSaleIndex;