ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 12:37:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107 from thechurchofcage/gamma

Browse Source 
Taunt fix etc.
This commit is contained in:
DizzyEggg 2019-03-29 22:24:03 +01:00 committed by GitHub
commit 567240b725
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/battle_scripts_1.s
View File

@ -5350,16 +5350,16 @@ BattleScript_SelectingNotAllowedMoveGravityInPalace::
goto BattleScript_SelectingUnusableMoveInPalace goto BattleScript_SelectingUnusableMoveInPalace
BattleScript_SelectingNotAllowedMoveHealBlock:: BattleScript_SelectingNotAllowedMoveHealBlock::
printselectionstring STRINGID_GRAVITYPREVENTSUSAGE printselectionstring STRINGID_HEALBLOCKPREVENTSUSAGE
endselectionscript endselectionscript
BattleScript_MoveUsedHealBlockPrevents:: BattleScript_MoveUsedHealBlockPrevents::
printstring STRINGID_GRAVITYPREVENTSUSAGE printstring STRINGID_HEALBLOCKPREVENTSUSAGE
waitmessage 0x40 waitmessage 0x40
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_SelectingNotAllowedMoveHealBlockInPalace:: BattleScript_SelectingNotAllowedMoveHealBlockInPalace::
printstring STRINGID_GRAVITYPREVENTSUSAGE printstring STRINGID_HEALBLOCKPREVENTSUSAGE
goto BattleScript_SelectingUnusableMoveInPalace goto BattleScript_SelectingUnusableMoveInPalace
BattleScript_WishComesTrue:: BattleScript_WishComesTrue::
@ -5773,18 +5773,13 @@ BattleScript_EmbargoEndTurn::
waitmessage 0x40 waitmessage 0x40
end2 end2
BattleScript_MagnetRiseEndTurn::
printstring STRINGID_MAGNETRISEENDS
waitmessage 0x40
end2
BattleScript_TelekinesisEndTurn:: BattleScript_TelekinesisEndTurn::
printstring STRINGID_TELEKINESISENDS printstring STRINGID_TELEKINESISENDS
waitmessage 0x40 waitmessage 0x40
end2 end2
BattleScript_HealBlockEndTurn:: BattleScript_BufferEndTurn::
printstring STRINGID_HEALBLOCKENDS printstring STRINGID_BUFFERENDS
waitmessage 0x40 waitmessage 0x40
end2 end2

2
include/battle_message.h
View File

@ -150,7 +150,7 @@
{ \ { \
textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \ textVar[0] = B_BUFF_PLACEHOLDER_BEGIN; \
textVar[1] = B_BUFF_STRING; \ textVar[1] = B_BUFF_STRING; \
textVar[2] = stringId; \ textVar[2] = stringId & 0xFF; \
textVar[3] = (stringId & 0xFF00) >> 8; \ textVar[3] = (stringId & 0xFF00) >> 8; \
textVar[4] = B_BUFF_EOS; \ textVar[4] = B_BUFF_EOS; \
} }

3
include/battle_scripts.h
View File

@ -225,9 +225,8 @@ extern const u8 BattleScript_ActionWatchesCarefully[];
extern const u8 BattleScript_ActionGetNear[]; extern const u8 BattleScript_ActionGetNear[];
extern const u8 BattleScript_ActionThrowPokeblock[]; extern const u8 BattleScript_ActionThrowPokeblock[];
extern const u8 BattleScript_EmbargoEndTurn[]; extern const u8 BattleScript_EmbargoEndTurn[];
extern const u8 BattleScript_MagnetRiseEndTurn[];
extern const u8 BattleScript_TelekinesisEndTurn[]; extern const u8 BattleScript_TelekinesisEndTurn[];
extern const u8 BattleScript_HealBlockEndTurn[]; extern const u8 BattleScript_BufferEndTurn[];
extern const u8 BattleScript_AquaRingHeal[]; extern const u8 BattleScript_AquaRingHeal[];
extern const u8 BattleScript_AuroraVeilEnds[]; extern const u8 BattleScript_AuroraVeilEnds[];
extern const u8 BattleScript_LuckyChantEnds[]; extern const u8 BattleScript_LuckyChantEnds[];

