decomp subtask.c

2 files changed, 41 insertions, 2 deletions

diff --git a/include/itemMenuTable.h b/include/itemMenuTable.h
new file mode 100644
index 00000000..f1d6aaa5
--- /dev/null
+++ b/include/itemMenuTable.h
@@ -0,0 +1,39 @@
+#ifndef SUBTASK_ITEMMENUTABLE_H
+#define SUBTASK_ITEMMENUTABLE_H
+
+#include "global.h"
+
+typedef enum {
+    MENU_SLOT_SWORD,
+    MENU_SLOT_GUST_JAR,
+    MENU_SLOT_CANE,
+    MENU_SLOT_BOOMERANG,
+    MENU_SLOT_SHIELD,
+    MENU_SLOT_MOLE_MITTS,
+    MENU_SLOT_LANTERN,
+    MENU_SLOT_BOMBS,
+    MENU_SLOT_PEGASUS_BOOTS,
+    MENU_SLOT_ROCS_CAPE,
+    MENU_SLOT_OCARINA,
+    MENU_SLOT_BOW,
+    MENU_SLOT_BOTTLE0,
+    MENU_SLOT_BOTTLE1,
+    MENU_SLOT_BOTTLE2,
+    MENU_SLOT_BOTTLE3,
+    MENU_SLOT_SAVE_BUTTON,
+} ItemMenuTableSlot;
+
+typedef struct {
+    u8 up;
+    u8 down;
+    u8 left;
+    u8 right;
+    u8 type;
+    u8 unk0;
+    u8 x;
+    u8 y;
+} ItemMenuTableEntry;
+
+extern const ItemMenuTableEntry gItemMenuTable[];
+
+#endif // SUBTASK_ITEMMENUTABLE_H
diff --git a/include/room.h b/include/room.h
index 0cd7f3c2..3ed662ba 100644
--- a/include/room.h
+++ b/include/room.h
@@ -124,8 +124,8 @@ typedef struct {
     /* 0x0e */ s16 dungeon_y;
     /* 0x10 */ u16 dungeon_map_x;
     /* 0x12 */ u16 dungeon_map_y;
-    /* 0x14 */ s16 overworld_map_x;
-    /* 0x16 */ s16 overworld_map_y;
+    /* 0x14 */ u16 overworld_map_x;
+    /* 0x16 */ u16 overworld_map_y;
     /* 0x18 */ u8 field_0x24[0x8];
 } PlayerRoomStatus;
 static_assert(sizeof(PlayerRoomStatus) == 0x20);