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

Revert "Converts a bunch of defines to enums" (#6082)

Browse Source
This commit is contained in:
Bassoonian 2025-01-22 21:50:39 +01:00 committed by GitHub
parent 2a8f4b03dc
commit a1c47a931f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
38 changed files with 387 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle_setup.h
View File

@ -29,7 +29,7 @@ void BattleSetup_StartLatiBattle(void);
void BattleSetup_StartLegendaryBattle(void); void BattleSetup_StartLegendaryBattle(void);
void StartGroudonKyogreBattle(void); void StartGroudonKyogreBattle(void);
void StartRegiBattle(void); void StartRegiBattle(void);
enum BattleTerrain BattleSetup_GetTerrainId(void); u8 BattleSetup_GetTerrainId(void);
u8 GetWildBattleTransition(void); u8 GetWildBattleTransition(void);
u8 GetTrainerBattleTransition(void); u8 GetTrainerBattleTransition(void);
u8 GetSpecialBattleTransition(s32 id); u8 GetSpecialBattleTransition(s32 id);

4
include/battle_tower.h
View File

@ -49,7 +49,7 @@ void SetEReaderTrainerGfxId(void);
u16 GetBattleFacilityTrainerGfxId(u16 trainerId); u16 GetBattleFacilityTrainerGfxId(u16 trainerId);
void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm); void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm);
u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); u8 GetFrontierTrainerFrontSpriteId(u16 trainerId);
enum TrainerClassID GetFrontierOpponentClass(u16 trainerId); u8 GetFrontierOpponentClass(u16 trainerId);
void GetFrontierTrainerName(u8 *dst, u16 trainerId); void GetFrontierTrainerName(u8 *dst, u16 trainerId);
void FillFrontierTrainerParty(u8 monsCount); void FillFrontierTrainerParty(u8 monsCount);
void FillFrontierTrainersParties(u8 monsCount); void FillFrontierTrainersParties(u8 monsCount);
@ -60,7 +60,7 @@ void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *record);
void CalcRubyBattleTowerChecksum(struct RSBattleTowerRecord *record); void CalcRubyBattleTowerChecksum(struct RSBattleTowerRecord *record);
u16 GetCurrentBattleTowerWinStreak(u8 lvlMode, u8 battleMode); u16 GetCurrentBattleTowerWinStreak(u8 lvlMode, u8 battleMode);
u8 GetEreaderTrainerFrontSpriteId(void); u8 GetEreaderTrainerFrontSpriteId(void);
enum TrainerClassID GetEreaderTrainerClassId(void); u8 GetEreaderTrainerClassId(void);
void GetEreaderTrainerName(u8 *dst); void GetEreaderTrainerName(u8 *dst);
void ValidateEReaderTrainer(void); void ValidateEReaderTrainer(void);
void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer); void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer);

52
include/constants/battle.h
View File

@ -424,33 +424,31 @@ enum BattleWeather
#define MOVE_EFFECT_CONTINUE 0x8000 #define MOVE_EFFECT_CONTINUE 0x8000
// Battle terrain defines for gBattleTerrain. // Battle terrain defines for gBattleTerrain.
enum BattleTerrain #define BATTLE_TERRAIN_GRASS 0
{ #define BATTLE_TERRAIN_LONG_GRASS 1
BATTLE_TERRAIN_GRASS, #define BATTLE_TERRAIN_SAND 2
BATTLE_TERRAIN_LONG_GRASS, #define BATTLE_TERRAIN_UNDERWATER 3
BATTLE_TERRAIN_SAND, #define BATTLE_TERRAIN_WATER 4
BATTLE_TERRAIN_UNDERWATER, #define BATTLE_TERRAIN_POND 5
BATTLE_TERRAIN_WATER, #define BATTLE_TERRAIN_MOUNTAIN 6
BATTLE_TERRAIN_POND, #define BATTLE_TERRAIN_CAVE 7
BATTLE_TERRAIN_MOUNTAIN, #define BATTLE_TERRAIN_BUILDING 8
BATTLE_TERRAIN_CAVE, #define BATTLE_TERRAIN_PLAIN 9
BATTLE_TERRAIN_BUILDING, // New battle terrains are used for Secret Power but not fully implemented.
BATTLE_TERRAIN_PLAIN, #define BATTLE_TERRAIN_SOARING 10
// New battle terrains are used for Secret Power but not fully implemented. #define BATTLE_TERRAIN_SKY_PILLAR 11
BATTLE_TERRAIN_SOARING, #define BATTLE_TERRAIN_BURIAL_GROUND 12
BATTLE_TERRAIN_SKY_PILLAR, #define BATTLE_TERRAIN_PUDDLE 13
BATTLE_TERRAIN_BURIAL_GROUND, #define BATTLE_TERRAIN_MARSH 14
BATTLE_TERRAIN_PUDDLE, #define BATTLE_TERRAIN_SWAMP 15
BATTLE_TERRAIN_MARSH, #define BATTLE_TERRAIN_SNOW 16
BATTLE_TERRAIN_SWAMP, #define BATTLE_TERRAIN_ICE 17
BATTLE_TERRAIN_SNOW, #define BATTLE_TERRAIN_VOLCANO 18
BATTLE_TERRAIN_ICE, #define BATTLE_TERRAIN_DISTORTION_WORLD 19
BATTLE_TERRAIN_VOLCANO, #define BATTLE_TERRAIN_SPACE 20
BATTLE_TERRAIN_DISTORTION_WORLD, #define BATTLE_TERRAIN_ULTRA_SPACE 21
BATTLE_TERRAIN_SPACE,
BATTLE_TERRAIN_ULTRA_SPACE, #define BATTLE_TERRAIN_COUNT 22
BATTLE_TERRAIN_COUNT,
};
#define B_WAIT_TIME_LONG (B_WAIT_TIME_MULTIPLIER * 4) #define B_WAIT_TIME_LONG (B_WAIT_TIME_MULTIPLIER * 4)
#define B_WAIT_TIME_MED (B_WAIT_TIME_MULTIPLIER * 3) #define B_WAIT_TIME_MED (B_WAIT_TIME_MULTIPLIER * 3)

44
include/constants/map_types.h
View File

@ -1,31 +1,25 @@
#ifndef GUARD_CONSTANTS_MAP_TYPES_H #ifndef GUARD_CONSTANTS_MAP_TYPES_H
#define GUARD_CONSTANTS_MAP_TYPES_H #define GUARD_CONSTANTS_MAP_TYPES_H
enum MapType #define MAP_TYPE_NONE 0
{ #define MAP_TYPE_TOWN 1
MAP_TYPE_NONE, #define MAP_TYPE_CITY 2
MAP_TYPE_TOWN, #define MAP_TYPE_ROUTE 3
MAP_TYPE_CITY, #define MAP_TYPE_UNDERGROUND 4
MAP_TYPE_ROUTE, #define MAP_TYPE_UNDERWATER 5
MAP_TYPE_UNDERGROUND, #define MAP_TYPE_OCEAN_ROUTE 6
MAP_TYPE_UNDERWATER, #define MAP_TYPE_UNKNOWN 7 // Not used by any map.
MAP_TYPE_OCEAN_ROUTE, #define MAP_TYPE_INDOOR 8
MAP_TYPE_UNKNOWN, // Not used by any map. #define MAP_TYPE_SECRET_BASE 9
MAP_TYPE_INDOOR,
MAP_TYPE_SECRET_BASE,
};
enum MapBattleScene #define MAP_BATTLE_SCENE_NORMAL 0
{ #define MAP_BATTLE_SCENE_GYM 1
MAP_BATTLE_SCENE_NORMAL, #define MAP_BATTLE_SCENE_MAGMA 2
MAP_BATTLE_SCENE_GYM, #define MAP_BATTLE_SCENE_AQUA 3
MAP_BATTLE_SCENE_MAGMA, #define MAP_BATTLE_SCENE_SIDNEY 4
MAP_BATTLE_SCENE_AQUA, #define MAP_BATTLE_SCENE_PHOEBE 5
MAP_BATTLE_SCENE_SIDNEY, #define MAP_BATTLE_SCENE_GLACIA 6
MAP_BATTLE_SCENE_PHOEBE, #define MAP_BATTLE_SCENE_DRAKE 7
MAP_BATTLE_SCENE_GLACIA, #define MAP_BATTLE_SCENE_FRONTIER 8
MAP_BATTLE_SCENE_DRAKE,
MAP_BATTLE_SCENE_FRONTIER,
};
#endif // GUARD_CONSTANTS_MAP_TYPES_H #endif // GUARD_CONSTANTS_MAP_TYPES_H

11
include/constants/trade.h
View File

@ -5,13 +5,10 @@
#define TRADE_PARTNER 1 #define TRADE_PARTNER 1
// In-game Trade IDs // In-game Trade IDs
enum InGameTradeID #define INGAME_TRADE_SEEDOT 0
{ #define INGAME_TRADE_PLUSLE 1
INGAME_TRADE_SEEDOT, #define INGAME_TRADE_HORSEA 2
INGAME_TRADE_PLUSLE, #define INGAME_TRADE_MEOWTH 3
INGAME_TRADE_HORSEA,
INGAME_TRADE_MEOWTH,
};
// Return values for CanTradeSelectedMon and CanSpinTradeMon // Return values for CanTradeSelectedMon and CanSpinTradeMon
#define CAN_TRADE_MON 0 #define CAN_TRADE_MON 0

137
include/constants/trainers.h
View File

