ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed B_ATK_TRAINER_NAME not working properly in tests (#3179)

Browse Source
This commit is contained in:
ghoulslash 2023-08-29 21:45:37 -04:00 committed by GitHub
commit c55fee147b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_message.c
View File

@ -18,6 +18,7 @@
#include "recorded_battle.h" #include "recorded_battle.h"
#include "string_util.h" #include "string_util.h"
#include "strings.h" #include "strings.h"
#include "test_runner.h"
#include "text.h" #include "text.h"
#include "trainer_hill.h" #include "trainer_hill.h"
#include "window.h" #include "window.h"
@ -3080,7 +3081,8 @@ static const u8 *BattleStringGetPlayerName(u8 *text, u8 battlerId)
toCpy = gSaveBlock2Ptr->playerName; toCpy = gSaveBlock2Ptr->playerName;
break; break;
case B_POSITION_PLAYER_RIGHT: case B_POSITION_PLAYER_RIGHT:
if ((gBattleTypeFlags & BATTLE_TYPE_RECORDED) && !(gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER))) if (((gBattleTypeFlags & BATTLE_TYPE_RECORDED) && !(gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER)))
|| gTestRunnerEnabled)
{ {
toCpy = gLinkPlayers[0].name; toCpy = gLinkPlayers[0].name;
} }

6
test/battle/form_change/mega_evolution.c
View File

@ -27,7 +27,7 @@ DOUBLE_BATTLE_TEST("Mega Evolution's order is determined by Speed - opponent fas
} WHEN { } WHEN {
TURN { MOVE(opponentLeft, MOVE_CELEBRATE, megaEvolve: TRUE); MOVE(playerLeft, MOVE_CELEBRATE, megaEvolve: TRUE); } TURN { MOVE(opponentLeft, MOVE_CELEBRATE, megaEvolve: TRUE); MOVE(playerLeft, MOVE_CELEBRATE, megaEvolve: TRUE); }
} SCENE { } 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); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, opponentLeft);
MESSAGE("Foe Gardevoir has Mega Evolved into Mega Gardevoir!"); MESSAGE("Foe Gardevoir has Mega Evolved into Mega Gardevoir!");
MESSAGE("Venusaur's Venusaurite is reacting to 1's Mega Ring!"); 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!"); MESSAGE("Venusaur's Venusaurite is reacting to 1's Mega Ring!");
ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, playerLeft); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, playerLeft);
MESSAGE("Venusaur has Mega Evolved into Mega Venusaur!"); 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); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, opponentLeft);
MESSAGE("Foe Gardevoir has Mega Evolved into Mega Gardevoir!"); 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); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, player);
MESSAGE("Rayquaza has Mega Evolved into Mega Rayquaza!"); 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); ANIMATION(ANIM_TYPE_GENERAL, B_ANIM_MEGA_EVOLUTION, opponent);
MESSAGE("Foe Gardevoir has Mega Evolved into Mega Gardevoir!"); MESSAGE("Foe Gardevoir has Mega Evolved into Mega Gardevoir!");
} THEN { } THEN {

5
test/test_runner_battle.c
View File

@ -9,6 +9,7 @@
#include "random.h" #include "random.h"
#include "test/battle.h" #include "test/battle.h"
#include "window.h" #include "window.h"
#include "constants/trainers.h"
#if defined(__INTELLISENSE__) #if defined(__INTELLISENSE__)
#undef TestRunner_Battle_RecordAbilityPopUp #undef TestRunner_Battle_RecordAbilityPopUp
@ -232,11 +233,15 @@ static void BattleTest_Run(void *data)
memset(&DATA, 0, sizeof(DATA)); memset(&DATA, 0, sizeof(DATA));
DATA.recordedBattle.rngSeed = RNG_SEED_DEFAULT; DATA.recordedBattle.rngSeed = RNG_SEED_DEFAULT;
DATA.recordedBattle.opponentA = TRAINER_LINK_OPPONENT;
DATA.recordedBattle.textSpeed = OPTIONS_TEXT_SPEED_FAST; 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; 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) if (test->type == BATTLE_TEST_DOUBLES)
{
DATA.recordedBattle.battleFlags |= BATTLE_TYPE_DOUBLE; DATA.recordedBattle.battleFlags |= BATTLE_TYPE_DOUBLE;
DATA.recordedBattle.opponentB = TRAINER_LINK_OPPONENT;
}
for (i = 0; i < STATE->battlersCount; i++) for (i = 0; i < STATE->battlersCount; i++)
{ {
DATA.recordedBattle.playersName[i][0] = CHAR_1 + i; DATA.recordedBattle.playersName[i][0] = CHAR_1 + i;