Adds moves Matcha Gotcha, Syrup Bomb and Ivy Cudgel #3402
Conversation
| else | ||
| { | ||
| gStatuses4[gEffectBattler] |= STATUS4_SYRUP_BOMB; | ||
| gDisableStructs[gBattlerTarget].syrupBombTimer = 3; |
| @@ -3116,6 +3117,30 @@ u8 DoBattlerEndTurnEffects(void) | |||
| } | |||
| gBattleStruct->turnEffectsTracker++; | |||
| break; | |||
| case ENDTURN_SYRUP_BOMB: | |||
There was a problem hiding this comment.
The way you have this set up now will lower speed twice and then kill the effect.
- When move is used timer is 3
- End of turn timer is reduced to 2 and speed is lowered
- End of turn timer is reduced to 1 and speed is lowered
- End of turn timer is reduced to 0 and effect is removed
I noticed the way you currently have it is how it's implemented on Showdown, but this goes against the move description and what Bulbapedia says is supposed to happen. This definitely warrants an in-game test. If Showdown is correct, then Bulbapedia should be updated to specify that it only lowers speed twice.
There was a problem hiding this comment.
Yep, you are correct. I followed showdown. I don't have SV so this was by best option but I see if I can get someone to test it in-game.
There was a problem hiding this comment.
It seems like Showdown is wrong. Speed drop goes on for three turns and there is no message at the end that mentions the effected target was freed from Syrup Bomb.
Recording: https://streamable.com/0eqvcz
There was a problem hiding this comment.
You should open a bug on Showdown then and update Bulbapedia to mention it just ends with no text.
There was a problem hiding this comment.
Already at the PR stage smogon/pokemon-showdown#9836,
Submitted the bug yesterday when Alex let us know in our Discord server :P
| call BattleScript_EffectHit_Ret | ||
| seteffectwithchance | ||
| tryfaintmon BS_TARGET | ||
| printstring STRINGID_TARGETCOVEREDINSTICKYCANDYSYRUP |
There was a problem hiding this comment.
This isn't supposed to print each turn if the effect is already active. It would be better to create a new move effect and call a battle script to print this string when the effect is set itself.
There was a problem hiding this comment.
Will fix in a follow up PR
| waitmessage B_WAIT_TIME_LONG | ||
| goto BattleScript_MoveEnd | ||
|
|
||
| BattleScript_SyrupBombEndTurn:: |
There was a problem hiding this comment.
Copy how Octolock is done. That way you don't need to add duplicate code that checks for these Abilities again.
There was a problem hiding this comment.
It might be better to do it the other way around because I think Octolock is currently not entirely accurate.
There was a problem hiding this comment.
You can simplify it by doing something like this:
playanimation BS_ATTACKER, B_ANIM_SYRUP_BOMB_STAT_DOWN
setstatchanger STAT_SPEED, 1, TRUE
statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_SyrupBombTurnDmgPrintMsg
BattleScript_SyrupBombTurnDmgPrintMsg:
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 3, BattleScript_SyrupBombTurnDmgEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 4, BattleScript_SyrupBombTurnDmgEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_SyrupBombTurnDmgEnd:
end2
There was a problem hiding this comment.
Why would the fail instruction in statbuffchange be BattleScript_SyrupBombTurnDmgPrintMsg in this case?
Though this looks much cleaner and overall better to understand, thank you.
There was a problem hiding this comment.
In the CFRU I have setbyte MULTISTRING_CHOOSER 0x4 at the end of each of those "redirection" battle scripts. But you probably don't, so probably better BattleScript_SyrupBombTurnDmgEnd, yeah.
|
As reported on https://www.smogon.com/forums/threads/scarlet-violet-battle-mechanics-research.3709545/page-41#post-9857447, Syrup Bomb needs to be cleared when the original user leaves the field. |
Oh, thank you for the notification. I will take care of it. |
Adds the Teal Mask moves.