Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor tweaks

Browse Source
This commit is contained in:
AgustinGDLV 2022-05-07 13:18:25 -07:00
parent 9d222d3ab4
commit fa334b21f7
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_message.c
View File

@ -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_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_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_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_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_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!"); static const u8 sText_ToxicSpikesPoisoned[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} was poisoned!");

5
src/battle_script_commands.c
View File

@ -7094,7 +7094,7 @@ static bool32 TrySymbiosis(u32 battler, u32 itemId)
BestowItem(ally, battler); BestowItem(ally, battler);
gLastUsedAbility = gBattleMons[ally].ability; gLastUsedAbility = gBattleMons[ally].ability;
gBattleScripting.battler = gBattlerAbility = ally; gBattleScripting.battler = gBattlerAbility = ally;
gBattlerTarget = battler; gBattlerAttacker = battler;
BattleScriptPush(gBattlescriptCurrInstr + 2); BattleScriptPush(gBattlescriptCurrInstr + 2);
gBattlescriptCurrInstr = BattleScript_SymbiosisActivates; gBattlescriptCurrInstr = BattleScript_SymbiosisActivates;
return TRUE; return TRUE;
@ -9636,7 +9636,7 @@ static void Cmd_various(void)
BestowItem(gActiveBattler ^ BIT_FLANK, gActiveBattler); BestowItem(gActiveBattler ^ BIT_FLANK, gActiveBattler);
gLastUsedAbility = gBattleMons[gActiveBattler ^ BIT_FLANK].ability; gLastUsedAbility = gBattleMons[gActiveBattler ^ BIT_FLANK].ability;
gBattleScripting.battler = gBattlerAbility = gActiveBattler ^ BIT_FLANK; gBattleScripting.battler = gBattlerAbility = gActiveBattler ^ BIT_FLANK;
gBattlerTarget = gActiveBattler; gBattlerAttacker = gActiveBattler;
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_SymbiosisActivates; gBattlescriptCurrInstr = BattleScript_SymbiosisActivates;
return; return;
@ -12694,7 +12694,6 @@ static void Cmd_tryswapitems(void) // trick
else else
{ {
CheckSetUnburden(gBattlerAttacker); CheckSetUnburden(gBattlerAttacker);
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ITEM_SWAP_GIVEN; // attacker's item -> <- nothing gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ITEM_SWAP_GIVEN; // attacker's item -> <- nothing
} }
} }