Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Converts some defines to enums and name unnamed enums (#8019)

Browse Source
This commit is contained in:
Bassoonian 2025-10-23 18:06:29 +02:00 committed by GitHub
parent 46b122c5ce
commit fb660061ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 130 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/battle_anim.h
View File

@ -211,7 +211,8 @@ u8 GetSubstituteSpriteDefault_Y(u8 battler);
#define STAT_ANIM_MULTIPLE_MINUS1 57 #define STAT_ANIM_MULTIPLE_MINUS1 57
#define STAT_ANIM_MULTIPLE_MINUS2 58 #define STAT_ANIM_MULTIPLE_MINUS2 58
enum { enum StatAnimPal
{
STAT_ANIM_PAL_ATK, STAT_ANIM_PAL_ATK,
STAT_ANIM_PAL_DEF, STAT_ANIM_PAL_DEF,
STAT_ANIM_PAL_ACC, STAT_ANIM_PAL_ACC,

7
include/battle_setup.h
View File

@ -1,6 +1,7 @@
#ifndef GUARD_BATTLE_SETUP_H #ifndef GUARD_BATTLE_SETUP_H
#define GUARD_BATTLE_SETUP_H #define GUARD_BATTLE_SETUP_H
#include "battle_transition.h"
#include "gym_leader_rematch.h" #include "gym_leader_rematch.h"
#define REMATCHES_COUNT 5 #define REMATCHES_COUNT 5
@ -61,9 +62,9 @@ void BattleSetup_StartLegendaryBattle(void);
void StartGroudonKyogreBattle(void); void StartGroudonKyogreBattle(void);
void StartRegiBattle(void); void StartRegiBattle(void);
enum BattleEnvironments BattleSetup_GetEnvironmentId(void); enum BattleEnvironments BattleSetup_GetEnvironmentId(void);
u8 GetWildBattleTransition(void); enum BattleTransition GetWildBattleTransition(void);
u8 GetTrainerBattleTransition(void); enum BattleTransition GetTrainerBattleTransition(void);
u8 GetSpecialBattleTransition(s32 id); enum BattleTransition GetSpecialBattleTransition(enum BattleTransitionGroup id);
void ChooseStarter(void); void ChooseStarter(void);
void ResetTrainerOpponentIds(void); void ResetTrainerOpponentIds(void);
void SetMapVarsToTrainerA(void); void SetMapVarsToTrainerA(void);

9
include/battle_transition.h
View File

@ -10,7 +10,8 @@ void GetBg0TilesDst(u16 **tilemap, u16 **tileset);
extern const struct SpritePalette gSpritePalette_Pokeball; extern const struct SpritePalette gSpritePalette_Pokeball;
enum { enum MugshotColor
{
MUGSHOT_COLOR_NONE, MUGSHOT_COLOR_NONE,
MUGSHOT_COLOR_PURPLE, MUGSHOT_COLOR_PURPLE,
MUGSHOT_COLOR_GREEN, MUGSHOT_COLOR_GREEN,
@ -20,7 +21,8 @@ enum {
MUGSHOT_COLOR_COUNT MUGSHOT_COLOR_COUNT
}; };
enum { enum BattleTransition
{
B_TRANSITION_BLUR, B_TRANSITION_BLUR,
B_TRANSITION_SWIRL, B_TRANSITION_SWIRL,
B_TRANSITION_SHUFFLE, B_TRANSITION_SHUFFLE,
@ -63,7 +65,8 @@ enum {
}; };
// IDs for GetSpecialBattleTransition // IDs for GetSpecialBattleTransition
enum { enum BattleTransitionGroup
{
B_TRANSITION_GROUP_B_TOWER, B_TRANSITION_GROUP_B_TOWER,
B_TRANSITION_GROUP_B_DOME = 3, B_TRANSITION_GROUP_B_DOME = 3,
B_TRANSITION_GROUP_B_PALACE, B_TRANSITION_GROUP_B_PALACE,

9
include/battle_util.h
View File

@ -40,7 +40,8 @@ enum MoveAbsorbed
MOVE_ABSORBED_BY_BOOST_FLASH_FIRE, MOVE_ABSORBED_BY_BOOST_FLASH_FIRE,
}; };
enum { enum AbilityEffect
{
ABILITYEFFECT_ON_SWITCHIN, ABILITYEFFECT_ON_SWITCHIN,
ABILITYEFFECT_ENDTURN, ABILITYEFFECT_ENDTURN,
ABILITYEFFECT_MOVE_END_ATTACKER, ABILITYEFFECT_MOVE_END_ATTACKER,
@ -253,7 +254,7 @@ bool32 HasNoMonsToSwitch(u32 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2
bool32 TryChangeBattleWeather(u32 battler, u32 battleWeatherId, bool32 viaAbility); bool32 TryChangeBattleWeather(u32 battler, u32 battleWeatherId, bool32 viaAbility);
bool32 CanAbilityBlockMove(u32 battlerAtk, u32 battlerDef, enum Ability abilityAtk, enum Ability abilityDef, u32 move, enum FunctionCallOption option); bool32 CanAbilityBlockMove(u32 battlerAtk, u32 battlerDef, enum Ability abilityAtk, enum Ability abilityDef, u32 move, enum FunctionCallOption option);
bool32 CanAbilityAbsorbMove(u32 battlerAtk, u32 battlerDef, enum Ability abilityDef, u32 move, u32 moveType, enum FunctionCallOption option); bool32 CanAbilityAbsorbMove(u32 battlerAtk, u32 battlerDef, enum Ability abilityDef, u32 move, u32 moveType, enum FunctionCallOption option);
u32 AbilityBattleEffects(u32 caseID, u32 battler, enum Ability ability, u32 special, u32 moveArg); u32 AbilityBattleEffects(enum AbilityEffect caseID, u32 battler, enum Ability ability, u32 special, u32 moveArg);
bool32 TryPrimalReversion(u32 battler); bool32 TryPrimalReversion(u32 battler);
bool32 IsNeutralizingGasOnField(void); bool32 IsNeutralizingGasOnField(void);
bool32 IsMoldBreakerTypeAbility(u32 battler, enum Ability ability); bool32 IsMoldBreakerTypeAbility(u32 battler, enum Ability ability);
@ -311,13 +312,13 @@ bool32 TryBattleFormChange(u32 battler, enum FormChanges method);
bool32 DoBattlersShareType(u32 battler1, u32 battler2); bool32 DoBattlersShareType(u32 battler1, u32 battler2);
bool32 CanBattlerGetOrLoseItem(u32 battler, u16 itemId); bool32 CanBattlerGetOrLoseItem(u32 battler, u16 itemId);
u32 GetBattlerVisualSpecies(u32 battler); u32 GetBattlerVisualSpecies(u32 battler);
bool32 TryClearIllusion(u32 battler, u32 caseID); bool32 TryClearIllusion(u32 battler, enum AbilityEffect caseID);
u32 GetIllusionMonSpecies(u32 battler); u32 GetIllusionMonSpecies(u32 battler);
struct Pokemon *GetIllusionMonPtr(u32 battler); struct Pokemon *GetIllusionMonPtr(u32 battler);
void ClearIllusionMon(u32 battler); void ClearIllusionMon(u32 battler);
u32 GetIllusionMonPartyId(struct Pokemon *party, struct Pokemon *mon, struct Pokemon *partnerMon, u32 battler); u32 GetIllusionMonPartyId(struct Pokemon *party, struct Pokemon *mon, struct Pokemon *partnerMon, u32 battler);
bool32 SetIllusionMon(struct Pokemon *mon, u32 battler); bool32 SetIllusionMon(struct Pokemon *mon, u32 battler);
u32 TryImmunityAbilityHealStatus(u32 battler, u32 caseID); u32 TryImmunityAbilityHealStatus(u32 battler, enum AbilityEffect caseID);
bool32 ShouldGetStatBadgeBoost(u16 flagId, u32 battler); bool32 ShouldGetStatBadgeBoost(u16 flagId, u32 battler);
enum DamageCategory GetBattleMoveCategory(u32 move); enum DamageCategory GetBattleMoveCategory(u32 move);
void SetDynamicMoveCategory(u32 battlerAtk, u32 battlerDef, u32 move); void SetDynamicMoveCategory(u32 battlerAtk, u32 battlerDef, u32 move);

120
include/constants/field_specials.h
View File

@ -2,65 +2,80 @@
#define GUARD_CONSTANTS_FIELD_SPECIALS_H #define GUARD_CONSTANTS_FIELD_SPECIALS_H
// PC Locations // PC Locations
#define PC_LOCATION_OTHER 0 enum PCLocation
#define PC_LOCATION_BRENDANS_HOUSE 1 {
#define PC_LOCATION_MAYS_HOUSE 2 PC_LOCATION_OTHER,
PC_LOCATION_BRENDANS_HOUSE,
PC_LOCATION_MAYS_HOUSE,
};
// SS Tidal Locations // SS Tidal Locations
#define SS_TIDAL_LOCATION_CURRENTS 0 enum SSTidalLocation
#define SS_TIDAL_LOCATION_SLATEPORT 1 {
#define SS_TIDAL_LOCATION_LILYCOVE 2 SS_TIDAL_LOCATION_CURRENTS,
#define SS_TIDAL_LOCATION_ROUTE124 3 SS_TIDAL_LOCATION_SLATEPORT,
#define SS_TIDAL_LOCATION_ROUTE131 4 SS_TIDAL_LOCATION_LILYCOVE,
SS_TIDAL_LOCATION_ROUTE124,
SS_TIDAL_LOCATION_ROUTE131,
};
#define SS_TIDAL_BOARD_SLATEPORT 1 enum SSTidalState
#define SS_TIDAL_DEPART_SLATEPORT 2 {
#define SS_TIDAL_HALFWAY_LILYCOVE 3 SS_TIDAL_BOARD_SLATEPORT = 1,
#define SS_TIDAL_LAND_LILYCOVE 4 SS_TIDAL_DEPART_SLATEPORT,
#define SS_TIDAL_BOARD_LILYCOVE 5 SS_TIDAL_HALFWAY_LILYCOVE,
#define SS_TIDAL_DEPART_LILYCOVE 6 SS_TIDAL_LAND_LILYCOVE,
#define SS_TIDAL_HALFWAY_SLATEPORT 7 SS_TIDAL_BOARD_LILYCOVE,
#define SS_TIDAL_LAND_SLATEPORT 8 SS_TIDAL_DEPART_LILYCOVE,
#define SS_TIDAL_EXIT_CURRENTS_RIGHT 9 SS_TIDAL_HALFWAY_SLATEPORT,
#define SS_TIDAL_EXIT_CURRENTS_LEFT 10 SS_TIDAL_LAND_SLATEPORT,
SS_TIDAL_EXIT_CURRENTS_RIGHT,
SS_TIDAL_EXIT_CURRENTS_LEFT,
};
#define SS_TIDAL_MAX_STEPS 205 #define SS_TIDAL_MAX_STEPS 205
// Scrollable Multichoice Menus // Scrollable Multichoice Menus
#define SCROLL_MULTI_NONE 0 enum ScrollMulti
#define SCROLL_MULTI_GLASS_WORKSHOP_VENDOR 1 {
#define SCROLL_MULTI_POKEMON_FAN_CLUB_RATER 2 SCROLL_MULTI_NONE,
#define SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1 3 SCROLL_MULTI_GLASS_WORKSHOP_VENDOR,
#define SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2 4 SCROLL_MULTI_POKEMON_FAN_CLUB_RATER,
#define SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR 5 SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1,
#define SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR 6 SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2,
#define SCROLL_MULTI_BERRY_POWDER_VENDOR 7 SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR,
#define SCROLL_MULTI_BF_RECEPTIONIST 8 SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR,
#define SCROLL_MULTI_BF_MOVE_TUTOR_1 9 SCROLL_MULTI_BERRY_POWDER_VENDOR,
#define SCROLL_MULTI_BF_MOVE_TUTOR_2 10 SCROLL_MULTI_BF_RECEPTIONIST,
#define SCROLL_MULTI_SS_TIDAL_DESTINATION 11 SCROLL_MULTI_BF_MOVE_TUTOR_1,
#define SCROLL_MULTI_BATTLE_TENT_RULES 12 SCROLL_MULTI_BF_MOVE_TUTOR_2,
SCROLL_MULTI_SS_TIDAL_DESTINATION,
SCROLL_MULTI_BATTLE_TENT_RULES,
};
#define MAX_SCROLL_MULTI_ON_SCREEN 6 #define MAX_SCROLL_MULTI_ON_SCREEN 6
#define MAX_SCROLL_MULTI_LENGTH 16 #define MAX_SCROLL_MULTI_LENGTH 16
// Dept Store Floor Numbers // Dept Store Floor Numbers
#define DEPT_STORE_FLOORNUM_B4F 0 enum DeptStoreFloorNumber
#define DEPT_STORE_FLOORNUM_B3F 1 {
#define DEPT_STORE_FLOORNUM_B2F 2 DEPT_STORE_FLOORNUM_B4F,
#define DEPT_STORE_FLOORNUM_B1F 3 DEPT_STORE_FLOORNUM_B3F,
#define DEPT_STORE_FLOORNUM_1F 4 DEPT_STORE_FLOORNUM_B2F,
#define DEPT_STORE_FLOORNUM_2F 5 DEPT_STORE_FLOORNUM_B1F,
#define DEPT_STORE_FLOORNUM_3F 6 DEPT_STORE_FLOORNUM_1F,
#define DEPT_STORE_FLOORNUM_4F 7 DEPT_STORE_FLOORNUM_2F,
#define DEPT_STORE_FLOORNUM_5F 8 DEPT_STORE_FLOORNUM_3F,
#define DEPT_STORE_FLOORNUM_6F 9 DEPT_STORE_FLOORNUM_4F,
#define DEPT_STORE_FLOORNUM_7F 10 DEPT_STORE_FLOORNUM_5F,
#define DEPT_STORE_FLOORNUM_8F 11 DEPT_STORE_FLOORNUM_6F,
#define DEPT_STORE_FLOORNUM_9F 12 DEPT_STORE_FLOORNUM_7F,
#define DEPT_STORE_FLOORNUM_10F 13 DEPT_STORE_FLOORNUM_8F,
#define DEPT_STORE_FLOORNUM_11F 14 DEPT_STORE_FLOORNUM_9F,
#define DEPT_STORE_FLOORNUM_ROOFTOP 15 DEPT_STORE_FLOORNUM_10F,
DEPT_STORE_FLOORNUM_11F,
DEPT_STORE_FLOORNUM_ROOFTOP,
};
// Lilycove Pokémon Trainer Fan Club // Lilycove Pokémon Trainer Fan Club
#define NUM_TRAINER_FAN_CLUB_MEMBERS 8 #define NUM_TRAINER_FAN_CLUB_MEMBERS 8
@ -81,10 +96,13 @@
#define FANCOUNTER_USED_BATTLE_TOWER 3 #define FANCOUNTER_USED_BATTLE_TOWER 3
// Return values for DoDeoxysRockInteraction // Return values for DoDeoxysRockInteraction
#define DEOXYS_ROCK_FAILED 0 enum DeoxysRockResult
#define DEOXYS_ROCK_PROGRESSED 1 {
#define DEOXYS_ROCK_SOLVED 2 DEOXYS_ROCK_FAILED,
#define DEOXYS_ROCK_COMPLETE 3 DEOXYS_ROCK_PROGRESSED,
DEOXYS_ROCK_SOLVED,
DEOXYS_ROCK_COMPLETE,
};
enum { enum {
OPEN_PARTY_SCREEN, OPEN_PARTY_SCREEN,

2
include/field_specials.h
View File

@ -19,7 +19,7 @@ bool32 ShouldDoScottBattleFrontierCall(void);
bool32 ShouldDoRoxanneCall(void); bool32 ShouldDoRoxanneCall(void);
bool32 ShouldDoRivalRayquazaCall(void); bool32 ShouldDoRivalRayquazaCall(void);
bool32 CountSSTidalStep(u16 delta); bool32 CountSSTidalStep(u16 delta);
u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y); enum SSTidalLocation GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y);
void ShowScrollableMultichoice(void); void ShowScrollableMultichoice(void);
void FrontierGamblerSetWonOrLost(bool8 won); void FrontierGamblerSetWonOrLost(bool8 won);
u8 TryGainNewFanFromCounter(u8 incrementId); u8 TryGainNewFanFromCounter(u8 incrementId);

2
src/battle_anim_status_effects.c
View File

@ -530,7 +530,7 @@ static void AnimTask_FrozenIceCube_Step4(u8 taskId)
void AnimTask_StatsChange(u8 taskId) void AnimTask_StatsChange(u8 taskId)
{ {
bool16 goesDown = FALSE; bool16 goesDown = FALSE;
s16 animStatId = 0; enum StatAnimPal animStatId = 0;
bool16 sharply = FALSE; bool16 sharply = FALSE;
switch (gBattleSpritesDataPtr->animationData->animArg) switch (gBattleSpritesDataPtr->animationData->animArg)

2
src/battle_anim_utility_funcs.c
View File

@ -480,7 +480,7 @@ static void StatsChangeAnimation_Step2(u8 taskId)
AnimLoadCompressedBgTilemapHandleContest(&animBgData, gStatAnim_Decrease_Tilemap, FALSE); AnimLoadCompressedBgTilemapHandleContest(&animBgData, gStatAnim_Decrease_Tilemap, FALSE);
AnimLoadCompressedBgGfx(animBgData.bgId, gStatAnim_Gfx, animBgData.tilesOffset); AnimLoadCompressedBgGfx(animBgData.bgId, gStatAnim_Gfx, animBgData.tilesOffset);
switch (sAnimStatsChangeData->aAnimStatId) switch ((enum StatAnimPal)sAnimStatsChangeData->aAnimStatId)
{ {
case STAT_ANIM_PAL_ATK: case STAT_ANIM_PAL_ATK:
LoadPalette(gStatAnim_Attack_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP); LoadPalette(gStatAnim_Attack_Pal, BG_PLTT_ID(animBgData.paletteId), PLTT_SIZE_4BPP);

19
src/battle_setup.c
View File

@ -54,7 +54,8 @@
#include "constants/weather.h" #include "constants/weather.h"
#include "fishing.h" #include "fishing.h"
enum { enum TransitionType
{
TRANSITION_TYPE_NORMAL, TRANSITION_TYPE_NORMAL,
TRANSITION_TYPE_CAVE, TRANSITION_TYPE_CAVE,
TRANSITION_TYPE_FLASH, TRANSITION_TYPE_FLASH,
@ -260,7 +261,7 @@ static void Task_BattleStart(u8 taskId)
} }
} }
static void CreateBattleStartTask(u8 transition, u16 song) static void CreateBattleStartTask(enum BattleTransition transition, u16 song)
{ {
u8 taskId = CreateTask(Task_BattleStart, 1); u8 taskId = CreateTask(Task_BattleStart, 1);
@ -533,7 +534,7 @@ void StartGroudonKyogreBattle(void)
void StartRegiBattle(void) void StartRegiBattle(void)
{ {
u8 transitionId; enum BattleTransition transitionId;
u16 species; u16 species;
LockPlayerFieldControls(); LockPlayerFieldControls();
@ -686,7 +687,7 @@ enum BattleEnvironments BattleSetup_GetEnvironmentId(void)
return BATTLE_ENVIRONMENT_PLAIN; return BATTLE_ENVIRONMENT_PLAIN;
} }
static u8 GetBattleTransitionTypeByMap(void) static enum TransitionType GetBattleTransitionTypeByMap(void)
{ {
u16 tileBehavior; u16 tileBehavior;
s16 x, y; s16 x, y;
@ -749,7 +750,7 @@ static u8 GetSumOfEnemyPartyLevel(u16 opponentId, u8 numMons)
return sum; return sum;
} }
u8 GetWildBattleTransition(void) enum BattleTransition GetWildBattleTransition(void)
{ {
u8 transitionType = GetBattleTransitionTypeByMap(); u8 transitionType = GetBattleTransitionTypeByMap();
u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL); u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
@ -771,7 +772,7 @@ u8 GetWildBattleTransition(void)
} }
} }
u8 GetTrainerBattleTransition(void) enum BattleTransition GetTrainerBattleTransition(void)
{ {
u8 minPartyCount = 1; u8 minPartyCount = 1;
u8 transitionType; u8 transitionType;
@ -814,7 +815,7 @@ u8 GetTrainerBattleTransition(void)
} }
#define RANDOM_TRANSITION(table) (table[Random() % ARRAY_COUNT(table)]) #define RANDOM_TRANSITION(table) (table[Random() % ARRAY_COUNT(table)])
u8 GetSpecialBattleTransition(s32 id) enum BattleTransition GetSpecialBattleTransition(enum BattleTransitionGroup id)
{ {
u16 var; u16 var;
u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL); u8 enemyLevel = GetMonData(&gEnemyParty[0], MON_DATA_LEVEL);
@ -832,6 +833,8 @@ u8 GetSpecialBattleTransition(s32 id)
return RANDOM_TRANSITION(sBattleTransitionTable_BattlePyramid); return RANDOM_TRANSITION(sBattleTransitionTable_BattlePyramid);
case B_TRANSITION_GROUP_B_DOME: case B_TRANSITION_GROUP_B_DOME:
return RANDOM_TRANSITION(sBattleTransitionTable_BattleDome); return RANDOM_TRANSITION(sBattleTransitionTable_BattleDome);
default:
break;
} }
if (VarGet(VAR_FRONTIER_BATTLE_MODE) != FRONTIER_MODE_LINK_MULTIS) if (VarGet(VAR_FRONTIER_BATTLE_MODE) != FRONTIER_MODE_LINK_MULTIS)
@ -849,6 +852,8 @@ u8 GetSpecialBattleTransition(s32 id)
return RANDOM_TRANSITION(sBattleTransitionTable_BattlePyramid); return RANDOM_TRANSITION(sBattleTransitionTable_BattlePyramid);
case B_TRANSITION_GROUP_B_DOME: case B_TRANSITION_GROUP_B_DOME:
return RANDOM_TRANSITION(sBattleTransitionTable_BattleDome); return RANDOM_TRANSITION(sBattleTransitionTable_BattleDome);
default:
break;
} }
if (VarGet(VAR_FRONTIER_BATTLE_MODE) != FRONTIER_MODE_LINK_MULTIS) if (VarGet(VAR_FRONTIER_BATTLE_MODE) != FRONTIER_MODE_LINK_MULTIS)

