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.
Merge branch '_RHH/master' into _RHH/upcoming
- Loading branch information
Showing
14 changed files
with
3,451 additions
and
45 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #include "global.h" | ||
| #include "test/battle.h" | ||
|
|
||
| SINGLE_BATTLE_TEST("Guard Dog raises Attack when intimidated", s16 damage) | ||
| { | ||
| u32 ability; | ||
| PARAMETRIZE { ability = ABILITY_INTIMIDATE; } | ||
| PARAMETRIZE { ability = ABILITY_SHED_SKIN; } | ||
| GIVEN { | ||
| PLAYER(SPECIES_OKIDOGI) { Ability(ABILITY_GUARD_DOG); } | ||
| OPPONENT(SPECIES_WOBBUFFET); | ||
| OPPONENT(SPECIES_ARBOK) { Ability(ability); } | ||
| } WHEN { | ||
| TURN { SWITCH(opponent, 1); } | ||
| TURN { MOVE(player, MOVE_TACKLE); } | ||
| } SCENE { | ||
| if (ability == ABILITY_INTIMIDATE) | ||
| { | ||
| ABILITY_POPUP(opponent, ABILITY_INTIMIDATE); | ||
| ABILITY_POPUP(player, ABILITY_GUARD_DOG); | ||
| ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); | ||
| MESSAGE("Okidogi's Attack rose!"); | ||
| } | ||
| HP_BAR(opponent, captureDamage: &results[i].damage); | ||
| } FINALLY { | ||
| EXPECT_MUL_EQ(results[1].damage, Q_4_12(1.5), results[0].damage); | ||
| } | ||
| } |
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,23 @@ | ||
| #include "global.h" | ||
| #include "test/battle.h" | ||
|
|
||
| SINGLE_BATTLE_TEST("Steam Engine raises speed when hit by a Fire or Water move") | ||
| { | ||
| u16 move; | ||
|
|
||
| PARAMETRIZE { move = MOVE_EMBER; } | ||
| PARAMETRIZE { move = MOVE_WATER_GUN; } | ||
|
|
||
| GIVEN { | ||
| PLAYER(SPECIES_COALOSSAL) { Ability(ABILITY_STEAM_ENGINE); } | ||
| OPPONENT(SPECIES_WOBBUFFET); | ||
| } WHEN { | ||
| TURN { MOVE(opponent, move); } | ||
| } SCENE { | ||
| ANIMATION(ANIM_TYPE_MOVE, move, opponent); | ||
| ABILITY_POPUP(player, ABILITY_STEAM_ENGINE); | ||
| MESSAGE("Coalossal's Speed drastically rose!"); | ||
| } THEN { | ||
| EXPECT_EQ(player->statStages[STAT_SPEED], DEFAULT_STAT_STAGE + 6); | ||
| } | ||
| } |
Oops, something went wrong.