4
include/constants/battle_string_ids.h
View File

@ -434,8 +434,8 @@
#define STRINGID_REFLECTTARGETSTYPE 430 #define STRINGID_REFLECTTARGETSTYPE 430
#define STRINGID_TRANSFERHELDITEM 431 #define STRINGID_TRANSFERHELDITEM 431
#define STRINGID_EMBARGOENDS 432 #define STRINGID_EMBARGOENDS 432
#define STRINGID_MAGNETRISEENDS 433 #define STRINGID_ELECTROMAGNETISM 433
#define STRINGID_HEALBLOCKENDS 434 #define STRINGID_BUFFERENDS 434
#define STRINGID_TELEKINESISENDS 435 #define STRINGID_TELEKINESISENDS 435
#define STRINGID_TAILWINDENDS 436 #define STRINGID_TAILWINDENDS 436
#define STRINGID_LUCKYCHANTENDS 437 #define STRINGID_LUCKYCHANTENDS 437

16
src/battle_message.c
View File

@ -223,7 +223,7 @@ static const u8 sText_NaturePowerTurnedInto[] = _("NATURE POWER turned into\n{B_
static const u8 sText_PkmnStatusNormal[] = _("{B_ATK_NAME_WITH_PREFIX}'s status\nreturned to normal!"); static const u8 sText_PkmnStatusNormal[] = _("{B_ATK_NAME_WITH_PREFIX}'s status\nreturned to normal!");
static const u8 sText_PkmnSubjectedToTorment[] = _("{B_DEF_NAME_WITH_PREFIX} was subjected\nto TORMENT!"); static const u8 sText_PkmnSubjectedToTorment[] = _("{B_DEF_NAME_WITH_PREFIX} was subjected\nto TORMENT!");
static const u8 sText_PkmnTighteningFocus[] = _("{B_ATK_NAME_WITH_PREFIX} is tightening\nits focus!"); static const u8 sText_PkmnTighteningFocus[] = _("{B_ATK_NAME_WITH_PREFIX} is tightening\nits focus!");
static const u8 sText_PkmnFellForTaunt[] = _("{B_DEF_NAME_WITH_PREFIX} fell for\nthe TAUNT!"); static const u8 sText_PkmnFellForTaunt[] = _("{B_DEF_NAME_WITH_PREFIX} fell for\nthe Taunt!");
static const u8 sText_PkmnReadyToHelp[] = _("{B_ATK_NAME_WITH_PREFIX} is ready to\nhelp {B_DEF_NAME_WITH_PREFIX}!"); static const u8 sText_PkmnReadyToHelp[] = _("{B_ATK_NAME_WITH_PREFIX} is ready to\nhelp {B_DEF_NAME_WITH_PREFIX}!");
static const u8 sText_PkmnSwitchedItems[] = _("{B_ATK_NAME_WITH_PREFIX} switched\nitems with its opponent!"); static const u8 sText_PkmnSwitchedItems[] = _("{B_ATK_NAME_WITH_PREFIX} switched\nitems with its opponent!");
static const u8 sText_PkmnObtainedX[] = _("{B_ATK_NAME_WITH_PREFIX} obtained\n{B_BUFF1}."); static const u8 sText_PkmnObtainedX[] = _("{B_ATK_NAME_WITH_PREFIX} obtained\n{B_BUFF1}.");
@ -258,8 +258,8 @@ static const u8 sText_TheWallShattered[] = _("The wall shattered!");
static const u8 sText_ButNoEffect[] = _("But it had no effect!"); static const u8 sText_ButNoEffect[] = _("But it had no effect!");
static const u8 sText_PkmnHasNoMovesLeft[] = _("{B_ACTIVE_NAME_WITH_PREFIX} has no\nmoves left!\p"); static const u8 sText_PkmnHasNoMovesLeft[] = _("{B_ACTIVE_NAME_WITH_PREFIX} has no\nmoves left!\p");
static const u8 sText_PkmnMoveIsDisabled[] = _("{B_ACTIVE_NAME_WITH_PREFIX}'s {B_CURRENT_MOVE}\nis disabled!\p"); static const u8 sText_PkmnMoveIsDisabled[] = _("{B_ACTIVE_NAME_WITH_PREFIX}'s {B_CURRENT_MOVE}\nis disabled!\p");
static const u8 sText_PkmnCantUseMoveTorment[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use the same\nmove in a row due to the TORMENT!\p"); static const u8 sText_PkmnCantUseMoveTorment[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use the same\nmove in a row due to the Torment!\p");
static const u8 sText_PkmnCantUseMoveTaunt[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use\n{B_CURRENT_MOVE} after the TAUNT!\p"); static const u8 sText_PkmnCantUseMoveTaunt[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use\n{B_CURRENT_MOVE} after the Taunt!\p");
static const u8 sText_PkmnCantUseMoveSealed[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use the\nsealed {B_CURRENT_MOVE}!\p"); static const u8 sText_PkmnCantUseMoveSealed[] = _("{B_ACTIVE_NAME_WITH_PREFIX} can't use the\nsealed {B_CURRENT_MOVE}!\p");
static const u8 sText_PkmnMadeItRain[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nmade it rain!"); static const u8 sText_PkmnMadeItRain[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nmade it rain!");
static const u8 sText_PkmnRaisedSpeed[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nraised its SPEED!"); static const u8 sText_PkmnRaisedSpeed[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX}'s {B_SCR_ACTIVE_ABILITY}\nraised its SPEED!");
@ -559,8 +559,8 @@ static const u8 sText_PostponeTargetMove[] =_("{B_DEF_NAME_WITH_PREFIX}'s move\n
static const u8 sText_ReflectTargetsType[] =_("{B_ATK_NAME_WITH_PREFIX}'s type\nchanged to match the {B_DEF_NAME_WITH_PREFIX}'s!"); static const u8 sText_ReflectTargetsType[] =_("{B_ATK_NAME_WITH_PREFIX}'s type\nchanged to match the {B_DEF_NAME_WITH_PREFIX}'s!");
static const u8 sText_TransferHeldItem[] =_("{B_DEF_NAME_WITH_PREFIX} recieved {B_LAST_ITEM}\nfrom {B_ATK_NAME_WITH_PREFIX}"); static const u8 sText_TransferHeldItem[] =_("{B_DEF_NAME_WITH_PREFIX} recieved {B_LAST_ITEM}\nfrom {B_ATK_NAME_WITH_PREFIX}");
static const u8 sText_EmbargoEnds[] = _("{B_DEF_NAME_WITH_PREFIX}can\nuse items again!"); static const u8 sText_EmbargoEnds[] = _("{B_DEF_NAME_WITH_PREFIX}can\nuse items again!");
static const u8 sText_MagnetRiseEnds[] = _("{B_ATK_NAME_WITH_PREFIX}'s electromagnetism\nwore off!"); static const u8 sText_Electromagnetism[] = _("electromagnetism");
static const u8 sText_HealBlockEnds[] = _("{B_ATK_NAME_WITH_PREFIX}'s Heal Block\nwore off!"); static const u8 sText_BufferEnds[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\nwore off!");
static const u8 sText_TelekinesisEnds[] = _("{B_ATK_NAME_WITH_PREFIX} was freed\nfrom the telekinesis!"); static const u8 sText_TelekinesisEnds[] = _("{B_ATK_NAME_WITH_PREFIX} was freed\nfrom the telekinesis!");
static const u8 sText_TailwindEnds[] = _("{B_ATK_TEAM1} team's tailwind\n petered out!"); static const u8 sText_TailwindEnds[] = _("{B_ATK_TEAM1} team's tailwind\n petered out!");
static const u8 sText_LuckyChantEnds[] = _("{B_ATK_TEAM1} team's Lucky Chant\n wore off!"); static const u8 sText_LuckyChantEnds[] = _("{B_ATK_TEAM1} team's Lucky Chant\n wore off!");
@ -627,7 +627,7 @@ static const u8 sText_TerrainBecomesPsychic[] = _("The battlefield got weird!");
static const u8 sText_TargetElectrified[] = _("The opposing {B_ATK_NAME_WITH_PREFIX}'s moves\nhave been electrified!"); static const u8 sText_TargetElectrified[] = _("The opposing {B_ATK_NAME_WITH_PREFIX}'s moves\nhave been electrified!");
static const u8 sText_AssaultVestDoesntAllow[] = _("The effects of the {B_LAST_ITEM} prevent status\nmoves from being used!\p"); static const u8 sText_AssaultVestDoesntAllow[] = _("The effects of the {B_LAST_ITEM} prevent status\nmoves from being used!\p");
static const u8 sText_GravityPreventsUsage[] = _("{B_ATK_NAME_WITH_PREFIX} can't use {B_CURRENT_MOVE}\nbecause of gravity!\p"); static const u8 sText_GravityPreventsUsage[] = _("{B_ATK_NAME_WITH_PREFIX} can't use {B_CURRENT_MOVE}\nbecause of gravity!\p");
static const u8 sText_HealBlockPreventsUsage[] = _("The opposing {B_ATK_NAME_WITH_PREFIX} was\nprevented from healing!\p"); static const u8 sText_HealBlockPreventsUsage[] = _("{B_ATK_NAME_WITH_PREFIX} was\nprevented from healing!\p");
static const u8 sText_MegaEvoReacting[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_LAST_ITEM} is reacting\nto {B_ATK_TRAINER_NAME}'s Mega Ring!"); static const u8 sText_MegaEvoReacting[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_LAST_ITEM} is reacting\nto {B_ATK_TRAINER_NAME}'s Mega Ring!");
static const u8 sText_MegaEvoEvolved[] = _("{B_ATK_NAME_WITH_PREFIX} has Mega\nEvolved into Mega {B_BUFF1}!"); static const u8 sText_MegaEvoEvolved[] = _("{B_ATK_NAME_WITH_PREFIX} has Mega\nEvolved into Mega {B_BUFF1}!");
static const u8 sText_drastically[] = _("drastically "); static const u8 sText_drastically[] = _("drastically ");
@ -1076,8 +1076,8 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
[STRINGID_REFLECTTARGETSTYPE - 12] = sText_ReflectTargetsType, [STRINGID_REFLECTTARGETSTYPE - 12] = sText_ReflectTargetsType,
[STRINGID_TRANSFERHELDITEM - 12] = sText_TransferHeldItem, [STRINGID_TRANSFERHELDITEM - 12] = sText_TransferHeldItem,
[STRINGID_EMBARGOENDS - 12] = sText_EmbargoEnds, [STRINGID_EMBARGOENDS - 12] = sText_EmbargoEnds,
[STRINGID_MAGNETRISEENDS - 12] = sText_MagnetRiseEnds, [STRINGID_ELECTROMAGNETISM - 12] = sText_Electromagnetism,
[STRINGID_HEALBLOCKENDS - 12] = sText_HealBlockEnds, [STRINGID_BUFFERENDS - 12] = sText_BufferEnds,
[STRINGID_TELEKINESISENDS - 12] = sText_TelekinesisEnds, [STRINGID_TELEKINESISENDS - 12] = sText_TelekinesisEnds,
[STRINGID_TAILWINDENDS - 12] = sText_TailwindEnds, [STRINGID_TAILWINDENDS - 12] = sText_TailwindEnds,
[STRINGID_LUCKYCHANTENDS - 12] = sText_LuckyChantEnds, [STRINGID_LUCKYCHANTENDS - 12] = sText_LuckyChantEnds,

7
src/battle_script_commands.c
View File

@ -9973,8 +9973,11 @@ static void atkD0_settaunt(void)
{ {
if (gDisableStructs[gBattlerTarget].tauntTimer == 0) if (gDisableStructs[gBattlerTarget].tauntTimer == 0)
{ {
gDisableStructs[gBattlerTarget].tauntTimer = 2; u8 turns = 4;
gDisableStructs[gBattlerTarget].tauntTimer2 = 2; if (GetBattlerTurnOrderNum(gBattlerTarget) > GetBattlerTurnOrderNum(gBattlerAttacker))
turns--; // If the target hasn't yet moved this turn, Taunt lasts for only three turns (source: Bulbapedia)
gDisableStructs[gBattlerTarget].tauntTimer = gDisableStructs[gBattlerTarget].tauntTimer2 = turns;
gBattlescriptCurrInstr += 5; gBattlescriptCurrInstr += 5;
} }
else else

34
src/battle_util.c
View File

@ -1685,8 +1685,12 @@ u8 DoBattlerEndTurnEffects(void)
gBattleStruct->turnEffectsTracker++; gBattleStruct->turnEffectsTracker++;
break; break;
case ENDTURN_TAUNT: // taunt case ENDTURN_TAUNT: // taunt
if (gDisableStructs[gActiveBattler].tauntTimer) if (gDisableStructs[gActiveBattler].tauntTimer && --gDisableStructs[gActiveBattler].tauntTimer == 0)
gDisableStructs[gActiveBattler].tauntTimer--; {
BattleScriptExecute(BattleScript_BufferEndTurn);
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_TAUNT);
effect++;
}
gBattleStruct->turnEffectsTracker++; gBattleStruct->turnEffectsTracker++;
break; break;
case ENDTURN_YAWN: // yawn case ENDTURN_YAWN: // yawn
@ -1711,9 +1715,7 @@ u8 DoBattlerEndTurnEffects(void)
case ENDTURN_LASER_FOCUS: case ENDTURN_LASER_FOCUS:
if (gStatuses3[gActiveBattler] & STATUS3_LASER_FOCUS) if (gStatuses3[gActiveBattler] & STATUS3_LASER_FOCUS)
{ {
if (gDisableStructs[gActiveBattler].laserFocusTimer != 0) if (gDisableStructs[gActiveBattler].laserFocusTimer == 0 || --gDisableStructs[gActiveBattler].laserFocusTimer == 0)
gDisableStructs[gActiveBattler].laserFocusTimer--;
if (gDisableStructs[gActiveBattler].laserFocusTimer == 0)
gStatuses3[gActiveBattler] &= ~(STATUS3_LASER_FOCUS); gStatuses3[gActiveBattler] &= ~(STATUS3_LASER_FOCUS);
} }
gBattleStruct->turnEffectsTracker++; gBattleStruct->turnEffectsTracker++;
@ -1721,9 +1723,7 @@ u8 DoBattlerEndTurnEffects(void)
case ENDTURN_EMBARGO: case ENDTURN_EMBARGO:
if (gStatuses3[gActiveBattler] & STATUS3_EMBARGO) if (gStatuses3[gActiveBattler] & STATUS3_EMBARGO)
{ {
if (gDisableStructs[gActiveBattler].embargoTimer != 0) if (gDisableStructs[gActiveBattler].embargoTimer == 0 || --gDisableStructs[gActiveBattler].embargoTimer == 0)
gDisableStructs[gActiveBattler].embargoTimer--;
if (gDisableStructs[gActiveBattler].embargoTimer == 0)
{ {
gStatuses3[gActiveBattler] &= ~(STATUS3_EMBARGO); gStatuses3[gActiveBattler] &= ~(STATUS3_EMBARGO);
BattleScriptExecute(BattleScript_EmbargoEndTurn); BattleScriptExecute(BattleScript_EmbargoEndTurn);
@ -1735,12 +1735,11 @@ u8 DoBattlerEndTurnEffects(void)
case ENDTURN_MAGNET_RISE: case ENDTURN_MAGNET_RISE:
if (gStatuses3[gActiveBattler] & STATUS3_MAGNET_RISE) if (gStatuses3[gActiveBattler] & STATUS3_MAGNET_RISE)
{ {
if (gDisableStructs[gActiveBattler].magnetRiseTimer != 0) if (gDisableStructs[gActiveBattler].magnetRiseTimer == 0 || --gDisableStructs[gActiveBattler].magnetRiseTimer == 0)
gDisableStructs[gActiveBattler].magnetRiseTimer--;
if (gDisableStructs[gActiveBattler].magnetRiseTimer == 0)
{ {
gStatuses3[gActiveBattler] &= ~(STATUS3_MAGNET_RISE); gStatuses3[gActiveBattler] &= ~(STATUS3_MAGNET_RISE);
BattleScriptExecute(BattleScript_MagnetRiseEndTurn); BattleScriptExecute(BattleScript_BufferEndTurn);
PREPARE_STRING_BUFFER(gBattleTextBuff1, STRINGID_ELECTROMAGNETISM);
effect++; effect++;
} }
} }
@ -1749,9 +1748,7 @@ u8 DoBattlerEndTurnEffects(void)
case ENDTURN_TELEKINESIS: case ENDTURN_TELEKINESIS:
if (gStatuses3[gActiveBattler] & STATUS3_TELEKINESIS) if (gStatuses3[gActiveBattler] & STATUS3_TELEKINESIS)
{ {
if (gDisableStructs[gActiveBattler].telekinesisTimer != 0) if (gDisableStructs[gActiveBattler].telekinesisTimer == 0 || --gDisableStructs[gActiveBattler].telekinesisTimer == 0)
gDisableStructs[gActiveBattler].telekinesisTimer--;
if (gDisableStructs[gActiveBattler].telekinesisTimer == 0)
{ {
gStatuses3[gActiveBattler] &= ~(STATUS3_TELEKINESIS); gStatuses3[gActiveBattler] &= ~(STATUS3_TELEKINESIS);
BattleScriptExecute(BattleScript_TelekinesisEndTurn); BattleScriptExecute(BattleScript_TelekinesisEndTurn);
@ -1763,12 +1760,11 @@ u8 DoBattlerEndTurnEffects(void)
case ENDTURN_HEALBLOCK: case ENDTURN_HEALBLOCK:
if (gStatuses3[gActiveBattler] & STATUS3_HEAL_BLOCK) if (gStatuses3[gActiveBattler] & STATUS3_HEAL_BLOCK)
{ {
if (gDisableStructs[gActiveBattler].healBlockTimer != 0) if (gDisableStructs[gActiveBattler].healBlockTimer == 0 || --gDisableStructs[gActiveBattler].healBlockTimer == 0)
gDisableStructs[gActiveBattler].healBlockTimer--;
if (gDisableStructs[gActiveBattler].healBlockTimer == 0)
{ {
gStatuses3[gActiveBattler] &= ~(STATUS3_HEAL_BLOCK); gStatuses3[gActiveBattler] &= ~(STATUS3_HEAL_BLOCK);
BattleScriptExecute(BattleScript_HealBlockEndTurn); BattleScriptExecute(BattleScript_BufferEndTurn);
PREPARE_MOVE_BUFFER(gBattleTextBuff1, MOVE_HEAL_BLOCK);
effect++; effect++;
} }
} }