correct dialog struct

This commit is contained in:
Behemoth 2020-08-22 14:52:00 +02:00
parent 7af023e11f
commit eaabe77cdc
1 changed files with 14 additions and 5 deletions

View File

@ -23,7 +23,7 @@ typedef struct {
} struct_0807D1C4; } struct_0807D1C4;
#define gUnk_02000000 ((struct_02000000*)(0x2000000)) #define gUnk_02000000 ((struct_02000000*)(0x2000000))
//extern struct_02000000 gUnk_02000000; // extern struct_02000000 gUnk_02000000;
typedef struct { typedef struct {
u8 filler0[0x4]; u8 filler0[0x4];
@ -57,7 +57,7 @@ typedef struct {
extern SaveFile gUnk_02002A40; extern SaveFile gUnk_02002A40;
typedef struct { typedef struct {
u32 frameCount; // regular frame count? does anything reset it? u32 frameCount; // regular frame count? does anything reset it?
u8 field_0x4[0x4]; u8 field_0x4[0x4];
bool8 transitioningOut; bool8 transitioningOut;
u8 transitionType; // transition when changing areas u8 transitionType; // transition when changing areas
@ -123,7 +123,7 @@ typedef struct {
u8 field_0x2; u8 field_0x2;
u8 field_0x3; u8 field_0x3;
u32 field_0x4; u32 field_0x4;
u16 fadeType; // fade in or out, are there others? u16 fadeType; // fade in or out, are there others?
u16 fadeSpeed; // subtracted from duration u16 fadeSpeed; // subtracted from duration
u16 fadeDuration; u16 fadeDuration;
u16 field_0xe; u16 field_0xe;
@ -161,8 +161,17 @@ typedef struct {
extern struct_02034480 gUnk_02034480; extern struct_02034480 gUnk_02034480;
typedef struct { typedef struct {
u32 field_0x0; u32 flag : 12;
u32 field_0x4; u32 flagType : 4;
u32 type : 4;
u32 unk : 1;
union {
struct {
u16 a;
u16 b;
} indices;
void (*func)(Entity*);
} data;
} Dialog; } Dialog;
#endif #endif