diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-02-07 19:10:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 21:10:12 -0600 |
| commit | 8dfd044ef3a6ea8da204265b4560716aa67391d1 (patch) | |
| tree | 15274fab1fd9b1d4e477bbfddbfb855ade1eabeb /src/pokemon_1.c | |
| parent | 74daf03fd70e7c71b92390c9133c9dd543bcb28d (diff) | |
Some Personality and data (#26)
* decomp few personality funcs and clean up some pointers in the dungeon data
* de-pointer-ify friend area dialogue
* clean pointers on a personality test question
* decomp a few more main menu funcs and dump some more data
* label some funcs
Diffstat (limited to 'src/pokemon_1.c')
| -rw-r--r-- | src/pokemon_1.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/pokemon_1.c b/src/pokemon_1.c index e76f970..440265b 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -8,12 +8,6 @@ extern struct gPokemon *gMonsterParameters; extern struct FileArchive gMonsterFileArchive; extern const char gUnknown_8107684[]; -struct unkEvolve -{ - /* 0x0 */ struct EvolveStruct1 conditions; - /* 0x4 */ struct EvolveNeeds needs; -}; - u8 *GetCategoryString(s16 index) { return gMonsterParameters[index].category; @@ -99,9 +93,10 @@ u16 GetPokemonDefSpdef(s16 index, u32 r1) return gMonsterParameters[index].base_def_spdef[r1]; } -u8 GetPokemonType(s16 index, u32 typeIndex) +u8 GetPokemonType(s32 index, u32 typeIndex) { - return gMonsterParameters[index].types[typeIndex]; + s16 newIndex = index; + return gMonsterParameters[newIndex].types[typeIndex]; } u8 GetPokemonAbility(s16 index, u32 abilityIndex) |