framestate, ezlo hint

This commit is contained in:
theo3
2021-12-20 23:11:22 -08:00
parent 40b2a30c1c
commit cb95bdb96a
31 changed files with 326 additions and 271 deletions
+1 -1
View File
@@ -38,7 +38,7 @@ typedef struct {
bool8 playShrinkSeq;
u8 unk1A;
u8 filler2[13];
u8 field_0x28;
u8 inventoryGfxIdx;
u8 filler4[0x13];
RoomResInfo roomResInfos[MAX_ROOMS];
RoomResInfo currentRoomInfo;
+2 -2
View File
@@ -648,8 +648,8 @@ typedef enum {
BILL_02_CAP_0,
MHOUSE_07_CAP_0,
MHOUSE_07_CAP_1,
MHOUSE_10_CAP_0,
MHOUSE_15_CAP_0,
MHOUSE_10_CAP_0, // links house entrance
MHOUSE_15_CAP_0, // links bedroom
MHOUSE_15_CAP_1,
SHOP_03_CAP_0,
MHOUSE_07_CAP_2,
+1 -1
View File
@@ -188,7 +188,7 @@ extern void sub_0801DFB4(Entity*, u32, u32, u32);
extern void sub_0801E00C();
extern void sub_08078790(Entity*, u32);
extern void sub_080788E0(Entity*);
extern void sub_08078AA8(u32, u32);
extern void CreateEzloHint(u32, u32);
extern void sub_08078B48(void);
extern void sub_0807919C();
extern void sub_0807CAA0(u32, u32);
+13 -13
View File
@@ -63,19 +63,19 @@ typedef struct {
typedef struct {
Manager manager;
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;
u16 x;
u16 y;
u16 rx;
u16 ry;
u8 unk_28[13];
u8 msg_height;
u16 msg_idx;
u8 x_raw;
u8 y_raw;
u8 rx_raw;
u8 ry_raw;
u16 flag1;
u16 flag2;
} ManagerA;
typedef struct {
+34 -2
View File
@@ -39,6 +39,38 @@ enum PlayerActions {
PLAYER_PARACHUTE,
};
enum PlayerFrameState {
PL_STATE_IDLE,
PL_STATE_WALK,
PL_STATE_SWORD,
PL_STATE_GUSTJAR,
PL_STATE_HOLD,
PL_STATE_THROW,
PL_STATE_6,
PL_STATE_SWIM,
PL_STATE_PARACHUTE,
PL_STATE_ROLL,
PL_STATE_FALL,
PL_STATE_JUMP,
PL_STATE_C,
PL_STATE_D,
PL_STATE_USEPORTAL,
PL_STATE_F,
PL_STATE_TRAPPED,
PL_STATE_11,
PL_STATE_DIE,
PL_STATE_TALKEZLO,
PL_STATE_CAPE,
PL_STATE_ITEMGET,
PL_STATE_DROWN,
PL_STATE_HOLE,
PL_STATE_CLIMB,
PL_STATE_PUSH,
PL_STATE_PULL,
PL_STATE_1B,
PL_STATE_STAIRS,
};
enum PlayerSpawnType {
PL_SPAWN_DEFAULT,
PL_SPAWN_MINISH,
@@ -137,8 +169,8 @@ typedef struct {
/*0x9a*/ u16 field_0x9a;
/*0x9c*/ u32 field_0x9c;
/*0xa0*/ u8 field_0xa0[8];
/*0xa8*/ u8 field_0xa8;
/*0xa9*/ u8 field_0xa9;
/*0xa8*/ u8 framestate;
/*0xa9*/ u8 framestate_last;
/*0xaa*/ u8 field_0xaa;
/*0xab*/ u8 field_0xab;
/*0xac*/ u16 field_0xac;
+3 -2
View File
@@ -121,8 +121,9 @@ typedef struct {
u8 transitionType; // transition when changing areas
u16 stairs_idx; // seems to be a tile type
PlayerWorldStatus player_status;
u8 field_0x2c[0xa];
u16 field_0x36;
u8 field_0x2c[0x9];
u8 hint_height;
u16 hint_idx;
u8 field_0x38;
u8 field_0x39;
u8 field_0x3a;