Skip to content

Commit

Permalink
simple enum + revert test desc
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexOn1ine committed Jul 18, 2024
1 parent e3c18d0 commit fb3f60b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion include/battle.h
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ struct BattleStruct
u8 moneyMultiplierItem:1;
u8 moneyMultiplierMove:1;
u8 savedTurnActionNumber;
enum FirstTurnEventStates eventsBeforeFirstTurnState;
u8 eventsBeforeFirstTurnState;
u8 faintedActionsState;
u8 faintedActionsBattlerId;
u8 scriptPartyIdx; // for printing the nickname
Expand Down
8 changes: 1 addition & 7 deletions include/battle_main.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,7 @@ struct MultiPartnerMenuPokemon
#define BOUNCE_MON 0x0
#define BOUNCE_HEALTHBOX 0x1

#if MODERN
#define U8_ENUM : u8
#else
#define U8_ENUM
#endif

enum FirstTurnEventStates U8_ENUM {
enum {
FIRST_TURN_EVENTS_START,
FIRST_TURN_EVENTS_OVERWORLD_WEATHER,
FIRST_TURN_EVENTS_TERRAIN,
Expand Down
2 changes: 1 addition & 1 deletion test/battle/hold_effect/mirror_herb.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ SINGLE_BATTLE_TEST("Mirror Herb copies all of foe's positive stat changes in a t
}
}

SINGLE_BATTLE_TEST("Mirror Herb copies all of Stuff Cheeks stat boosts")
SINGLE_BATTLE_TEST("Mirror Herb copies all of Stuff Cheeks' stat boosts")
{
GIVEN {
ASSUME(gItemsInfo[ITEM_LIECHI_BERRY].holdEffect == HOLD_EFFECT_ATTACK_UP);
Expand Down

0 comments on commit fb3f60b

Please sign in to comment.