Browse Source

remove gcc errors

SBird1337 6 years ago
parent
commit
f46ab4ecde
2 changed files with 5 additions and 5 deletions
  1. 1
    1
      g3headers
  2. 4
    4
      src/pokedex/pokedex_detail.c

+ 1
- 1
g3headers

@@ -1 +1 @@
1
-Subproject commit 2f9b41afbceba16f5270691c2b7531529853efb5
1
+Subproject commit 9f790f1f0ac16ed8f80556e8f74e824836fc1950

+ 4
- 4
src/pokedex/pokedex_detail.c View File

@@ -122,11 +122,11 @@ void dexdetail_load_pokemon(u16 dexindex, enum DexFormType formType) {
122 122
         gpu_pal_apply_compressed(pokemon_palette_normal[species].data,
123 123
                                  16 * (objects[pokedex_context->detail_pokemon_oam].final_oam.palette_num + 16), 32);
124 124
     } else {
125
-        struct SpriteTiles pkmnTiles = {pokemon_graphics_front[species].data, 2048, DEX_PKMN_TAG};
126
-        struct SpritePalette pkmnPal = {pokemon_palette_normal[species].data, DEX_PKMN_TAG};
125
+        struct SpriteTiles pkmnTiles = {pokemon_graphics_front[species].data, 2048, DEX_PKMN_TAG_ONE};
126
+        struct SpritePalette pkmnPal = {pokemon_palette_normal[species].data, DEX_PKMN_TAG_ONE};
127 127
         const struct Template pkmnTemplate = {
128
-            .tiles_tag = DEX_PKMN_TAG,
129
-            .pal_tag = DEX_PKMN_TAG,
128
+            .tiles_tag = DEX_PKMN_TAG_ONE,
129
+            .pal_tag = DEX_PKMN_TAG_ONE,
130 130
             .oam = &pdex_oam_pkmn,
131 131
             .animation = &anim_image_empty,
132 132
             .graphics = &pkmnTiles,