From fa334b21f7772f32ab5e012bc0e491b764ba05ab Mon Sep 17 00:00:00 2001 From: AgustinGDLV Date: Sat, 7 May 2022 13:18:25 -0700 Subject: [PATCH] minor tweaks --- src/battle_message.c | 2 +- src/battle_script_commands.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/battle_message.c b/src/battle_message.c index d2b02e341f..d5c6844bc7 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -601,7 +601,7 @@ static const u8 sText_HarvestBerry[] = _("{B_ATK_NAME_WITH_PREFIX} harvested\nit static const u8 sText_LastAbilityRaisedBuff1[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_LAST_ABILITY}\nraised its {B_BUFF1}!"); static const u8 sText_MagicBounceActivates[] = _("The {B_DEF_NAME_WITH_PREFIX} bounced the\n{B_ATK_NAME_WITH_PREFIX} back!"); static const u8 sText_ProteanTypeChange[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_ATK_ABILITY} transformed\nit into the {B_BUFF1} type!"); -static const u8 sText_SymbiosisItemPass[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} passed its {B_LAST_ITEM}\nto {B_DEF_NAME_WITH_PREFIX} through {B_LAST_ABILITY}!"); +static const u8 sText_SymbiosisItemPass[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} passed its {B_LAST_ITEM}\nto {B_ATK_NAME_WITH_PREFIX} through {B_LAST_ABILITY}!"); static const u8 sText_StealthRockDmg[] = _("Pointed stones dug into\n{B_SCR_ACTIVE_NAME_WITH_PREFIX}!"); static const u8 sText_ToxicSpikesAbsorbed[] = _("The poison spikes disappeared\nfrom around the opposing team's feet!"); static const u8 sText_ToxicSpikesPoisoned[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} was poisoned!"); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a6420bbc76..aa8b668798 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -7094,7 +7094,7 @@ static bool32 TrySymbiosis(u32 battler, u32 itemId) BestowItem(ally, battler); gLastUsedAbility = gBattleMons[ally].ability; gBattleScripting.battler = gBattlerAbility = ally; - gBattlerTarget = battler; + gBattlerAttacker = battler; BattleScriptPush(gBattlescriptCurrInstr + 2); gBattlescriptCurrInstr = BattleScript_SymbiosisActivates; return TRUE; @@ -9636,7 +9636,7 @@ static void Cmd_various(void) BestowItem(gActiveBattler ^ BIT_FLANK, gActiveBattler); gLastUsedAbility = gBattleMons[gActiveBattler ^ BIT_FLANK].ability; gBattleScripting.battler = gBattlerAbility = gActiveBattler ^ BIT_FLANK; - gBattlerTarget = gActiveBattler; + gBattlerAttacker = gActiveBattler; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SymbiosisActivates; return; @@ -12694,7 +12694,6 @@ static void Cmd_tryswapitems(void) // trick else { CheckSetUnburden(gBattlerAttacker); - gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ITEM_SWAP_GIVEN; // attacker's item -> <- nothing } }