about summary refs log tree commit diff stats
path: root/include
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2017-09-29 18:39:52 -0400
committerKelly Rauchenberger <fefferburbia@gmail.com>2017-09-29 18:39:52 -0400
commit62be650076d6ea83e9822be56eaa59ab4195202c (patch)
tree3f9742814e42523292ee30aef266058547ddac9a /include
parent7012d24b532a4996cfe27fdea40b4209d608a1a7 (diff)
downloadgen3uploader-62be650076d6ea83e9822be56eaa59ab4195202c.tar.gz
gen3uploader-62be650076d6ea83e9822be56eaa59ab4195202c.tar.bz2
gen3uploader-62be650076d6ea83e9822be56eaa59ab4195202c.zip
Extractor now gets ribbons
Diffstat (limited to 'include')
-rw-r--r--include/pokemon.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index dbf0d41..ce961ed 100644 --- a/include/pokemon.h +++ b/include/pokemon.h
@@ -20,6 +20,19 @@ enum PokemonLanguage {
20 Spanish = 7 20 Spanish = 7
21}; 21};
22 22
23#define CHAMPION_RIBBON (1 << 0)
24#define WINNING_RIBBON (1 << 1)
25#define VICTORY_RIBBON (1 << 2)
26#define ARTIST_RIBBON (1 << 3)
27#define EFFORT_RIBBON (1 << 4)
28#define MARINE_RIBBON (1 << 5)
29#define LAND_RIBBON (1 << 6)
30#define SKY_RIBBON (1 << 7)
31#define COUNTRY_RIBBON (1 << 8)
32#define NATIONAL_RIBBON (1 << 9)
33#define EARTH_RIBBON (1 << 10)
34#define WORLD_RIBBON (1 << 11)
35
23struct __attribute__((aligned(4))) PokemonIntermediate { 36struct __attribute__((aligned(4))) PokemonIntermediate {
24 // a hash that can be used to identify the Pokémon. because the games do not 37 // a hash that can be used to identify the Pokémon. because the games do not
25 // naturally generate unique identifiers for Pokémon, this hash is generated 38 // naturally generate unique identifiers for Pokémon, this hash is generated
@@ -59,7 +72,13 @@ struct __attribute__((aligned(4))) PokemonIntermediate {
59 u16 heldItem; 72 u16 heldItem;
60 u16 moves[4]; 73 u16 moves[4];
61 u16 otId; // only the lower 2 bytes, because the upper 2 are secret 74 u16 otId; // only the lower 2 bytes, because the upper 2 are secret
75 u16 miscRibbons;
62 76
77 u8 coolRibbons;
78 u8 beautyRibbons;
79 u8 cuteRibbons;
80 u8 smartRibbons;
81 u8 toughRibbons;
63 u8 ppBonuses; 82 u8 ppBonuses;
64 u8 otGender; 83 u8 otGender;
65 u8 metLevel; 84 u8 metLevel;