2
src/battle_transition.c
View File

@ -2280,7 +2280,7 @@ static bool8 Mugshot_SetGfx(struct Task *task)
s16 i, j; s16 i, j;
u16 *tilemap, *tileset; u16 *tilemap, *tileset;
const u16 *mugshotsMap = sMugshotsTilemap; const u16 *mugshotsMap = sMugshotsTilemap;
u8 mugshotColor = GetTrainerMugshotColorFromId(TRAINER_BATTLE_PARAM.opponentA); enum MugshotColor mugshotColor = GetTrainerMugshotColorFromId(TRAINER_BATTLE_PARAM.opponentA);
GetBg0TilesDst(&tilemap, &tileset); GetBg0TilesDst(&tilemap, &tileset);
CpuSet(sEliteFour_Tileset, tileset, 0xF0); CpuSet(sEliteFour_Tileset, tileset, 0xF0);

18
src/battle_util.c
View File

@ -3621,7 +3621,7 @@ static inline u32 SetStartingSideStatus(u32 flag, u32 side, u32 message, u32 ani
return 0; return 0;
} }
u32 AbilityBattleEffects(u32 caseID, u32 battler, enum Ability ability, u32 special, u32 moveArg) u32 AbilityBattleEffects(enum AbilityEffect caseID, u32 battler, enum Ability ability, u32 special, u32 moveArg)
{ {
u32 effect = 0; u32 effect = 0;
u32 moveType = 0, move = 0; u32 moveType = 0, move = 0;
@ -9137,7 +9137,7 @@ u32 GetBattlerVisualSpecies(u32 battler)
return gBattleMons[battler].species; return gBattleMons[battler].species;
} }
bool32 TryClearIllusion(u32 battler, u32 caseID) bool32 TryClearIllusion(u32 battler, enum AbilityEffect caseID)
{ {
if (gBattleStruct->illusion[battler].state != ILLUSION_ON) if (gBattleStruct->illusion[battler].state != ILLUSION_ON)
return FALSE; return FALSE;
@ -9181,10 +9181,10 @@ u32 GetIllusionMonPartyId(struct Pokemon *party, struct Pokemon *mon, struct Pok
s32 partyStart=0; s32 partyStart=0;
// Adjust party search range for Multibattles and Player vs two-trainers // Adjust party search range for Multibattles and Player vs two-trainers
if((GetBattlerSide(battler) == B_SIDE_PLAYER && (gBattleTypeFlags & BATTLE_TYPE_MULTI)) if ((GetBattlerSide(battler) == B_SIDE_PLAYER && (gBattleTypeFlags & BATTLE_TYPE_MULTI))
|| (GetBattlerSide(battler) == B_SIDE_OPPONENT && (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS))) || (GetBattlerSide(battler) == B_SIDE_OPPONENT && (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)))
{ {
if((GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT) || (GetBattlerPosition(battler) == B_POSITION_OPPONENT_LEFT)) if ((GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT) || (GetBattlerPosition(battler) == B_POSITION_OPPONENT_LEFT))
{ {
partyEnd = 3; partyEnd = 3;
partyStart = 0; partyStart = 0;
@ -9242,7 +9242,7 @@ bool32 SetIllusionMon(struct Pokemon *mon, u32 battler)
return FALSE; return FALSE;
} }
u32 TryImmunityAbilityHealStatus(u32 battler, u32 caseID) u32 TryImmunityAbilityHealStatus(u32 battler, enum AbilityEffect caseID)
{ {
u32 effect = 0; u32 effect = 0;
switch (GetBattlerAbilityIgnoreMoldBreaker(battler)) switch (GetBattlerAbilityIgnoreMoldBreaker(battler))
@ -9309,28 +9309,28 @@ u32 TryImmunityAbilityHealStatus(u32 battler, u32 caseID)
{ {
case 1: // status cleared case 1: // status cleared
gBattleMons[battler].status1 = 0; gBattleMons[battler].status1 = 0;
if(caseID == ABILITYEFFECT_ON_SWITCHIN_IMMUNITIES) if (caseID == ABILITYEFFECT_ON_SWITCHIN_IMMUNITIES)
BattleScriptExecute(BattleScript_AbilityCuredStatusEnd3); BattleScriptExecute(BattleScript_AbilityCuredStatusEnd3);
else else
BattleScriptCall(BattleScript_AbilityCuredStatus); BattleScriptCall(BattleScript_AbilityCuredStatus);
break; break;
case 2: // get rid of confusion case 2: // get rid of confusion
RemoveConfusionStatus(battler); RemoveConfusionStatus(battler);
if(caseID == ABILITYEFFECT_ON_SWITCHIN_IMMUNITIES) if (caseID == ABILITYEFFECT_ON_SWITCHIN_IMMUNITIES)
BattleScriptExecute(BattleScript_AbilityCuredStatusEnd3); BattleScriptExecute(BattleScript_AbilityCuredStatusEnd3);
else else
BattleScriptCall(BattleScript_AbilityCuredStatus); BattleScriptCall(BattleScript_AbilityCuredStatus);
break; break;
case 3: // get rid of infatuation case 3: // get rid of infatuation
gBattleMons[battler].volatiles.infatuation = 0; gBattleMons[battler].volatiles.infatuation = 0;
if(caseID == ABILITYEFFECT_ON_SWITCHIN_IMMUNITIES) if (caseID == ABILITYEFFECT_ON_SWITCHIN_IMMUNITIES)
BattleScriptExecute(BattleScript_AbilityCuredStatusEnd3); BattleScriptExecute(BattleScript_AbilityCuredStatusEnd3);
else else
BattleScriptCall(BattleScript_AbilityCuredStatus); BattleScriptCall(BattleScript_AbilityCuredStatus);
break; break;
case 4: // get rid of taunt case 4: // get rid of taunt
gDisableStructs[battler].tauntTimer = 0; gDisableStructs[battler].tauntTimer = 0;
if(caseID == ABILITYEFFECT_ON_SWITCHIN_IMMUNITIES) if (caseID == ABILITYEFFECT_ON_SWITCHIN_IMMUNITIES)
BattleScriptExecute(BattleScript_AbilityCuredStatusEnd3); BattleScriptExecute(BattleScript_AbilityCuredStatusEnd3);
else else
BattleScriptCall(BattleScript_AbilityCuredStatus); BattleScriptCall(BattleScript_AbilityCuredStatus);

4
src/field_special_scene.c
View File

@ -34,7 +34,7 @@
#define BOX3_Y_OFFSET 0 #define BOX3_Y_OFFSET 0
// porthole states // porthole states
enum enum PortholeState
{ {
INIT_PORTHOLE, INIT_PORTHOLE,
IDLE_CHECK, IDLE_CHECK,
@ -300,7 +300,7 @@ void Task_HandlePorthole(u8 taskId)
u16 *cruiseState = GetVarPointer(VAR_SS_TIDAL_STATE); u16 *cruiseState = GetVarPointer(VAR_SS_TIDAL_STATE);
struct WarpData *location = &gSaveBlock1Ptr->location; struct WarpData *location = &gSaveBlock1Ptr->location;
switch (data[0]) switch ((enum PortholeState)data[0])
{ {
case INIT_PORTHOLE: // finish fading before making porthole finish. case INIT_PORTHOLE: // finish fading before making porthole finish.
if (!gPaletteFade.active) if (!gPaletteFade.active)

29
src/field_specials.c
View File

@ -122,14 +122,14 @@ static void Task_MoveElevator(u8);
static void MoveElevatorWindowLights(u16, bool8); static void MoveElevatorWindowLights(u16, bool8);
static void Task_MoveElevatorWindowLights(u8); static void Task_MoveElevatorWindowLights(u8);
static void Task_ShowScrollableMultichoice(u8); static void Task_ShowScrollableMultichoice(u8);
static void FillFrontierExchangeCornerWindowAndItemIcon(u16, u16); static void FillFrontierExchangeCornerWindowAndItemIcon(enum ScrollMulti, u16);
static void ShowBattleFrontierTutorWindow(u8, u16); static void ShowBattleFrontierTutorWindow(enum ScrollMulti, u16);
static void InitScrollableMultichoice(void); static void InitScrollableMultichoice(void);
static void ScrollableMultichoice_ProcessInput(u8); static void ScrollableMultichoice_ProcessInput(u8);
static void ScrollableMultichoice_UpdateScrollArrows(u8); static void ScrollableMultichoice_UpdateScrollArrows(u8);
static void ScrollableMultichoice_MoveCursor(s32, bool8, struct ListMenu *); static void ScrollableMultichoice_MoveCursor(s32, bool8, struct ListMenu *);
static void HideFrontierExchangeCornerItemIcon(u16, u16); static void HideFrontierExchangeCornerItemIcon(enum ScrollMulti, u16);
static void ShowBattleFrontierTutorMoveDescription(u8, u16); static void ShowBattleFrontierTutorMoveDescription(enum ScrollMulti, u16);
static void CloseScrollableMultichoice(u8); static void CloseScrollableMultichoice(u8);
static void ScrollableMultichoice_RemoveScrollArrows(u8); static void ScrollableMultichoice_RemoveScrollArrows(u8);
static void Task_ScrollableMultichoice_WaitReturnToList(u8); static void Task_ScrollableMultichoice_WaitReturnToList(u8);
@ -314,10 +314,11 @@ bool32 CountSSTidalStep(u16 delta)
return TRUE; return TRUE;
} }
u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y) enum SSTidalLocation GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y)
{ {
u16 *varCruiseStepCount = GetVarPointer(VAR_CRUISE_STEP_COUNT); u16 *varCruiseStepCount = GetVarPointer(VAR_CRUISE_STEP_COUNT);
switch (*GetVarPointer(VAR_SS_TIDAL_STATE))
switch ((enum SSTidalState)(*GetVarPointer(VAR_SS_TIDAL_STATE)))
{ {
case SS_TIDAL_BOARD_SLATEPORT: case SS_TIDAL_BOARD_SLATEPORT:
case SS_TIDAL_LAND_SLATEPORT: case SS_TIDAL_LAND_SLATEPORT:
@ -1781,7 +1782,7 @@ static const u16 sElevatorWindowTiles_Descending[ELEVATOR_WINDOW_HEIGHT][ELEVATO
void SetDeptStoreFloor(void) void SetDeptStoreFloor(void)
{ {
u8 deptStoreFloor; enum DeptStoreFloorNumber deptStoreFloor;
switch (gSaveBlock1Ptr->dynamicWarp.mapNum) switch (gSaveBlock1Ptr->dynamicWarp.mapNum)
{ {
case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F): case MAP_NUM(MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F):
@ -2294,7 +2295,7 @@ void ShowScrollableMultichoice(void)
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
task->tScrollMultiId = gSpecialVar_0x8004; task->tScrollMultiId = gSpecialVar_0x8004;
switch (gSpecialVar_0x8004) switch ((enum ScrollMulti)gSpecialVar_0x8004)
{ {
case SCROLL_MULTI_NONE: case SCROLL_MULTI_NONE:
task->tMaxItemsOnScreen = 1; task->tMaxItemsOnScreen = 1;
@ -2989,7 +2990,7 @@ void CloseFrontierExchangeCornerItemIconWindow(void)
RemoveWindow(sFrontierExchangeCorner_ItemIconWindowId); RemoveWindow(sFrontierExchangeCorner_ItemIconWindowId);
} }
static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection) static void FillFrontierExchangeCornerWindowAndItemIcon(enum ScrollMulti menu, u16 selection)
{ {
#include "data/battle_frontier/battle_frontier_exchange_corner.h" #include "data/battle_frontier/battle_frontier_exchange_corner.h"
@ -3032,6 +3033,8 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_HoldItemsDescriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_HoldItemsDescriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_HoldItems[selection]); ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_HoldItems[selection]);
break; break;
default:
break;
} }
} }
} }
@ -3050,7 +3053,7 @@ static void ShowFrontierExchangeCornerItemIcon(u16 item)
} }
} }
static void HideFrontierExchangeCornerItemIcon(u16 menu, u16 unused) static void HideFrontierExchangeCornerItemIcon(enum ScrollMulti menu, u16 unused)
{ {
if (sScrollableMultichoice_ItemSpriteId != MAX_SPRITES) if (sScrollableMultichoice_ItemSpriteId != MAX_SPRITES)
{ {
@ -3063,6 +3066,8 @@ static void HideFrontierExchangeCornerItemIcon(u16 menu, u16 unused)
// This makes sure deleting the icon will not clear palettes in use by object events // This makes sure deleting the icon will not clear palettes in use by object events
FieldEffectFreeGraphicsResources(&gSprites[sScrollableMultichoice_ItemSpriteId]); FieldEffectFreeGraphicsResources(&gSprites[sScrollableMultichoice_ItemSpriteId]);
break; break;
default:
break;
} }
sScrollableMultichoice_ItemSpriteId = MAX_SPRITES; sScrollableMultichoice_ItemSpriteId = MAX_SPRITES;
} }
@ -3073,7 +3078,7 @@ void BufferBattleFrontierTutorMoveName(void)
StringCopy(gStringVar1, GetMoveName(gSpecialVar_0x8005)); StringCopy(gStringVar1, GetMoveName(gSpecialVar_0x8005));
} }
static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection) static void ShowBattleFrontierTutorWindow(enum ScrollMulti menu, u16 selection)
{ {
static const struct WindowTemplate sBattleFrontierTutor_WindowTemplate = static const struct WindowTemplate sBattleFrontierTutor_WindowTemplate =
{ {
@ -3097,7 +3102,7 @@ static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection)
} }
} }
static void ShowBattleFrontierTutorMoveDescription(u8 menu, u16 selection) static void ShowBattleFrontierTutorMoveDescription(enum ScrollMulti menu, u16 selection)
{ {
static const u8 *const sBattleFrontier_TutorMoveDescriptions1[] = static const u8 *const sBattleFrontier_TutorMoveDescriptions1[] =
{ {