diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-11-02 16:37:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-02 16:37:00 -0700 |
| commit | e29e61a4a1de2dff8ac4b7d0469794ba9ddf48f8 (patch) | |
| tree | aa9bf96f0d1d91f06220e670b660f5fcf829b945 /include/pokemon.h | |
| parent | f99f00b180561afeeb4b9c9918135c2db607fd52 (diff) | |
| parent | 3a1db3dfac99d017b592afa4e7e3fc7325e060cc (diff) | |
Merge pull request #68 from SethBarberee/sese_work
Moves and some friend_area_action_menu
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 969c0f8..f24eb84 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -65,6 +65,13 @@ struct EvolveStage u8 unkHasNextStage; }; + +struct unkStruct_8094184 +{ + struct PokemonMove moves[MAX_MON_MOVES]; + u8 unk20; +}; + struct PokemonStruct2 { // size 0x68 @@ -80,8 +87,7 @@ struct PokemonStruct2 u16 unk12; // pokeHP struct Offense offense; // offense (other offset) u32 unk18; // unk1C - struct PokemonMove moves[MAX_MON_MOVES]; - u8 fill3c[4]; + struct unkStruct_8094184 moves; /* 40 */ struct ItemSlot itemSlot; // heldItem u32 unk44; // some struct u32 unk48; // some struct (same type as 44) |