diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-13 00:31:06 -0500 |
| commit | 6748ef72fb31e1b0af250472a34e50cb3966c5f8 (patch) | |
| tree | f6dafca53a0e45e5a2a6cdb262a2766f2bde8753 /include/item_menu.h | |
| parent | 2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff) | |
| parent | 170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'include/item_menu.h')
| -rw-r--r-- | include/item_menu.h | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/include/item_menu.h b/include/item_menu.h index 6214c69fc..3fe5f2c03 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -1,6 +1,22 @@ #ifndef GUARD_item_menu_H #define GUARD_item_menu_H +#include "item.h" + +#define RETURN_LOCATION_FIELD 0 +#define RETURN_LOCATION_BATTLE 1 +#define RETURN_LOCATION_POKEMON_LIST 2 +#define RETURN_LOCATION_SHOP 3 +#define RETURN_LOCATION_FIELD_2 4 +#define RETURN_LOCATION_FIELD_3 5 +#define RETURN_LOCATION_PC 6 +#define RETURN_LOCATION_FIELD_4 7 +#define RETURN_LOCATION_FIELD_5 8 +#define RETURN_LOCATION_FIELD_6 9 +#define RETURN_LOCATION_BATTLE_2 10 +#define RETURN_LOCATION_PC_2 11 +#define RETURN_LOCATION_UNCHANGED 12 + // Exported type declarations struct BagStruct { @@ -8,8 +24,8 @@ struct BagStruct u8 location; u8 pocket; u16 unk6; - u16 cursorPosition[5]; - u16 scrollPosition[5]; + u16 cursorPosition[POCKETS_COUNT]; + u16 scrollPosition[POCKETS_COUNT]; }; extern struct BagStruct gUnknown_0203CE58; @@ -36,7 +52,7 @@ struct UnkBagStruct u8 unk825; u8 filler[2]; u8 unk828; - u8 unk829[5]; + u8 unk829[POCKETS_COUNT]; u8 unk82E[6]; s16 unk834; u8 filler4[0xE]; |