@ -285,76 +285,73 @@
#define RS_FACILITY_CLASSES_COUNT 0x4D #define RS_FACILITY_CLASSES_COUNT 0x4D
enum TrainerClassID #define TRAINER_CLASS_PKMN_TRAINER_1 0x0 // Unused
{ #define TRAINER_CLASS_PKMN_TRAINER_2 0x1 // Unused
TRAINER_CLASS_PKMN_TRAINER_1, // Unused #define TRAINER_CLASS_HIKER 0x2
TRAINER_CLASS_PKMN_TRAINER_2, // Unused #define TRAINER_CLASS_TEAM_AQUA 0x3
TRAINER_CLASS_HIKER, #define TRAINER_CLASS_PKMN_BREEDER 0x4
TRAINER_CLASS_TEAM_AQUA, #define TRAINER_CLASS_COOLTRAINER 0x5
TRAINER_CLASS_PKMN_BREEDER, #define TRAINER_CLASS_BIRD_KEEPER 0x6
TRAINER_CLASS_COOLTRAINER, #define TRAINER_CLASS_COLLECTOR 0x7
TRAINER_CLASS_BIRD_KEEPER, #define TRAINER_CLASS_SWIMMER_M 0x8
TRAINER_CLASS_COLLECTOR, #define TRAINER_CLASS_TEAM_MAGMA 0x9
TRAINER_CLASS_SWIMMER_M, #define TRAINER_CLASS_EXPERT 0xa
TRAINER_CLASS_TEAM_MAGMA, #define TRAINER_CLASS_AQUA_ADMIN 0xb
TRAINER_CLASS_EXPERT, #define TRAINER_CLASS_BLACK_BELT 0xc
TRAINER_CLASS_AQUA_ADMIN, #define TRAINER_CLASS_AQUA_LEADER 0xd
TRAINER_CLASS_BLACK_BELT, #define TRAINER_CLASS_HEX_MANIAC 0xe
TRAINER_CLASS_AQUA_LEADER, #define TRAINER_CLASS_AROMA_LADY 0xf
TRAINER_CLASS_HEX_MANIAC, #define TRAINER_CLASS_RUIN_MANIAC 0x10
TRAINER_CLASS_AROMA_LADY, #define TRAINER_CLASS_INTERVIEWER 0x11
TRAINER_CLASS_RUIN_MANIAC, #define TRAINER_CLASS_TUBER_F 0x12
TRAINER_CLASS_INTERVIEWER, #define TRAINER_CLASS_TUBER_M 0x13
TRAINER_CLASS_TUBER_F, #define TRAINER_CLASS_LADY 0x14
TRAINER_CLASS_TUBER_M, #define TRAINER_CLASS_BEAUTY 0x15
TRAINER_CLASS_LADY, #define TRAINER_CLASS_RICH_BOY 0x16
TRAINER_CLASS_BEAUTY, #define TRAINER_CLASS_POKEMANIAC 0x17
TRAINER_CLASS_RICH_BOY, #define TRAINER_CLASS_GUITARIST 0x18
TRAINER_CLASS_POKEMANIAC, #define TRAINER_CLASS_KINDLER 0x19
TRAINER_CLASS_GUITARIST, #define TRAINER_CLASS_CAMPER 0x1a
TRAINER_CLASS_KINDLER, #define TRAINER_CLASS_PICNICKER 0x1b
TRAINER_CLASS_CAMPER, #define TRAINER_CLASS_BUG_MANIAC 0x1c
TRAINER_CLASS_PICNICKER, #define TRAINER_CLASS_PSYCHIC 0x1d
TRAINER_CLASS_BUG_MANIAC, #define TRAINER_CLASS_GENTLEMAN 0x1e
TRAINER_CLASS_PSYCHIC, #define TRAINER_CLASS_ELITE_FOUR 0x1f
TRAINER_CLASS_GENTLEMAN, #define TRAINER_CLASS_LEADER 0x20
TRAINER_CLASS_ELITE_FOUR, #define TRAINER_CLASS_SCHOOL_KID 0x21
TRAINER_CLASS_LEADER, #define TRAINER_CLASS_SR_AND_JR 0x22
TRAINER_CLASS_SCHOOL_KID, #define TRAINER_CLASS_WINSTRATE 0x23
TRAINER_CLASS_SR_AND_JR, #define TRAINER_CLASS_POKEFAN 0x24
TRAINER_CLASS_WINSTRATE, #define TRAINER_CLASS_YOUNGSTER 0x25
TRAINER_CLASS_POKEFAN, #define TRAINER_CLASS_CHAMPION 0x26
TRAINER_CLASS_YOUNGSTER, #define TRAINER_CLASS_FISHERMAN 0x27
TRAINER_CLASS_CHAMPION, #define TRAINER_CLASS_TRIATHLETE 0x28
TRAINER_CLASS_FISHERMAN, #define TRAINER_CLASS_DRAGON_TAMER 0x29
TRAINER_CLASS_TRIATHLETE, #define TRAINER_CLASS_NINJA_BOY 0x2a
TRAINER_CLASS_DRAGON_TAMER, #define TRAINER_CLASS_BATTLE_GIRL 0x2b
TRAINER_CLASS_NINJA_BOY, #define TRAINER_CLASS_PARASOL_LADY 0x2c
TRAINER_CLASS_BATTLE_GIRL, #define TRAINER_CLASS_SWIMMER_F 0x2d
TRAINER_CLASS_PARASOL_LADY, #define TRAINER_CLASS_TWINS 0x2e
TRAINER_CLASS_SWIMMER_F, #define TRAINER_CLASS_SAILOR 0x2f
TRAINER_CLASS_TWINS, #define TRAINER_CLASS_COOLTRAINER_2 0x30 // Used for only one trainer.
TRAINER_CLASS_SAILOR, #define TRAINER_CLASS_MAGMA_ADMIN 0x31
TRAINER_CLASS_COOLTRAINER_2, // Used for only one trainer. #define TRAINER_CLASS_RIVAL 0x32
TRAINER_CLASS_MAGMA_ADMIN, #define TRAINER_CLASS_BUG_CATCHER 0x33
TRAINER_CLASS_RIVAL, #define TRAINER_CLASS_PKMN_RANGER 0x34
TRAINER_CLASS_BUG_CATCHER, #define TRAINER_CLASS_MAGMA_LEADER 0x35
TRAINER_CLASS_PKMN_RANGER, #define TRAINER_CLASS_LASS 0x36
TRAINER_CLASS_MAGMA_LEADER, #define TRAINER_CLASS_YOUNG_COUPLE 0x37
TRAINER_CLASS_LASS, #define TRAINER_CLASS_OLD_COUPLE 0x38
TRAINER_CLASS_YOUNG_COUPLE, #define TRAINER_CLASS_SIS_AND_BRO 0x39
TRAINER_CLASS_OLD_COUPLE, #define TRAINER_CLASS_SALON_MAIDEN 0x3a
TRAINER_CLASS_SIS_AND_BRO, #define TRAINER_CLASS_DOME_ACE 0x3b
TRAINER_CLASS_SALON_MAIDEN, #define TRAINER_CLASS_PALACE_MAVEN 0x3c
TRAINER_CLASS_DOME_ACE, #define TRAINER_CLASS_ARENA_TYCOON 0x3d
TRAINER_CLASS_PALACE_MAVEN, #define TRAINER_CLASS_FACTORY_HEAD 0x3e
TRAINER_CLASS_ARENA_TYCOON, #define TRAINER_CLASS_PIKE_QUEEN 0x3f
TRAINER_CLASS_FACTORY_HEAD, #define TRAINER_CLASS_PYRAMID_KING 0x40
TRAINER_CLASS_PIKE_QUEEN, #define TRAINER_CLASS_RS_PROTAG 0x41
TRAINER_CLASS_PYRAMID_KING, #define TRAINER_CLASS_COUNT 0x42
TRAINER_CLASS_RS_PROTAG,
TRAINER_CLASS_COUNT,
};
#define TRAINER_ENCOUNTER_MUSIC_MALE 0 // standard male encounter music #define TRAINER_ENCOUNTER_MUSIC_MALE 0 // standard male encounter music
#define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music #define TRAINER_ENCOUNTER_MUSIC_FEMALE 1 // standard female encounter music

2
include/data.h
View File

@ -200,7 +200,7 @@ static inline const struct Trainer *GetTrainerStructFromId(u16 trainerId)
return &gTrainers[difficulty][sanitizedTrainerId]; return &gTrainers[difficulty][sanitizedTrainerId];
} }
static inline const enum TrainerClassID GetTrainerClassFromId(u16 trainerId) static inline const u8 GetTrainerClassFromId(u16 trainerId)
{ {
u32 sanitizedTrainerId = SanitizeTrainerId(trainerId); u32 sanitizedTrainerId = SanitizeTrainerId(trainerId);
enum DifficultyLevel difficulty = GetTrainerDifficultyLevel(sanitizedTrainerId); enum DifficultyLevel difficulty = GetTrainerDifficultyLevel(sanitizedTrainerId);

2
include/frontier_util.h
View File

@ -13,7 +13,7 @@ void ScrollRankingHallRecordsWindow(void);
void ClearRankingHallRecords(void); void ClearRankingHallRecords(void);
void SaveGameFrontier(void); void SaveGameFrontier(void);
u8 GetFrontierBrainTrainerPicIndex(void); u8 GetFrontierBrainTrainerPicIndex(void);
enum TrainerClassID GetFrontierBrainTrainerClass(void); u8 GetFrontierBrainTrainerClass(void);
void CopyFrontierBrainTrainerName(u8 *dst); void CopyFrontierBrainTrainerName(u8 *dst);
bool8 IsFrontierBrainFemale(void); bool8 IsFrontierBrainFemale(void);
void SetFrontierBrainObjEventGfx_2(void); void SetFrontierBrainObjEventGfx_2(void);

18
include/overworld.h
View File

@ -1,8 +1,6 @@
#ifndef GUARD_OVERWORLD_H #ifndef GUARD_OVERWORLD_H
#define GUARD_OVERWORLD_H #define GUARD_OVERWORLD_H
#include "constants/map_types.h"
#define LINK_KEY_CODE_NULL 0x00 #define LINK_KEY_CODE_NULL 0x00
#define LINK_KEY_CODE_EMPTY 0x11 #define LINK_KEY_CODE_EMPTY 0x11
#define LINK_KEY_CODE_DPAD_DOWN 0x12 #define LINK_KEY_CODE_DPAD_DOWN 0x12
@ -118,16 +116,16 @@ void TryFadeOutOldMapMusic(void);
bool8 BGMusicStopped(void); bool8 BGMusicStopped(void);
void Overworld_FadeOutMapMusic(void); void Overworld_FadeOutMapMusic(void);
void UpdateAmbientCry(s16 *state, u16 *delayCounter); void UpdateAmbientCry(s16 *state, u16 *delayCounter);
enum MapType GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum);
enum MapType GetMapTypeByWarpData(struct WarpData *warp); u8 GetMapTypeByWarpData(struct WarpData *warp);
enum MapType GetCurrentMapType(void); u8 GetCurrentMapType(void);
enum MapType GetLastUsedWarpMapType(void); u8 GetLastUsedWarpMapType(void);
bool8 IsMapTypeOutdoors(enum MapType mapType); bool8 IsMapTypeOutdoors(u8 mapType);
bool8 Overworld_MapTypeAllowsTeleportAndFly(enum MapType mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
bool8 IsMapTypeIndoors(enum MapType mapType); bool8 IsMapTypeIndoors(u8 mapType);
u8 GetSavedWarpRegionMapSectionId(void); u8 GetSavedWarpRegionMapSectionId(void);
u8 GetCurrentRegionMapSectionId(void); u8 GetCurrentRegionMapSectionId(void);
enum MapBattleScene GetCurrentMapBattleScene(void); u8 GetCurrentMapBattleScene(void);
void CleanupOverworldWindowsAndTilemaps(void); void CleanupOverworldWindowsAndTilemaps(void);
bool32 IsOverworldLinkActive(void); bool32 IsOverworldLinkActive(void);
void CB1_Overworld(void); void CB1_Overworld(void);

11
include/pokemon.h
View File

@ -1,12 +1,11 @@
#ifndef GUARD_POKEMON_H #ifndef GUARD_POKEMON_H
#define GUARD_POKEMON_H #define GUARD_POKEMON_H
#include "contest_effect.h"
#include "sprite.h" #include "sprite.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/map_groups.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"
#include "constants/trainers.h" #include "constants/map_groups.h"
#include "contest_effect.h"
#define GET_BASE_SPECIES_ID(speciesId) (GetFormSpeciesId(speciesId, 0)) #define GET_BASE_SPECIES_ID(speciesId) (GetFormSpeciesId(speciesId, 0))
#define FORM_SPECIES_END (0xffff) #define FORM_SPECIES_END (0xffff)
@ -610,7 +609,7 @@ extern struct SpriteTemplate gMultiuseSpriteTemplate;
extern u16 gFollowerSteps; extern u16 gFollowerSteps;
extern const u8 gFacilityClassToPicIndex[]; extern const u8 gFacilityClassToPicIndex[];
extern const enum TrainerClassID gFacilityClassToTrainerClass[]; extern const u8 gFacilityClassToTrainerClass[];
extern const struct SpeciesInfo gSpeciesInfo[]; extern const struct SpeciesInfo gSpeciesInfo[];
extern const u32 gExperienceTables[][MAX_LEVEL + 1]; extern const u32 gExperienceTables[][MAX_LEVEL + 1];
extern const u8 gPPUpGetMask[]; extern const u8 gPPUpGetMask[];
@ -642,7 +641,7 @@ void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level,
void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerPokemon *dest); void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerPokemon *dest);
bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId); bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId);
u16 GetUnionRoomTrainerPic(void); u16 GetUnionRoomTrainerPic(void);
enum TrainerClassID GetUnionRoomTrainerClass(void); u16 GetUnionRoomTrainerClass(void);
void CreateEnemyEventMon(void); void CreateEnemyEventMon(void);
void CalculateMonStats(struct Pokemon *mon); void CalculateMonStats(struct Pokemon *mon);
void BoxMonToMon(const struct BoxPokemon *src, struct Pokemon *dest); void BoxMonToMon(const struct BoxPokemon *src, struct Pokemon *dest);
@ -695,7 +694,7 @@ u16 GetAbilityBySpecies(u16 species, u8 abilityNum);
u16 GetMonAbility(struct Pokemon *mon); u16 GetMonAbility(struct Pokemon *mon);
void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord); void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord);
u8 GetSecretBaseTrainerPicIndex(void); u8 GetSecretBaseTrainerPicIndex(void);
enum TrainerClassID GetSecretBaseTrainerClass(void); u8 GetSecretBaseTrainerClass(void);
bool8 IsPlayerPartyAndPokemonStorageFull(void); bool8 IsPlayerPartyAndPokemonStorageFull(void);
bool8 IsPokemonStorageFull(void); bool8 IsPokemonStorageFull(void);
const u8 *GetSpeciesName(u16 species); const u8 *GetSpeciesName(u16 species);

378
include/pokemon_animation.h
View File

