atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Imposter

Browse source
This commit is contained in:
DizzyEggg 2018-07-29 12:21:28 +02:00
parent d628d1f5fd
commit 3d93da7133
8 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
asm/macros/battle_script.inc
View file

@ -1393,6 +1393,11 @@
various \battler, VARIOUS_TRY_ACTIVATE_FELL_STINGER various \battler, VARIOUS_TRY_ACTIVATE_FELL_STINGER
.endm .endm
.macro playmoveanimation battler move
various \battler, VARIOUS_PLAY_MOVE_ANIMATION
.2byte \move
.endm
@ helpful macros @ helpful macros
.macro setstatchanger stat, stages, down .macro setstatchanger stat, stages, down
setbyte sSTATCHANGER \stat | \stages << 4 | \down << 7 setbyte sSTATCHANGER \stat | \stages << 4 | \down << 7

8
data/battle_scripts_1.s
View file

@ -4859,6 +4859,14 @@ BattleScript_SwitchInAbilityMsg::
waitmessage 0x40 waitmessage 0x40
end3 end3
BattleScript_ImposterActivates::
transformdataexecution
playmoveanimation BS_ATTACKER MOVE_TRANSFORM
waitanimation
printstring STRINGID_IMPOSTERTRANSFORM
waitmessage 0x40
end3
BattleScript_RoughSkinActivates:: BattleScript_RoughSkinActivates::
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
healthbarupdate BS_ATTACKER healthbarupdate BS_ATTACKER

1
include/battle_scripts.h
View file

@ -324,5 +324,6 @@ extern const u8 BattleScript_WeakArmorActivates[];
extern const u8 BattleScript_FellStingerRaisesStat[]; extern const u8 BattleScript_FellStingerRaisesStat[];
extern const u8 BattleScript_SnowWarningActivates[]; extern const u8 BattleScript_SnowWarningActivates[];
extern const u8 BattleScript_HarvestActivates[]; extern const u8 BattleScript_HarvestActivates[];
extern const u8 BattleScript_ImposterActivates[];
#endif // GUARD_BATTLE_SCRIPTS_H #endif // GUARD_BATTLE_SCRIPTS_H

1
include/constants/battle_script_commands.h
View file

@ -81,6 +81,7 @@
#define VARIOUS_RESTORE_PP 33 #define VARIOUS_RESTORE_PP 33
#define VARIOUS_TRY_ACTIVATE_MOXIE 34 #define VARIOUS_TRY_ACTIVATE_MOXIE 34
#define VARIOUS_TRY_ACTIVATE_FELL_STINGER 35 #define VARIOUS_TRY_ACTIVATE_FELL_STINGER 35
#define VARIOUS_PLAY_MOVE_ANIMATION 36
// atk80, dmg manipulation // atk80, dmg manipulation
#define ATK80_DMG_CHANGE_SIGN 0 #define ATK80_DMG_CHANGE_SIGN 0

1
include/constants/battle_string_ids.h
View file

@ -485,6 +485,7 @@
#define STRINGID_TARGETABILITYSTATLOWER 482 #define STRINGID_TARGETABILITYSTATLOWER 482
#define STRINGID_TARGETSTATWONTGOHIGHER 483 #define STRINGID_TARGETSTATWONTGOHIGHER 483
#define STRINGID_PKMNMOVEBOUNCEDABILITY 484 #define STRINGID_PKMNMOVEBOUNCEDABILITY 484
#define STRINGID_IMPOSTERTRANSFORM 485
#define BATTLESTRINGS_COUNT 496 #define BATTLESTRINGS_COUNT 496

2
src/battle_message.c
View file

@ -626,6 +626,7 @@ static const u8 sText_CursedBodyDisabled[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_
static const u8 sText_AttackerAquiredAbility[] = _("{B_ATK_NAME_WITH_PREFIX} acquired {B_LAST_ABILITY}!"); static const u8 sText_AttackerAquiredAbility[] = _("{B_ATK_NAME_WITH_PREFIX} acquired {B_LAST_ABILITY}!");
static const u8 sText_TargetStatWontGoHigher[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}\nwon’t go higher!"); static const u8 sText_TargetStatWontGoHigher[] = _("{B_DEF_NAME_WITH_PREFIX}’s {B_BUFF1}\nwon’t go higher!");
static const u8 sText_PkmnMoveBouncedViaAbility[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_CURRENT_MOVE} was\nbounced back by {B_DEF_NAME_WITH_PREFIX}’s\l{B_DEF_ABILITY}!"); static const u8 sText_PkmnMoveBouncedViaAbility[] = _("{B_ATK_NAME_WITH_PREFIX}’s {B_CURRENT_MOVE} was\nbounced back by {B_DEF_NAME_WITH_PREFIX}’s\l{B_DEF_ABILITY}!");
static const u8 sText_ImposterTransform[] = _("{B_ATK_NAME_WITH_PREFIX} transformed into\n{B_DEF_NAME_WITH_PREFIX} using {B_LAST_ABILITY}!");
const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
{ {
@ -1103,6 +1104,7 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
sText_TargetAbilityLoweredStat, sText_TargetAbilityLoweredStat,
sText_TargetStatWontGoHigher, sText_TargetStatWontGoHigher,
sText_PkmnMoveBouncedViaAbility, sText_PkmnMoveBouncedViaAbility,
sText_ImposterTransform,
}; };
const u16 gMagicCoatBounceStringIds[] = const u16 gMagicCoatBounceStringIds[] =

5
src/battle_script_commands.c
View file

@ -6355,6 +6355,11 @@ static void atk76_various(void)
return; return;
} }
break; break;
case VARIOUS_PLAY_MOVE_ANIMATION:
BtlController_EmitMoveAnimation(0, T1_READ_16(gBattlescriptCurrInstr + 3), gBattleScripting.animTurn, 0, 0, gBattleMons[gActiveBattler].friendship, &gDisableStructs[gActiveBattler], gMultiHitCounter);
MarkBattlerForControllerExec(gActiveBattler);
gBattlescriptCurrInstr += 5;
return;
} }
gBattlescriptCurrInstr += 3; gBattlescriptCurrInstr += 3;

10
src/battle_util.c
View file

@ -2429,6 +2429,16 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts); BattleScriptPushCursorAndCallback(BattleScript_OverworldWeatherStarts);
} }
break; break;
case ABILITY_IMPOSTER:
if (IsBattlerAlive(BATTLE_OPPOSITE(battler))
&& !(gBattleMons[BATTLE_OPPOSITE(battler)].status2 & (STATUS2_TRANSFORMED | STATUS2_SUBSTITUTE))
&& !(gBattleMons[battler].status2 & STATUS2_TRANSFORMED))
{
gBattlerTarget = BATTLE_OPPOSITE(battler);
BattleScriptPushCursorAndCallback(BattleScript_ImposterActivates);
effect++;
}
break;
case ABILITY_MOLD_BREAKER: case ABILITY_MOLD_BREAKER:
if (!gSpecialStatuses[battler].switchInAbilityDone) if (!gSpecialStatuses[battler].switchInAbilityDone)
{ {