From 4adb908a6bf5b8a80ec64deb715bd0f809e2894c Mon Sep 17 00:00:00 2001 From: AlexOn1ine Date: Wed, 12 Mar 2025 23:41:28 +0100 Subject: [PATCH] review comments --- include/battle.h | 2 +- test/battle/end_turn_effects.c | 8 ++++++++ test/battle/move_effect/leech_seed.c | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/include/battle.h b/include/battle.h index 2b6c8fae53..aa73fb11f5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -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; diff --git a/test/battle/end_turn_effects.c b/test/battle/end_turn_effects.c index be821c2aaa..51aa1e79bf 100644 --- a/test/battle/end_turn_effects.c +++ b/test/battle/end_turn_effects.c @@ -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); } } diff --git a/test/battle/move_effect/leech_seed.c b/test/battle/move_effect/leech_seed.c index 7dc142c303..56da50a12b 100644 --- a/test/battle/move_effect/leech_seed.c +++ b/test/battle/move_effect/leech_seed.c @@ -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); } }