Esteban Fuentealba 2 yıl önce
ebeveyn
işleme
6e185ee819
6 değiştirilmiş dosya ile 625 ekleme ve 452 silme
  1. 191 0
      .clang-format
  2. 152 152
      pokemon_app.cpp
  3. 3 3
      pokemon_app.h
  4. 276 289
      pokemon_data.h
  5. 2 7
      views/select_pokemon.cpp
  6. 1 1
      views/trade.hpp

+ 191 - 0
.clang-format

@@ -0,0 +1,191 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+AlignArrayOfStructures: None
+AlignConsecutiveMacros: None
+AlignConsecutiveAssignments: None
+AlignConsecutiveBitFields: None
+AlignConsecutiveDeclarations: None
+AlignEscapedNewlines: Left
+AlignOperands:   Align
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+  - __capability
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: true
+BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit:     99
+CommentPragmas:  '^ IWYU pragma:'
+QualifierAlignment: Leave
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: LogicalBlock
+ExperimentalAutoDetectBinPacking: false
+PackConstructorInitializers: BinPack
+BasedOnStyle:    ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+AllowAllConstructorInitializersOnNextLine: true
+FixNamespaceComments: false
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseLabels: false
+IndentCaseBlocks: false
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentExternBlock: AfterExternBlock
+IndentRequires:  false
+IndentWidth:     4
+IndentWrappedFunctionNames: true
+InsertTrailingCommas: None
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 4
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 10
+PenaltyBreakBeforeFirstCallParameter: 30
+PenaltyBreakComment: 10
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 10
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+PointerAlignment: Left
+PPIndentWidth:   -1
+ReferenceAlignment: Pointer
+ReflowComments:  false
+RemoveBracesLLVM: false
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    Never
+SortJavaStaticImport: Before
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: Never
+SpaceBeforeParensOptions:
+  AfterControlStatements: false
+  AfterForeachMacros: false
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   false
+  AfterOverloadedOperator: false
+  BeforeNonEmptyParentheses: false
+SpaceAroundPointerQualifiers: Default
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: Both
+Standard:        c++03
+StatementAttributeLikeMacros:
+  - Q_EMIT
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        4
+UseCRLF:         false
+UseTab:          Never
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+...
+

+ 152 - 152
pokemon_app.cpp

