diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/pokemon_storage_system.h | 2 | ||||
| -rw-r--r-- | include/pokemon_storage_system_internal.h | 2 | ||||
| -rw-r--r-- | include/text.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 6d0489ed6..7422b4522 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -30,7 +30,7 @@ enum u8 *GetBoxNamePtr(u8 boxNumber); struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 monPosition); void SetBoxMonNickAt(u8 boxId, u8 monPosition, const u8 *newNick); -void CompactPartySlots(void); +s16 CompactPartySlots(void); u32 GetBoxMonDataAt(u8 boxId, u8 monPosition, s32 request); void ZeroBoxMonAt(u8 boxId, u8 monPosition); void Cb2_ReturnToPSS(void); diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h index 4d5af348c..caec69019 100644 --- a/include/pokemon_storage_system_internal.h +++ b/include/pokemon_storage_system_internal.h @@ -454,5 +454,7 @@ void sub_80901EC(u8 boxPosition); void sub_8090FC4(u8 mode, u8 position); bool8 sub_8091084(void); void sub_80910CC(void); +u8 CountPartyMons(void); +u8 CountPartyAliveNonEggMonsExcept(u8 slotToIgnore); #endif //GUARD_POKEMON_STORAGE_SYSTEM_INTERNAL_H diff --git a/include/text.h b/include/text.h index ff8b033e9..f1bf8b942 100644 --- a/include/text.h +++ b/include/text.h @@ -128,6 +128,7 @@ #define EXT_CTRL_CODE_COLOR 0x1 #define EXT_CTRL_CODE_HIGHLIGHT 0x2 #define EXT_CTRL_CODE_SHADOW 0x3 +#define EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW 0x4 // #define EXT_CTRL_CODE_UNKNOWN_7 0x7 // |