Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes spread move fire types not defrosting all targets (#6998)

Browse Source
This commit is contained in:
Alex 2025-05-29 11:25:10 +02:00 committed by GitHub
parent e605b87722
commit 213503dee9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/battle_script_commands.h
View File

@ -278,9 +278,9 @@ enum MoveEndEffects
MOVEEND_SKY_DROP_CONFUSE,
MOVEEND_UPDATE_LAST_MOVES,
MOVEEND_MIRROR_MOVE,
MOVEEND_DEFROST,
MOVEEND_NEXT_TARGET, // Everything up until here is handled for each strike of a multi-hit move
MOVEEND_MULTIHIT_MOVE,
MOVEEND_DEFROST,
MOVEEND_RECOIL,
MOVEEND_RAPID_SPIN,
MOVEEND_ITEM_EFFECTS_ATTACKER,

18
test/battle/defrost.c Normal file
View File

@ -0,0 +1,18 @@
#include "global.h"
#include "test/battle.h"
DOUBLE_BATTLE_TEST("Defrost: A fire type spread move will thaw both targets")
{
GIVEN {
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_FREEZE); }
OPPONENT(SPECIES_WOBBUFFET) { Status1(STATUS1_FREEZE); }
} WHEN {
TURN { MOVE(playerLeft, MOVE_HEAT_WAVE); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_HEAT_WAVE, playerLeft);
STATUS_ICON(opponentLeft, freeze: FALSE);
STATUS_ICON(opponentRight, freeze: FALSE);
}
}

1
test/battle/spread_moves.c
View File

@ -3,7 +3,6 @@
DOUBLE_BATTLE_TEST("Spread Moves: Ability and Item effects activate correctly after a multi target move")
{
// TODO: Might be a bug, verify on cardridge
GIVEN {
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LUM_BERRY); }
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_COVERT_CLOAK); }