diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a030cdb67..80dc1bdbb 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6166,6 +6166,7 @@ BattleScript_AttackerFormChangeEnd3:: end3 BattleScript_BallFetch:: + call BattleScript_AbilityPopUp printstring STRINGID_FETCHEDPOKEBALL waitmessage 0x40 end3 diff --git a/src/battle_main.c b/src/battle_main.c index e2c23bd2a..000bed511 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -229,7 +229,7 @@ EWRAM_DATA struct FieldTimer gFieldTimers = {0}; EWRAM_DATA u8 gBattlerAbility = 0; EWRAM_DATA u16 gPartnerSpriteId = 0; EWRAM_DATA bool8 gHasFetchedBall = FALSE; -EWRAM_DATA bool8 gLastUsedBall = 0; +EWRAM_DATA u8 gLastUsedBall = 0; // IWRAM common vars void (*gPreBattleCallback1)(void); diff --git a/src/battle_message.c b/src/battle_message.c index c62674d53..3bc300d2c 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -685,7 +685,7 @@ static const u8 sText_FairyAuraActivates[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} static const u8 sText_AuraBreakActivates[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} reversed all\nother POKéMON's auras!"); static const u8 sText_ComatoseActivates[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is drowsing!"); static const u8 sText_ScreenCleanerActivates[] = _("All screens on the field were\ncleansed!"); -static const u8 sText_FetchedPokeBall[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} has fetched\nyour {B_LAST_ITEM}!"); +static const u8 sText_FetchedPokeBall[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} found\na {B_LAST_ITEM}!"); const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = {