diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2021-03-23 12:11:10 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-23 12:11:10 -0500 |
commit | 2fd4f339b42c010191c199772b09ac34c580de94 (patch) | |
tree | e562899f35861ece70c292602fe6aac2f50906bf /src/exclusive_pokemon.c | |
parent | 7b142311a7294c4c7a943870fa5f24f0fbea604a (diff) |
Miscellaneous Work (Again) (#31)
* move some personality data from asm to C
* combine personality_test files and add my close attempt at RedrawPartnerSelectionMenu
* decomp some more wonder mail funcs and label some more data
* lots of data splitting and move some to src
* split out more dungeon data
* continue splitting out more dungeon data
* doc rescue team rank/pts funcs/data and exclusive pokemon ewram
* doc more sound things and decomp a func
* decomp LoadTeamRankBadge and label some data members
* split out rescue team and text util stuff
* forgot a constant
* match a few funcs and clean up a few
* cleaned up sub_80A28B4
Diffstat (limited to 'src/exclusive_pokemon.c')
-rw-r--r-- | src/exclusive_pokemon.c | 42 |
1 files changed, 7 insertions, 35 deletions
diff --git a/src/exclusive_pokemon.c b/src/exclusive_pokemon.c index cf64724..cbcdf0c 100644 --- a/src/exclusive_pokemon.c +++ b/src/exclusive_pokemon.c @@ -1,28 +1,6 @@ #include "global.h" #include "constants/species.h" -#define NUM_EXCLUSIVE_POKEMON 12 - -#define RED_EXCLUSIVE(species) \ -{ \ - .poke_id = species, \ - .in_rrt = TRUE, \ - .in_brt = FALSE, \ -} - -#define BLUE_EXCLUSIVE(species) \ -{ \ - .poke_id = species, \ - .in_rrt = FALSE, \ - .in_brt = TRUE, \ -} - - -struct ExclusivePokemon -{ - u16 poke_id; - bool8 in_rrt; // red rescue team - bool8 in_brt; // blue rescue team -}; +#include "exclusive_pokemon.h" const struct ExclusivePokemon gExclusivePokemon[NUM_EXCLUSIVE_POKEMON] = { @@ -49,30 +27,24 @@ const u8 filler_ex1[8] = 'p', 'k', 's', 'd', 'i', 'r', '0', 0 }; - -struct unkStruct_203B498 -{ - u8 fill0[0x58]; - bool8 Exclusives[NUM_EXCLUSIVE_POKEMON]; -}; -extern struct unkStruct_203B498 *gUnknown_203B498; -extern struct unkStruct_203B498 gUnknown_2039840; +extern struct ExclusivePokemonData *gUnknown_203B498; +extern struct ExclusivePokemonData gExclusivePokemonInfo; void LoadExclusivePokemon(void) { - gUnknown_203B498 = &gUnknown_2039840; + gUnknown_203B498 = &gExclusivePokemonInfo; } -struct unkStruct_203B498 *GetExclusivePokemon(void) +struct ExclusivePokemonData *GetExclusivePokemon(void) { - return &gUnknown_2039840; + return &gExclusivePokemonInfo; } void InitializeExclusivePokemon(void) { s32 counter; - memset(gUnknown_203B498, 0, sizeof(struct unkStruct_203B498)); + memset(gUnknown_203B498, 0, sizeof(struct ExclusivePokemonData)); for(counter = 0; counter < NUM_EXCLUSIVE_POKEMON; counter++) { gUnknown_203B498->Exclusives[counter] = gExclusivePokemon[counter].in_rrt; |