diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index dd64a5391..8bc5db5ab 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -220,8 +220,10 @@ struct EntityInfo u8 fill160[0x164 - 0x160]; /* 0x164 */ u8 unk164; /* 0x165 */ u8 unk165; - u8 fill166[0x169 - 0x166]; - u8 turnsSinceWarpScarfActivation; + /* 0x166 */ u8 unk166; + /* 0x167 */ u8 unk167; + /* 0x168 */ u8 unk168; + /* 0x169 */ u8 turnsSinceWarpScarfActivation; /* 0x16C */ struct Position targetPos; /* 0x170 */ struct Position pixelPos; u32 unk174; @@ -291,11 +293,13 @@ struct Entity /* 0x54 */ u16 spriteGlobalIndex; u8 fill56[0x64 - 0x56]; u32 unk64; - u8 fill68[2]; + u16 unk68; /* 0x6A */ u8 unk6A; /* 0x6A */ u8 unk6B; /* 0x6C */ u8 direction; /* 0x6D */ u8 direction2; // Duplicate of 0x6C? + /* 0x6E */ u8 unk6E; + /* 0x6F */ u8 unk6F; /* 0x70 */ struct EntityInfo *info; }; diff --git a/include/dungeon_global_data.h b/include/dungeon_global_data.h index 67fc979a0..a3f91d9fa 100644 --- a/include/dungeon_global_data.h +++ b/include/dungeon_global_data.h @@ -95,7 +95,7 @@ struct Dungeon /* 0x660 */ s16 fractionalTurn; // Handles turn order when Pokémon have different movement speeds. u8 fill662[0x666 - 0x662]; /* 0x666 */ u16 windTurns; // Turns remaining before getting swept out of the dungeon. - u8 fill668[0x66A - 0x668]; + /* 0x668 */ u16 unk668; u16 bossSongIndex; u8 unk66C; u8 unk66D; @@ -114,7 +114,9 @@ struct Dungeon /* 0x68A */ u8 unk68A; u8 fill68B[0x699 - 0x68B]; u8 unk699; - u8 fill69A[0x363C - 0x69A]; + u8 fill69A[0x69C - 0x69A]; + /* 0x69C */ struct EntityInfo unk69C[4]; + u8 fillEBC[0x363C - 0xEBC]; /* 0x363C */ u8 expYieldRankings[NUM_MONSTERS]; u8 fill37E3[0x37F4 - 0x37D9]; /* 0x37F4 */ s32 unk37F4;