From 90be8436d9191d9d22ac1f56d9d2c17f57ceaa63 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Fri, 2 Feb 2024 13:39:21 +0100 Subject: [PATCH] Fix FREE_POKEMON_JUMP --- include/config/save.h | 2 +- src/pokemon_jump.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/config/save.h b/include/config/save.h index 90134a270c..c00b559c9b 100644 --- a/include/config/save.h +++ b/include/config/save.h @@ -12,7 +12,7 @@ // saveblock1 total: 1846 bytes //free saveblock 2 defines #define FREE_BATTLE_TOWER_E_READER FALSE //frees up battle tower e reader trainer data. 188 bytes. WARNING THIS HAS BEEN SHOWN TO BREAK THE POKÉ MARTS' QUESTIONNAIRE -#define FREE_POKEMON_JUMP FALSE //frees up pokemon jump data. 16 bytes +#define FREE_POKEMON_JUMP FALSE // Frees up Pokémon Jump data (16 bytes). #define FREE_RECORD_MIXING_HALL_RECORDS FALSE //frees up hall records for record mixing. 1032 bytes // saveblock2 total: 1236 bytes diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 534b907496..5b0ee35715 100755 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -415,7 +415,7 @@ static void DoPokeJumpCountdown(void); static void Msg_CommunicationStandby(void); static void Task_ShowPokemonJumpRecords(u8); static void PrintRecordsText(u16, int); -static void TruncateToFirstWordOnly(u8 *); +static inline void TruncateToFirstWordOnly(u8 *); EWRAM_DATA static struct PokemonJump *sPokemonJump = NULL; EWRAM_DATA static struct PokemonJumpGfx *sPokemonJumpGfx = NULL; @@ -4332,12 +4332,12 @@ static bool32 RecvPacket_MemberStateToMember(struct PokemonJump_Player *player, return TRUE; } +#if FREE_POKEMON_JUMP == FALSE static struct PokemonJumpRecords *GetPokeJumpRecords(void) { -#if FREE_POKEMON_JUMP == FALSE return &gSaveBlock2Ptr->pokeJump; -#endif //FREE_POKEMON_JUMP } +#endif //FREE_POKEMON_JUMP void ResetPokemonJumpRecords(void) { @@ -4481,7 +4481,7 @@ static void PrintRecordsText(u16 windowId, int width) #endif //FREE_POKEMON_JUMP } -static void TruncateToFirstWordOnly(u8 *str) +static inline void TruncateToFirstWordOnly(u8 *str) { for (;*str != EOS; str++) {