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

Fix Tera indicators (#4960)

Browse Source 
* Fix Tera indicators

* Better fix
This commit is contained in:
Bassoonian 2024-07-13 23:08:43 +02:00 committed by GitHub
parent 45275fee17
commit f6d2b2861a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/data/graphics/gimmicks.h
View File

@ -105,6 +105,7 @@ static const struct SpriteSheet sSpriteSheet_OmegaIndicator = {sOmegaIndicatorGf
static const struct SpriteSheet sSpriteSheet_DynamaxIndicator = {sDynamaxIndicatorGfx, sizeof(sDynamaxIndicatorGfx), TAG_DYNAMAX_INDICATOR_TILE};
static const struct SpriteSheet sTeraIndicatorSpriteSheets[NUMBER_OF_MON_TYPES + 1] =
{
{sNormalIndicatorGfx, sizeof(sNormalIndicatorGfx), TAG_NORMAL_INDICATOR_TILE}, // TYPE_NONE
{sNormalIndicatorGfx, sizeof(sNormalIndicatorGfx), TAG_NORMAL_INDICATOR_TILE},
{sFightingIndicatorGfx, sizeof(sFightingIndicatorGfx), TAG_FIGHTING_INDICATOR_TILE},
{sFlyingIndicatorGfx, sizeof(sFlyingIndicatorGfx), TAG_FLYING_INDICATOR_TILE},

56
test/battle/gimmick/terastal.c
View File

@ -762,6 +762,24 @@ SINGLE_BATTLE_TEST("(TERA) Stellar type's one-time boost factors in dynamically-
}
}
SINGLE_BATTLE_TEST("(TERA) Pokemon with Tera forms change upon Terastallizing")
{
u32 species, targetSpecies;
PARAMETRIZE { species = SPECIES_OGERPON_TEAL_MASK; targetSpecies = SPECIES_OGERPON_TEAL_MASK_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_WELLSPRING_MASK; targetSpecies = SPECIES_OGERPON_WELLSPRING_MASK_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_HEARTHFLAME_MASK; targetSpecies = SPECIES_OGERPON_HEARTHFLAME_MASK_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_CORNERSTONE_MASK; targetSpecies = SPECIES_OGERPON_CORNERSTONE_MASK_TERA; }
PARAMETRIZE { species = SPECIES_TERAPAGOS_TERASTAL; targetSpecies = SPECIES_TERAPAGOS_STELLAR; }
GIVEN {
PLAYER(species);
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_CELEBRATE, gimmick: GIMMICK_TERA); }
} THEN {
EXPECT_EQ(player->species, targetSpecies);
}
}
SINGLE_BATTLE_TEST("(TERA) All type indicators function correctly")
{
u32 type;
@ -794,20 +812,34 @@ SINGLE_BATTLE_TEST("(TERA) All type indicators function correctly")
}
}
SINGLE_BATTLE_TEST("(TERA) Pokemon with Tera forms change upon Terastallizing")
SINGLE_BATTLE_TEST("(TERA) All type indicators function correctly - Opponent")
{
u32 species, targetSpecies;
PARAMETRIZE { species = SPECIES_OGERPON_TEAL_MASK; targetSpecies = SPECIES_OGERPON_TEAL_MASK_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_WELLSPRING_MASK; targetSpecies = SPECIES_OGERPON_WELLSPRING_MASK_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_HEARTHFLAME_MASK; targetSpecies = SPECIES_OGERPON_HEARTHFLAME_MASK_TERA; }
PARAMETRIZE { species = SPECIES_OGERPON_CORNERSTONE_MASK; targetSpecies = SPECIES_OGERPON_CORNERSTONE_MASK_TERA; }
PARAMETRIZE { species = SPECIES_TERAPAGOS_TERASTAL; targetSpecies = SPECIES_TERAPAGOS_STELLAR; }
u32 type;
PARAMETRIZE { type = TYPE_NONE; }
PARAMETRIZE { type = TYPE_NORMAL; }
PARAMETRIZE { type = TYPE_FIGHTING; }
PARAMETRIZE { type = TYPE_FLYING; }
PARAMETRIZE { type = TYPE_POISON; }
PARAMETRIZE { type = TYPE_GROUND; }
PARAMETRIZE { type = TYPE_ROCK; }
PARAMETRIZE { type = TYPE_BUG; }
PARAMETRIZE { type = TYPE_GHOST; }
PARAMETRIZE { type = TYPE_STEEL; }
PARAMETRIZE { type = TYPE_MYSTERY; }
PARAMETRIZE { type = TYPE_FIRE; }
PARAMETRIZE { type = TYPE_WATER; }
PARAMETRIZE { type = TYPE_GRASS; }
PARAMETRIZE { type = TYPE_ELECTRIC; }
PARAMETRIZE { type = TYPE_PSYCHIC; }
PARAMETRIZE { type = TYPE_ICE; }
PARAMETRIZE { type = TYPE_DRAGON; }
PARAMETRIZE { type = TYPE_DARK; }
PARAMETRIZE { type = TYPE_FAIRY; }
PARAMETRIZE { type = TYPE_STELLAR; }
GIVEN {
PLAYER(species);
OPPONENT(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET) { TeraType(type); }
} WHEN {
TURN { MOVE(player, MOVE_CELEBRATE, gimmick: GIMMICK_TERA); }
} THEN {
EXPECT_EQ(player->species, targetSpecies);
TURN { MOVE(opponent, MOVE_CELEBRATE, gimmick: GIMMICK_TERA); }
}
}