diff --git a/include/constants/battle.h b/include/constants/battle.h index 2408b2c81..56bf1553e 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -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) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 9b3176630..15778f190 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -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); diff --git a/test/test_runner.c b/test/test_runner.c index d6f48571c..3b1e5420a 100644 --- a/test/test_runner.c +++ b/test/test_runner.c @@ -9,7 +9,7 @@ #include "test_runner.h" #include "test/test.h" -#define TIMEOUT_SECONDS 55 +#define TIMEOUT_SECONDS 70 void CB2_TestRunner(void);