forked from rh-hideout/pokeemerald-expansion
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Future Sight fixes (rh-hideout#4350)
* Future Sight fixes * handle life orb boost * applied review * Future Sight changes * removed future sight no hit string * agbcc * Update battle_scripts.h
- Loading branch information
1 parent
35cbc6f
commit a7cc742
Showing
5 changed files
with
224 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| #include "global.h" | ||
| #include "test/battle.h" | ||
|
|
||
| ASSUMPTIONS | ||
| { | ||
| ASSUME(gMovesInfo[MOVE_SEED_FLARE].power == gMovesInfo[MOVE_FUTURE_SIGHT].power); | ||
| ASSUME(gMovesInfo[MOVE_SEED_FLARE].category == gMovesInfo[MOVE_FUTURE_SIGHT].category); | ||
| } | ||
|
|
||
| SINGLE_BATTLE_TEST("Future Sight uses Sp. Atk stat of the original user without modifiers") | ||
| { | ||
| u32 item; | ||
| s16 seedFlareDmg; | ||
| s16 futureSightDmg; | ||
|
|
||
| PARAMETRIZE { item = ITEM_TWISTED_SPOON; } | ||
| PARAMETRIZE { item = ITEM_PSYCHIC_GEM; } | ||
|
|
||
| GIVEN { | ||
| PLAYER(SPECIES_PIKACHU) { Item(item); } | ||
| PLAYER(SPECIES_RAICHU) { Item(item); } | ||
| OPPONENT(SPECIES_REGICE); | ||
| } WHEN { | ||
| TURN { MOVE(player, MOVE_SEED_FLARE, WITH_RNG(RNG_SECONDARY_EFFECT, FALSE)); } | ||
| TURN { MOVE(player, MOVE_FUTURE_SIGHT); } | ||
| TURN { SWITCH(player, 1); } | ||
| TURN { } | ||
| TURN { } | ||
| } SCENE { | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_SEED_FLARE, player); | ||
| HP_BAR(opponent, captureDamage: &seedFlareDmg); | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); | ||
| MESSAGE("Foe Regice took the Future Sight attack!"); | ||
| HP_BAR(opponent, captureDamage: &futureSightDmg); | ||
| } THEN { | ||
| EXPECT_EQ(seedFlareDmg, futureSightDmg); | ||
| } | ||
| } | ||
|
|
||
| SINGLE_BATTLE_TEST("Future Sight is not boosted by Life Orb is original user if not on the field") | ||
| { | ||
| s16 seedFlareDmg; | ||
| s16 futureSightDmg; | ||
|
|
||
| GIVEN { | ||
| PLAYER(SPECIES_PIKACHU); | ||
| PLAYER(SPECIES_RAICHU) { Item(ITEM_LIFE_ORB); } | ||
| OPPONENT(SPECIES_REGICE); | ||
| } WHEN { | ||
| TURN { MOVE(player, MOVE_SEED_FLARE, WITH_RNG(RNG_SECONDARY_EFFECT, FALSE)); } | ||
| TURN { MOVE(player, MOVE_FUTURE_SIGHT); } | ||
| TURN { SWITCH(player, 1); } | ||
| TURN { } | ||
| TURN { } | ||
| } SCENE { | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_SEED_FLARE, player); | ||
| HP_BAR(opponent, captureDamage: &seedFlareDmg); | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); | ||
| MESSAGE("Foe Regice took the Future Sight attack!"); | ||
| HP_BAR(opponent, captureDamage: &futureSightDmg); | ||
| NOT MESSAGE("Raichu was hurt by its Life Orb!"); | ||
| } THEN { | ||
| EXPECT_EQ(seedFlareDmg, futureSightDmg); | ||
| } | ||
| } | ||
|
|
||
| SINGLE_BATTLE_TEST("Future Sight receives STAB from party mon") | ||
| { | ||
| s16 seedFlareDmg; | ||
| s16 futureSightDmg; | ||
|
|
||
| GIVEN { | ||
| PLAYER(SPECIES_RALTS); | ||
| PLAYER(SPECIES_RAICHU); | ||
| OPPONENT(SPECIES_REGICE); | ||
| } WHEN { | ||
| TURN { MOVE(player, MOVE_SEED_FLARE, WITH_RNG(RNG_SECONDARY_EFFECT, FALSE)); } | ||
| TURN { MOVE(player, MOVE_FUTURE_SIGHT); } | ||
| TURN { SWITCH(player, 1); } | ||
| TURN { } | ||
| TURN { } | ||
| } SCENE { | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_SEED_FLARE, player); | ||
| HP_BAR(opponent, captureDamage: &seedFlareDmg); | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); | ||
| HP_BAR(opponent, captureDamage: &futureSightDmg); | ||
| } THEN { | ||
| EXPECT_MUL_EQ(seedFlareDmg, Q_4_12(1.5), futureSightDmg); | ||
| } | ||
| } | ||
|
|
||
| SINGLE_BATTLE_TEST("Future Sight is affected by type effectiveness") | ||
| { | ||
| GIVEN { | ||
| PLAYER(SPECIES_PIKACHU); | ||
| PLAYER(SPECIES_RAICHU); | ||
| OPPONENT(SPECIES_HOUNDOOM); | ||
| } WHEN { | ||
| TURN { MOVE(player, MOVE_SEED_FLARE, WITH_RNG(RNG_SECONDARY_EFFECT, FALSE)); } | ||
| TURN { MOVE(player, MOVE_FUTURE_SIGHT); } | ||
| TURN { SWITCH(player, 1); } | ||
| TURN { } | ||
| TURN { } | ||
| } SCENE { | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_SEED_FLARE, player); | ||
| HP_BAR(opponent); | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); | ||
| MESSAGE("Foe Houndoom took the Future Sight attack!"); | ||
| MESSAGE("It doesn't affect Foe Houndoom…"); | ||
| NOT HP_BAR(opponent); | ||
| } | ||
| } | ||
|
|
||
| SINGLE_BATTLE_TEST("Future Sight will miss timing if target faints before it is about to get hit") | ||
| { | ||
| GIVEN { | ||
| PLAYER(SPECIES_WOBBUFFET); | ||
| OPPONENT(SPECIES_WOBBUFFET); | ||
| OPPONENT(SPECIES_WYNAUT); | ||
| } WHEN { | ||
| TURN { MOVE(player, MOVE_FUTURE_SIGHT); } | ||
| TURN { MOVE(player, MOVE_CELEBRATE); } | ||
| TURN { MOVE(player, MOVE_CELEBRATE); MOVE(opponent, MOVE_MEMENTO); SEND_OUT(opponent, 1); } | ||
| TURN { } | ||
| } SCENE { | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_FUTURE_SIGHT, player); | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player); | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_CELEBRATE, player); | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_MEMENTO, opponent); | ||
| MESSAGE("Foe Wobbuffet fainted!"); | ||
| MESSAGE("2 sent out Wynaut!"); | ||
| NOT MESSAGE("Foe Wynaut took the Future Sight attack!"); | ||
| } | ||
| } |