ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Incorporate requested changes

Browse Source
This commit is contained in:
Bassoonian 2023-10-11 16:11:46 +02:00
parent cee84f0f74
commit 8c9ea8b786
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/battle/ability/dragons_maw.c
View File

@ -14,7 +14,7 @@ SINGLE_BATTLE_TEST("Dragon's Maw increases Dragon-type move damage", s16 damage)
PARAMETRIZE { move = MOVE_DRAGON_BREATH; ability = ABILITY_DRAGONS_MAW; } PARAMETRIZE { move = MOVE_DRAGON_BREATH; ability = ABILITY_DRAGONS_MAW; }
GIVEN { GIVEN {
ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL); ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_DRAGON);
ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].type == TYPE_DRAGON); ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].type == TYPE_DRAGON);
ASSUME(gBattleMoves[MOVE_DRAGON_BREATH].type == TYPE_DRAGON); ASSUME(gBattleMoves[MOVE_DRAGON_BREATH].type == TYPE_DRAGON);
ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].split == SPLIT_PHYSICAL); ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].split == SPLIT_PHYSICAL);

8
test/battle/ability/poison_heal.c
View File

@ -4,8 +4,8 @@
SINGLE_BATTLE_TEST("Poison Heal heals from (Toxic) Poison damage") SINGLE_BATTLE_TEST("Poison Heal heals from (Toxic) Poison damage")
{ {
u8 status; u8 status;
PARAMETRIZE { status=STATUS1_POISON; } PARAMETRIZE { status = STATUS1_POISON; }
PARAMETRIZE { status=STATUS1_TOXIC_POISON; } PARAMETRIZE { status = STATUS1_TOXIC_POISON; }
GIVEN { GIVEN {
PLAYER(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); Status1(status); HP(1), MaxHP(400); } PLAYER(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); Status1(status); HP(1), MaxHP(400); }
@ -28,8 +28,8 @@ SINGLE_BATTLE_TEST("Poison Heal heals from Toxic Poison damage are constant")
PLAYER(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); Status1(STATUS1_TOXIC_POISON); HP(1), MaxHP(400); } PLAYER(SPECIES_SHROOMISH) { Ability(ABILITY_POISON_HEAL); Status1(STATUS1_TOXIC_POISON); HP(1), MaxHP(400); }
OPPONENT(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET);
} WHEN { } WHEN {
TURN { MOVE(player, MOVE_CELEBRATE); } TURN { }
TURN { MOVE(player, MOVE_CELEBRATE); } TURN { }
} SCENE { } SCENE {
ABILITY_POPUP(player, ABILITY_POISON_HEAL); ABILITY_POPUP(player, ABILITY_POISON_HEAL);
MESSAGE("The poisoning healed Shroomish a little bit!"); MESSAGE("The poisoning healed Shroomish a little bit!");

2
test/battle/ability/rocky_payload.c
View File

@ -14,7 +14,7 @@ SINGLE_BATTLE_TEST("Rocky Payload increases Rock-type move damage", s16 damage)
PARAMETRIZE { move = MOVE_POWER_GEM; ability = ABILITY_ROCKY_PAYLOAD; } PARAMETRIZE { move = MOVE_POWER_GEM; ability = ABILITY_ROCKY_PAYLOAD; }
GIVEN { GIVEN {
ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL); ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_ROCK);
ASSUME(gBattleMoves[MOVE_ROCK_THROW].type == TYPE_ROCK); ASSUME(gBattleMoves[MOVE_ROCK_THROW].type == TYPE_ROCK);
ASSUME(gBattleMoves[MOVE_POWER_GEM].type == TYPE_ROCK); ASSUME(gBattleMoves[MOVE_POWER_GEM].type == TYPE_ROCK);
ASSUME(gBattleMoves[MOVE_ROCK_THROW].split == SPLIT_PHYSICAL); ASSUME(gBattleMoves[MOVE_ROCK_THROW].split == SPLIT_PHYSICAL);

2
test/battle/ability/sap_sipper.c
View File

@ -52,4 +52,4 @@ SINGLE_BATTLE_TEST("Sap Sipper does not increase Attack if already maxed")
NONE_OF { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); } NONE_OF { ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_STATS_CHANGE, player); }
NONE_OF { MESSAGE("Marill's Attack rose!"); } NONE_OF { MESSAGE("Marill's Attack rose!"); }
} }
} }

2
test/battle/ability/steelworker.c
View File

@ -14,7 +14,7 @@ SINGLE_BATTLE_TEST("Steelworker increases Steel-type move damage", s16 damage)
PARAMETRIZE { move = MOVE_FLASH_CANNON; ability = ABILITY_STEELWORKER; } PARAMETRIZE { move = MOVE_FLASH_CANNON; ability = ABILITY_STEELWORKER; }
GIVEN { GIVEN {
ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL); ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_STEEL);
ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].type == TYPE_STEEL); ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].type == TYPE_STEEL);
ASSUME(gBattleMoves[MOVE_FLASH_CANNON].type == TYPE_STEEL); ASSUME(gBattleMoves[MOVE_FLASH_CANNON].type == TYPE_STEEL);
ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].split == SPLIT_PHYSICAL); ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].split == SPLIT_PHYSICAL);

2
test/battle/ability/transistor.c
View File

@ -14,7 +14,7 @@ SINGLE_BATTLE_TEST("Transistor increases Electric-type move damage", s16 damage)
PARAMETRIZE { move = MOVE_THUNDER_SHOCK; ability = ABILITY_TRANSISTOR; } PARAMETRIZE { move = MOVE_THUNDER_SHOCK; ability = ABILITY_TRANSISTOR; }
GIVEN { GIVEN {
ASSUME(gBattleMoves[MOVE_TACKLE].type == TYPE_NORMAL); ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_ELECTRIC);
ASSUME(gBattleMoves[MOVE_WILD_CHARGE].type == TYPE_ELECTRIC); ASSUME(gBattleMoves[MOVE_WILD_CHARGE].type == TYPE_ELECTRIC);
ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC);
ASSUME(gBattleMoves[MOVE_WILD_CHARGE].split == SPLIT_PHYSICAL); ASSUME(gBattleMoves[MOVE_WILD_CHARGE].split == SPLIT_PHYSICAL);