From 8d3980e2f09599fc16ec1658cad75234c78ad38b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 24 Dec 2024 09:58:44 +0100 Subject: [PATCH] Fix ASSUMPTIONS not working --- include/test/test.h | 2 +- test/battle/move_effect/two_turns_attack.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/test/test.h b/include/test/test.h index 1a9d8a237ef6..ccfc589c214b 100644 --- a/include/test/test.h +++ b/include/test/test.h @@ -95,7 +95,7 @@ s32 Test_MgbaPrintf(const char *fmt, ...); #define ASSUMPTIONS \ static void Assumptions(void); \ - __attribute__((section(".tests"), used)) static const struct Test sAssumptions = \ + __attribute__((section(".tests"), used, no_reorder)) static const struct Test sAssumptions = \ { \ .name = "ASSUMPTIONS: " __FILE__, \ .filename = __FILE__, \ diff --git a/test/battle/move_effect/two_turns_attack.c b/test/battle/move_effect/two_turns_attack.c index 847f8db72c03..de308ab950a0 100644 --- a/test/battle/move_effect/two_turns_attack.c +++ b/test/battle/move_effect/two_turns_attack.c @@ -10,12 +10,12 @@ ASSUMPTIONS // Solar Beam - check for sun ASSUME(gMovesInfo[MOVE_SOLAR_BEAM].effect == EFFECT_SOLAR_BEAM); - ASSUME(HIHALF(gMovesInfo[MOVE_SOLAR_BLADE].argument.twoTurnAttack.status) == B_WEATHER_SUN); + ASSUME(gMovesInfo[MOVE_SOLAR_BLADE].argument.twoTurnAttack.status == B_WEATHER_SUN); ASSUME(gMovesInfo[MOVE_SOLAR_BLADE].effect == EFFECT_SOLAR_BEAM); - ASSUME(HIHALF(gMovesInfo[MOVE_SOLAR_BLADE].argument.twoTurnAttack.status) == B_WEATHER_SUN); + ASSUME(gMovesInfo[MOVE_SOLAR_BLADE].argument.twoTurnAttack.status == B_WEATHER_SUN); // Electro shot - check for rain - ASSUME(HIHALF(gMovesInfo[MOVE_ELECTRO_SHOT].argument.twoTurnAttack.status) == B_WEATHER_RAIN); + ASSUME(gMovesInfo[MOVE_ELECTRO_SHOT].argument.twoTurnAttack.status == B_WEATHER_RAIN); ASSUME(gMovesInfo[MOVE_ELECTRO_SHOT].effect == EFFECT_TWO_TURNS_ATTACK); ASSUME(MoveHasAdditionalEffectSelf(MOVE_ELECTRO_SHOT, MOVE_EFFECT_SP_ATK_PLUS_1) == TRUE); }