diff options
Diffstat (limited to 'gba/source/serialize.c')
-rw-r--r-- | gba/source/serialize.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gba/source/serialize.c b/gba/source/serialize.c index 4a80bdf..c5e8570 100644 --- a/gba/source/serialize.c +++ b/gba/source/serialize.c | |||
@@ -11,14 +11,6 @@ | |||
11 | #include "exptables.h" | 11 | #include "exptables.h" |
12 | #include "dexorder.h" | 12 | #include "dexorder.h" |
13 | 13 | ||
14 | enum Stat { | ||
15 | StatAttack, | ||
16 | StatDefense, | ||
17 | StatSpeed, | ||
18 | StatSpAttack, | ||
19 | StatSpDefense | ||
20 | }; | ||
21 | |||
22 | u32 CalculateStat( | 14 | u32 CalculateStat( |
23 | u8 base, | 15 | u8 base, |
24 | u32 iv, | 16 | u32 iv, |
@@ -50,8 +42,7 @@ void PokemonIntermediateInit( | |||
50 | struct PokemonIntermediate* pki, | 42 | struct PokemonIntermediate* pki, |
51 | struct BoxPokemon* bpkm, | 43 | struct BoxPokemon* bpkm, |
52 | u16 trainerId, | 44 | u16 trainerId, |
53 | u16 secretId, | 45 | u16 secretId) |
54 | const struct GameData* gameData) | ||
55 | { | 46 | { |
56 | DecryptBoxPokemon(bpkm); | 47 | DecryptBoxPokemon(bpkm); |
57 | 48 | ||
@@ -88,6 +79,7 @@ void PokemonIntermediateInit( | |||
88 | pki->metLocation = sub3->metLocation; | 79 | pki->metLocation = sub3->metLocation; |
89 | pki->pokeball = sub3->pokeball; | 80 | pki->pokeball = sub3->pokeball; |
90 | pki->altAbility = sub3->altAbility; | 81 | pki->altAbility = sub3->altAbility; |
82 | pki->language = bpkm->language & 3; | ||
91 | 83 | ||
92 | // Derive nature from the personality value. | 84 | // Derive nature from the personality value. |
93 | pki->nature = (bpkm->personality % 25); | 85 | pki->nature = (bpkm->personality % 25); |