@@ -1,158 +1,158 @@
 #include "pokemon_app.h"
 
 struct pokemon_lut pokemon_table[] = {
-	{ "Bulbasaur",	&I_bulbasaur,	0x99 },
-	{ "Ivysaur",	&I_ivysaur,	0x09 },
-	{ "Venusaur",	&I_venusaur,	0x9A },
-	{ "Charmander",	&I_charmander,	0xB0 },
-	{ "Charmeleon",	&I_charmeleon,	0xB2 },
-	{ "Charizard",	&I_charizard,	0xB4 },
-	{ "Squirtle",	&I_squirtle,	0xB1 },
-	{ "Wartortle",	&I_wartortle,	0xB3 },
-	{ "Blastoise",	&I_blastoise,	0x1C },
-	{ "Caterpie",	&I_caterpie,	0x7B },
-	{ "Metapod",	&I_metapod,	0x7C },
-	{ "Butterfree",	&I_butterfree,	0x7D },
-	{ "Weedle",	&I_weedle,	0x70 },
-	{ "Kakuna",	&I_kakuna,	0x71 },
-	{ "Beedrill",	&I_beedrill,	0x72 },
-	{ "Pidgey",	&I_pidgey,	0x24 },
-	{ "Pidgeotto",	&I_pidgeotto,	0x96 },
-	{ "Pidgeot",	&I_pidgeot,	0x97 },
-	{ "Rattata",	&I_rattata,	0xA5 },
-	{ "Raticate",	&I_raticate,	0xA6 },
-	{ "Spearow",	&I_spearow,	0x05 },
-	{ "Fearow",	&I_fearow,	0x23 },
-	{ "Ekans",	&I_ekans,	0x6C },
-	{ "Arbok",	&I_arbok,	0x2D },
-	{ "Pikachu",	&I_pikachu,	0x54 },
-	{ "Raichu",	&I_raichu,	0x55 },
-	{ "Sandshrew",	&I_sandshrew,	0x60 },
-	{ "Sandslash",	&I_sandslash,	0x61 },
-	{ "Nidoran ♀",	&I_nidoranf,	0x0F },
-	{ "Nidorina",	&I_nidorina,	0xA8 },
-	{ "Nidoqueen",	&I_nidoqueen,	0x10 },
-	{ "Nidoran ♂",	&I_nidoranm,	0x03 },
-	{ "Nidorino",	&I_nidorino,	0xA7 },
-	{ "Nidoking",	&I_nidoking,	0x07 },
-	{ "Clefairy",	&I_clefairy,	0x04 },
-	{ "Clefable",	&I_clefable,	0x8E },
-	{ "Vulpix",	&I_vulpix,	0x52 },
-	{ "Ninetales",	&I_ninetales,	0x53 },
-	{ "Jigglypuff",	&I_jigglypuff,	0x64 },
-	{ "Wigglytuff",	&I_wigglytuff,	0x65 },
-	{ "Zubat",	&I_zubat,	0x6B },
-	{ "Golbat",	&I_golbat,	0x82 },
-	{ "Oddish",	&I_oddish,	0xB9 },
-	{ "Gloom",	&I_gloom,	0xBA },
-	{ "Vileplume",	&I_vileplume,	0xBB },
-	{ "Paras",	&I_paras,	0x6D },
-	{ "Parasect",	&I_parasect,	0x2E },
-	{ "Venonat",	&I_venonat,	0x41 },
-	{ "Venomoth",	&I_venomoth,	0x77 },
-	{ "Diglett",	&I_diglett,	0x3B },
-	{ "Dugtrio",	&I_dugtrio,	0x76 },
-	{ "Meowth",	&I_meowth,	0x4D },
-	{ "Persian",	&I_persian,	0x90 },
-	{ "Psyduck",	&I_psyduck,	0x2F },
-	{ "Golduck",	&I_golduck,	0x80 },
-	{ "Mankey",	&I_mankey,	0x39 },
-	{ "Primeape",	&I_primeape,	0x75 },
-	{ "Growlithe",	&I_growlithe,	0x21 },
-	{ "Arcanine",	&I_arcanine,	0x14 },
-	{ "Poliwag",	&I_poliwag,	0x47 },
-	{ "Poliwhirl",	&I_poliwhirl,	0x6E },
-	{ "Poliwrath",	&I_poliwrath,	0x6F },
-	{ "Abra",	&I_abra,	0x94 },
-	{ "Kadabra",	&I_kadabra,	0x26 },
-	{ "Alakazam",	&I_alakazam,	0x95 },
-	{ "Machop",	&I_machop,	0x6A },
-	{ "Machoke",	&I_machoke,	0x29 },
-	{ "Machamp",	&I_machamp,	0x7E },
-	{ "Bellsprout",	&I_bellsprout,	0xBC },
-	{ "Weepinbell",	&I_weepinbell,	0xBD },
-	{ "Victreebel",	&I_victreebel,	0xBE },
-	{ "Tentacool",	&I_tentacool,	0x18 },
-	{ "Tentacruel",	&I_tentacruel,	0x9B },
-	{ "Geodude",	&I_geodude,	0xA9 },
-	{ "Graveler",	&I_graveler,	0x27 },
-	{ "Golem",	&I_golem,	0x31 },
-	{ "Ponyta",	&I_ponyta,	0xA3 },
-	{ "Rapidash",	&I_rapidash,	0xA4 },
-	{ "Slowpoke",	&I_slowpoke,	0x25 },
-	{ "Slowbro",	&I_slowbro,	0x08 },
-	{ "Magnemite",	&I_magnemite,	0xAD },
-	{ "Magneton",	&I_magneton,	0x36 },
-	{ "Farfetch'd",	&I_farfetchd,	0x40 },
-	{ "Doduo",	&I_doduo,	0x46 },
-	{ "Dodrio",	&I_dodrio,	0x74 },
-	{ "Seel",	&I_seel,	0x3A },
-	{ "Dewgong",	&I_dewgong,	0x78 },
-	{ "Grimer",	&I_grimer,	0x0D },
-	{ "Muk",	&I_muk,	        0x88 },
-	{ "Shellder",	&I_shellder,	0x17 },
-	{ "Cloyster",	&I_cloyster,	0x8B },
-	{ "Gastly",	&I_gastly,	0x19 },
-	{ "Haunter",	&I_haunter,	0x93 },
-	{ "Gengar",	&I_gengar,	0x0E },
-	{ "Onix",	&I_onix,	0x22 },
-	{ "Drowzee",	&I_drowzee,	0x30 },
-	{ "Hypno",	&I_hypno,	0x81 },
-	{ "Krabby",	&I_krabby,	0x4E },
-	{ "Kingler",	&I_kingler,	0x8A },
-	{ "Voltorb",	&I_voltorb,	0x06 },
-	{ "Electrode",	&I_electrode,	0x8D },
-	{ "Exeggcute",	&I_exeggcute,	0x0C },
-	{ "Exeggutor",	&I_exeggutor,	0x0A },
-	{ "Cubone",	&I_cubone,	0x11 },
-	{ "Marowak",	&I_marowak,	0x91 },
-	{ "Hitmonlee",	&I_hitmonlee,	0x2B },
-	{ "Hitmonchan",	&I_hitmonchan,	0x2C },
-	{ "Lickitung",	&I_lickitung,	0x0B },
-	{ "Koffing",	&I_koffing,	0x37 },
-	{ "Weezing",	&I_weezing,	0x8F },
-	{ "Rhyhorn",	&I_rhyhorn,	0x12 },
-	{ "Rhydon",	&I_rhydon,	0x01 },
-	{ "Chansey",	&I_chansey,	0x28 },
-	{ "Tangela",	&I_tangela,	0x1E },
-	{ "Kangaskhan",	&I_kangaskhan,	0x02 },
-	{ "Horsea",	&I_horsea,	0x5C },
-	{ "Seadra",	&I_seadra,	0x5D },
-	{ "Goldeen",	&I_goldeen,	0x9D },
-	{ "Seaking",	&I_seaking,	0x9E },
-	{ "Staryu",	&I_staryu,	0x1B },
-	{ "Starmie",	&I_starmie,	0x98 },
-	{ "Mr. Mime",	&I_mr_mime,	0x2A },
-	{ "Scyther",	&I_scyther,	0x1A },
-	{ "Jynx",	&I_jynx,	0x48 },
-	{ "Electabuzz",	&I_electabuzz,	0x35 },
-	{ "Magmar",	&I_magmar,	0x33 },
-	{ "Pinsir",	&I_pinsir,	0x1D },
-	{ "Tauros",	&I_tauros,	0x3C },
-	{ "Magikarp",	&I_magikarp,	0x85 },
-	{ "Gyarados",	&I_gyarados,	0x16 },
-	{ "Lapras",	&I_lapras,	0x13 },
-	{ "Ditto",	&I_ditto,	0x4C },
-	{ "Eevee",	&I_eevee,	0x66 },
-	{ "Vaporeon",	&I_vaporeon,	0x69 },
-	{ "Jolteon",	&I_jolteon,	0x68 },
-	{ "Flareon",	&I_flareon,	0x67 },
-	{ "Porygon",	&I_porygon,	0xAA },
-	{ "Omanyte",	&I_omanyte,	0x62 },
-	{ "Omastar",	&I_omastar,	0x63 },
-	{ "Kabuto",	&I_kabuto,	0x5A },
-	{ "Kabutops",	&I_kabutops,	0x5B },
-	{ "Aerodactyl",	&I_aerodactyl,	0xAB },
-	{ "Snorlax",	&I_snorlax,	0x84 },
-	{ "Articuno",	&I_articuno,	0x4A },
-	{ "Zapdos",	&I_zapdos,	0x4B },
-	{ "Moltres",	&I_moltres,	0x49 },
-	{ "Dratini",	&I_dratini,	0x58 },
-	{ "Dragonair",	&I_dragonair,	0x59 },
-	{ "Dragonite",	&I_dragonite,	0x42 },
-	{ "Mewtwo",	&I_mewtwo,	0x83 },
-	{ "Mew",	&I_mew,	        0x15 },
-	{ },
+    {"Bulbasaur", &I_bulbasaur, 0x99},
+    {"Ivysaur", &I_ivysaur, 0x09},
+    {"Venusaur", &I_venusaur, 0x9A},
+    {"Charmander", &I_charmander, 0xB0},
+    {"Charmeleon", &I_charmeleon, 0xB2},
+    {"Charizard", &I_charizard, 0xB4},
+    {"Squirtle", &I_squirtle, 0xB1},
+    {"Wartortle", &I_wartortle, 0xB3},
+    {"Blastoise", &I_blastoise, 0x1C},
+    {"Caterpie", &I_caterpie, 0x7B},
+    {"Metapod", &I_metapod, 0x7C},
+    {"Butterfree", &I_butterfree, 0x7D},
+    {"Weedle", &I_weedle, 0x70},
+    {"Kakuna", &I_kakuna, 0x71},
+    {"Beedrill", &I_beedrill, 0x72},
+    {"Pidgey", &I_pidgey, 0x24},
+    {"Pidgeotto", &I_pidgeotto, 0x96},
+    {"Pidgeot", &I_pidgeot, 0x97},
+    {"Rattata", &I_rattata, 0xA5},
+    {"Raticate", &I_raticate, 0xA6},
+    {"Spearow", &I_spearow, 0x05},
+    {"Fearow", &I_fearow, 0x23},
+    {"Ekans", &I_ekans, 0x6C},
+    {"Arbok", &I_arbok, 0x2D},
+    {"Pikachu", &I_pikachu, 0x54},
+    {"Raichu", &I_raichu, 0x55},
+    {"Sandshrew", &I_sandshrew, 0x60},
+    {"Sandslash", &I_sandslash, 0x61},
+    {"Nidoran ♀", &I_nidoranf, 0x0F},
+    {"Nidorina", &I_nidorina, 0xA8},
+    {"Nidoqueen", &I_nidoqueen, 0x10},
+    {"Nidoran ♂", &I_nidoranm, 0x03},
+    {"Nidorino", &I_nidorino, 0xA7},
+    {"Nidoking", &I_nidoking, 0x07},
+    {"Clefairy", &I_clefairy, 0x04},
+    {"Clefable", &I_clefable, 0x8E},
+    {"Vulpix", &I_vulpix, 0x52},
+    {"Ninetales", &I_ninetales, 0x53},
+    {"Jigglypuff", &I_jigglypuff, 0x64},
+    {"Wigglytuff", &I_wigglytuff, 0x65},
+    {"Zubat", &I_zubat, 0x6B},
+    {"Golbat", &I_golbat, 0x82},
+    {"Oddish", &I_oddish, 0xB9},
+    {"Gloom", &I_gloom, 0xBA},
+    {"Vileplume", &I_vileplume, 0xBB},
+    {"Paras", &I_paras, 0x6D},
+    {"Parasect", &I_parasect, 0x2E},
+    {"Venonat", &I_venonat, 0x41},
+    {"Venomoth", &I_venomoth, 0x77},
+    {"Diglett", &I_diglett, 0x3B},
+    {"Dugtrio", &I_dugtrio, 0x76},
+    {"Meowth", &I_meowth, 0x4D},
+    {"Persian", &I_persian, 0x90},
+    {"Psyduck", &I_psyduck, 0x2F},
+    {"Golduck", &I_golduck, 0x80},
+    {"Mankey", &I_mankey, 0x39},
+    {"Primeape", &I_primeape, 0x75},
+    {"Growlithe", &I_growlithe, 0x21},
+    {"Arcanine", &I_arcanine, 0x14},
+    {"Poliwag", &I_poliwag, 0x47},
+    {"Poliwhirl", &I_poliwhirl, 0x6E},
+    {"Poliwrath", &I_poliwrath, 0x6F},
+    {"Abra", &I_abra, 0x94},
+    {"Kadabra", &I_kadabra, 0x26},
+    {"Alakazam", &I_alakazam, 0x95},
+    {"Machop", &I_machop, 0x6A},
+    {"Machoke", &I_machoke, 0x29},
+    {"Machamp", &I_machamp, 0x7E},
+    {"Bellsprout", &I_bellsprout, 0xBC},
+    {"Weepinbell", &I_weepinbell, 0xBD},
+    {"Victreebel", &I_victreebel, 0xBE},
+    {"Tentacool", &I_tentacool, 0x18},
+    {"Tentacruel", &I_tentacruel, 0x9B},
+    {"Geodude", &I_geodude, 0xA9},
+    {"Graveler", &I_graveler, 0x27},
+    {"Golem", &I_golem, 0x31},
+    {"Ponyta", &I_ponyta, 0xA3},
+    {"Rapidash", &I_rapidash, 0xA4},
+    {"Slowpoke", &I_slowpoke, 0x25},
+    {"Slowbro", &I_slowbro, 0x08},
+    {"Magnemite", &I_magnemite, 0xAD},
+    {"Magneton", &I_magneton, 0x36},
+    {"Farfetch'd", &I_farfetchd, 0x40},
+    {"Doduo", &I_doduo, 0x46},
+    {"Dodrio", &I_dodrio, 0x74},
+    {"Seel", &I_seel, 0x3A},
+    {"Dewgong", &I_dewgong, 0x78},
+    {"Grimer", &I_grimer, 0x0D},
+    {"Muk", &I_muk, 0x88},
+    {"Shellder", &I_shellder, 0x17},
+    {"Cloyster", &I_cloyster, 0x8B},
+    {"Gastly", &I_gastly, 0x19},
+    {"Haunter", &I_haunter, 0x93},
+    {"Gengar", &I_gengar, 0x0E},
+    {"Onix", &I_onix, 0x22},
+    {"Drowzee", &I_drowzee, 0x30},
+    {"Hypno", &I_hypno, 0x81},
+    {"Krabby", &I_krabby, 0x4E},
+    {"Kingler", &I_kingler, 0x8A},
+    {"Voltorb", &I_voltorb, 0x06},
+    {"Electrode", &I_electrode, 0x8D},
+    {"Exeggcute", &I_exeggcute, 0x0C},
+    {"Exeggutor", &I_exeggutor, 0x0A},
+    {"Cubone", &I_cubone, 0x11},
+    {"Marowak", &I_marowak, 0x91},
+    {"Hitmonlee", &I_hitmonlee, 0x2B},
+    {"Hitmonchan", &I_hitmonchan, 0x2C},
+    {"Lickitung", &I_lickitung, 0x0B},
+    {"Koffing", &I_koffing, 0x37},
+    {"Weezing", &I_weezing, 0x8F},
+    {"Rhyhorn", &I_rhyhorn, 0x12},
+    {"Rhydon", &I_rhydon, 0x01},
+    {"Chansey", &I_chansey, 0x28},
+    {"Tangela", &I_tangela, 0x1E},
+    {"Kangaskhan", &I_kangaskhan, 0x02},
+    {"Horsea", &I_horsea, 0x5C},
+    {"Seadra", &I_seadra, 0x5D},
+    {"Goldeen", &I_goldeen, 0x9D},
+    {"Seaking", &I_seaking, 0x9E},
+    {"Staryu", &I_staryu, 0x1B},
+    {"Starmie", &I_starmie, 0x98},
+    {"Mr. Mime", &I_mr_mime, 0x2A},
+    {"Scyther", &I_scyther, 0x1A},
+    {"Jynx", &I_jynx, 0x48},
+    {"Electabuzz", &I_electabuzz, 0x35},
+    {"Magmar", &I_magmar, 0x33},
+    {"Pinsir", &I_pinsir, 0x1D},
+    {"Tauros", &I_tauros, 0x3C},
+    {"Magikarp", &I_magikarp, 0x85},
+    {"Gyarados", &I_gyarados, 0x16},
+    {"Lapras", &I_lapras, 0x13},
+    {"Ditto", &I_ditto, 0x4C},
+    {"Eevee", &I_eevee, 0x66},
+    {"Vaporeon", &I_vaporeon, 0x69},
+    {"Jolteon", &I_jolteon, 0x68},
+    {"Flareon", &I_flareon, 0x67},
+    {"Porygon", &I_porygon, 0xAA},
+    {"Omanyte", &I_omanyte, 0x62},
+    {"Omastar", &I_omastar, 0x63},
+    {"Kabuto", &I_kabuto, 0x5A},
+    {"Kabutops", &I_kabutops, 0x5B},
+    {"Aerodactyl", &I_aerodactyl, 0xAB},
+    {"Snorlax", &I_snorlax, 0x84},
+    {"Articuno", &I_articuno, 0x4A},
+    {"Zapdos", &I_zapdos, 0x4B},
+    {"Moltres", &I_moltres, 0x49},
+    {"Dratini", &I_dratini, 0x58},
+    {"Dragonair", &I_dragonair, 0x59},
+    {"Dragonite", &I_dragonite, 0x42},
+    {"Mewtwo", &I_mewtwo, 0x83},
+    {"Mew", &I_mew, 0x15},
+    {},
 };
 
 uint32_t pokemon_exit_confirm_view(void* context) {

+ 3 - 3
pokemon_app.h

@@ -16,9 +16,9 @@
 #define TAG "Pokemon"
 
 struct pokemon_lut {
-	const char *name;
-	const Icon *icon;
-	const uint8_t hex;
+    const char* name;
+    const Icon* icon;
+    const uint8_t hex;
 };
 
 typedef struct App App;

+ 276 - 289
pokemon_data.h

@@ -10,310 +10,297 @@
  * to set names and things on the fly in the flipper. Need to explore that.
  * once I get to that point.
  */
-#define TERM_		0x50
-#define SPACE_		0x7f
-#define A_		0x80
-#define B_		0x81
-#define C_		0x82
-#define D_		0x83
-#define E_		0x84
-#define F_		0x85
-#define G_		0x86
-#define H_		0x87
-#define I_		0x88
-#define J_		0x89
-#define K_		0x8a
-#define L_		0x8b
-#define M_		0x8c
-#define N_		0x8d
-#define O_		0x8e
-#define P_		0x8f
-#define Q_		0x90
-#define R_		0x91
-#define S_		0x92
-#define T_		0x93
-#define U_		0x94
-#define V_		0x95
-#define W_		0x96
-#define X_		0x97
-#define Y_		0x98
-#define Z_		0x99
-#define O_PAREN_	0x9a
-#define C_PAREN_	0x9b
-#define COLON_		0x9c
-#define SEMI_		0x9d
-#define O_BRACKET_	0x9e
-#define C_BRACKET_	0x9f
-#define a_		0xa0
-#define b_		0xa1
-#define c_		0xa2
-#define d_		0xa3
-#define e_		0xa4
-#define f_		0xa5
-#define g_		0xa6
-#define h_		0xa7
-#define i_		0xa8
-#define j_		0xa9
-#define k_		0xaa
-#define l_		0xab
-#define m_		0xac
-#define n_		0xad
-#define o_		0xae
-#define p_		0xaf
-#define q_		0xb0
-#define r_		0xb1
-#define s_		0xb2
-#define t_		0xb3
-#define u_		0xb4
-#define v_		0xb5
-#define w_		0xb6
-#define x_		0xb7
-#define y_		0xb8
-#define z_		0xb9
-#define e_ACCENT_	0xba
-#define d_TICK_		0xbb
-#define l_TICK_		0xbc
-#define s_TICK_		0xbd
-#define t_TICK_		0xbe
-#define v_TICK_		0xbf
-#define S_QUOTE_	0xe0
-#define PK_		0xe1
-#define MN_		0xe2
-#define DASH_		0xe3
-#define r_TICK_		0xe4
-#define m_TICK_		0xe5
-#define QUESTION_	0xe6
-#define EXCLAIM_	0xe7
-#define PERIOD_		0xe8
-#define R_ARR_		0xec
-#define D_ARR_		0xee
-#define MALE_		0xef
-#define FEMALE_		0xf5
-#define _0_		0xf6
-#define _1_		0xf7
-#define _2_		0xf8
-#define _3_		0xf9
-#define _4_		0xfa
-#define _5_		0xfb
-#define _6_		0xfc
-#define _7_		0xfd
-#define _8_		0xfe
-#define _9_		0xff
-
+#define TERM_ 0x50
+#define SPACE_ 0x7f
+#define A_ 0x80
+#define B_ 0x81
+#define C_ 0x82
+#define D_ 0x83
+#define E_ 0x84
+#define F_ 0x85
+#define G_ 0x86
+#define H_ 0x87
+#define I_ 0x88
+#define J_ 0x89
+#define K_ 0x8a
+#define L_ 0x8b
+#define M_ 0x8c
+#define N_ 0x8d
+#define O_ 0x8e
+#define P_ 0x8f
+#define Q_ 0x90
+#define R_ 0x91
+#define S_ 0x92
+#define T_ 0x93
+#define U_ 0x94
+#define V_ 0x95
+#define W_ 0x96
+#define X_ 0x97
+#define Y_ 0x98
+#define Z_ 0x99
+#define O_PAREN_ 0x9a
+#define C_PAREN_ 0x9b
+#define COLON_ 0x9c
+#define SEMI_ 0x9d
+#define O_BRACKET_ 0x9e
+#define C_BRACKET_ 0x9f
+#define a_ 0xa0
+#define b_ 0xa1
+#define c_ 0xa2
+#define d_ 0xa3
+#define e_ 0xa4
+#define f_ 0xa5
+#define g_ 0xa6
+#define h_ 0xa7
+#define i_ 0xa8
+#define j_ 0xa9
+#define k_ 0xaa
+#define l_ 0xab
+#define m_ 0xac
+#define n_ 0xad
+#define o_ 0xae
+#define p_ 0xaf
+#define q_ 0xb0
+#define r_ 0xb1
+#define s_ 0xb2
+#define t_ 0xb3
+#define u_ 0xb4
+#define v_ 0xb5
+#define w_ 0xb6
+#define x_ 0xb7
+#define y_ 0xb8
+#define z_ 0xb9
+#define e_ACCENT_ 0xba
+#define d_TICK_ 0xbb
+#define l_TICK_ 0xbc
+#define s_TICK_ 0xbd
+#define t_TICK_ 0xbe
+#define v_TICK_ 0xbf
+#define S_QUOTE_ 0xe0
+#define PK_ 0xe1
+#define MN_ 0xe2
+#define DASH_ 0xe3
+#define r_TICK_ 0xe4
+#define m_TICK_ 0xe5
+#define QUESTION_ 0xe6
+#define EXCLAIM_ 0xe7
+#define PERIOD_ 0xe8
+#define R_ARR_ 0xec
+#define D_ARR_ 0xee
+#define MALE_ 0xef
+#define FEMALE_ 0xf5
+#define _0_ 0xf6
+#define _1_ 0xf7
+#define _2_ 0xf8
+#define _3_ 0xf9
+#define _4_ 0xfa
+#define _5_ 0xfb
+#define _6_ 0xfc
+#define _7_ 0xfd
+#define _8_ 0xfe
+#define _9_ 0xff
 
 /* XXX: These are all opposite endianness on the flipper than they are in the
  * GB/Z80. e.g. a uint16_t value of 0x2c01 translates to 0x012c. Does flipper
  * API have calls to swap endianness?
  */
 struct __attribute__((__packed__)) pokemon_structure {
-	uint8_t species;
-	uint16_t hp;
-	uint8_t level;
-	uint8_t status_condition;
-	uint8_t type[2];
-	uint8_t catch_held;
-	uint8_t move[4];
-	uint16_t orig_trainer;
-	uint8_t exp[3];
-	uint16_t hp_ev;
-	uint16_t atk_ev;
-	uint16_t def_ev;
-	uint16_t spd_ev;
-	uint16_t special_ev;
-	uint16_t iv;
-	uint8_t move_pp[4];
-	uint8_t level_again;
-	uint16_t max_hp;
-	uint16_t atk;
-	uint16_t def;
-	uint16_t spd;
-	uint16_t special;
+    uint8_t species;
+    uint16_t hp;
+    uint8_t level;
+    uint8_t status_condition;
+    uint8_t type[2];
+    uint8_t catch_held;
+    uint8_t move[4];
+    uint16_t orig_trainer;
+    uint8_t exp[3];
+    uint16_t hp_ev;
+    uint16_t atk_ev;
+    uint16_t def_ev;
+    uint16_t spd_ev;
+    uint16_t special_ev;
+    uint16_t iv;
+    uint8_t move_pp[4];
+    uint8_t level_again;
+    uint16_t max_hp;
+    uint16_t atk;
+    uint16_t def;
+    uint16_t spd;
+    uint16_t special;
 };
 
 struct __attribute__((__packed__)) name {
-	unsigned char str[11];
+    unsigned char str[11];
 };
 
 struct __attribute__((__packed__)) trade_data_block {
-	unsigned char trainer_name[11];
-	uint8_t party_cnt;
-	uint8_t party_members[7]; // Unsure if last byte always needs to be 0xff for terminator
-	struct pokemon_structure party[6];
-	struct name ot_name[6];
-	struct name nickname[6];
-};
-
-struct trade_data_block DATA_BLOCK2 = {
-	.trainer_name = { F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00, 0x00 },
-	.party_cnt = 1,
-	.party_members = { 0x15, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
-	.party = {
-		{
-			.species = 0x4a,
-			.hp = 0x2c01,
-			.level = 0x4a,
-			.status_condition = 0x0,
-			.type = { 0x14, 0x08 },
-			.catch_held = 0x1f,
-			.move = { 0x7e, 0x38, 0x09, 0x19 },
-			.orig_trainer = 0xd204,
-			.exp = { 0x3, 0xd, 0x40 },
-			.hp_ev = 0xffff,
-			.atk_ev = 0xffff,
-			.def_ev = 0xffff,
-			.spd_ev = 0xffff,
-			.special_ev = 0xffff,
-			.iv = 0xffff,
-			.move_pp = { 0xc0, 0xc0, 0xc0, 0xc0 },
-			.level_again = 0x4a,
-			.max_hp = 0x2c01,
-			.atk = 0x9600,
-			.def = 0x9700,
-			.spd = 0x9800,
-			.special = 0x9900
-		},
-		{
-			.species = 0x4a,
-			.hp = 0x2c01,
-			.level = 0x4a,
-			.status_condition = 0x0,
-			.type = { 0x14, 0x08 },
-			.catch_held = 0x1f,
-			.move = { 0x7e, 0x38, 0x09, 0x19 },
-			.orig_trainer = 0xd204,
-			.exp = { 0x3, 0xd, 0x40 },
-			.hp_ev = 0xffff,
-			.atk_ev = 0xffff,
-			.def_ev = 0xffff,
-			.spd_ev = 0xffff,
-			.special_ev = 0xffff,
-			.iv = 0xffff,
-			.move_pp = { 0xc0, 0xc0, 0xc0, 0xc0 },
-			.level_again = 0x4a,
-			.max_hp = 0x2c01,
-			.atk = 0x9600,
-			.def = 0x9700,
-			.spd = 0x9800,
-			.special = 0x9900
-		},
-		{
-			.species = 0x4a,
-			.hp = 0x2c01,
-			.level = 0x4a,
-			.status_condition = 0x0,
-			.type = { 0x14, 0x08 },
-			.catch_held = 0x1f,
-			.move = { 0x7e, 0x38, 0x09, 0x19 },
-			.orig_trainer = 0xd204,
-			.exp = { 0x3, 0xd, 0x40 },
-			.hp_ev = 0xffff,
-			.atk_ev = 0xffff,
-			.def_ev = 0xffff,
-			.spd_ev = 0xffff,
-			.special_ev = 0xffff,
-			.iv = 0xffff,
-			.move_pp = { 0xc0, 0xc0, 0xc0, 0xc0 },
-			.level_again = 0x4a,
-			.max_hp = 0x2c01,
-			.atk = 0x9600,
-			.def = 0x9700,
-			.spd = 0x9800,
-			.special = 0x9900
-		},
-		{
-			.species = 0x4a,
-			.hp = 0x2c01,
-			.level = 0x4a,
-			.status_condition = 0x0,
-			.type = { 0x14, 0x08 },
-			.catch_held = 0x1f,
-			.move = { 0x7e, 0x38, 0x09, 0x19 },
-			.orig_trainer = 0xd204,
-			.exp = { 0x3, 0xd, 0x40 },
-			.hp_ev = 0xffff,
-			.atk_ev = 0xffff,
-			.def_ev = 0xffff,
-			.spd_ev = 0xffff,
-			.special_ev = 0xffff,
-			.iv = 0xffff,
-			.move_pp = { 0xc0, 0xc0, 0xc0, 0xc0 },
-			.level_again = 0x4a,
-			.max_hp = 0x2c01,
-			.atk = 0x9600,
-			.def = 0x9700,
-			.spd = 0x9800,
-			.special = 0x9900
-		},
-		{
-			.species = 0x4a,
-			.hp = 0x2c01,
-			.level = 0x4a,
-			.status_condition = 0x0,
-			.type = { 0x14, 0x08 },
-			.catch_held = 0x1f,
-			.move = { 0x7e, 0x38, 0x09, 0x19 },
-			.orig_trainer = 0xd204,
-			.exp = { 0x3, 0xd, 0x40 },
-			.hp_ev = 0xffff,
-			.atk_ev = 0xffff,
-			.def_ev = 0xffff,
-			.spd_ev = 0xffff,
-			.special_ev = 0xffff,
-			.iv = 0xffff,
-			.move_pp = { 0xc0, 0xc0, 0xc0, 0xc0 },
-			.level_again = 0x4a,
-			.max_hp = 0x2c01,
-			.atk = 0x9600,
-			.def = 0x9700,
-			.spd = 0x9800,
-			.special = 0x9900
-		},
-		{
-			.species = 0x4a,
-			.hp = 0x2c01,
-			.level = 0x4a,
-			.status_condition = 0x0,
-			.type = { 0x14, 0x08 },
-			.catch_held = 0x1f,
-			.move = { 0x7e, 0x38, 0x09, 0x19 },
-			.orig_trainer = 0xd204,
-			.exp = { 0x3, 0xd, 0x40 },
-			.hp_ev = 0xffff,
-			.atk_ev = 0xffff,
-			.def_ev = 0xffff,
-			.spd_ev = 0xffff,
-			.special_ev = 0xffff,
-			.iv = 0xffff,
-			.move_pp = { 0xc0, 0xc0, 0xc0, 0xc0 },
-			.level_again = 0x4a,
-			.max_hp = 0x2c01,
-			.atk = 0x9600,
-			.def = 0x9700,
-			.spd = 0x9800,
-			.special = 0x9900
-		},
-	},
-	/* NOTE: I think this shouldn't exceed 7 chars */
-	.ot_name = {
-		{ .str = { F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-		{ .str = { F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-		{ .str = { F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-		{ .str = { F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-		{ .str = { F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-		{ .str = { F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-	},
-	.nickname = {
-		{ .str = { F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-		{ .str = { F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-		{ .str = { F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-		{ .str = { F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-		{ .str = { F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-		{ .str = { F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00 } },
-	}
+    unsigned char trainer_name[11];
+    uint8_t party_cnt;
+    uint8_t party_members[7]; // Unsure if last byte always needs to be 0xff for terminator
+    struct pokemon_structure party[6];
+    struct name ot_name[6];
+    struct name nickname[6];
 };
 
+struct trade_data_block DATA_BLOCK2 =
+    {.trainer_name = {F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00, 0x00},
+     .party_cnt = 1,
+     .party_members = {0x15, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
+     .party =
+         {
+             {.species = 0x4a,
+              .hp = 0x2c01,
+              .level = 0x4a,
+              .status_condition = 0x0,
+              .type = {0x14, 0x08},
+              .catch_held = 0x1f,
+              .move = {0x7e, 0x38, 0x09, 0x19},
+              .orig_trainer = 0xd204,
+              .exp = {0x3, 0xd, 0x40},
+              .hp_ev = 0xffff,
+              .atk_ev = 0xffff,
+              .def_ev = 0xffff,
+              .spd_ev = 0xffff,
+              .special_ev = 0xffff,
+              .iv = 0xffff,
+              .move_pp = {0xc0, 0xc0, 0xc0, 0xc0},
+              .level_again = 0x4a,
+              .max_hp = 0x2c01,
+              .atk = 0x9600,
+              .def = 0x9700,
+              .spd = 0x9800,
+              .special = 0x9900},
+             {.species = 0x4a,
+              .hp = 0x2c01,
+              .level = 0x4a,
+              .status_condition = 0x0,
+              .type = {0x14, 0x08},
+              .catch_held = 0x1f,
+              .move = {0x7e, 0x38, 0x09, 0x19},
+              .orig_trainer = 0xd204,
+              .exp = {0x3, 0xd, 0x40},
+              .hp_ev = 0xffff,
+              .atk_ev = 0xffff,
+              .def_ev = 0xffff,
+              .spd_ev = 0xffff,
+              .special_ev = 0xffff,
+              .iv = 0xffff,
+              .move_pp = {0xc0, 0xc0, 0xc0, 0xc0},
+              .level_again = 0x4a,
+              .max_hp = 0x2c01,
+              .atk = 0x9600,
+              .def = 0x9700,
+              .spd = 0x9800,
+              .special = 0x9900},
+             {.species = 0x4a,
+              .hp = 0x2c01,
+              .level = 0x4a,
+              .status_condition = 0x0,
+              .type = {0x14, 0x08},
+              .catch_held = 0x1f,
+              .move = {0x7e, 0x38, 0x09, 0x19},
+              .orig_trainer = 0xd204,
+              .exp = {0x3, 0xd, 0x40},
+              .hp_ev = 0xffff,
+              .atk_ev = 0xffff,
+              .def_ev = 0xffff,
+              .spd_ev = 0xffff,
+              .special_ev = 0xffff,
+              .iv = 0xffff,
+              .move_pp = {0xc0, 0xc0, 0xc0, 0xc0},
+              .level_again = 0x4a,
+              .max_hp = 0x2c01,
+              .atk = 0x9600,
+              .def = 0x9700,
+              .spd = 0x9800,
+              .special = 0x9900},
+             {.species = 0x4a,
+              .hp = 0x2c01,
+              .level = 0x4a,
+              .status_condition = 0x0,
+              .type = {0x14, 0x08},
+              .catch_held = 0x1f,
+              .move = {0x7e, 0x38, 0x09, 0x19},
+              .orig_trainer = 0xd204,
+              .exp = {0x3, 0xd, 0x40},
+              .hp_ev = 0xffff,
+              .atk_ev = 0xffff,
+              .def_ev = 0xffff,
+              .spd_ev = 0xffff,
+              .special_ev = 0xffff,
+              .iv = 0xffff,
+              .move_pp = {0xc0, 0xc0, 0xc0, 0xc0},
+              .level_again = 0x4a,
+              .max_hp = 0x2c01,
+              .atk = 0x9600,
+              .def = 0x9700,
+              .spd = 0x9800,
+              .special = 0x9900},
+             {.species = 0x4a,
+              .hp = 0x2c01,
+              .level = 0x4a,
+              .status_condition = 0x0,
+              .type = {0x14, 0x08},
+              .catch_held = 0x1f,
+              .move = {0x7e, 0x38, 0x09, 0x19},
+              .orig_trainer = 0xd204,
+              .exp = {0x3, 0xd, 0x40},
+              .hp_ev = 0xffff,
+              .atk_ev = 0xffff,
+              .def_ev = 0xffff,
+              .spd_ev = 0xffff,
+              .special_ev = 0xffff,
+              .iv = 0xffff,
+              .move_pp = {0xc0, 0xc0, 0xc0, 0xc0},
+              .level_again = 0x4a,
+              .max_hp = 0x2c01,
+              .atk = 0x9600,
+              .def = 0x9700,
+              .spd = 0x9800,
+              .special = 0x9900},
+             {.species = 0x4a,
+              .hp = 0x2c01,
+              .level = 0x4a,
+              .status_condition = 0x0,
+              .type = {0x14, 0x08},
+              .catch_held = 0x1f,
+              .move = {0x7e, 0x38, 0x09, 0x19},
+              .orig_trainer = 0xd204,
+              .exp = {0x3, 0xd, 0x40},
+              .hp_ev = 0xffff,
+              .atk_ev = 0xffff,
+              .def_ev = 0xffff,
+              .spd_ev = 0xffff,
+              .special_ev = 0xffff,
+              .iv = 0xffff,
+              .move_pp = {0xc0, 0xc0, 0xc0, 0xc0},
+              .level_again = 0x4a,
+              .max_hp = 0x2c01,
+              .atk = 0x9600,
+              .def = 0x9700,
+              .spd = 0x9800,
+              .special = 0x9900},
+         },
+     /* NOTE: I think this shouldn't exceed 7 chars */
+     .ot_name =
+         {
+             {.str = {F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+             {.str = {F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+             {.str = {F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+             {.str = {F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+             {.str = {F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+             {.str = {F_, l_, i_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+         },
+     .nickname = {
+         {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+         {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+         {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+         {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+         {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+         {.str = {F_, l_, o_, p_, p_, e_, r_, TERM_, 0x00, 0x00}},
+     }};
 
 unsigned char INPUT_BLOCK[405];
-unsigned char *DATA_BLOCK = (unsigned char *)&DATA_BLOCK2;
+unsigned char* DATA_BLOCK = (unsigned char*)&DATA_BLOCK2;
 
 #endif /* POKEMON_DATA_H */

+ 2 - 7
views/select_pokemon.cpp

@@ -8,15 +8,10 @@ static void select_pokemon_render_callback(Canvas* canvas, void* context) {
     const uint8_t current_index = model->current_pokemon;
     char pokedex_num[5];
 
-    snprintf(pokedex_num, sizeof(pokedex_num), "#%03d", current_index+1);
+    snprintf(pokedex_num, sizeof(pokedex_num), "#%03d", current_index + 1);
     canvas_set_font(canvas, FontPrimary);
     canvas_draw_str_aligned(
-        canvas,
-        55,
-        54 / 2,
-        AlignLeft,
-        AlignTop,
-	pokemon_table[current_index].name);
+        canvas, 55, 54 / 2, AlignLeft, AlignTop, pokemon_table[current_index].name);
 
     canvas_set_font(canvas, FontSecondary);
     canvas_draw_str_aligned(canvas, 55, 38, AlignLeft, AlignTop, pokedex_num);

+ 1 - 1
views/trade.hpp

@@ -67,6 +67,6 @@ void trade_free(App* app);
 View* trade_get_view(App* app);
 
 extern unsigned char INPUT_BLOCK[405];
-extern unsigned char *DATA_BLOCK;
+extern unsigned char* DATA_BLOCK;
 
 #endif /* TRADE_HPP */