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_1.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_1.c')
-rw-r--r-- | src/pokemon_1.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/pokemon_1.c b/src/pokemon_1.c index a6aff55..86f410d 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -7,6 +7,10 @@ extern int sprintf(char *, const char *, ...); extern struct gPokemon *gMonsterParameters; extern struct FileArchive gMonsterFileArchive; extern const char gUnknown_8107684[]; +extern struct unkStruct_203B45C *gRecruitedPokemonRef; + +extern void sub_808DE50(void* r0, struct PokemonStruct *r1, u32 r2, u32 r3); + u8 *GetCategoryString(s16 index) { @@ -217,3 +221,8 @@ bool8 IsPokemonDialogueSpriteAvail(s16 index, s32 r1) // checking to see if dialogue sprite is available?? return (gMonsterParameters[index].dialogue_sprites >> r1) & 1; } + +void sub_808DE30(void* r0, u32 r1) +{ + sub_808DE50(r0, &gRecruitedPokemonRef->pokemon[r1], r1, r1 * sizeof(struct PokemonStruct)); +} |