forked from rh-hideout/pokeemerald-expansion
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds some Indigo Disk moves (rh-hideout#3853)
* Burning Bulwark * Fickle Beam * Alluring Voice * Electro Shot * forgot sheer force flag for alluring voice * review changes * additional alluring voice test * Simple Allruing Voice animation * Update battle.h --------- Co-authored-by: Bassoonian <[email protected]>
- Loading branch information
1 parent
66a638f
commit cc32e37
Showing
15 changed files
with
257 additions
and
12 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
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
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,50 @@ | ||
| #include "global.h" | ||
| #include "test/battle.h" | ||
|
|
||
| SINGLE_BATTLE_TEST("Alluring Voice confuses the target if the target raised a stat this turn") | ||
| { | ||
| u16 move; | ||
|
|
||
| PARAMETRIZE { move = MOVE_CELEBRATE; } | ||
| PARAMETRIZE { move = MOVE_SWORDS_DANCE; } | ||
|
|
||
| GIVEN { | ||
| ASSUME(gBattleMoves[MOVE_ALLURING_VOICE].effect == EFFECT_CONFUSE_HIT); | ||
| PLAYER(SPECIES_WOBBUFFET); | ||
| OPPONENT(SPECIES_WOBBUFFET); | ||
| } WHEN { | ||
| TURN { MOVE(opponent, move); MOVE(player, MOVE_ALLURING_VOICE); } | ||
| } SCENE { | ||
| ANIMATION(ANIM_TYPE_MOVE, move, opponent); | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_ALLURING_VOICE, player); | ||
| HP_BAR(opponent); | ||
| if (move == MOVE_SWORDS_DANCE) { | ||
| ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_CONFUSION, opponent); | ||
| MESSAGE("Foe Wobbuffet became confused!"); | ||
| } else { | ||
| NONE_OF { | ||
| ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_CONFUSION, opponent); | ||
| MESSAGE("Foe Wobbuffet became confused!"); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| SINGLE_BATTLE_TEST("Alluring Voice confuse effect is removed if it is Sheer Force boosted") | ||
| { | ||
| GIVEN { | ||
| ASSUME(gBattleMoves[MOVE_ALLURING_VOICE].effect == EFFECT_CONFUSE_HIT); | ||
| PLAYER(SPECIES_NIDOKING) { Ability(ABILITY_SHEER_FORCE); } | ||
| OPPONENT(SPECIES_WOBBUFFET); | ||
| } WHEN { | ||
| TURN { MOVE(opponent, MOVE_SWORDS_DANCE); MOVE(player, MOVE_ALLURING_VOICE); } | ||
| } SCENE { | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_SWORDS_DANCE, opponent); | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_ALLURING_VOICE, player); | ||
| HP_BAR(opponent); | ||
| NONE_OF { | ||
| ANIMATION(ANIM_TYPE_STATUS, B_ANIM_STATUS_CONFUSION, opponent); | ||
| MESSAGE("Foe Wobbuffet became confused!"); | ||
| } | ||
| } | ||
| } |
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,30 @@ | ||
| #include "global.h" | ||
| #include "test/battle.h" | ||
|
|
||
| ASSUMPTIONS | ||
| { | ||
| ASSUME(gBattleMoves[MOVE_FICKLE_BEAM].effect == EFFECT_FICKLE_BEAM); | ||
| } | ||
|
|
||
| SINGLE_BATTLE_TEST("Fickle Beam deals double damage 30% of the time") | ||
| { | ||
| s16 damage[2]; | ||
|
|
||
| PASSES_RANDOMLY(30, 100, RNG_FICKLE_BEAM); | ||
| GIVEN { | ||
| ASSUME(gBattleMoves[MOVE_POWER_GEM].power == 80); | ||
| ASSUME(gBattleMoves[MOVE_FICKLE_BEAM].power == 80); | ||
| PLAYER(SPECIES_WOBBUFFET); | ||
| OPPONENT(SPECIES_WOBBUFFET); | ||
| } WHEN { | ||
| TURN { MOVE(player, MOVE_POWER_GEM); } | ||
| TURN { MOVE(player, MOVE_FICKLE_BEAM); } | ||
| } SCENE { | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_POWER_GEM, player); | ||
| HP_BAR(opponent, captureDamage: &damage[0]); | ||
| ANIMATION(ANIM_TYPE_MOVE, MOVE_FICKLE_BEAM, player); | ||
| HP_BAR(opponent, captureDamage: &damage[1]); | ||
| } THEN { | ||
| EXPECT_MUL_EQ(damage[0], Q_4_12(2.0), damage[1]); | ||
| } | ||
| } |
Oops, something went wrong.