summaryrefslogtreecommitdiff
path: root/include/pokemon.h
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2021-06-09 22:54:21 -0500
committerGitHub <noreply@github.com>2021-06-09 22:54:21 -0500
commit377bd14ea67d6177250fb401e12d7dfcf44e2cf6 (patch)
tree5440970e02a7890791b234aa233e91e5c1d65b40 /include/pokemon.h
parenteaa141c612dd1689936a21bd57018a55ff686b69 (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 'include/pokemon.h')
-rw-r--r--include/pokemon.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index 1c51eab..363b24d 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -2,6 +2,7 @@
#define POKEMON_H
#include "file_system.h"
+#include "constants/species.h"
struct PokemonStruct
{
@@ -49,7 +50,7 @@ struct PokemonStruct3
struct unkStruct_203B45C
{
- struct PokemonStruct pokemon[0x19D];
+ struct PokemonStruct pokemon[NUM_SPECIES];
struct PokemonStruct2 pokemon2[4];
struct PokemonStruct3 pokemon3[4];
};
@@ -111,6 +112,11 @@ struct gPokemon
/* 0x42 */ s16 alphabetParent[2]; // alphabetNo and parentNo
};
+void LoadMonsterParameters(void);
+struct unkStruct_203B45C *GetRecruitedPokemon(void);
+void InitializeRecruitedPokemon(void);
+
+
void CopySpeciesNametoBuffer(u8 * buffer, s16 index);
void CopyYellowSpeciesNametoBuffer(u8 *buffer, s16 index);
void CopyCyanSpeciesNametoBuffer(u8 *buffer, s16 index);