Merge branch 'master' into pot

This commit is contained in:
notyouraveragehooman
2020-08-09 16:24:35 -07:00
committed by GitHub
15 changed files with 1265 additions and 1464 deletions
+2 -2
View File
@@ -39,7 +39,7 @@ typedef struct Entity {
/*0x12*/ s16 spriteIndex;
/*0x14*/ u8 animationState;
/*0x15*/ u8 direction;
/*0x16*/ u8 possibleBool;
/*0x16*/ u8 field_0x16;
/*0x17*/ u8 field_0x17;
/*0x18*/ union {
/* */ u8 raw;
@@ -47,7 +47,7 @@ typedef struct Entity {
/* */ u8 draw : 2; // 1-2
/* */ u8 ss2 : 1; // 4
/* */ u8 ss3 : 1; // 8
/* */ u8 shadow : 2; //0x10
/* */ u8 shadow : 2; //0x10-0x20
/* */ u8 flipX : 1; //0x40
/* */ u8 flipY : 1; //0x80
/* */ } PACKED b;
+11
View File
@@ -232,4 +232,15 @@ extern void sub_0800417E(Entity*, u32);
extern void sub_080784C8();
extern void sub_08017640();
extern u32 sub_0808288C(Entity*, u32, u32, u32);
extern void sub_0806FDA0(Entity*);
extern void sub_080AE008(Entity*, u32, u32);
extern u32 sub_08016A30(Entity*);
extern u32 IsItemEquipped(u32);
extern void sub_08077728();
extern void sub_0807AEE4();
extern u32 sub_08078EFC();
extern void sub_0807921C();
extern void sub_0807A1B8();
extern void sub_08079938();
extern void sub_0807ACCC(Entity*);
#endif
+23
View File
@@ -3,6 +3,29 @@
#include "global.h"
typedef struct {
u8 unk_00[0x0a];
u8 unk_0a;
u8 unk_0b;
u8 unk_0c;
u8 unk_0d;
u8 unk_0e;
u8 unk_0f[0x11];
u16 unk_20;
u16 unk_22;
u16 unk_24;
u16 unk_26;
u8 unk_28[0x0D];
u8 unk_35;
u16 unk_36;
u8 unk_38;
u8 unk_39;
u8 unk_3a;
u8 unk_3b;
u16 unk_3c;
u16 unk_3e;
} Manager;
typedef struct {
u16 field_0x00;
u16 field_0x02;