diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/box_party_pokemon_dropdown.h | 22 | ||||
| -rw-r--r-- | include/graphics.h | 7 | ||||
| -rw-r--r-- | include/pokemon_storage_system_internal.h | 108 | ||||
| -rw-r--r-- | include/strings.h | 31 |
4 files changed, 151 insertions, 17 deletions
diff --git a/include/box_party_pokemon_dropdown.h b/include/box_party_pokemon_dropdown.h index c2df93f1e..52e620956 100644 --- a/include/box_party_pokemon_dropdown.h +++ b/include/box_party_pokemon_dropdown.h @@ -1,14 +1,24 @@ #ifndef GUARD_BOX_PARTY_POKEMON_DROPDOWN_H #define GUARD_BOX_PARTY_POKEMON_DROPDOWN_H +enum +{ + BPPD_MOVE_INNER_LEFT = 0, + BPPD_MOVE_OUTER_LEFT, + BPPD_MOVE_INNER_TOP, + BPPD_MOVE_OUTER_TOP, + BPPD_MOVE_INNER_X, + BPPD_MOVE_INNER_Y +}; + void AllocBoxPartyPokemonDropdowns(u8 num); -void sub_80F7B2C(void); -void sub_80F7B40(void); +void FreeBoxPartyPokemonDropdowns(void); +void CopyAllBoxPartyPokemonDropdownsToVram(void); void SetBoxPartyPokemonDropdownMap2(u8 idx, u8 bgId, const void * src, u16 width, u16 height); -void sub_80F7C7C(u8 a0, const void * a1); +void SetBoxPartyPokemonDropdownMap1Tiles(u8 idx, const void * src); void SetBoxPartyPokemonDropdownMap2Pos(u8 idx, u16 x, u16 y); -void sub_80F7CE8(u8 a0, u16 a1, u16 a2, u16 a3, u16 a4); -void sub_80F7D30(u8 a0, u8 a1, s8 a2); -void sub_80F7E54(u8 a0); +void SetBoxPartyPokemonDropdownMap2Rect(u8 idx, u16 x, u16 y, u16 width, u16 height); +void AdjustBoxPartyPokemonDropdownPos(u8 a0, u8 a1, s8 a2); +void CopyBoxPartyPokemonDropdownToBgTilemapBuffer(u8 idx); #endif //GUARD_BOX_PARTY_POKEMON_DROPDOWN_H diff --git a/include/graphics.h b/include/graphics.h index d84371e3a..3930861f8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4917,4 +4917,11 @@ extern const u16 gUnknown_8E98F38[]; extern const u16 gUnknown_8E990D8[]; extern const u16 gUnknown_8E990F8[]; +// pokemon_storage_system +extern const u32 gPSSMenu_Gfx[]; +extern const u32 gUnknown_8E9CAEC[]; +extern const u16 gPSSMenu_Pal[]; +extern const u16 gUnknown_8E9C3F8[]; +extern const u16 gUnknown_8E9C418[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h index 9a4dcdfaa..1e7430dd9 100644 --- a/include/pokemon_storage_system_internal.h +++ b/include/pokemon_storage_system_internal.h @@ -50,6 +50,18 @@ enum enum { + PC_TEXT_FMT_NORMAL, + PC_TEXT_FMT_MON_NAME_1, + PC_TEXT_FMT_MON_NAME_2, + PC_TEXT_FMT_MON_NAME_3, + PC_TEXT_FMT_MON_NAME_4, + PC_TEXT_FMT_MON_NAME_5, + PC_TEXT_FMT_MON_NAME_6, + PC_TEXT_FMT_ITEM_NAME, +}; + +enum +{ CURSOR_AREA_IN_BOX, CURSOR_AREA_IN_PARTY, CURSOR_AREA_BOX, @@ -85,6 +97,12 @@ enum #define TAG_TILE_0 0x0 #define TAG_TILE_1 0x1 +struct StorageAction +{ + const u8 *text; + u8 format; +}; + struct UnkPSSStruct_2002370 { struct Sprite *unk_0000; @@ -136,10 +154,10 @@ struct UnkStorageStruct struct PssQuestLogBuffer { - u16 a0; - u16 a2; - u8 a4; - u8 a5; + u16 species; + u16 species2; + u8 fromBox; + u8 toBox; }; struct PokemonStorageSystemData @@ -157,7 +175,7 @@ struct PokemonStorageSystemData u8 field_2C4; u8 field_2C5; u8 showPartyMenuState; - u8 unk_02C7; + bool8 unk_02C7; u8 unk_02C8; bool8 unk_02C9; s16 newCurrBoxId; @@ -248,10 +266,7 @@ struct PokemonStorageSystemData /* 0ce8 */ u8 cursorMonLevel; /* 0ce9 */ bool8 cursorMonIsEgg; /* 0cea */ u8 cursorMonNick[POKEMON_NAME_LENGTH + 1]; - /* 0cf5 */ u8 cursorMonNickText[36]; - /* 0d19 */ u8 cursorMonSpeciesName[36]; - /* 0d3d */ u8 cursorMonGenderLvlText[36]; - /* 0d61 */ u8 cursorMonItemName[36]; + /* 0cf5 */ u8 cursorMonTexts[4][36]; /* 0d88 */ bool8 (*monPlaceChangeFunc)(void); /* 0d8c */ u8 monPlaceChangeState; /* 0d8d */ u8 field_D91; @@ -289,8 +304,9 @@ struct PokemonStorageSystemData /* 21f4 */ struct UnkStorageStruct field_2204[3]; /* 2224 */ u16 movingItem; /* 2226 */ u16 field_2236; - /* 2228 */ struct PssQuestLogBuffer field_2238; - /* 2230 */ u16 field_223A; + /* 2228 */ struct PssQuestLogBuffer qlogBuffer; + /* 2230 */ u16 field_2238; + /* 2232 */ u16 field_223A; /* 2234 */ u16 *field_223C; /* 2238 */ struct Sprite *cursorMonSprite; /* 223c */ u16 field_2244[0x40]; @@ -310,5 +326,75 @@ void sub_808C950(void); u8 HandleBoxChooseSelectionInput(void); void sub_808C854(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3, bool32 loadPal); void SetCurrentBoxMonData(u8 boxPosition, s32 request, const void *value); +u32 GetCurrentBoxMonData(u8 boxPosition, s32 request); + +void sub_80922C0(void); +void sub_8092340(void); +bool8 sub_80924A8(void); +void sub_8092AE4(void); +void sub_8092B3C(u8 a0); +void sub_8092B50(void); +void sub_8092B5C(void); +u8 sub_8092B70(void); +void sub_8092F54(void); +void sub_8093174(void); +void sub_8093194(void); +bool8 sub_80931EC(void); +void sub_8093264(void); +void sub_8093630(void); +void sub_8093660(void); +void sub_80936B8(void); +void sub_80937B4(void); +void sub_8094D14(u8 a0); +u8 sub_8094D34(void); +void sub_8094D60(void); +void sub_8094D84(void); +bool8 sub_8094F90(void); +s16 sub_8094F94(void); +void sub_8095024(void); +bool8 sub_8095050(void); +void sub_80950A4(void); +void sub_80950BC(u8 a0); +bool8 sub_80950D0(void); +void sub_8095B5C(void); +void sub_8096088(void); +void sub_80960C0(void); +bool8 sub_809610C(void); +const u8 *GetMovingItemName(void); +void sub_80966F4(void); +bool8 sub_8096728(void); +bool8 sub_80967C0(void); +void sub_8096BE4(struct UnkStruct_2000020 *arg0, struct UnkStruct_2000028 *arg1, u32 arg2); +void sub_8096BF8(void); +void AddMenu(void); +bool8 CanMovePartyMon(void); +bool8 CanShiftMon(void); +bool8 DoMonPlaceChange(void); +bool8 DoWallpaperGfxChange(void); +u8 GetBoxCursorPosition(void); +u16 GetMovingItem(void); +u8 HandleInput(void); +void InitCanReleaseMonVars(void); +void InitMonPlaceChange(u8 a0); +bool8 IsActiveItemMoving(void); +bool8 IsCursorOnCloseBox(void); +bool8 IsMonBeingMoved(void); +void Item_FromMonToMoving(u8 cursorArea, u8 cursorPos); +void Item_GiveMovingToMon(u8 cursorArea, u8 cursorPos); +void Item_SwitchMonsWithMoving(u8 cursorArea, u8 cursorPos); +void Item_TakeMons(u8 cursorArea, u8 cursorPos); +void PrintItemDescription(void); +void ReleaseMon(void); +s8 RunCanReleaseMon(void); +bool8 ScrollToBox(void); +void SetMonMarkings(u8 markings); +void SetMovingMonPriority(u8 priority); +void SetUpScrollToBox(u8 targetBox); +void SetWallpaperForCurrentBox(u8 wallpaper); +bool8 TryStorePartyMonInBox(u8 boxId); +void InitMenu(void); +void SetMenuText(u8 textId); +void sub_8095C84(u8 cursorArea, u8 cursorPos); +void sub_8095E2C(u16 itemId); #endif //GUARD_POKEMON_STORAGE_SYSTEM_INTERNAL_H diff --git a/include/strings.h b/include/strings.h index 06851c983..0b3e61dba 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1372,5 +1372,36 @@ extern const u8 gText_SeeYaDescription[]; extern const u8 gText_PartyFull[]; extern const u8 gText_JustOnePkmn[]; extern const u8 gText_Box[]; +extern const u8 gText_ExitFromBox[]; +extern const u8 gText_WhatDoYouWantToDo[]; +extern const u8 gText_PleasePickATheme[]; +extern const u8 gText_PickTheWallpaper[]; +extern const u8 gText_PkmnIsSelected[]; +extern const u8 gText_JumpToWhichBox[]; +extern const u8 gText_DepositInWhichBox[]; +extern const u8 gText_PkmnWasDeposited[]; +extern const u8 gText_BoxIsFull2[]; +extern const u8 gText_ReleaseThisPokemon[]; +extern const u8 gText_PkmnWasReleased[]; +extern const u8 gText_ByeByePkmn[]; +extern const u8 gText_MarkYourPkmn[]; +extern const u8 gText_ThatsYourLastPkmn[]; +extern const u8 gText_YourPartysFull[]; +extern const u8 gText_YoureHoldingAPkmn[]; +extern const u8 gText_WhichOneWillYouTake[]; +extern const u8 gText_YouCantReleaseAnEgg[]; +extern const u8 gText_ContinueBoxOperations[]; +extern const u8 gText_PkmnCameBack[]; +extern const u8 gText_WasItWorriedAboutYou[]; +extern const u8 gText_FourEllipsesExclamation[]; +extern const u8 gText_PleaseRemoveTheMail[]; +extern const u8 gText_PkmnIsSelected[]; +extern const u8 gText_GiveToAPkmn[]; +extern const u8 gText_PlacedItemInBag[]; +extern const u8 gText_BagIsFull2[]; +extern const u8 gText_PutItemInBag[]; +extern const u8 gText_ItemIsNowHeld[]; +extern const u8 gText_ChangedToNewItem[]; +extern const u8 gText_MailCantBeStored[]; #endif //GUARD_STRINGS_H |