From ab308c9547feb78bd6bf1a1c6ced74a23844ca8c Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 20 Nov 2024 18:43:54 -0500 Subject: [PATCH 1/3] Fix typo --- include/constants/direction.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/constants/direction.h b/include/constants/direction.h index 73fbdea0e..2e3d5abb1 100644 --- a/include/constants/direction.h +++ b/include/constants/direction.h @@ -2,7 +2,7 @@ #define GUARD_CONSTANTS_DIRECTION_H #define DIRECTION_MASK 7 -#define DIRECTION_MASK_CARDINAL 6 // Only South, Easy, North and West +#define DIRECTION_MASK_CARDINAL 6 // Only South, East, North and West enum Direction { From d53a2666cd6720d66a94eeeb6834d8885dff9e09 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 20 Nov 2024 18:47:52 -0500 Subject: [PATCH 2/3] Removed unnecessary fill --- include/structs/str_806B7F8.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/structs/str_806B7F8.h b/include/structs/str_806B7F8.h index f3f804755..444aba579 100644 --- a/include/structs/str_806B7F8.h +++ b/include/structs/str_806B7F8.h @@ -9,7 +9,6 @@ struct unkStruct_806B7F8 u8 unk2; u32 unk4; u16 level; - u8 fillA[2]; DungeonPos pos; u8 unk10; }; From bba5f35836ca90cfe90787605dc4463a354c2505 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Wed, 20 Nov 2024 18:52:43 -0500 Subject: [PATCH 3/3] Add missing comment offsets to Dungeon struct --- include/structs/str_dungeon.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/structs/str_dungeon.h b/include/structs/str_dungeon.h index 80fe9eb77..ec6ecaefd 100644 --- a/include/structs/str_dungeon.h +++ b/include/structs/str_dungeon.h @@ -334,7 +334,7 @@ typedef struct Dungeon Entity *unkBC; u8 fillC0[0x134 - 0xC0]; struct unkStruct_Dungeon134_sub unk134; - RGB colorRamp[0x100]; + /* 0x47C */ RGB colorRamp[0x100]; /* 0x57C */ u8 fill57C[0x5C0 - 0x57c]; /* 0x5C0 */ s32 unk5C0; /* 0x5C4 */ struct unkStruct_Dungeon5C4_sub unk5C4[3]; @@ -376,9 +376,9 @@ typedef struct Dungeon /* 0x3A16 */ s16 unk3A16; /* 0x3A18 */ Tile tiles[DUNGEON_MAX_SIZE_Y][DUNGEON_MAX_SIZE_X]; /* 0xEA18 */ DungeonPos playerSpawn; - DungeonPos stairsSpawn; // stairs location + /* 0xEA1C */ DungeonPos stairsSpawn; // stairs location DungeonPos unkE220[8]; - struct MinMaxPosition kecleonShopPos; + /* 0xEA24 */ struct MinMaxPosition kecleonShopPos; struct MinMaxPosition unkE250; unkDungeonE260 unkE260; /* 0xE264 */ Weather weather; // Uses the weather constants in weather.h. @@ -428,7 +428,7 @@ typedef struct Dungeon /* 0x181E8 */ UnkDungeonGlobal_unk181E8_sub unk181e8; u8 fill18220[0x1BDD4 - 0x1822C]; struct UnkStructDungeon1BDD4 unk1BDD4; - struct MessageLogString messageLogStrings[MESSAGE_LOG_STRINGS_COUNT]; + /* 0x1BE14 */ struct MessageLogString messageLogStrings[MESSAGE_LOG_STRINGS_COUNT]; /* 0x1C570 */ DungeonLocation unk1C570; /* 0x1C574 */ FloorProperties unk1C574; /* 0x1C590 */ UnkDungeonGlobal_unk1C590 unk1C590[4];