diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-25 12:51:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 12:51:51 -0400 |
| commit | 1150e16b68c5e6fc2c7baf56ab061cea69d69953 (patch) | |
| tree | 55aafd11c76cb39fe2a83cc7839f5b0f7d7efa9c /src/pokedex_screen.c | |
| parent | cd8ac0ed9b9e9f53979409bf1a99d62132e5001b (diff) | |
| parent | aec808ac0d6266dc1c96ecf1aca998a06b11db19 (diff) | |
Merge pull request #450 from PikalaxALT/flatten_sprite_pos
Flatten pos fields in struct Sprite
Diffstat (limited to 'src/pokedex_screen.c')
| -rw-r--r-- | src/pokedex_screen.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 75660518d..5b0105fcb 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -3105,14 +3105,14 @@ u8 DexScreen_DrawMonAreaPage(void) gSprites[sPokedexScreenData->windowIds[14]].oam.affineMode = 1; gSprites[sPokedexScreenData->windowIds[14]].oam.matrixNum = 2; gSprites[sPokedexScreenData->windowIds[14]].oam.priority = 1; - gSprites[sPokedexScreenData->windowIds[14]].pos2.y = gPokedexEntries[speciesId].pokemonOffset; + gSprites[sPokedexScreenData->windowIds[14]].y2 = gPokedexEntries[speciesId].pokemonOffset; SetOamMatrix(2, gPokedexEntries[speciesId].pokemonScale, 0, 0, gPokedexEntries[speciesId].pokemonScale); sPokedexScreenData->windowIds[15] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId_Debug(gSaveBlock2Ptr->playerGender, TRUE), 1, 80, 104, 0, 0xFFFF); gSprites[sPokedexScreenData->windowIds[15]].oam.paletteNum = 2; gSprites[sPokedexScreenData->windowIds[15]].oam.affineMode = 1; gSprites[sPokedexScreenData->windowIds[15]].oam.matrixNum = 1; gSprites[sPokedexScreenData->windowIds[15]].oam.priority = 1; - gSprites[sPokedexScreenData->windowIds[15]].pos2.y = gPokedexEntries[speciesId].trainerOffset; + gSprites[sPokedexScreenData->windowIds[15]].y2 = gPokedexEntries[speciesId].trainerOffset; SetOamMatrix(1, gPokedexEntries[speciesId].trainerScale, 0, 0, gPokedexEntries[speciesId].trainerScale); } else |