|
|
|
|
122
|
gpu_pal_apply_compressed(pokemon_palette_normal[species].data,
|
122
|
gpu_pal_apply_compressed(pokemon_palette_normal[species].data,
|
123
|
16 * (objects[pokedex_context->detail_pokemon_oam].final_oam.palette_num + 16), 32);
|
123
|
16 * (objects[pokedex_context->detail_pokemon_oam].final_oam.palette_num + 16), 32);
|
124
|
} else {
|
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
|
const struct Template pkmnTemplate = {
|
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
|
.oam = &pdex_oam_pkmn,
|
130
|
.oam = &pdex_oam_pkmn,
|
131
|
.animation = &anim_image_empty,
|
131
|
.animation = &anim_image_empty,
|
132
|
.graphics = &pkmnTiles,
|
132
|
.graphics = &pkmnTiles,
|