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

Merge pull request #2034 from LOuroboros/proteanMsgboxFlush

Browse source 
Tweaked Protean's effect's InGame appearance
This commit is contained in:
ghoulslash 2022-01-13 11:42:31 -05:00 committed by GitHub
commit 543252bc6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/battle_scripts_1.s
View file

@ -1251,7 +1251,7 @@ BattleScript_EffectAromaticMistWorks:
setstatchanger STAT_SPDEF, 1, FALSE setstatchanger STAT_SPDEF, 1, FALSE
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectAromaticMistEnd statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_EffectAromaticMistEnd
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AromaticMistAnim jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AromaticMistAnim
pause 16 pause B_WAIT_TIME_SHORTEST
printstring STRINGID_TARGETSTATWONTGOHIGHER printstring STRINGID_TARGETSTATWONTGOHIGHER
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_EffectAromaticMistEnd goto BattleScript_EffectAromaticMistEnd
@ -7147,7 +7147,7 @@ BattleScript_EnduredMsg::
BattleScript_SturdiedMsg:: BattleScript_SturdiedMsg::
copybyte gBattlerAbility, gBattlerTarget copybyte gBattlerAbility, gBattlerTarget
pause 16 pause B_WAIT_TIME_SHORTEST
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
printstring STRINGID_ENDUREDSTURDY printstring STRINGID_ENDUREDSTURDY
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@ -8299,6 +8299,7 @@ BattleScript_MimicryActivatesEnd3::
end3 end3
BattleScript_ProteanActivates:: BattleScript_ProteanActivates::
pause B_WAIT_TIME_SHORTEST
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
printstring STRINGID_PKMNCHANGEDTYPE printstring STRINGID_PKMNCHANGEDTYPE
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@ -8394,7 +8395,7 @@ BattleScript_WeakArmorActivates::
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeakArmorActivatesSpeed statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeakArmorActivatesSpeed
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_WeakArmorDefAnim jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_WeakArmorDefAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_WeakArmorActivatesSpeed jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_WeakArmorActivatesSpeed
pause 16 pause B_WAIT_TIME_SHORTEST
printfromtable gStatDownStringIds printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_WeakArmorActivatesSpeed goto BattleScript_WeakArmorActivatesSpeed
@ -8408,7 +8409,7 @@ BattleScript_WeakArmorActivatesSpeed:
statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeakArmorActivatesEnd statbuffchange STAT_BUFF_ALLOW_PTR, BattleScript_WeakArmorActivatesEnd
jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeakArmorSpeedAnim jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeakArmorSpeedAnim
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_EMPTY, BattleScript_WeakArmorActivatesEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_EMPTY, BattleScript_WeakArmorActivatesEnd
pause 16 pause B_WAIT_TIME_SHORTEST
printstring STRINGID_TARGETSTATWONTGOHIGHER printstring STRINGID_TARGETSTATWONTGOHIGHER
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_WeakArmorActivatesEnd goto BattleScript_WeakArmorActivatesEnd

7
include/constants/battle.h
View file

@ -396,9 +396,10 @@
#define BATTLE_TERRAIN_COUNT 22 #define BATTLE_TERRAIN_COUNT 22
#define B_WAIT_TIME_LONG 64 #define B_WAIT_TIME_LONG 64
#define B_WAIT_TIME_MED 48 #define B_WAIT_TIME_MED 48
#define B_WAIT_TIME_SHORT 32 #define B_WAIT_TIME_SHORT 32
#define B_WAIT_TIME_SHORTEST 16
#define CHERRIM_OVERCAST 0 #define CHERRIM_OVERCAST 0
#define CHERRIM_SUNSHINE 1 #define CHERRIM_SUNSHINE 1

2
src/battle_script_commands.c
View file

@ -1428,6 +1428,8 @@ static void Cmd_attackcanceler(void)
SET_BATTLER_TYPE(gBattlerAttacker, moveType); SET_BATTLER_TYPE(gBattlerAttacker, moveType);
gBattlerAbility = gBattlerAttacker; gBattlerAbility = gBattlerAttacker;
BattleScriptPushCursor(); BattleScriptPushCursor();
PrepareStringBattle(STRINGID_EMPTYSTRING3, gBattlerAttacker);
gBattleCommunication[MSG_DISPLAY] = 1;
gBattlescriptCurrInstr = BattleScript_ProteanActivates; gBattlescriptCurrInstr = BattleScript_ProteanActivates;
return; return;
} }