diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/decoration.h | 1 | ||||
| -rw-r--r-- | include/international_string_util.h | 4 | ||||
| -rw-r--r-- | include/item.h | 4 | ||||
| -rw-r--r-- | include/menu_helpers.h | 2 | ||||
| -rw-r--r-- | include/party_menu.h | 1 | ||||
| -rw-r--r-- | include/player_pc.h | 3 | ||||
| -rw-r--r-- | include/pokenav.h | 8 | ||||
| -rw-r--r-- | include/strings.h | 39 |
8 files changed, 57 insertions, 5 deletions
diff --git a/include/decoration.h b/include/decoration.h index c841bbfc1..a51d9ccce 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -69,5 +69,6 @@ extern EWRAM_DATA u8 gCurDecorationIndex; void sub_8126968(void); void sub_8126AD8(u8 taskId); void sub_8127D38(u16 mapX, u16 mapY, u16 decor); +void sub_8126B2C(u8 taskId); #endif //GUARD_DECORATION_H diff --git a/include/international_string_util.h b/include/international_string_util.h index f4ba827e3..426a2d48c 100644 --- a/include/international_string_util.h +++ b/include/international_string_util.h @@ -10,12 +10,12 @@ s32 GetStringRightAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth); s32 GetStringCenterAlignXOffsetWithLetterSpacing(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing); s32 GetStringWidthDifference(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing); s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1); -s32 sub_81DB3D8(const struct MenuAction *str, u8* arg1, s32 arg2); +s32 sub_81DB3D8(const struct MenuAction *str, const u8* arg1, s32 arg2); // sub_81DB41C // CopyMonCategoryText // sub_81DB494 void PadNameString(u8 *dst, u8 padWith); -// sub_81DB554 +void sub_81DB554(u8 *, u8); // sub_81DB5AC u32 sub_81DB604(const u8 *); // sub_81DB620 diff --git a/include/item.h b/include/item.h index d81a3de33..33d434f78 100644 --- a/include/item.h +++ b/include/item.h @@ -64,5 +64,9 @@ u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 pocketPos); void sub_80D6FB4(struct BagPocket*); void sub_80D6F64(struct BagPocket*); void sub_80D702C(struct ItemSlot*, s16, u16); +u8 sub_80D6CE4(); +bool8 itemid_is_unique(u16 itemId); +void sub_80D6E48(u8, u16); +void sub_80D6E84(void); #endif // ITEM_H diff --git a/include/menu_helpers.h b/include/menu_helpers.h index bbdd21327..4de6603a3 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -14,7 +14,7 @@ struct YesNoFuncTable // Exported RAM declarations // Exported ROM declarations - +void sub_812220C(struct ItemSlot *, u8, u8 *, u8 *, u8); void sub_812225C(u16 *, u16 *, u8, u8); void sub_8122298(u16 *, u16 *, u8, u8, u8); void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data); diff --git a/include/party_menu.h b/include/party_menu.h index 1ce12d98f..c96eb0d9d 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -37,5 +37,6 @@ void display_pokemon_menu_message(u8 windowId); void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func); void sub_81B1B5C(void *a, u8 b); u8 sub_81B1BD4(); +void sub_81B8448(); #endif // GUARD_PARTY_MENU_H diff --git a/include/player_pc.h b/include/player_pc.h index 9e8ae6ef4..bd060faa8 100644 --- a/include/player_pc.h +++ b/include/player_pc.h @@ -72,14 +72,15 @@ struct PlayerPCItemPageStruct u8 count; u8 filler[3]; u8 scrollIndicatorId; - u8 filler2[4]; }; // Exported type declarations // Exported RAM declarations +extern struct PlayerPCItemPageStruct playerPCItemPageInfo; // Exported ROM declarations +extern const struct MenuAction gMailboxMailOptions[]; void ReshowPlayerPC(u8 taskId); void sub_816B31C(void); diff --git a/include/pokenav.h b/include/pokenav.h index ebe3b325c..fabe211ea 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -1,5 +1,6 @@ #ifndef GUARD_POKENAV_H #define GUARD_POKENAV_H +#include "player_pc.h" bool8 sub_81D5C18(void); bool8 sub_81D20BC(void *arg0); @@ -13,5 +14,12 @@ void sub_81D3480(void *arg0, u8 arg1); void sub_81D2754(void *arg0, void *arg1); void sub_81D1F84(void *arg0, void *arg1, void *arg2); const u8 *sub_81D62AC(void); +u8 sub_81D1C84(u8); +u8 sub_81D1DC0(struct PlayerPCItemPageStruct *); +void sub_81D1E90(struct PlayerPCItemPageStruct *); +void sub_81D1EC0(void); +void sub_81D1D04(u8); +bool8 sub_81D1C44(u8); + #endif //GUARD_POKENAV_H diff --git a/include/strings.h b/include/strings.h index 907873160..689acff5e 100644 --- a/include/strings.h +++ b/include/strings.h @@ -372,8 +372,45 @@ extern const u8 gBirchDexRatingText_LessThan190[]; extern const u8 gBirchDexRatingText_LessThan200[]; extern const u8 gBirchDexRatingText_DexCompleted[]; -//player menu text +//player pc text extern const u8 gText_WhatWouldYouLike[]; extern const u8 gText_NoMailHere[]; +extern const u8 gText_TakeOutItemsFromPC[]; +extern const u8 gText_StoreItemsInPC[]; +extern const u8 gText_ThrowAwayItemsInPC[]; +extern const u8 gText_GoBackPrevMenu[]; + +extern const u8 gText_ItemStorage[]; +extern const u8 gText_Mailbox[]; +extern const u8 gText_Decoration[]; +extern const u8 gText_TurnOff[]; + +extern const u8 gText_WithdrawItem[]; +extern const u8 gText_DepositItem[]; +extern const u8 gText_TossItem[]; +extern const u8 gText_Cancel[]; + +extern const u8 gText_Read[]; +extern const u8 gText_MoveToBag[]; +extern const u8 gText_Give2[]; +extern const u8 gText_Cancel2[]; + +extern const u8 gText_NoItems[]; +extern const u8 gText_WhatToDoWithVar1sMail[]; +extern const u8 gText_MessageWillBeLost[]; +extern const u8 gText_BagIsFull[]; + +extern const u8 gText_MailToBagMessageErased[]; +extern const u8 gText_GoBackPrevMenu[]; +extern const u8 gText_WithdrawHowManyItems[]; +extern const u8 gText_WithdrawXItems[]; +extern const u8 gText_TossHowManyVar1s[]; +extern const u8 gText_ThrewAwayVar2Var1s[]; +extern const u8 gText_NoRoomInBag[]; +extern const u8 gText_TooImportantToToss[]; +extern const u8 gText_ConfirmTossItems[]; +extern const u8 gText_MoveVar1Where[]; + + #endif //GUARD_STRINGS_H |