diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/pokemon.h | 1 | ||||
| -rw-r--r-- | include/pokemon.h | 2 | ||||
| -rw-r--r-- | include/pokemon_storage_system.h | 8 | ||||
| -rw-r--r-- | include/string_util.h | 4 | ||||
| -rw-r--r-- | include/strings.h | 15 |
5 files changed, 26 insertions, 4 deletions
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index a8009f1ff..bc02bffdd 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -212,5 +212,6 @@ #define MAX_TOTAL_EVS 510 #define UNOWN_FORM_COUNT 28 #define MAX_MON_LEVEL 100 +#define BOX_NAME_LENGTH 8 #endif // GUARD_CONSTANTS_POKEMON_H diff --git a/include/pokemon.h b/include/pokemon.h index be0a35877..3cefcfcf2 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -126,7 +126,7 @@ struct PokemonStorage { /*0x0000*/ u8 currentBox; /*0x0001*/ struct BoxPokemon boxes[14][30]; - /*0x8344*/ u8 boxNames[14][9]; + /*0x8344*/ u8 boxNames[14][BOX_NAME_LENGTH + 1]; /*0x83C2*/ u8 boxWallpapers[14]; }; diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 9ac9eff5d..3c29dd9fd 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -15,6 +15,12 @@ void ZeroBoxMonAt(u8 boxId, u8 monPosition); void sub_808CE60(void); void ResetPokemonStorageSystem(void); u8 StorageGetCurrentBox(void); -void PSS_RenderTextToVramViaBuffer(const u8 *name, u8 *a1, u8 a2, u8 a3, u8 *buffer, u8 a5); +void DrawTextWindowAndBufferTiles(const u8 *name, void *a1, u8 a2, u8 a3, u8 *buffer, s32 a5); +void SetCurrentBox(u8 boxId); +void SetBoxWallpaper(u8 boxId, u8 wallpaperId); +struct Sprite *sub_809223C(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority); + +void Cb2_EnterPSS(u8 a0); +u8 GetCurrentBoxOption(void); #endif // GUARD_POKEMON_STORAGE_SYSTEM_H diff --git a/include/string_util.h b/include/string_util.h index 32e74e031..45adac78d 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -30,8 +30,8 @@ u8 *GetExpandedPlaceholder(u32 id); u8 *StringFill(u8 *dest, u8 c, u16 n); u8 *StringCopyPadded(u8 *dest, const u8 *src, u8 c, u16 n); u8 *StringFillWithTerminator(u8 *dest, u16 n); -u8 *StringCopyN_Multibyte(u8 *dest, u8 *src, u32 n); -u32 StringLength_Multibyte(u8 *str); +u8 *StringCopyN_Multibyte(u8 *dest, const u8 *src, u32 n); +u32 StringLength_Multibyte(const u8 *str); u8 *WriteColorChangeControlCode(u8 *dest, u32 colorType, u8 color); bool32 IsStringJapanese(u8 *str); bool32 sub_800924C(u8 *str, s32 n); diff --git a/include/strings.h b/include/strings.h index be3555780..06851c983 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1358,4 +1358,19 @@ extern const u8 gText_BoxName[]; extern const u8 gText_PkmnsNickname[]; extern const u8 gText_RivalsName[]; +// pokemon_storage_system +extern const u8 gText_WithdrawPokemon[]; +extern const u8 gText_WithdrawMonDescription[]; +extern const u8 gText_DepositPokemon[]; +extern const u8 gText_DepositMonDescription[]; +extern const u8 gText_MovePokemon[]; +extern const u8 gText_MoveMonDescription[]; +extern const u8 gText_MoveItems[]; +extern const u8 gText_MoveItemsDescription[]; +extern const u8 gText_SeeYa[]; +extern const u8 gText_SeeYaDescription[]; +extern const u8 gText_PartyFull[]; +extern const u8 gText_JustOnePkmn[]; +extern const u8 gText_Box[]; + #endif //GUARD_STRINGS_H |