diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-06-09 22:54:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 22:54:21 -0500 |
| commit | 377bd14ea67d6177250fb401e12d7dfcf44e2cf6 (patch) | |
| tree | 5440970e02a7890791b234aa233e91e5c1d65b40 /src/pokemon.c | |
| parent | eaa141c612dd1689936a21bd57018a55ff686b69 (diff) | |
Dungeon pokemon/Floor ID JSON Part 1 (#39)
* move Thunderwave and Tiny Woods pokemon to json
* rule tweaking to actually build tool before parsing JSON
* delete .inc pokemon for tiny Woods and Thunderwave
* silence git complaining about br_ips and ips_patch
* use defines for species and pass the header file for species
* convert sinister woods
* convert MtThunderPeak
* convert silent chasm
* add trial floor_id w/ tiny woods
* change make rule name to fix compile
* MtSteel converted and bugfix
* convert few floor headers and great canyon pokemon
* code cleanup
* unify unkData into UnkTextStruct2
* more code cleanup and some text decomp
* doc more funcs and decomp/split some stuff
* document more save stuff
* more save work and move some data
* pika sniped UpdateNatureTotal
* decomp a litle and convert a few more dungeons
* better scanning for json files
* mt freeze and peak
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index e87c8c6..2499e11 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3,17 +3,17 @@ #include "file_system.h" #include "constants/species.h" -extern struct unkStruct_203B45C gRecruitedPokemon[]; extern struct FileArchive gSystemFileArchive; extern const char gUnknown_81075F4; -extern struct OpenedFile *gMonsterParametersFile; -extern u16 gLevelCurrentPokeId; -extern struct gPokemon *gMonsterParameters; +EWRAM_DATA struct gPokemon *gMonsterParameters; +EWRAM_DATA struct OpenedFile *gMonsterParametersFile; +EWRAM_DATA struct unkStruct_203B45C gRecruitedPokemon; extern struct unkStruct_203B45C *gRecruitedPokemonRef; +EWRAM_DATA u16 gLevelCurrentPokeId; void LoadMonsterParameters(void) { - gRecruitedPokemonRef = gRecruitedPokemon; + gRecruitedPokemonRef = &gRecruitedPokemon; gMonsterParametersFile = OpenFileAndGetFileDataPtr(&gUnknown_81075F4, &gSystemFileArchive); gMonsterParameters = (struct gPokemon *)gMonsterParametersFile->data; gLevelCurrentPokeId = 0; @@ -21,7 +21,7 @@ void LoadMonsterParameters(void) struct unkStruct_203B45C *GetRecruitedPokemon(void) { - return gRecruitedPokemon; + return &gRecruitedPokemon; } void InitializeRecruitedPokemon(void) |