From 8dafc5e2081473dbf45543106a3b30c3dcae3e20 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 26 Jul 2023 17:36:37 -0400 Subject: [PATCH] Fixed B_ATK_TRAINER_NAME not working properly in tests --- src/battle_message.c | 3 ++- test/mega_evolution.c | 6 +++--- test/test_runner_battle.c | 5 +++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/battle_message.c b/src/battle_message.c index 1585f8c47..64723e2b9 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -18,6 +18,7 @@ #include "recorded_battle.h" #include "string_util.h" #include "strings.h" +#include "test_runner.h" #include "text.h" #include "trainer_hill.h" #include "window.h" @@ -3074,7 +3075,7 @@ static const u8 *BattleStringGetPlayerName(u8 *text, u8 battlerId) toCpy = gSaveBlock2Ptr->playerName; break; case B_POSITION_PLAYER_RIGHT: - if ((gBattleTypeFlags & BATTLE_TYPE_RECORDED) && !(gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER))) + if (gTestRunnerEnabled) { toCpy = gLinkPlayers[0].name; } diff --git a/test/mega_evolution.c b/test/mega_evolution.c index 5597f5396..d27566028 100644 --- a/test/mega_evolution.c +++ b/test/mega_evolution.c @@ -27,7 +27,7 @@ DOUBLE_BATTLE_TEST("Mega Evolution's order is determined by Speed - opponent fas } WHEN { TURN { MOVE(opponentLeft, MOVE_CELEBRATE, megaEvolve: TRUE); MOVE(playerLeft, MOVE_CELEBRATE, megaEvolve: TRUE); } } SCENE { - MESSAGE("Foe Gardevoir's Gardevoirite is reacting to 's Mega Ring!"); + MESSAGE("Foe Gardevoir's Gardevoirite is reacting to 2's Mega Ring!"); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, opponentLeft); MESSAGE("Foe Gardevoir has Mega Evolved into Mega Gardevoir!"); MESSAGE("Venusaur's Venusaurite is reacting to 1's Mega Ring!"); @@ -49,7 +49,7 @@ DOUBLE_BATTLE_TEST("Mega Evolution's order is determined by Speed - player faste MESSAGE("Venusaur's Venusaurite is reacting to 1's Mega Ring!"); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, playerLeft); MESSAGE("Venusaur has Mega Evolved into Mega Venusaur!"); - MESSAGE("Foe Gardevoir's Gardevoirite is reacting to 's Mega Ring!"); + MESSAGE("Foe Gardevoir's Gardevoirite is reacting to 2's Mega Ring!"); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, opponentLeft); MESSAGE("Foe Gardevoir has Mega Evolved into Mega Gardevoir!"); } @@ -145,7 +145,7 @@ SINGLE_BATTLE_TEST("Regular Mega Evolution and Fervent Wish Mega Evolution can h ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, player); MESSAGE("Rayquaza has Mega Evolved into Mega Rayquaza!"); - MESSAGE("Foe Gardevoir's Gardevoirite is reacting to 's Mega Ring!"); + MESSAGE("Foe Gardevoir's Gardevoirite is reacting to 2's Mega Ring!"); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, opponent); MESSAGE("Foe Gardevoir has Mega Evolved into Mega Gardevoir!"); } THEN { diff --git a/test/test_runner_battle.c b/test/test_runner_battle.c index 4de144c38..91c00f6cc 100644 --- a/test/test_runner_battle.c +++ b/test/test_runner_battle.c @@ -9,6 +9,7 @@ #include "random.h" #include "test_battle.h" #include "window.h" +#include "constants/trainers.h" #if defined(__INTELLISENSE__) #undef TestRunner_Battle_RecordAbilityPopUp @@ -232,11 +233,15 @@ static void BattleTest_Run(void *data) memset(&DATA, 0, sizeof(DATA)); DATA.recordedBattle.rngSeed = RNG_SEED_DEFAULT; + DATA.recordedBattle.opponentA = TRAINER_LINK_OPPONENT; DATA.recordedBattle.textSpeed = OPTIONS_TEXT_SPEED_FAST; DATA.recordedBattle.battleFlags = BATTLE_TYPE_RECORDED_IS_MASTER | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_TRAINER | BATTLE_TYPE_IS_MASTER; if (test->type == BATTLE_TEST_DOUBLES) + { DATA.recordedBattle.battleFlags |= BATTLE_TYPE_DOUBLE; + DATA.recordedBattle.opponentB = TRAINER_LINK_OPPONENT; + } for (i = 0; i < STATE->battlersCount; i++) { DATA.recordedBattle.playersName[i][0] = CHAR_1 + i;