Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-09-28 20:08:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed large exp test: added autoclick for lvlup popup + increased timeout for tests

Browse Source
This commit is contained in:
cawtds
2024-06-09 13:44:11 +02:00
parent d181464ca4
commit 1bab23c4ff
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/battle.h
View File

@@ -77,6 +77,7 @@
#define IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && !((flags) & BATTLE_TYPE_GHOST_UNVEILED))
#define IS_BATTLE_TYPE_GHOST_WITH_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && (flags) & BATTLE_TYPE_GHOST_UNVEILED)
#define WILD_DOUBLE_BATTLE ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER))))
#define RECORDED_WILD_BATTLE ((gBattleTypeFlags & BATTLE_TYPE_RECORDED) && !(gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_BATTLE_TOWER)))
#define BATTLE_TWO_VS_ONE_OPPONENT ((gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && gTrainerBattleOpponent_B == 0xFFFF))
#define BATTLE_TYPE_HAS_AI (BATTLE_TYPE_TRAINER | BATTLE_TYPE_FIRST_BATTLE | BATTLE_TYPE_SAFARI | BATTLE_TYPE_ROAMER | BATTLE_TYPE_INGAME_PARTNER)

5
src/battle_script_commands.c
View File

@@ -7976,7 +7976,7 @@ static void Cmd_drawlvlupbox(void)
}
break;
case 6:
if (gMain.newKeys != 0)
if (gMain.newKeys != 0 || RECORDED_WILD_BATTLE)
{
// Draw page 2 of level up box
PlaySE(SE_SELECT);
@@ -7986,7 +7986,7 @@ static void Cmd_drawlvlupbox(void)
}
break;
case 8:
if (gMain.newKeys != 0)
if (gMain.newKeys != 0 || RECORDED_WILD_BATTLE)
{
// Close level up box
PlaySE(SE_SELECT);
@@ -15150,7 +15150,6 @@ static void Cmd_handleballthrow(void)
for (shakes = 0; shakes < maxShakes && Random() < odds; shakes++);
}
DebugPrintfLevel(MGBA_LOG_ERROR, "BtlController_EmitBallThrowAnim2");
BtlController_EmitBallThrowAnim(gBattlerAttacker, BUFFER_A, shakes);
MarkBattlerForControllerExec(gBattlerAttacker);

2
test/test_runner.c
View File

@@ -9,7 +9,7 @@
#include "test_runner.h"
#include "test/test.h"
#define TIMEOUT_SECONDS 55
#define TIMEOUT_SECONDS 70
void CB2_TestRunner(void);