diff options
| author | Tal Hayon <talhayon1@gmail.com> | 2022-08-08 20:03:12 +0300 |
|---|---|---|
| committer | Tal Hayon <talhayon1@gmail.com> | 2022-08-08 20:03:12 +0300 |
| commit | 79bae9cd8a7891dd4545649fa196aad5a36237d2 (patch) | |
| tree | 1e59403522cbeeaa36c33ca34662f17c49866639 /include | |
| parent | 22cbdd2fd645a5525a6ef0c9b8ee8ec11af9e9aa (diff) | |
Various documentations
Diffstat (limited to 'include')
| -rw-r--r-- | include/area.h | 5 | ||||
| -rw-r--r-- | include/color.h | 2 | ||||
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rw-r--r-- | include/kinstone.h | 2 | ||||
| -rw-r--r-- | include/manager/fightManager.h | 2 | ||||
| -rw-r--r-- | include/player.h | 4 | ||||
| -rw-r--r-- | include/room.h | 6 | ||||
| -rw-r--r-- | include/structures.h | 2 |
8 files changed, 14 insertions, 13 deletions
diff --git a/include/area.h b/include/area.h index d8be7fc1..bffd9b43 100644 --- a/include/area.h +++ b/include/area.h @@ -35,7 +35,8 @@ typedef struct { u8 unk; u8 dungeon_idx; /* same index as global flags for dungeons */ u16 localFlagOffset; - u8 filler[4]; + u8 flag_bank; + u8 filler[3]; u16 lightLevel; u8 lightType; u8 unk_0c_0 : 1; @@ -50,7 +51,7 @@ typedef struct { u8 portal_mode; // u8 filler3[7]; bool8 portal_in_use; - u8 unk1A; + u8 portal_timer; u8 filler2[13]; struct_area_28 unk28; RoomResInfo roomResInfos[MAX_ROOMS]; diff --git a/include/color.h b/include/color.h index 2a728474..fc99cdf8 100644 --- a/include/color.h +++ b/include/color.h @@ -9,7 +9,7 @@ typedef struct { u8 _1; u16 _2; } Palette; -extern Palette gPaletteList[]; +extern Palette gPaletteList[0x10]; typedef struct { struct { diff --git a/include/functions.h b/include/functions.h index bd78c851..aeaf26f1 100644 --- a/include/functions.h +++ b/include/functions.h @@ -83,8 +83,8 @@ extern void sub_0803C0AC(Entity*); extern void sub_08049CF4(Entity*); extern u32 sub_0804A024(Entity*, u32, u32); extern u32 sub_080542AC(u32); -extern void sub_08054564(); -extern void sub_08054570(void); +extern void DisableRandomDrops(); +extern void EnableRandomDrops(void); extern s32 sub_08056338(void); extern void sub_080575C8(u32); extern void sub_08057688(void); diff --git a/include/kinstone.h b/include/kinstone.h index f3c0bd00..d9980699 100644 --- a/include/kinstone.h +++ b/include/kinstone.h @@ -11,7 +11,7 @@ typedef struct { u8 action; u8 _2; u8 _3; - u8 _4; + u8 prevUpdatePriority; u8 _5; u16 textIndex; u16 _8; diff --git a/include/manager/fightManager.h b/include/manager/fightManager.h index 2d3968de..e3d10b18 100644 --- a/include/manager/fightManager.h +++ b/include/manager/fightManager.h @@ -5,7 +5,7 @@ typedef struct { Manager base; - u8 unk_20; + u8 prevBgm; u8 unk_21[0x14]; u8 unk_35; u8 unk_36[0x4]; diff --git a/include/player.h b/include/player.h index 541c8821..6e6229f7 100644 --- a/include/player.h +++ b/include/player.h @@ -112,7 +112,7 @@ typedef enum { PL_DRUGGED = 0x4000, PL_PIT_IS_EXIT = 0x8000, PL_FLAGS10000 = 0x10000, - PL_FLAGS20000 = 0x20000, + PL_GYORG_FIGHT = 0x20000, PL_ROLLING = 0x40000, PL_MOLDWORM_CAPTURED = 0x80000, PL_IN_HOLE = 0x100000, @@ -120,7 +120,7 @@ typedef enum { PL_CLONING = 0x400000, PL_USE_LANTERN = 0x800000, PL_PARACHUTE = 0x1000000, - PL_FLAGS2000000 = 0x2000000, + PL_CONVEYOR_PUSHED = 0x2000000, PL_ENTER_MINECART = 0x4000000, PL_SWORD_THRUST = 0x8000000, PL_USE_OCARINA = 0x10000000, diff --git a/include/room.h b/include/room.h index 710aab1f..b13fc21a 100644 --- a/include/room.h +++ b/include/room.h @@ -59,14 +59,14 @@ extern RoomControls gRoomControls; typedef struct { /* 0x00 */ u8 field_0x0; /* 0x01 */ u8 filler_0x1; - /* 0x02 */ u8 field_0x2; + /* 0x02 */ bool8 randomDropsDisabled; /* 0x03 */ u8 field_0x3; /* 0x04 */ u8 field_0x4; /* 0x05 */ u8 filler1[1]; /* 0x06 */ u8 shopItemType; /* 0x07 */ u8 shopItemType2; /* 0x08 */ u8 field_0x8; - /* 0x09 */ u8 field_0x9; + /* 0x09 */ u8 fight_bgm; /* 0x0a */ u8 unk2; /* 0x0b */ u8 filler2; /* 0x0c */ s16 lightLevel; @@ -162,7 +162,7 @@ typedef struct { /* 0x3c */ u8 field_0x3c; /* 0x3d */ u8 field_0x3d; /* 0x3e */ u16 field_0x3e; - /* 0x40 */ u16 hurtType; + /* 0x40 */ u16 field_0x40; /* 0x42 */ u16 field_0x42; /* 0x44 */ u16 field_0x44; /* 0x46 */ u16 field_0x46; diff --git a/include/structures.h b/include/structures.h index 1a880e1d..a87a820a 100644 --- a/include/structures.h +++ b/include/structures.h @@ -298,7 +298,7 @@ typedef struct { u8 draw_border : 1; u8 border_type : 4; u8 fill_type; - u8 _15; + u8 charColor; u8 _16; u8 stylized; } Font; |