@ -1,201 +1,195 @@
#ifndef GUARD_POKEMON_ANIMATION_H #ifndef GUARD_POKEMON_ANIMATION_H
#define GUARD_POKEMON_ANIMATION_H #define GUARD_POKEMON_ANIMATION_H
u8 GetSpeciesBackAnimSet(u16 species);
void LaunchAnimationTaskForFrontSprite(struct Sprite *sprite, u8 frontAnimId);
void StartMonSummaryAnimation(struct Sprite *sprite, u8 frontAnimId);
void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimSet);
void SetSpriteCB_MonAnimDummy(struct Sprite *sprite);
// Pokémon back animation sets // Pokémon back animation sets
enum BackAnim #define BACK_ANIM_NONE 0
{ #define BACK_ANIM_H_VIBRATE 1
BACK_ANIM_NONE, #define BACK_ANIM_H_SLIDE 2
BACK_ANIM_H_VIBRATE, #define BACK_ANIM_H_SPRING 3
BACK_ANIM_H_SLIDE, #define BACK_ANIM_H_SPRING_REPEATED 4
BACK_ANIM_H_SPRING, #define BACK_ANIM_SHRINK_GROW 5
BACK_ANIM_H_SPRING_REPEATED, #define BACK_ANIM_GROW 6
BACK_ANIM_SHRINK_GROW, #define BACK_ANIM_CIRCLE_COUNTERCLOCKWISE 7
BACK_ANIM_GROW, #define BACK_ANIM_H_SHAKE 8
BACK_ANIM_CIRCLE_COUNTERCLOCKWISE, #define BACK_ANIM_V_SHAKE 9
BACK_ANIM_H_SHAKE, #define BACK_ANIM_V_SHAKE_H_SLIDE 10
BACK_ANIM_V_SHAKE, #define BACK_ANIM_V_STRETCH 11
BACK_ANIM_V_SHAKE_H_SLIDE, #define BACK_ANIM_H_STRETCH 12
BACK_ANIM_V_STRETCH, #define BACK_ANIM_GROW_STUTTER 13
BACK_ANIM_H_STRETCH, #define BACK_ANIM_V_SHAKE_LOW 14
BACK_ANIM_GROW_STUTTER, #define BACK_ANIM_TRIANGLE_DOWN 15
BACK_ANIM_V_SHAKE_LOW, #define BACK_ANIM_CONCAVE_ARC_LARGE 16
BACK_ANIM_TRIANGLE_DOWN, #define BACK_ANIM_CONVEX_DOUBLE_ARC 17
BACK_ANIM_CONCAVE_ARC_LARGE, #define BACK_ANIM_CONCAVE_ARC_SMALL 18
BACK_ANIM_CONVEX_DOUBLE_ARC, #define BACK_ANIM_DIP_RIGHT_SIDE 19
BACK_ANIM_CONCAVE_ARC_SMALL, #define BACK_ANIM_SHRINK_GROW_VIBRATE 20
BACK_ANIM_DIP_RIGHT_SIDE, #define BACK_ANIM_JOLT_RIGHT 21
BACK_ANIM_SHRINK_GROW_VIBRATE, #define BACK_ANIM_SHAKE_FLASH_YELLOW 22
BACK_ANIM_JOLT_RIGHT, #define BACK_ANIM_SHAKE_GLOW_RED 23
BACK_ANIM_SHAKE_FLASH_YELLOW, #define BACK_ANIM_SHAKE_GLOW_GREEN 24
BACK_ANIM_SHAKE_GLOW_RED, #define BACK_ANIM_SHAKE_GLOW_BLUE 25
BACK_ANIM_SHAKE_GLOW_GREEN,
BACK_ANIM_SHAKE_GLOW_BLUE,
};
// Pokémon animation function ids (for front and back) // Pokémon animation function ids (for front and back)
// Each front anim uses 1, and each back anim uses a set of 3 // Each front anim uses 1, and each back anim uses a set of 3
enum AnimFunctionIDs #define ANIM_V_SQUISH_AND_BOUNCE 0
{ #define ANIM_CIRCULAR_STRETCH_TWICE 1
ANIM_V_SQUISH_AND_BOUNCE, #define ANIM_H_VIBRATE 2
ANIM_CIRCULAR_STRETCH_TWICE, #define ANIM_H_SLIDE 3
ANIM_H_VIBRATE, #define ANIM_V_SLIDE 4
ANIM_H_SLIDE, #define ANIM_BOUNCE_ROTATE_TO_SIDES 5
ANIM_V_SLIDE, #define ANIM_V_JUMPS_H_JUMPS 6
ANIM_BOUNCE_ROTATE_TO_SIDES, #define ANIM_ROTATE_TO_SIDES 7
ANIM_V_JUMPS_H_JUMPS, #define ANIM_ROTATE_TO_SIDES_TWICE 8
ANIM_ROTATE_TO_SIDES, #define ANIM_GROW_VIBRATE 9
ANIM_ROTATE_TO_SIDES_TWICE, #define ANIM_ZIGZAG_FAST 10
ANIM_GROW_VIBRATE, #define ANIM_SWING_CONCAVE 11
ANIM_ZIGZAG_FAST, #define ANIM_SWING_CONCAVE_FAST 12
ANIM_SWING_CONCAVE, #define ANIM_SWING_CONVEX 13
ANIM_SWING_CONCAVE_FAST, #define ANIM_SWING_CONVEX_FAST 14
ANIM_SWING_CONVEX, #define ANIM_H_SHAKE 15
ANIM_SWING_CONVEX_FAST, #define ANIM_V_SHAKE 16
ANIM_H_SHAKE, #define ANIM_CIRCULAR_VIBRATE 17
ANIM_V_SHAKE, #define ANIM_TWIST 18
ANIM_CIRCULAR_VIBRATE, #define ANIM_SHRINK_GROW 19
ANIM_TWIST, #define ANIM_CIRCLE_C_CLOCKWISE 20
ANIM_SHRINK_GROW, #define ANIM_GLOW_BLACK 21
ANIM_CIRCLE_C_CLOCKWISE, #define ANIM_H_STRETCH 22
ANIM_GLOW_BLACK, #define ANIM_V_STRETCH 23
ANIM_H_STRETCH, #define ANIM_RISING_WOBBLE 24
ANIM_V_STRETCH, #define ANIM_V_SHAKE_TWICE 25
ANIM_RISING_WOBBLE, #define ANIM_TIP_MOVE_FORWARD 26
ANIM_V_SHAKE_TWICE, #define ANIM_H_PIVOT 27
ANIM_TIP_MOVE_FORWARD, #define ANIM_V_SLIDE_WOBBLE 28
ANIM_H_PIVOT, #define ANIM_H_SLIDE_WOBBLE 29
ANIM_V_SLIDE_WOBBLE, #define ANIM_V_JUMPS_BIG 30
ANIM_H_SLIDE_WOBBLE, #define ANIM_SPIN_LONG 31
ANIM_V_JUMPS_BIG, #define ANIM_GLOW_ORANGE 32
ANIM_SPIN_LONG, #define ANIM_GLOW_RED 33
ANIM_GLOW_ORANGE, #define ANIM_GLOW_BLUE 34
ANIM_GLOW_RED, #define ANIM_GLOW_YELLOW 35
ANIM_GLOW_BLUE, #define ANIM_GLOW_PURPLE 36
ANIM_GLOW_YELLOW, #define ANIM_BACK_AND_LUNGE 37
ANIM_GLOW_PURPLE, #define ANIM_BACK_FLIP 38
ANIM_BACK_AND_LUNGE, #define ANIM_FLICKER 39
ANIM_BACK_FLIP, #define ANIM_BACK_FLIP_BIG 40
ANIM_FLICKER, #define ANIM_FRONT_FLIP 41
ANIM_BACK_FLIP_BIG, #define ANIM_TUMBLING_FRONT_FLIP 42
ANIM_FRONT_FLIP, #define ANIM_FIGURE_8 43
ANIM_TUMBLING_FRONT_FLIP, #define ANIM_FLASH_YELLOW 44
ANIM_FIGURE_8, #define ANIM_SWING_CONCAVE_FAST_SHORT 45
ANIM_FLASH_YELLOW, #define ANIM_SWING_CONVEX_FAST_SHORT 46
ANIM_SWING_CONCAVE_FAST_SHORT, #define ANIM_ROTATE_UP_SLAM_DOWN 47
ANIM_SWING_CONVEX_FAST_SHORT, #define ANIM_DEEP_V_SQUISH_AND_BOUNCE 48
ANIM_ROTATE_UP_SLAM_DOWN, #define ANIM_H_JUMPS 49
ANIM_DEEP_V_SQUISH_AND_BOUNCE, #define ANIM_H_JUMPS_V_STRETCH 50
ANIM_H_JUMPS, #define ANIM_ROTATE_TO_SIDES_FAST 51
ANIM_H_JUMPS_V_STRETCH, #define ANIM_ROTATE_UP_TO_SIDES 52
ANIM_ROTATE_TO_SIDES_FAST, #define ANIM_FLICKER_INCREASING 53
ANIM_ROTATE_UP_TO_SIDES, #define ANIM_TIP_HOP_FORWARD 54
ANIM_FLICKER_INCREASING, #define ANIM_PIVOT_SHAKE 55
ANIM_TIP_HOP_FORWARD, #define ANIM_TIP_AND_SHAKE 56
ANIM_PIVOT_SHAKE, #define ANIM_VIBRATE_TO_CORNERS 57
ANIM_TIP_AND_SHAKE, #define ANIM_GROW_IN_STAGES 58
ANIM_VIBRATE_TO_CORNERS, #define ANIM_V_SPRING 59
ANIM_GROW_IN_STAGES, #define ANIM_V_REPEATED_SPRING 60
ANIM_V_SPRING, #define ANIM_SPRING_RISING 61
ANIM_V_REPEATED_SPRING, #define ANIM_H_SPRING 62
ANIM_SPRING_RISING, #define ANIM_H_REPEATED_SPRING_SLOW 63
ANIM_H_SPRING, #define ANIM_H_SLIDE_SHRINK 64
ANIM_H_REPEATED_SPRING_SLOW, #define ANIM_LUNGE_GROW 65
ANIM_H_SLIDE_SHRINK, #define ANIM_CIRCLE_INTO_BG 66
ANIM_LUNGE_GROW, #define ANIM_RAPID_H_HOPS 67
ANIM_CIRCLE_INTO_BG, #define ANIM_FOUR_PETAL 68
ANIM_RAPID_H_HOPS, #define ANIM_V_SQUISH_AND_BOUNCE_SLOW 69
ANIM_FOUR_PETAL, #define ANIM_H_SLIDE_SLOW 70
ANIM_V_SQUISH_AND_BOUNCE_SLOW, #define ANIM_V_SLIDE_SLOW 71
ANIM_H_SLIDE_SLOW, #define ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL 72
ANIM_V_SLIDE_SLOW, #define ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW 73
ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL, #define ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL_SLOW 74
ANIM_BOUNCE_ROTATE_TO_SIDES_SLOW, #define ANIM_ZIGZAG_SLOW 75
ANIM_BOUNCE_ROTATE_TO_SIDES_SMALL_SLOW, #define ANIM_H_SHAKE_SLOW 76
ANIM_ZIGZAG_SLOW, #define ANIM_V_SHAKE_SLOW 77
ANIM_H_SHAKE_SLOW, #define ANIM_TWIST_TWICE 78
ANIM_V_SHAKE_SLOW, #define ANIM_CIRCLE_C_CLOCKWISE_SLOW 79
ANIM_TWIST_TWICE, #define ANIM_V_SHAKE_TWICE_SLOW 80
ANIM_CIRCLE_C_CLOCKWISE_SLOW, #define ANIM_V_SLIDE_WOBBLE_SMALL 81
ANIM_V_SHAKE_TWICE_SLOW, #define ANIM_V_JUMPS_SMALL 82
ANIM_V_SLIDE_WOBBLE_SMALL, #define ANIM_SPIN 83
ANIM_V_JUMPS_SMALL, #define ANIM_TUMBLING_FRONT_FLIP_TWICE 84
ANIM_SPIN, #define ANIM_DEEP_V_SQUISH_AND_BOUNCE_TWICE 85
ANIM_TUMBLING_FRONT_FLIP_TWICE, #define ANIM_H_JUMPS_V_STRETCH_TWICE 86
ANIM_DEEP_V_SQUISH_AND_BOUNCE_TWICE, #define ANIM_V_SHAKE_BACK 87
ANIM_H_JUMPS_V_STRETCH_TWICE, #define ANIM_V_SHAKE_BACK_SLOW 88
ANIM_V_SHAKE_BACK, #define ANIM_V_SHAKE_H_SLIDE_SLOW 89
ANIM_V_SHAKE_BACK_SLOW, #define ANIM_V_STRETCH_BOTH_ENDS_SLOW 90
ANIM_V_SHAKE_H_SLIDE_SLOW, #define ANIM_H_STRETCH_FAR_SLOW 91
ANIM_V_STRETCH_BOTH_ENDS_SLOW, #define ANIM_V_SHAKE_LOW_TWICE 92
ANIM_H_STRETCH_FAR_SLOW, #define ANIM_H_SHAKE_FAST 93
ANIM_V_SHAKE_LOW_TWICE, #define ANIM_H_SLIDE_FAST 94
ANIM_H_SHAKE_FAST, #define ANIM_H_VIBRATE_FAST 95
ANIM_H_SLIDE_FAST, #define ANIM_H_VIBRATE_FASTEST 96
ANIM_H_VIBRATE_FAST, #define ANIM_V_SHAKE_BACK_FAST 97
ANIM_H_VIBRATE_FASTEST, #define ANIM_V_SHAKE_LOW_TWICE_SLOW 98
ANIM_V_SHAKE_BACK_FAST, #define ANIM_V_SHAKE_LOW_TWICE_FAST 99
ANIM_V_SHAKE_LOW_TWICE_SLOW, #define ANIM_CIRCLE_C_CLOCKWISE_LONG 100
ANIM_V_SHAKE_LOW_TWICE_FAST, #define ANIM_GROW_STUTTER_SLOW 101
ANIM_CIRCLE_C_CLOCKWISE_LONG, #define ANIM_V_SHAKE_H_SLIDE 102
ANIM_GROW_STUTTER_SLOW, #define ANIM_V_SHAKE_H_SLIDE_FAST 103
ANIM_V_SHAKE_H_SLIDE, #define ANIM_TRIANGLE_DOWN_SLOW 104
ANIM_V_SHAKE_H_SLIDE_FAST, #define ANIM_TRIANGLE_DOWN 105
ANIM_TRIANGLE_DOWN_SLOW, #define ANIM_TRIANGLE_DOWN_TWICE 106
ANIM_TRIANGLE_DOWN, #define ANIM_GROW 107
ANIM_TRIANGLE_DOWN_TWICE, #define ANIM_GROW_TWICE 108
ANIM_GROW, #define ANIM_H_SPRING_FAST 109
ANIM_GROW_TWICE, #define ANIM_H_SPRING_SLOW 110
ANIM_H_SPRING_FAST, #define ANIM_H_REPEATED_SPRING_FAST 111
ANIM_H_SPRING_SLOW, #define ANIM_H_REPEATED_SPRING 112
ANIM_H_REPEATED_SPRING_FAST, #define ANIM_SHRINK_GROW_FAST 113
ANIM_H_REPEATED_SPRING, #define ANIM_SHRINK_GROW_SLOW 114
ANIM_SHRINK_GROW_FAST, #define ANIM_V_STRETCH_BOTH_ENDS 115
ANIM_SHRINK_GROW_SLOW, #define ANIM_V_STRETCH_BOTH_ENDS_TWICE 116
ANIM_V_STRETCH_BOTH_ENDS, #define ANIM_H_STRETCH_FAR_TWICE 117
ANIM_V_STRETCH_BOTH_ENDS_TWICE, #define ANIM_H_STRETCH_FAR 118
ANIM_H_STRETCH_FAR_TWICE, #define ANIM_GROW_STUTTER_TWICE 119
ANIM_H_STRETCH_FAR, #define ANIM_GROW_STUTTER 120
ANIM_GROW_STUTTER_TWICE, #define ANIM_CONCAVE_ARC_LARGE_SLOW 121
ANIM_GROW_STUTTER, #define ANIM_CONCAVE_ARC_LARGE 122
ANIM_CONCAVE_ARC_LARGE_SLOW, #define ANIM_CONCAVE_ARC_LARGE_TWICE 123
ANIM_CONCAVE_ARC_LARGE, #define ANIM_CONVEX_DOUBLE_ARC_SLOW 124
ANIM_CONCAVE_ARC_LARGE_TWICE, #define ANIM_CONVEX_DOUBLE_ARC 125
ANIM_CONVEX_DOUBLE_ARC_SLOW, #define ANIM_CONVEX_DOUBLE_ARC_TWICE 126
ANIM_CONVEX_DOUBLE_ARC, #define ANIM_CONCAVE_ARC_SMALL_SLOW 127
ANIM_CONVEX_DOUBLE_ARC_TWICE, #define ANIM_CONCAVE_ARC_SMALL 128
ANIM_CONCAVE_ARC_SMALL_SLOW, #define ANIM_CONCAVE_ARC_SMALL_TWICE 129
ANIM_CONCAVE_ARC_SMALL, #define ANIM_H_DIP 130
ANIM_CONCAVE_ARC_SMALL_TWICE, #define ANIM_H_DIP_FAST 131
ANIM_H_DIP, #define ANIM_H_DIP_TWICE 132
ANIM_H_DIP_FAST, #define ANIM_SHRINK_GROW_VIBRATE_FAST 133
ANIM_H_DIP_TWICE, #define ANIM_SHRINK_GROW_VIBRATE 134
ANIM_SHRINK_GROW_VIBRATE_FAST, #define ANIM_SHRINK_GROW_VIBRATE_SLOW 135
ANIM_SHRINK_GROW_VIBRATE, #define ANIM_JOLT_RIGHT_FAST 136
ANIM_SHRINK_GROW_VIBRATE_SLOW, #define ANIM_JOLT_RIGHT 137
ANIM_JOLT_RIGHT_FAST, #define ANIM_JOLT_RIGHT_SLOW 138
ANIM_JOLT_RIGHT, #define ANIM_SHAKE_FLASH_YELLOW_FAST 139
ANIM_JOLT_RIGHT_SLOW, #define ANIM_SHAKE_FLASH_YELLOW 140
ANIM_SHAKE_FLASH_YELLOW_FAST, #define ANIM_SHAKE_FLASH_YELLOW_SLOW 141
ANIM_SHAKE_FLASH_YELLOW, #define ANIM_SHAKE_GLOW_RED_FAST 142
ANIM_SHAKE_FLASH_YELLOW_SLOW, #define ANIM_SHAKE_GLOW_RED 143
ANIM_SHAKE_GLOW_RED_FAST, #define ANIM_SHAKE_GLOW_RED_SLOW 144
ANIM_SHAKE_GLOW_RED, #define ANIM_SHAKE_GLOW_GREEN_FAST 145
ANIM_SHAKE_GLOW_RED_SLOW, #define ANIM_SHAKE_GLOW_GREEN 146
ANIM_SHAKE_GLOW_GREEN_FAST, #define ANIM_SHAKE_GLOW_GREEN_SLOW 147
ANIM_SHAKE_GLOW_GREEN, #define ANIM_SHAKE_GLOW_BLUE_FAST 148
ANIM_SHAKE_GLOW_GREEN_SLOW, #define ANIM_SHAKE_GLOW_BLUE 149
ANIM_SHAKE_GLOW_BLUE_FAST, #define ANIM_SHAKE_GLOW_BLUE_SLOW 150
ANIM_SHAKE_GLOW_BLUE, #define ANIM_SHAKE_GLOW_BLACK_SLOW 151
ANIM_SHAKE_GLOW_BLUE_SLOW, #define ANIM_SHAKE_GLOW_WHITE_SLOW 152
ANIM_SHAKE_GLOW_BLACK_SLOW, #define ANIM_SHAKE_GLOW_PURPLE_SLOW 153
ANIM_SHAKE_GLOW_WHITE_SLOW,
ANIM_SHAKE_GLOW_PURPLE_SLOW,
};
enum BackAnim GetSpeciesBackAnimSet(u16 species);
void LaunchAnimationTaskForFrontSprite(struct Sprite *sprite, enum AnimFunctionIDs frontAnimId);
void StartMonSummaryAnimation(struct Sprite *sprite, enum AnimFunctionIDs frontAnimId);
void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, enum BackAnim backAnimSet);
void SetSpriteCB_MonAnimDummy(struct Sprite *sprite);
#endif // GUARD_POKEMON_ANIMATION_H #endif // GUARD_POKEMON_ANIMATION_H

