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

Handled Mimicry's interaction with Steel Roller's effect

Browse Source
This commit is contained in:
LOuroboros 2021-11-03 21:04:34 -03:00
parent f6628e301f
commit b931e34172
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/battle_script.inc
View File

@ -1883,6 +1883,10 @@
.4byte \ptr .4byte \ptr
.endm .endm
.macro trytorevertmimicry
various BS_ATTACKER, VARIOUS_TRY_TO_REVERT_MIMICRY
.endm
@ helpful macros @ helpful macros
.macro setstatchanger stat:req, stages:req, down:req .macro setstatchanger stat:req, stages:req, down:req
setbyte sSTATCHANGER \stat | \stages << 3 | \down << 7 setbyte sSTATCHANGER \stat | \stages << 3 | \down << 7

1
data/battle_scripts_1.s
View File

@ -660,6 +660,7 @@ BattleScript_EffectRemoveTerrain:
resultmessage resultmessage
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
removeterrain removeterrain
trytorevertmimicry
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 4, BattleScript_MoveEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 4, BattleScript_MoveEnd
printfromtable gTerrainEndingStringIds printfromtable gTerrainEndingStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG

1
include/constants/battle_script_commands.h
View File

@ -199,6 +199,7 @@
#define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 126 #define VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED 126
#define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 127 #define VARIOUS_SET_ATTACKER_STICKY_WEB_USER 127
#define VARIOUS_TRY_TO_APPLY_MIMICRY 128 #define VARIOUS_TRY_TO_APPLY_MIMICRY 128
#define VARIOUS_TRY_TO_REVERT_MIMICRY 129
// Cmd_manipulatedamage // Cmd_manipulatedamage
#define DMG_CHANGE_SIGN 0 #define DMG_CHANGE_SIGN 0

7
src/battle_script_commands.c
View File

@ -9039,6 +9039,13 @@ static void Cmd_various(void)
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
return; return;
} }
case VARIOUS_TRY_TO_REVERT_MIMICRY:
for (i = 0; i < gBattlersCount; i++)
{
if (GetBattlerAbility(i) == ABILITY_MIMICRY)
RestoreBattlerOriginalTypes(i);
}
break;
} }
gBattlescriptCurrInstr += 3; gBattlescriptCurrInstr += 3;