Skip to content

Commit c09a0e3

Browse files
EstebanFuentealbaEstebanFuentealba
authored
Merge pull request #13 from kbembedded/cleanup-data-struct
Cleanup data structs
2 parents 62a7b2a + 82e6961 commit c09a0e3

File tree

6 files changed

+486
-115
lines changed

6 files changed

+486
-115
lines changed

‎pokemon_app.cpp

Lines changed: 154 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,159 @@
11
#include "pokemon_app.h"
22

3-
const char* pokemon_names[] = {
4-
"bulbasaur", "ivysaur", "venusaur", "charmander", "charmeleon", "charizard",
5-
"squirtle", "wartortle", "blastoise", "caterpie", "metapod", "butterfree",
6-
"weedle", "kakuna", "beedrill", "pidgey", "pidgeotto", "pidgeot",
7-
"rattata", "raticate", "spearow", "fearow", "ekans", "arbok",
8-
"pikachu", "raichu", "sandshrew", "sandslash", "nidoran ♀", "nidorina",
9-
"nidoqueen", "nidoran ♂", "nidorino", "nidoking", "clefairy", "clefable",
10-
"vulpix", "ninetales", "jigglypuff", "wigglytuff", "zubat", "golbat",
11-
"oddish", "gloom", "vileplume", "paras", "parasect", "venonat",
12-
"venomoth", "diglett", "dugtrio", "meowth", "persian", "psyduck",
13-
"golduck", "mankey", "primeape", "growlithe", "arcanine", "poliwag",
14-
"poliwhirl", "poliwrath", "abra", "kadabra", "alakazam", "machop",
15-
"machoke", "machamp", "bellsprout", "weepinbell", "victreebel", "tentacool",
16-
"tentacruel", "geodude", "graveler", "golem", "ponyta", "rapidash",
17-
"slowpoke", "slowbro", "magnemite", "magneton", "farfetchd", "doduo",
18-
"dodrio", "seel", "dewgong", "grimer", "muk", "shellder",
19-
"cloyster", "gastly", "haunter", "gengar", "onix", "drowzee",
20-
"hypno", "krabby", "kingler", "voltorb", "electrode", "exeggcute",
21-
"exeggutor", "cubone", "marowak", "hitmonlee", "hitmonchan", "lickitung",
22-
"koffing", "weezing", "rhyhorn", "rhydon", "chansey", "tangela",
23-
"kangaskhan", "horsea", "seadra", "goldeen", "seaking", "staryu",
24-
"starmie", "mr. mime", "scyther", "jynx", "electabuzz", "magmar",
25-
"pinsir", "tauros", "magikarp", "gyarados", "lapras", "ditto",
26-
"eevee", "vaporeon", "jolteon", "flareon", "porygon", "omanyte",
27-
"omastar", "kabuto", "kabutops", "aerodactyl", "snorlax", "articuno",
28-
"zapdos", "moltres", "dratini", "dragonair", "dragonite", "mewtwo",
29-
"mew"};
30-
const Icon* pokemon_icons[] = {
31-
&I_bulbasaur, &I_ivysaur, &I_venusaur, &I_charmander, &I_charmeleon, &I_charizard,
32-
&I_squirtle, &I_wartortle, &I_blastoise, &I_caterpie, &I_metapod, &I_butterfree,
33-
&I_weedle, &I_kakuna, &I_beedrill, &I_pidgey, &I_pidgeotto, &I_pidgeot,
34-
&I_rattata, &I_raticate, &I_spearow, &I_fearow, &I_ekans, &I_arbok,
35-
&I_pikachu, &I_raichu, &I_sandshrew, &I_sandslash, &I_nidoranf, &I_nidorina,
36-
&I_nidoqueen, &I_nidoranm, &I_nidorino, &I_nidoking, &I_clefairy, &I_clefable,
37-
&I_vulpix, &I_ninetales, &I_jigglypuff, &I_wigglytuff, &I_zubat, &I_golbat,
38-
&I_oddish, &I_gloom, &I_vileplume, &I_paras, &I_parasect, &I_venonat,
39-
&I_venomoth, &I_diglett, &I_dugtrio, &I_meowth, &I_persian, &I_psyduck,
40-
&I_golduck, &I_mankey, &I_primeape, &I_growlithe, &I_arcanine, &I_poliwag,
41-
&I_poliwhirl, &I_poliwrath, &I_abra, &I_kadabra, &I_alakazam, &I_machop,
42-
&I_machoke, &I_machamp, &I_bellsprout, &I_weepinbell, &I_victreebel, &I_tentacool,
43-
&I_tentacruel, &I_geodude, &I_graveler, &I_golem, &I_ponyta, &I_rapidash,
44-
&I_slowpoke, &I_slowbro, &I_magnemite, &I_magneton, &I_farfetchd, &I_doduo,
45-
&I_dodrio, &I_seel, &I_dewgong, &I_grimer, &I_muk, &I_shellder,
46-
&I_cloyster, &I_gastly, &I_haunter, &I_gengar, &I_onix, &I_drowzee,
47-
&I_hypno, &I_krabby, &I_kingler, &I_voltorb, &I_electrode, &I_exeggcute,
48-
&I_exeggutor, &I_cubone, &I_marowak, &I_hitmonlee, &I_hitmonchan, &I_lickitung,
49-
&I_koffing, &I_weezing, &I_rhyhorn, &I_rhydon, &I_chansey, &I_tangela,
50-
&I_kangaskhan, &I_horsea, &I_seadra, &I_goldeen, &I_seaking, &I_staryu,
51-
&I_starmie, &I_mr_mime, &I_scyther, &I_jynx, &I_electabuzz, &I_magmar,
52-
&I_pinsir, &I_tauros, &I_magikarp, &I_gyarados, &I_lapras, &I_ditto,
53-
&I_eevee, &I_vaporeon, &I_jolteon, &I_flareon, &I_porygon, &I_omanyte,
54-
&I_omastar, &I_kabuto, &I_kabutops, &I_aerodactyl, &I_snorlax, &I_articuno,
55-
&I_zapdos, &I_moltres, &I_dratini, &I_dragonair, &I_dragonite, &I_mewtwo,
56-
&I_mew};
57-
const unsigned char pokemon_hex_codes[] = {
58-
0x99, 0x09, 0x9A, 0xB0, 0xB2, 0xB4, 0xB1, 0xB3, 0x1C, 0x7B, 0x7C, 0x7D, 0x70, 0x71, 0x72, 0x24,
59-
0x96, 0x97, 0xA5, 0xA6, 0x05, 0x23, 0x6C, 0x2D, 0x54, 0x55, 0x60, 0x61, 0x0F, 0xA8, 0x10, 0x03,
60-
0xA7, 0x07, 0x04, 0x8E, 0x52, 0x53, 0x64, 0x65, 0x6B, 0x82, 0xB9, 0xBA, 0xBB, 0x6D, 0x2E, 0x41,
61-
0x77, 0x3B, 0x76, 0x4D, 0x90, 0x2F, 0x80, 0x39, 0x75, 0x21, 0x14, 0x47, 0x6E, 0x6F, 0x94, 0x26,
62-
0x95, 0x6A, 0x29, 0x7E, 0xBC, 0xBD, 0xBE, 0x18, 0x9B, 0xA9, 0x27, 0x31, 0xA3, 0xA4, 0x25, 0x08,
63-
0xAD, 0x36, 0x40, 0x46, 0x74, 0x3A, 0x78, 0x0D, 0x88, 0x17, 0x8B, 0x19, 0x93, 0x0E, 0x22, 0x30,
64-
0x81, 0x4E, 0x8A, 0x06, 0x8D, 0x0C, 0x0A, 0x11, 0x91, 0x2B, 0x2C, 0x0B, 0x37, 0x8F, 0x12, 0x01,
65-
0x28, 0x1E, 0x02, 0x5C, 0x5D, 0x9D, 0x9E, 0x1B, 0x98, 0x2A, 0x1A, 0x48, 0x35, 0x33, 0x1D, 0x3C,
66-
0x85, 0x16, 0x13, 0x4C, 0x66, 0x69, 0x68, 0x67, 0xAA, 0x62, 0x63, 0x5A, 0x5B, 0xAB, 0x84, 0x4A,
67-
0x4B, 0x49, 0x58, 0x59, 0x42, 0x83, 0x15};
3+
struct pokemon_lut pokemon_table[] = {
4+
{ "Bulbasaur", &I_bulbasaur, 0x99 },
5+
{ "Ivysaur", &I_ivysaur, 0x09 },
6+
{ "Venusaur", &I_venusaur, 0x9A },
7+
{ "Charmander", &I_charmander, 0xB0 },
8+
{ "Charmeleon", &I_charmeleon, 0xB2 },
9+
{ "Charizard", &I_charizard, 0xB4 },
10+
{ "Squirtle", &I_squirtle, 0xB1 },
11+
{ "Wartortle", &I_wartortle, 0xB3 },
12+
{ "Blastoise", &I_blastoise, 0x1C },
13+
{ "Caterpie", &I_caterpie, 0x7B },
14+
{ "Metapod", &I_metapod, 0x7C },
15+
{ "Butterfree", &I_butterfree, 0x7D },
16+
{ "Weedle", &I_weedle, 0x70 },
17+
{ "Kakuna", &I_kakuna, 0x71 },
18+
{ "Beedrill", &I_beedrill, 0x72 },
19+
{ "Pidgey", &I_pidgey, 0x24 },
20+
{ "Pidgeotto", &I_pidgeotto, 0x96 },
21+
{ "Pidgeot", &I_pidgeot, 0x97 },
22+
{ "Rattata", &I_rattata, 0xA5 },
23+
{ "Raticate", &I_raticate, 0xA6 },
24+
{ "Spearow", &I_spearow, 0x05 },
25+
{ "Fearow", &I_fearow, 0x23 },
26+
{ "Ekans", &I_ekans, 0x6C },
27+
{ "Arbok", &I_arbok, 0x2D },
28+
{ "Pikachu", &I_pikachu, 0x54 },
29+
{ "Raichu", &I_raichu, 0x55 },
30+
{ "Sandshrew", &I_sandshrew, 0x60 },
31+
{ "Sandslash", &I_sandslash, 0x61 },
32+
{ "Nidoran ♀", &I_nidoranf, 0x0F },
33+
{ "Nidorina", &I_nidorina, 0xA8 },
34+
{ "Nidoqueen", &I_nidoqueen, 0x10 },
35+
{ "Nidoran ♂", &I_nidoranm, 0x03 },
36+
{ "Nidorino", &I_nidorino, 0xA7 },
37+
{ "Nidoking", &I_nidoking, 0x07 },
38+
{ "Clefairy", &I_clefairy, 0x04 },
39+
{ "Clefable", &I_clefable, 0x8E },
40+
{ "Vulpix", &I_vulpix, 0x52 },
41+
{ "Ninetales", &I_ninetales, 0x53 },
42+
{ "Jigglypuff", &I_jigglypuff, 0x64 },
43+
{ "Wigglytuff", &I_wigglytuff, 0x65 },
44+
{ "Zubat", &I_zubat, 0x6B },
45+
{ "Golbat", &I_golbat, 0x82 },
46+
{ "Oddish", &I_oddish, 0xB9 },
47+
{ "Gloom", &I_gloom, 0xBA },
48+
{ "Vileplume", &I_vileplume, 0xBB },
49+
{ "Paras", &I_paras, 0x6D },
50+
{ "Parasect", &I_parasect, 0x2E },
51+
{ "Venonat", &I_venonat, 0x41 },
52+
{ "Venomoth", &I_venomoth, 0x77 },
53+
{ "Diglett", &I_diglett, 0x3B },
54+
{ "Dugtrio", &I_dugtrio, 0x76 },
55+
{ "Meowth", &I_meowth, 0x4D },
56+
{ "Persian", &I_persian, 0x90 },
57+
{ "Psyduck", &I_psyduck, 0x2F },
58+
{ "Golduck", &I_golduck, 0x80 },
59+
{ "Mankey", &I_mankey, 0x39 },
60+
{ "Primeape", &I_primeape, 0x75 },
61+
{ "Growlithe", &I_growlithe, 0x21 },
62+
{ "Arcanine", &I_arcanine, 0x14 },
63+
{ "Poliwag", &I_poliwag, 0x47 },
64+
{ "Poliwhirl", &I_poliwhirl, 0x6E },
65+
{ "Poliwrath", &I_poliwrath, 0x6F },
66+
{ "Abra", &I_abra, 0x94 },
67+
{ "Kadabra", &I_kadabra, 0x26 },
68+
{ "Alakazam", &I_alakazam, 0x95 },
69+
{ "Machop", &I_machop, 0x6A },
70+
{ "Machoke", &I_machoke, 0x29 },
71+
{ "Machamp", &I_machamp, 0x7E },
72+
{ "Bellsprout", &I_bellsprout, 0xBC },
73+
{ "Weepinbell", &I_weepinbell, 0xBD },
74+
{ "Victreebel", &I_victreebel, 0xBE },
75+
{ "Tentacool", &I_tentacool, 0x18 },
76+
{ "Tentacruel", &I_tentacruel, 0x9B },
77+
{ "Geodude", &I_geodude, 0xA9 },
78+
{ "Graveler", &I_graveler, 0x27 },
79+
{ "Golem", &I_golem, 0x31 },
80+
{ "Ponyta", &I_ponyta, 0xA3 },
81+
{ "Rapidash", &I_rapidash, 0xA4 },
82+
{ "Slowpoke", &I_slowpoke, 0x25 },
83+
{ "Slowbro", &I_slowbro, 0x08 },
84+
{ "Magnemite", &I_magnemite, 0xAD },
85+
{ "Magneton", &I_magneton, 0x36 },
86+
{ "Farfetch'd", &I_farfetchd, 0x40 },
87+
{ "Doduo", &I_doduo, 0x46 },
88+
{ "Dodrio", &I_dodrio, 0x74 },
89+
{ "Seel", &I_seel, 0x3A },
90+
{ "Dewgong", &I_dewgong, 0x78 },
91+
{ "Grimer", &I_grimer, 0x0D },
92+
{ "Muk", &I_muk, 0x88 },
93+
{ "Shellder", &I_shellder, 0x17 },
94+
{ "Cloyster", &I_cloyster, 0x8B },
95+
{ "Gastly", &I_gastly, 0x19 },
96+
{ "Haunter", &I_haunter, 0x93 },
97+
{ "Gengar", &I_gengar, 0x0E },
98+
{ "Onix", &I_onix, 0x22 },
99+
{ "Drowzee", &I_drowzee, 0x30 },
100+
{ "Hypno", &I_hypno, 0x81 },
101+
{ "Krabby", &I_krabby, 0x4E },
102+
{ "Kingler", &I_kingler, 0x8A },
103+
{ "Voltorb", &I_voltorb, 0x06 },
104+
{ "Electrode", &I_electrode, 0x8D },
105+
{ "Exeggcute", &I_exeggcute, 0x0C },
106+
{ "Exeggutor", &I_exeggutor, 0x0A },
107+
{ "Cubone", &I_cubone, 0x11 },
108+
{ "Marowak", &I_marowak, 0x91 },
109+
{ "Hitmonlee", &I_hitmonlee, 0x2B },
110+
{ "Hitmonchan", &I_hitmonchan, 0x2C },
111+
{ "Lickitung", &I_lickitung, 0x0B },
112+
{ "Koffing", &I_koffing, 0x37 },
113+
{ "Weezing", &I_weezing, 0x8F },
114+
{ "Rhyhorn", &I_rhyhorn, 0x12 },
115+
{ "Rhydon", &I_rhydon, 0x01 },
116+
{ "Chansey", &I_chansey, 0x28 },
117+
{ "Tangela", &I_tangela, 0x1E },
118+
{ "Kangaskhan", &I_kangaskhan, 0x02 },
119+
{ "Horsea", &I_horsea, 0x5C },
120+
{ "Seadra", &I_seadra, 0x5D },
121+
{ "Goldeen", &I_goldeen, 0x9D },
122+
{ "Seaking", &I_seaking, 0x9E },
123+
{ "Staryu", &I_staryu, 0x1B },
124+
{ "Starmie", &I_starmie, 0x98 },
125+
{ "Mr. Mime", &I_mr_mime, 0x2A },
126+
{ "Scyther", &I_scyther, 0x1A },
127+
{ "Jynx", &I_jynx, 0x48 },
128+
{ "Electabuzz", &I_electabuzz, 0x35 },
129+
{ "Magmar", &I_magmar, 0x33 },
130+
{ "Pinsir", &I_pinsir, 0x1D },
131+
{ "Tauros", &I_tauros, 0x3C },
132+
{ "Magikarp", &I_magikarp, 0x85 },
133+
{ "Gyarados", &I_gyarados, 0x16 },
134+
{ "Lapras", &I_lapras, 0x13 },
135+
{ "Ditto", &I_ditto, 0x4C },
136+
{ "Eevee", &I_eevee, 0x66 },
137+
{ "Vaporeon", &I_vaporeon, 0x69 },
138+
{ "Jolteon", &I_jolteon, 0x68 },
139+
{ "Flareon", &I_flareon, 0x67 },
140+
{ "Porygon", &I_porygon, 0xAA },
141+
{ "Omanyte", &I_omanyte, 0x62 },
142+
{ "Omastar", &I_omastar, 0x63 },
143+
{ "Kabuto", &I_kabuto, 0x5A },
144+
{ "Kabutops", &I_kabutops, 0x5B },
145+
{ "Aerodactyl", &I_aerodactyl, 0xAB },
146+
{ "Snorlax", &I_snorlax, 0x84 },
147+
{ "Articuno", &I_articuno, 0x4A },
148+
{ "Zapdos", &I_zapdos, 0x4B },
149+
{ "Moltres", &I_moltres, 0x49 },
150+
{ "Dratini", &I_dratini, 0x58 },
151+
{ "Dragonair", &I_dragonair, 0x59 },
152+
{ "Dragonite", &I_dragonite, 0x42 },
153+
{ "Mewtwo", &I_mewtwo, 0x83 },
154+
{ "Mew", &I_mew, 0x15 },
155+
{ },
156+
};
68157

69158
uint32_t pokemon_exit_confirm_view(void* context) {
70159
UNUSED(context);

‎pokemon_app.h

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515

1616
#define TAG "Pokemon"
1717

18+
struct pokemon_lut {
19+
const char *name;
20+
const Icon *icon;
21+
const uint8_t hex;
22+
};
23+
1824
typedef struct App App;
1925
typedef enum {
2026
GAMEBOY_INITIAL,
@@ -54,8 +60,6 @@ typedef struct SelectPokemonModel {
5460
void* callback_context;
5561
} SelectPokemonModel;
5662

57-
extern const char* pokemon_names[];
58-
extern const Icon* pokemon_icons[];
59-
extern const unsigned char pokemon_hex_codes[];
63+
extern struct pokemon_lut pokemon_table[];
6064

61-
#endif /* POKEMON_APP_H */
65+
#endif /* POKEMON_APP_H */

0 commit comments

Comments
 (0)