diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-26 09:42:03 -0400 |
| commit | 8c8a5a07c5e6b1a2d0d0592a30be31ccd140fc1e (patch) | |
| tree | c23120a706d012bd19c4c2584af5009fd2016ecf /include/pokemon.h | |
| parent | e643eddc0def8e4851a4195e8ed4de06c847f52d (diff) | |
| parent | 227da51c377f621f542ffdb52ef56bfb807f29ab (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'include/pokemon.h')
| -rw-r--r-- | include/pokemon.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index a350d1a1..8886c47c 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -112,6 +112,7 @@ typedef struct { u8 friendship; u8 ability; u8 circleMarking:1, triangleMarking:1, squareMarking:1, heartMarking:1, starMarking:1, diamondMarking:1; + u8 padding; OriginLanguage originLanguage; u8 hpEV; u8 atkEV; @@ -179,9 +180,11 @@ typedef struct { u8 pokerus; u8 pokeball; u8 flags; + u8 padding[3]; EncounterType encounterType; u8 HGSS_Pokeball; u8 HGSS_Performance; + u8 padding2[2]; } PokemonDataBlockD; typedef union { |