2
include/trainer_hill.h
View File

@ -45,7 +45,7 @@ extern u32 *gTrainerHillVBlankCounter;
void CallTrainerHillFunction(void); void CallTrainerHillFunction(void);
void ResetTrainerHillResults(void); void ResetTrainerHillResults(void);
enum TrainerClassID GetTrainerHillOpponentClass(u16 trainerId); u8 GetTrainerHillOpponentClass(u16 trainerId);
void GetTrainerHillTrainerName(u8 *dst, u16 trainerId); void GetTrainerHillTrainerName(u8 *dst, u16 trainerId);
u8 GetTrainerHillTrainerFrontSpriteId(u16 trainerId); u8 GetTrainerHillTrainerFrontSpriteId(u16 trainerId);
void InitTrainerHillBattleStruct(void); void InitTrainerHillBattleStruct(void);

11
src/battle_bg.c
View File

@ -21,6 +21,7 @@
#include "text_window.h" #include "text_window.h"
#include "trig.h" #include "trig.h"
#include "window.h" #include "window.h"
#include "constants/map_types.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/trainers.h" #include "constants/trainers.h"
@ -805,7 +806,7 @@ void DrawMainBattleBackground(void)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{ {
enum TrainerClassID trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A); u32 trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A);
if (trainerClass == TRAINER_CLASS_LEADER) if (trainerClass == TRAINER_CLASS_LEADER)
{ {
LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
@ -1206,7 +1207,7 @@ void DrawBattleEntryBackground(void)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{ {
enum TrainerClassID trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A); u32 trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A);
if (trainerClass == TRAINER_CLASS_LEADER) if (trainerClass == TRAINER_CLASS_LEADER)
{ {
LZDecompressVram(gBattleTerrainAnimTiles_Building, (void *)(BG_CHAR_ADDR(1))); LZDecompressVram(gBattleTerrainAnimTiles_Building, (void *)(BG_CHAR_ADDR(1)));
@ -1271,7 +1272,7 @@ bool8 LoadChosenBattleElement(u8 caseId)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{ {
enum TrainerClassID trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A); u32 trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A);
if (trainerClass == TRAINER_CLASS_LEADER) if (trainerClass == TRAINER_CLASS_LEADER)
{ {
LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTiles_Building, (void *)(BG_CHAR_ADDR(2)));
@ -1333,7 +1334,7 @@ bool8 LoadChosenBattleElement(u8 caseId)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{ {
enum TrainerClassID trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A); u32 trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A);
if (trainerClass == TRAINER_CLASS_LEADER) if (trainerClass == TRAINER_CLASS_LEADER)
{ {
LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26))); LZDecompressVram(gBattleTerrainTilemap_Building, (void *)(BG_SCREEN_ADDR(26)));
@ -1395,7 +1396,7 @@ bool8 LoadChosenBattleElement(u8 caseId)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{ {
enum TrainerClassID trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A); u32 trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A);
if (trainerClass == TRAINER_CLASS_LEADER) if (trainerClass == TRAINER_CLASS_LEADER)
{ {
LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP); LoadCompressedPalette(gBattleTerrainPalette_BuildingLeader, BG_PLTT_ID(2), 3 * PLTT_SIZE_4BPP);

1
src/battle_script_commands.c
View File

@ -56,6 +56,7 @@
#include "constants/hold_effects.h" #include "constants/hold_effects.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/item_effects.h" #include "constants/item_effects.h"
#include "constants/map_types.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/party_menu.h" #include "constants/party_menu.h"
#include "constants/rgb.h" #include "constants/rgb.h"

5
src/battle_setup.c
View File

@ -45,6 +45,7 @@
#include "constants/game_stat.h" #include "constants/game_stat.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/map_types.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/trainer_hill.h" #include "constants/trainer_hill.h"
#include "constants/weather.h" #include "constants/weather.h"
@ -738,7 +739,7 @@ static void CB2_EndScriptedWildBattle(void)
} }
} }
enum BattleTerrain BattleSetup_GetTerrainId(void) u8 BattleSetup_GetTerrainId(void)
{ {
u16 tileBehavior; u16 tileBehavior;
s16 x, y; s16 x, y;
@ -890,7 +891,7 @@ u8 GetTrainerBattleTransition(void)
u8 enemyLevel; u8 enemyLevel;
u8 playerLevel; u8 playerLevel;
u32 trainerId = SanitizeTrainerId(gTrainerBattleOpponent_A); u32 trainerId = SanitizeTrainerId(gTrainerBattleOpponent_A);
enum TrainerClassID trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A); u32 trainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A);
if (DoesTrainerHaveMugshot(trainerId)) if (DoesTrainerHaveMugshot(trainerId))
return B_TRANSITION_MUGSHOT; return B_TRANSITION_MUGSHOT;

6
src/battle_tower.c
View File

@ -1352,9 +1352,9 @@ u8 GetFrontierTrainerFrontSpriteId(u16 trainerId)
} }
} }
enum TrainerClassID GetFrontierOpponentClass(u16 trainerId) u8 GetFrontierOpponentClass(u16 trainerId)
{ {
enum TrainerClassID trainerClass = 0; u8 trainerClass = 0;
enum DifficultyLevel difficulty = GetBattlePartnerDifficultyLevel(trainerId); enum DifficultyLevel difficulty = GetBattlePartnerDifficultyLevel(trainerId);
SetFacilityPtrsGetLevel(); SetFacilityPtrsGetLevel();
@ -2847,7 +2847,7 @@ u8 GetEreaderTrainerFrontSpriteId(void)
#endif //FREE_BATTLE_TOWER_E_READER #endif //FREE_BATTLE_TOWER_E_READER
} }
enum TrainerClassID GetEreaderTrainerClassId(void) u8 GetEreaderTrainerClassId(void)
{ {
#if FREE_BATTLE_TOWER_E_READER == FALSE #if FREE_BATTLE_TOWER_E_READER == FALSE
return gFacilityClassToTrainerClass[gSaveBlock2Ptr->frontier.ereaderTrainer.facilityClass]; return gFacilityClassToTrainerClass[gSaveBlock2Ptr->frontier.ereaderTrainer.facilityClass];

1
src/bike.c
View File

@ -7,6 +7,7 @@
#include "metatile_behavior.h" #include "metatile_behavior.h"
#include "overworld.h" #include "overworld.h"
#include "sound.h" #include "sound.h"
#include "constants/map_types.h"
#include "constants/songs.h" #include "constants/songs.h"
// this file's functions // this file's functions

2
src/data/pokemon/trainer_class_lookups.h
View File

@ -84,7 +84,7 @@ const u8 gFacilityClassToPicIndex[] =
[FACILITY_CLASS_RS_MAY] = TRAINER_PIC_RS_MAY, [FACILITY_CLASS_RS_MAY] = TRAINER_PIC_RS_MAY,
}; };
const enum TrainerClassID gFacilityClassToTrainerClass[] = const u8 gFacilityClassToTrainerClass[] =
{ {
[FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER, [FACILITY_CLASS_HIKER] = TRAINER_CLASS_HIKER,
[FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_CLASS_TEAM_AQUA, [FACILITY_CLASS_AQUA_GRUNT_M] = TRAINER_CLASS_TEAM_AQUA,

8
src/debug.c
View File

@ -168,7 +168,7 @@ enum FlagsVarsDebugMenu
DEBUG_FLAGVAR_MENU_ITEM_TOGGLE_CATCHING, DEBUG_FLAGVAR_MENU_ITEM_TOGGLE_CATCHING,
}; };
enum DebugBattleType enum BattleType
{ {
DEBUG_BATTLE_0_MENU_ITEM_WILD, DEBUG_BATTLE_0_MENU_ITEM_WILD,
DEBUG_BATTLE_0_MENU_ITEM_WILD_DOUBLE, DEBUG_BATTLE_0_MENU_ITEM_WILD_DOUBLE,
@ -177,7 +177,7 @@ enum DebugBattleType
DEBUG_BATTLE_0_MENU_ITEM_MULTI, DEBUG_BATTLE_0_MENU_ITEM_MULTI,
}; };
enum DebugBattleAIFlags enum BattleAIFlags
{ {
DEBUG_BATTLE_1_MENU_ITEM_AI_FLAG_00, DEBUG_BATTLE_1_MENU_ITEM_AI_FLAG_00,
DEBUG_BATTLE_1_MENU_ITEM_AI_FLAG_01, DEBUG_BATTLE_1_MENU_ITEM_AI_FLAG_01,
@ -200,7 +200,7 @@ enum DebugBattleAIFlags
DEBUG_BATTLE_1_MENU_ITEM_CONTINUE, DEBUG_BATTLE_1_MENU_ITEM_CONTINUE,
}; };
enum DebugBattleTerrain enum BattleTerrain
{ {
DEBUG_BATTLE_2_MENU_ITEM_TERRAIN_0, DEBUG_BATTLE_2_MENU_ITEM_TERRAIN_0,
DEBUG_BATTLE_2_MENU_ITEM_TERRAIN_1, DEBUG_BATTLE_2_MENU_ITEM_TERRAIN_1,
@ -297,7 +297,7 @@ struct DebugBattleData
{ {
u8 submenu; u8 submenu;
u8 battleType; u8 battleType;
enum BattleTerrain battleTerrain; u8 battleTerrain;
bool8 aiFlags[AI_FLAG_COUNT]; bool8 aiFlags[AI_FLAG_COUNT];
}; };

5
src/dexnav.c
View File

@ -49,6 +49,7 @@
#include "text_window.h" #include "text_window.h"
#include "wild_encounter.h" #include "wild_encounter.h"
#include "window.h" #include "window.h"
#include "constants/map_types.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
@ -612,7 +613,7 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
bool8 nextIter; bool8 nextIter;
u8 scale = 0; u8 scale = 0;
u8 weight = 0; u8 weight = 0;
enum MapType currMapType = GetCurrentMapType(); u8 currMapType = GetCurrentMapType();
u8 tileBehaviour; u8 tileBehaviour;
u8 tileBuffer = 2; u8 tileBuffer = 2;
u8 *xPos = AllocZeroed((botX - topX) * (botY - topY) * sizeof(u8)); u8 *xPos = AllocZeroed((botX - topX) * (botY - topY) * sizeof(u8));
@ -724,7 +725,7 @@ static bool8 DexNavPickTile(u8 environment, u8 areaX, u8 areaY, bool8 smallScan)
static bool8 TryStartHiddenMonFieldEffect(u8 environment, u8 xSize, u8 ySize, bool8 smallScan) static bool8 TryStartHiddenMonFieldEffect(u8 environment, u8 xSize, u8 ySize, bool8 smallScan)
{ {
enum MapType currMapType = GetCurrentMapType(); u8 currMapType = GetCurrentMapType();
u8 fldEffId = 0; u8 fldEffId = 0;
if (DexNavPickTile(environment, xSize, ySize, smallScan)) if (DexNavPickTile(environment, xSize, ySize, smallScan))

1
src/event_object_movement.c
View File

@ -44,6 +44,7 @@
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/map_types.h"
#include "constants/mauville_old_man.h" #include "constants/mauville_old_man.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"

1
src/field_control_avatar.c
View File

@ -35,6 +35,7 @@
#include "constants/event_bg.h" #include "constants/event_bg.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/field_poison.h" #include "constants/field_poison.h"
#include "constants/map_types.h"
#include "constants/metatile_behaviors.h" #include "constants/metatile_behaviors.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/trainer_hill.h" #include "constants/trainer_hill.h"

1
src/field_effect.c
View File

@ -36,6 +36,7 @@
#include "constants/metatile_behaviors.h" #include "constants/metatile_behaviors.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/map_types.h"
#define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))} #define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}

4
src/field_screen_effect.c
View File

@ -86,7 +86,7 @@ static void FillPalBufferBlack(void)
void WarpFadeInScreen(void) void WarpFadeInScreen(void)
{ {
enum MapType previousMapType = GetLastUsedWarpMapType(); u8 previousMapType = GetLastUsedWarpMapType();
switch (GetMapPairFadeFromType(previousMapType, GetCurrentMapType())) switch (GetMapPairFadeFromType(previousMapType, GetCurrentMapType()))
{ {
case 0: case 0:
@ -113,7 +113,7 @@ void FadeInFromBlack(void)
void WarpFadeOutScreen(void) void WarpFadeOutScreen(void)
{ {
enum MapType currentMapType = GetCurrentMapType(); u8 currentMapType = GetCurrentMapType();
switch (GetMapPairFadeToType(currentMapType, GetDestinationWarpMapHeader()->mapType)) switch (GetMapPairFadeToType(currentMapType, GetDestinationWarpMapHeader()->mapType))
{ {
case 0: case 0:

1
src/field_specials.c
View File

@ -59,6 +59,7 @@
#include "constants/field_specials.h" #include "constants/field_specials.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/heal_locations.h" #include "constants/heal_locations.h"
#include "constants/map_types.h"
#include "constants/mystery_gift.h" #include "constants/mystery_gift.h"
#include "constants/slot_machine.h" #include "constants/slot_machine.h"
#include "constants/songs.h" #include "constants/songs.h"

5
src/fldeff_flash.c
View File

@ -14,6 +14,7 @@
#include "sprite.h" #include "sprite.h"
#include "task.h" #include "task.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/map_types.h"
struct FlashStruct struct FlashStruct
{ {
@ -153,8 +154,8 @@ void CB2_DoChangeMap(void)
static bool8 TryDoMapTransition(void) static bool8 TryDoMapTransition(void)
{ {
u8 i; u8 i;
enum MapType fromType = GetLastUsedWarpMapType(); u8 fromType = GetLastUsedWarpMapType();
enum MapType toType = GetCurrentMapType(); u8 toType = GetCurrentMapType();
for (i = 0; sTransitionTypes[i].fromType; i++) for (i = 0; sTransitionTypes[i].fromType; i++)
{ {

1
src/fldeff_rocksmash.c
View File

@ -16,6 +16,7 @@
#include "constants/event_object_movement.h" #include "constants/event_object_movement.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/map_types.h"
#include "constants/songs.h" #include "constants/songs.h"
static void Task_DoFieldMove_Init(u8 taskId); static void Task_DoFieldMove_Init(u8 taskId);

2
src/frontier_util.c
View File

@ -2459,7 +2459,7 @@ u8 GetFrontierBrainTrainerPicIndex(void)
return GetTrainerPicFromId(gFrontierBrainInfo[facility].trainerId); return GetTrainerPicFromId(gFrontierBrainInfo[facility].trainerId);
} }
enum TrainerClassID GetFrontierBrainTrainerClass(void) u8 GetFrontierBrainTrainerClass(void)
{ {
s32 facility; s32 facility;

3
src/item_use.c
View File

@ -44,6 +44,7 @@
#include "constants/item_effects.h" #include "constants/item_effects.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/map_types.h"
static void SetUpItemUseCallback(u8); static void SetUpItemUseCallback(u8);
static void FieldCB_UseItemOnField(void); static void FieldCB_UseItemOnField(void);
@ -1471,7 +1472,7 @@ static bool32 IsValidLocationForVsSeeker(void)
{ {
u16 mapGroup = gSaveBlock1Ptr->location.mapGroup; u16 mapGroup = gSaveBlock1Ptr->location.mapGroup;
u16 mapNum = gSaveBlock1Ptr->location.mapNum; u16 mapNum = gSaveBlock1Ptr->location.mapNum;
enum MapType mapType = gMapHeader.mapType; u16 mapType = gMapHeader.mapType;
typedef struct { typedef struct {
u16 mapGroup; u16 mapGroup;

31
src/overworld.c
View File

@ -67,6 +67,7 @@
#include "frontier_util.h" #include "frontier_util.h"
#include "constants/abilities.h" #include "constants/abilities.h"
#include "constants/layouts.h" #include "constants/layouts.h"
#include "constants/map_types.h"
#include "constants/region_map_sections.h" #include "constants/region_map_sections.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/trainer_hill.h" #include "constants/trainer_hill.h"
@ -172,8 +173,8 @@ static void SetKeyInterceptCallback(u16 (*func)(u32));
static void SetFieldVBlankCallback(void); static void SetFieldVBlankCallback(void);
static void FieldClearVBlankHBlankCallbacks(void); static void FieldClearVBlankHBlankCallbacks(void);
static void TransitionMapMusic(void); static void TransitionMapMusic(void);
static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *playerStruct, u16 metatileBehavior, enum MapType mapType); static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *, u16, u8);
static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStruct, u8 transitionFlags, u16 metatileBehavior, enum MapType mapType); static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *, u8, u16, u8);
static u16 GetCenterScreenMetatileBehavior(void); static u16 GetCenterScreenMetatileBehavior(void);
static void *sUnusedOverworldCallback; static void *sUnusedOverworldCallback;
@ -718,8 +719,8 @@ void SetLastHealLocationWarp(u8 healLocationId)
void UpdateEscapeWarp(s16 x, s16 y) void UpdateEscapeWarp(s16 x, s16 y)
{ {
enum MapType currMapType = GetCurrentMapType(); u8 currMapType = GetCurrentMapType();
enum MapType destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum); u8 destMapType = GetMapTypeByGroupAndId(sWarpDestination.mapGroup, sWarpDestination.mapNum);
if (IsMapTypeOutdoors(currMapType) && IsMapTypeOutdoors(destMapType) != TRUE) if (IsMapTypeOutdoors(currMapType) && IsMapTypeOutdoors(destMapType) != TRUE)
SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, WARP_ID_NONE, x - MAP_OFFSET, y - MAP_OFFSET + 1); SetEscapeWarp(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, WARP_ID_NONE, x - MAP_OFFSET, y - MAP_OFFSET + 1);
} }
@ -964,7 +965,7 @@ void StoreInitialPlayerAvatarState(void)
static struct InitialPlayerAvatarState *GetInitialPlayerAvatarState(void) static struct InitialPlayerAvatarState *GetInitialPlayerAvatarState(void)
{ {
struct InitialPlayerAvatarState playerStruct; struct InitialPlayerAvatarState playerStruct;
enum MapType mapType = GetCurrentMapType(); u8 mapType = GetCurrentMapType();
u16 metatileBehavior = GetCenterScreenMetatileBehavior(); u16 metatileBehavior = GetCenterScreenMetatileBehavior();
u8 transitionFlags = GetAdjustedInitialTransitionFlags(&sInitialPlayerAvatarState, metatileBehavior, mapType); u8 transitionFlags = GetAdjustedInitialTransitionFlags(&sInitialPlayerAvatarState, metatileBehavior, mapType);
playerStruct.transitionFlags = transitionFlags; playerStruct.transitionFlags = transitionFlags;
@ -973,7 +974,7 @@ static struct InitialPlayerAvatarState *GetInitialPlayerAvatarState(void)
return &sInitialPlayerAvatarState; return &sInitialPlayerAvatarState;
} }
static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *playerStruct, u16 metatileBehavior, enum MapType mapType) static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *playerStruct, u16 metatileBehavior, u8 mapType)
{ {
if (mapType != MAP_TYPE_INDOOR && FlagGet(FLAG_SYS_CRUISE_MODE)) if (mapType != MAP_TYPE_INDOOR && FlagGet(FLAG_SYS_CRUISE_MODE))
return PLAYER_AVATAR_FLAG_ON_FOOT; return PLAYER_AVATAR_FLAG_ON_FOOT;
@ -991,7 +992,7 @@ static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *pla
return PLAYER_AVATAR_FLAG_ACRO_BIKE; return PLAYER_AVATAR_FLAG_ACRO_BIKE;
} }
static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStruct, u8 transitionFlags, u16 metatileBehavior, enum MapType mapType) static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStruct, u8 transitionFlags, u16 metatileBehavior, u8 mapType)
{ {
if (FlagGet(FLAG_SYS_CRUISE_MODE) && mapType == MAP_TYPE_OCEAN_ROUTE) if (FlagGet(FLAG_SYS_CRUISE_MODE) && mapType == MAP_TYPE_OCEAN_ROUTE)
return DIR_EAST; return DIR_EAST;
@ -1400,27 +1401,27 @@ static void ChooseAmbientCrySpecies(void)
} }
} }
enum MapType GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum) u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum)
{ {
return Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum)->mapType; return Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum)->mapType;
} }
enum MapType GetMapTypeByWarpData(struct WarpData *warp) u8 GetMapTypeByWarpData(struct WarpData *warp)
{ {
return GetMapTypeByGroupAndId(warp->mapGroup, warp->mapNum); return GetMapTypeByGroupAndId(warp->mapGroup, warp->mapNum);
} }
enum MapType GetCurrentMapType(void) u8 GetCurrentMapType(void)
{ {
return GetMapTypeByWarpData(&gSaveBlock1Ptr->location); return GetMapTypeByWarpData(&gSaveBlock1Ptr->location);
} }
enum MapType GetLastUsedWarpMapType(void) u8 GetLastUsedWarpMapType(void)
{ {
return GetMapTypeByWarpData(&gLastUsedWarp); return GetMapTypeByWarpData(&gLastUsedWarp);
} }
bool8 IsMapTypeOutdoors(enum MapType mapType) bool8 IsMapTypeOutdoors(u8 mapType)
{ {
if (mapType == MAP_TYPE_ROUTE if (mapType == MAP_TYPE_ROUTE
|| mapType == MAP_TYPE_TOWN || mapType == MAP_TYPE_TOWN
@ -1432,7 +1433,7 @@ bool8 IsMapTypeOutdoors(enum MapType mapType)
return FALSE; return FALSE;
} }
bool8 Overworld_MapTypeAllowsTeleportAndFly(enum MapType mapType) bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType)
{ {
if (mapType == MAP_TYPE_ROUTE if (mapType == MAP_TYPE_ROUTE
|| mapType == MAP_TYPE_TOWN || mapType == MAP_TYPE_TOWN
@ -1443,7 +1444,7 @@ bool8 Overworld_MapTypeAllowsTeleportAndFly(enum MapType mapType)
return FALSE; return FALSE;
} }
bool8 IsMapTypeIndoors(enum MapType mapType) bool8 IsMapTypeIndoors(u8 mapType)
{ {
if (mapType == MAP_TYPE_INDOOR if (mapType == MAP_TYPE_INDOOR
|| mapType == MAP_TYPE_SECRET_BASE) || mapType == MAP_TYPE_SECRET_BASE)
@ -1462,7 +1463,7 @@ u8 GetCurrentRegionMapSectionId(void)
return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum)->regionMapSectionId; return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum)->regionMapSectionId;
} }
enum MapBattleScene GetCurrentMapBattleScene(void) u8 GetCurrentMapBattleScene(void)
{ {
return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum)->battleType; return Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum)->battleType;
} }

8
src/pokemon.c
View File

@ -1688,7 +1688,7 @@ u16 GetUnionRoomTrainerPic(void)
return FacilityClassToPicIndex(gUnionRoomFacilityClasses[arrId]); return FacilityClassToPicIndex(gUnionRoomFacilityClasses[arrId]);
} }
enum TrainerClassID GetUnionRoomTrainerClass(void) u16 GetUnionRoomTrainerClass(void)
{ {
u8 linkId; u8 linkId;
u32 arrId; u32 arrId;
@ -3519,7 +3519,7 @@ u8 GetSecretBaseTrainerPicIndex(void)
return gFacilityClassToPicIndex[facilityClass]; return gFacilityClassToPicIndex[facilityClass];
} }
enum TrainerClassID GetSecretBaseTrainerClass(void) u8 GetSecretBaseTrainerClass(void)
{ {
u8 facilityClass = sSecretBaseFacilityClasses[gBattleResources->secretBase->gender][gBattleResources->secretBase->trainerId[0] % NUM_SECRET_BASE_CLASSES]; u8 facilityClass = sSecretBaseFacilityClasses[gBattleResources->secretBase->gender][gBattleResources->secretBase->trainerId[0] % NUM_SECRET_BASE_CLASSES];
return gFacilityClassToTrainerClass[facilityClass]; return gFacilityClassToTrainerClass[facilityClass];
@ -5181,7 +5181,7 @@ void AdjustFriendship(struct Pokemon *mon, u8 event)
{ {
u8 friendshipLevel = 0; u8 friendshipLevel = 0;
s16 friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, 0); s16 friendship = GetMonData(mon, MON_DATA_FRIENDSHIP, 0);
enum TrainerClassID opponentTrainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A); u32 opponentTrainerClass = GetTrainerClassFromId(gTrainerBattleOpponent_A);
if (friendship > 99) if (friendship > 99)
friendshipLevel++; friendshipLevel++;
@ -5745,7 +5745,7 @@ u16 GetBattleBGM(void)
} }
else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER)
{ {
enum TrainerClassID trainerClass; u8 trainerClass;
if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
trainerClass = GetFrontierOpponentClass(gTrainerBattleOpponent_A); trainerClass = GetFrontierOpponentClass(gTrainerBattleOpponent_A);

11
src/pokemon_animation.c
View File

@ -468,7 +468,7 @@ static void SetPosForRotation(struct Sprite *sprite, u16 index, s16 amplitudeX,
sprite->y2 = yAdder + amplitudeY; sprite->y2 = yAdder + amplitudeY;
} }
enum BackAnim GetSpeciesBackAnimSet(u16 species) u8 GetSpeciesBackAnimSet(u16 species)
{ {
if (gSpeciesInfo[species].backAnimId != BACK_ANIM_NONE) if (gSpeciesInfo[species].backAnimId != BACK_ANIM_NONE)
return gSpeciesInfo[species].backAnimId - 1; return gSpeciesInfo[species].backAnimId - 1;
@ -527,7 +527,7 @@ static void Task_HandleMonAnimation(u8 taskId)
} }
} }
void LaunchAnimationTaskForFrontSprite(struct Sprite *sprite, enum AnimFunctionIDs frontAnimId) void LaunchAnimationTaskForFrontSprite(struct Sprite *sprite, u8 frontAnimId)
{ {
u8 taskId = CreateTask(Task_HandleMonAnimation, 128); u8 taskId = CreateTask(Task_HandleMonAnimation, 128);
gTasks[taskId].tPtrHi = (u32)(sprite) >> 16; gTasks[taskId].tPtrHi = (u32)(sprite) >> 16;
@ -535,17 +535,16 @@ void LaunchAnimationTaskForFrontSprite(struct Sprite *sprite, enum AnimFunctionI
gTasks[taskId].tAnimId = frontAnimId; gTasks[taskId].tAnimId = frontAnimId;
} }
void StartMonSummaryAnimation(struct Sprite *sprite, enum AnimFunctionIDs frontAnimId) void StartMonSummaryAnimation(struct Sprite *sprite, u8 frontAnimId)
{ {
// sDontFlip is expected to still be FALSE here, not explicitly cleared // sDontFlip is expected to still be FALSE here, not explicitly cleared
sIsSummaryAnim = TRUE; sIsSummaryAnim = TRUE;
sprite->callback = sMonAnimFunctions[frontAnimId]; sprite->callback = sMonAnimFunctions[frontAnimId];
} }
void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, enum BackAnim backAnimSet) void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimSet)
{ {
u8 nature, taskId, battlerId; u8 nature, taskId, animId, battlerId;
enum AnimFunctionIDs animId;
taskId = CreateTask(Task_HandleMonAnimation, 128); taskId = CreateTask(Task_HandleMonAnimation, 128);
gTasks[taskId].tPtrHi = (u32)(sprite) >> 16; gTasks[taskId].tPtrHi = (u32)(sprite) >> 16;

2
src/pokemon_sprite_visualizer.c
View File

@ -922,7 +922,7 @@ static void LoadAndCreateEnemyShadowSpriteCustom(struct PokemonSpriteVisualizer
} }
//Battle background functions //Battle background functions
static void LoadBattleBg(u8 battleBgType, enum BattleTerrain battleTerrain) static void LoadBattleBg(u8 battleBgType, u8 battleTerrain)
{ {
switch (battleBgType) switch (battleBgType)
{ {

2
src/pokenav_match_call_list.c
View File

@ -410,7 +410,7 @@ void BufferMatchCallNameAndDesc(struct PokenavMatchCallEntry *matchCallEntry, u8
{ {
int index = GetTrainerIdxByRematchIdx(matchCallEntry->headerId); int index = GetTrainerIdxByRematchIdx(matchCallEntry->headerId);
const struct Trainer *trainer = GetTrainerStructFromId(index); const struct Trainer *trainer = GetTrainerStructFromId(index);
enum TrainerClassID class = trainer->trainerClass; int class = trainer->trainerClass;
className = gTrainerClasses[class].name; className = gTrainerClasses[class].name;
trainerName = trainer->trainerName; trainerName = trainer->trainerName;
} }

1
src/region_map.c
View File

@ -24,6 +24,7 @@
#include "heal_location.h" #include "heal_location.h"
#include "constants/field_specials.h" #include "constants/field_specials.h"
#include "constants/heal_locations.h" #include "constants/heal_locations.h"
#include "constants/map_types.h"
#include "constants/rgb.h" #include "constants/rgb.h"
#include "constants/weather.h" #include "constants/weather.h"

4
src/scrcmd.c
View File

@ -2939,7 +2939,7 @@ static void CloseBrailleWindow(void)
bool8 ScrCmd_buffertrainerclassname(struct ScriptContext *ctx) bool8 ScrCmd_buffertrainerclassname(struct ScriptContext *ctx)
{ {
u8 stringVarIndex = ScriptReadByte(ctx); u8 stringVarIndex = ScriptReadByte(ctx);
enum TrainerClassID trainerClassId = VarGet(ScriptReadHalfword(ctx)); u16 trainerClassId = VarGet(ScriptReadHalfword(ctx));
Script_RequestEffects(SCREFF_V1); Script_RequestEffects(SCREFF_V1);
@ -2950,7 +2950,7 @@ bool8 ScrCmd_buffertrainerclassname(struct ScriptContext *ctx)
bool8 ScrCmd_buffertrainername(struct ScriptContext *ctx) bool8 ScrCmd_buffertrainername(struct ScriptContext *ctx)
{ {
u8 stringVarIndex = ScriptReadByte(ctx); u8 stringVarIndex = ScriptReadByte(ctx);
enum TrainerClassID trainerClassId = VarGet(ScriptReadHalfword(ctx)); u16 trainerClassId = VarGet(ScriptReadHalfword(ctx));
Script_RequestEffects(SCREFF_V1); Script_RequestEffects(SCREFF_V1);

1
src/secret_base.c
View File

@ -39,6 +39,7 @@
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/field_specials.h" #include "constants/field_specials.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/map_types.h"
#include "constants/metatile_behaviors.h" #include "constants/metatile_behaviors.h"
#include "constants/metatile_labels.h" #include "constants/metatile_labels.h"
#include "constants/moves.h" #include "constants/moves.h"

2
src/trainer_hill.c
View File

@ -309,7 +309,7 @@ static u8 GetFloorId(void)
return gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F; return gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F;
} }
enum TrainerClassID GetTrainerHillOpponentClass(u16 trainerId) u8 GetTrainerHillOpponentClass(u16 trainerId)
{ {
u8 id = trainerId - 1; u8 id = trainerId - 1;