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

review comments

Browse Source
This commit is contained in:
AlexOn1ine 2025-03-12 23:41:28 +01:00
parent dd8606d577
commit 4adb908a6b
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@ -108,7 +108,7 @@ struct DisableStruct
u16 throatChopTimer;
u8 wrapTurns;
u16 syrupBombTimer;
u16 tormentTimer:4; // used for G-Max Meltdown
u16 tormentTimer; // used for G-Max Meltdown
u8 usedMoves:4;
u8 truantCounter:1;
u8 truantSwitchInHack:1;

8
test/battle/end_turn_effects.c
View File

@ -3,6 +3,9 @@
DOUBLE_BATTLE_TEST("End Turn Effects: First Event Block is executed correctly")
{
s16 healed;
s16 damage;
GIVEN {
PLAYER(SPECIES_WYNAUT) { HP(100); Speed(1); }
PLAYER(SPECIES_EKANS) { HP(100); Ability(ABILITY_SHED_SKIN); Status1(STATUS1_BURN); Speed(2); }
@ -12,12 +15,17 @@ DOUBLE_BATTLE_TEST("End Turn Effects: First Event Block is executed correctly")
TURN { MOVE(playerLeft, MOVE_GRASSY_TERRAIN); }
} SCENE {
MESSAGE("The opposing Wobbuffet is healed by the grassy terrain!");
HP_BAR(opponentRight, captureDamage: &healed);
HP_BAR(opponentRight, captureDamage: &damage);
MESSAGE("The opposing Wobbuffet was hurt by the Black Sludge!");
MESSAGE("The opposing Wynaut is healed by the grassy terrain!");
MESSAGE("The opposing Wynaut restored a little HP using its Leftovers!");
MESSAGE("Ekans is healed by the grassy terrain!");
MESSAGE("Ekans's Shed Skin cured its burn problem!");
MESSAGE("Wynaut is healed by the grassy terrain!");
} THEN {
EXPECT_GT(0, healed);
EXPECT_GT(damage, 0);
}
}

4
test/battle/move_effect/leech_seed.c
View File

@ -77,9 +77,13 @@ DOUBLE_BATTLE_TEST("Leech Seed will drain HP based on speed of the drained mon")
ANIMATION(ANIM_TYPE_MOVE, MOVE_LEECH_SEED, opponentLeft);
ANIMATION(ANIM_TYPE_MOVE, MOVE_LEECH_SEED, playerRight);
ANIMATION(ANIM_TYPE_MOVE, MOVE_LEECH_SEED, playerLeft);
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_LEECH_SEED_DRAIN, opponentRight);
HP_BAR(opponentRight);
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_LEECH_SEED_DRAIN, opponentLeft);
HP_BAR(opponentLeft);
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_LEECH_SEED_DRAIN, playerRight);
HP_BAR(playerRight);
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_LEECH_SEED_DRAIN, playerLeft);
HP_BAR(playerLeft);
}
}