summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/menu.h6
-rw-r--r--include/pokemon_storage_system.h43
-rwxr-xr-xinclude/pokemon_summary_screen.h2
-rw-r--r--include/strings.h39
4 files changed, 71 insertions, 19 deletions
diff --git a/include/menu.h b/include/menu.h
index f9b7c52df..198e7bd4a 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -43,7 +43,7 @@ void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palet
void schedule_bg_copy_tilemap_to_vram(u8 bgNum);
void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs);
u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 numItems, u8 initialCursorPos);
-u8 GetMenuCursorPos(void);
+u8 Menu_GetCursorPos(void);
s8 Menu_ProcessInput(void);
s8 Menu_ProcessInputNoWrap(void);
void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
@@ -71,8 +71,8 @@ u8 sub_8199944(u8 windowId, u8 optionWidth, u8 horizontalCount, u8 verticalCount
u8 sub_8199134(s8, s8);
u8 GetStartMenuWindowId(void);
void sub_819A2BC(u8, u8);
-u8 MoveMenuCursor(s8 cursorDelta);
-u8 MoveMenuCursorNoWrapAround(s8 cursorDelta);
+u8 Menu_MoveCursor(s8 cursorDelta);
+u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta);
void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 CopyToVram);
u8 sub_81979C4(u8 a1);
u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos);
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index e9b3302c0..530fb7042 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -21,7 +21,7 @@ struct StorageAction
u8 format;
};
-struct StorageText
+struct StorageMenu
{
const u8 *text;
int textId;
@@ -124,7 +124,7 @@ struct PokemonStorageSystemData
u8 field_A66;
u8 field_A67;
u8 *wallpaperTiles;
- struct Sprite *field_A6C;
+ struct Sprite *movingMonSprite;
struct Sprite *partySprites[PARTY_SIZE];
struct Sprite *boxMonsSprites[IN_BOX_COUNT];
struct Sprite **field_B00;
@@ -145,7 +145,15 @@ struct PokemonStorageSystemData
s8 field_C69;
u8 field_C6A;
u8 field_C6B;
- u8 field_C6C[72];
+ struct WindowTemplate menuWindow;
+ struct StorageMenu menuItems[7];
+ u8 menuItemsCount;
+ u8 menuWidth;
+ u8 field_CAE;
+ u8 field_CAF;
+ u16 field_CB0;
+ u8 field_CB2;
+ u8 field_CB3;
struct Sprite *field_CB4;
struct Sprite *field_CB8;
s32 field_CBC;
@@ -161,21 +169,20 @@ struct PokemonStorageSystemData
u8 field_CD5;
u8 field_CD6;
u8 field_CD7;
- u8 field_CD8;
- u8 field_CD9;
+ u8 field_CD8[2];
u8 field_CDA;
u8 field_CDB;
- u32 *field_CDC;
+ const u32 *cursorMonPalette;
u32 cursorMonPersonality;
u16 cursorMonSpecies;
- u16 selectedItem;
+ u16 cursorMonItem;
u16 field_CE8;
u8 field_CEA;
- u8 field_CEB;
- u8 field_CEC;
- u8 field_CED;
- u8 field_CEE[POKEMON_NAME_LENGTH + 1];
- u8 cursorMonNick[36];
+ u8 cursorMonMarkings;
+ u8 cursorMonLevel;
+ bool8 cursorMonIsEgg;
+ u8 cursorMonNick[POKEMON_NAME_LENGTH + 1];
+ u8 cursorMonNickText[36];
u8 cursorMonSpeciesName[36];
u8 cursorMonGenderLvlText[36];
u8 cursorMonItemName[36];
@@ -187,7 +194,7 @@ struct PokemonStorageSystemData
u16 *field_DA0;
struct PokemonMarkMenu field_DA4;
struct UnkPSSStruct_2002370 field_1E5C;
- struct Pokemon field_20A4;
+ struct Pokemon movingMon;
struct Pokemon field_2108;
s8 field_216C;
u8 field_216D;
@@ -207,7 +214,11 @@ struct PokemonStorageSystemData
u8 field_2186;
u8 field_2187;
u8 field_2188;
- struct BoxPokemon *field_218C;
+ union
+ {
+ struct Pokemon *mon;
+ struct BoxPokemon *box;
+ } field_218C;
u8 field_2190[40];
u8 field_21B8[40];
u8 field_21E0[POKEMON_NAME_LENGTH + 1];
@@ -217,7 +228,7 @@ struct PokemonStorageSystemData
u8 field_21FC;
u8 field_21FD;
u8 field_21FE;
- u8 field_21FF;
+ u8 inBoxMovingMode;
u8 field_2200;
u8 field_2201[51];
u16 movingItem;
@@ -242,7 +253,7 @@ extern struct PokemonStorageSystemData *gUnknown_02039D08;
u8* GetBoxNamePtr(u8 boxNumber);
struct BoxPokemon *GetBoxedMonPtr(u8, u8);
void SetBoxMonNickFromAnyBox(u8, u8, u8 *);
-void CompactPartySlots(void);
+s16 CompactPartySlots(void);
u32 GetBoxMonDataAt(u8 boxId, u8 monPosition, u32 request);
bool8 CheckFreePokemonStorageSpace(void);
u8 StorageGetCurrentBox(void);
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index d0926d388..c08c581c3 100755
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -1,6 +1,8 @@
#ifndef GUARD_POKEMON_SUMMARY_SCREEN_H
#define GUARD_POKEMON_SUMMARY_SCREEN_H
+extern u8 gUnknown_0203CF20;
+
void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
void sub_81C4F98(u8, void(*)(void));
void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
diff --git a/include/strings.h b/include/strings.h
index 744859c3e..1557baa6b 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1434,5 +1434,44 @@ extern const u8 gText_PutItemInBag[];
extern const u8 gText_ItemIsNowHeld[];
extern const u8 gText_ChangedToNewItem[];
extern const u8 gText_MailCantBeStored[];
+extern const u8 gPCText_Cancel[];
+extern const u8 gPCText_Store[];
+extern const u8 gPCText_Withdraw[];
+extern const u8 gPCText_Move[];
+extern const u8 gPCText_Shift[];
+extern const u8 gPCText_Place[];
+extern const u8 gPCText_Summary[];
+extern const u8 gPCText_Release[];
+extern const u8 gPCText_Mark[];
+extern const u8 gPCText_Jump[];
+extern const u8 gPCText_Wallpaper[];
+extern const u8 gPCText_Name[];
+extern const u8 gPCText_Take[];
+extern const u8 gPCText_Give[];
+extern const u8 gPCText_Give[];
+extern const u8 gPCText_Switch[];
+extern const u8 gPCText_Bag[];
+extern const u8 gPCText_Info[];
+extern const u8 gPCText_Scenery1[];
+extern const u8 gPCText_Scenery2[];
+extern const u8 gPCText_Scenery3[];
+extern const u8 gPCText_Etcetera[];
+extern const u8 gPCText_Friends[];
+extern const u8 gPCText_Forest[];
+extern const u8 gPCText_City[];
+extern const u8 gPCText_Desert[];
+extern const u8 gPCText_Savanna[];
+extern const u8 gPCText_Crag[];
+extern const u8 gPCText_Volcano[];
+extern const u8 gPCText_Snow[];
+extern const u8 gPCText_Cave[];
+extern const u8 gPCText_Beach[];
+extern const u8 gPCText_Seafloor[];
+extern const u8 gPCText_River[];
+extern const u8 gPCText_Sky[];
+extern const u8 gPCText_PolkaDot[];
+extern const u8 gPCText_Pokecenter[];
+extern const u8 gPCText_Machine[];
+extern const u8 gPCText_Simple[];
#endif //GUARD_STRINGS_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 08:53:41 +0000