summaryrefslogtreecommitdiff
path: root/src/pokedex.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pokedex.c')
-rw-r--r--src/pokedex.c90
1 files changed, 45 insertions, 45 deletions
diff --git a/src/pokedex.c b/src/pokedex.c
index 2d371f937..cc469b32f 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -305,7 +305,7 @@ static void ClearSearchParameterBoxText(void);
static const struct OamData sOamData_ScrollBar =
{
- .y = 160,
+ .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
@@ -322,7 +322,7 @@ static const struct OamData sOamData_ScrollBar =
static const struct OamData sOamData_ScrollArrow =
{
- .y = 160,
+ .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
@@ -339,7 +339,7 @@ static const struct OamData sOamData_ScrollArrow =
static const struct OamData sOamData_InterfaceText =
{
- .y = 160,
+ .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
@@ -356,7 +356,7 @@ static const struct OamData sOamData_InterfaceText =
static const struct OamData sOamData_RotatingPokeBall =
{
- .y = 160,
+ .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_WINDOW,
.mosaic = 0,
@@ -373,7 +373,7 @@ static const struct OamData sOamData_RotatingPokeBall =
static const struct OamData sOamData_SeenOwnText =
{
- .y = 160,
+ .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
@@ -390,7 +390,7 @@ static const struct OamData sOamData_SeenOwnText =
static const struct OamData sOamData_Dex8x16 =
{
- .y = 160,
+ .y = DISPLAY_HEIGHT,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
@@ -1785,7 +1785,7 @@ static void Task_HandlePokedexStartMenuInput(u8 taskId)
static void Task_OpenInfoScreenAfterMonMovement(u8 taskId)
{
- if (gSprites[sPokedexView->selectedMonSpriteId].pos1.x == 48 && gSprites[sPokedexView->selectedMonSpriteId].pos1.y == 56)
+ if (gSprites[sPokedexView->selectedMonSpriteId].x == 48 && gSprites[sPokedexView->selectedMonSpriteId].y == 56)
{
sPokedexView->currentPageBackup = sPokedexView->currentPage;
gTasks[taskId].tTaskId = LoadInfoScreen(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId);
@@ -1987,7 +1987,7 @@ static void Task_HandleSearchResultsStartMenuInput(u8 taskId)
static void Task_OpenSearchResultsInfoScreenAfterMonMovement(u8 taskId)
{
- if (gSprites[sPokedexView->selectedMonSpriteId].pos1.x == 48 && gSprites[sPokedexView->selectedMonSpriteId].pos1.y == 56)
+ if (gSprites[sPokedexView->selectedMonSpriteId].x == 48 && gSprites[sPokedexView->selectedMonSpriteId].y == 56)
{
sPokedexView->currentPageBackup = sPokedexView->currentPage;
gTasks[taskId].tTaskId = LoadInfoScreen(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId);
@@ -2109,8 +2109,8 @@ static bool8 LoadPokedexListPage(u8 page)
gMain.state++;
break;
case 5:
- SetGpuReg(REG_OFFSET_WININ, 0x3F3F);
- SetGpuReg(REG_OFFSET_WINOUT, 0x1D3F);
+ SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_ALL | WININ_WIN1_ALL);
+ SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_ALL | WINOUT_WINOBJ_BG0 | WINOUT_WINOBJ_BG2 | WINOUT_WINOBJ_BG3 | WINOUT_WINOBJ_OBJ);
SetGpuReg(REG_OFFSET_WIN0H, 0);
SetGpuReg(REG_OFFSET_WIN0V, 0);
SetGpuReg(REG_OFFSET_WIN1H, 0);
@@ -2652,7 +2652,7 @@ static void UpdateSelectedMonSpriteId(void)
{
u16 spriteId = sPokedexView->monSpriteIds[i];
- if (gSprites[spriteId].pos2.x == 0 && gSprites[spriteId].pos2.y == 0 && spriteId != 0xFFFF)
+ if (gSprites[spriteId].x2 == 0 && gSprites[spriteId].y2 == 0 && spriteId != 0xFFFF)
sPokedexView->selectedMonSpriteId = spriteId;
}
}
@@ -2768,7 +2768,7 @@ static void CreateInterfaceSprites(u8 page)
// Scroll arrows
spriteId = CreateSprite(&sScrollArrowSpriteTemplate, 184, 4, 0);
gSprites[spriteId].sIsDownArrow = FALSE;
- spriteId = CreateSprite(&sScrollArrowSpriteTemplate, 184, 156, 0);
+ spriteId = CreateSprite(&sScrollArrowSpriteTemplate, 184, DISPLAY_HEIGHT - 4, 0);
gSprites[spriteId].sIsDownArrow = TRUE;
gSprites[spriteId].vFlip = TRUE;
@@ -2779,20 +2779,20 @@ static void CreateInterfaceSprites(u8 page)
spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 48, 120, 0);
StartSpriteAnim(&gSprites[spriteId], 3);
// Select button
- spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 16, 144, 0);
+ spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 16, DISPLAY_HEIGHT - 16, 0);
StartSpriteAnim(&gSprites[spriteId], 2);
gSprites[spriteId].data[2] = 0x80;
// Search text
- spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 48, 144, 0);
+ spriteId = CreateSprite(&sInterfaceTextSpriteTemplate, 48, DISPLAY_HEIGHT - 16, 0);
StartSpriteAnim(&gSprites[spriteId], 1);
- spriteId = CreateSprite(&sRotatingPokeBallSpriteTemplate, 0, 80, 2);
+ spriteId = CreateSprite(&sRotatingPokeBallSpriteTemplate, 0, DISPLAY_HEIGHT / 2, 2);
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 30;
gSprites[spriteId].data[0] = 30;
gSprites[spriteId].data[1] = 0;
- spriteId = CreateSprite(&sRotatingPokeBallSpriteTemplate, 0, 80, 2);
+ spriteId = CreateSprite(&sRotatingPokeBallSpriteTemplate, 0, DISPLAY_HEIGHT / 2, 2);
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 31;
gSprites[spriteId].data[0] = 31;
@@ -3000,19 +3000,19 @@ void SpriteCB_MoveMonForInfoScreen(struct Sprite *sprite)
{
sprite->oam.priority = 0;
sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
- sprite->pos2.x = 0;
- sprite->pos2.y = 0;
- if (sprite->pos1.x != 48 || sprite->pos1.y != 56)
+ sprite->x2 = 0;
+ sprite->y2 = 0;
+ if (sprite->x != 48 || sprite->y != 56)
{
- if (sprite->pos1.x > 48)
- sprite->pos1.x--;
- if (sprite->pos1.x < 48)
- sprite->pos1.x++;
+ if (sprite->x > 48)
+ sprite->x--;
+ if (sprite->x < 48)
+ sprite->x++;
- if (sprite->pos1.y > 56)
- sprite->pos1.y--;
- if (sprite->pos1.y < 56)
- sprite->pos1.y++;
+ if (sprite->y > 56)
+ sprite->y--;
+ if (sprite->y < 56)
+ sprite->y++;
}
else
{
@@ -3032,7 +3032,7 @@ static void SpriteCB_PokedexListMonSprite(struct Sprite *sprite)
else
{
u32 var;
- sprite->pos2.y = gSineTable[(u8)sprite->data[5]] * 76 / 256;
+ sprite->y2 = gSineTable[(u8)sprite->data[5]] * 76 / 256;
var = SAFE_DIV(0x10000, gSineTable[sprite->data[5] + 64]);
if (var > 0xFFFF)
var = 0xFFFF;
@@ -3062,7 +3062,7 @@ static void SpriteCB_Scrollbar(struct Sprite *sprite)
if (sPokedexView->currentPage != PAGE_MAIN && sPokedexView->currentPage != PAGE_SEARCH_RESULTS)
DestroySprite(sprite);
else
- sprite->pos2.y = sPokedexView->selectedPokemon * 120 / (sPokedexView->pokemonListCount - 1);
+ sprite->y2 = sPokedexView->selectedPokemon * 120 / (sPokedexView->pokemonListCount - 1);
}
static void SpriteCB_ScrollArrow(struct Sprite *sprite)
@@ -3091,7 +3091,7 @@ static void SpriteCB_ScrollArrow(struct Sprite *sprite)
sprite->invisible = FALSE;
r0 = sprite->data[2] - 128;
}
- sprite->pos2.y = gSineTable[r0] / 64;
+ sprite->y2 = gSineTable[r0] / 64;
sprite->data[2] = sprite->data[2] + 8;
if (sPokedexView->menuIsOpen == FALSE && sPokedexView->menuY == 0 && sprite->invisible == FALSE)
sprite->invisible = FALSE;
@@ -3126,8 +3126,8 @@ static void SpriteCB_RotatingPokeBall(struct Sprite *sprite)
val = sPokedexView->pokeBallRotation + (sprite->data[1] + 64);
r3 = gSineTable[val];
r0 = gSineTable[val + 64];
- sprite->pos2.x = r0 * 40 / 256;
- sprite->pos2.y = r3 * 40 / 256;
+ sprite->x2 = r0 * 40 / 256;
+ sprite->y2 = r3 * 40 / 256;
}
}
@@ -3144,8 +3144,8 @@ static void SpriteCB_DexListStartMenuCursor(struct Sprite *sprite)
if (sPokedexView->menuIsOpen && sPokedexView->menuY == r1)
{
sprite->invisible = FALSE;
- sprite->pos2.y = sPokedexView->menuCursorPos * 16;
- sprite->pos2.x = gSineTable[(u8)sprite->data[2]] / 64;
+ sprite->y2 = sPokedexView->menuCursorPos * 16;
+ sprite->x2 = gSineTable[(u8)sprite->data[2]] / 64;
sprite->data[2] += 8;
}
else
@@ -3755,7 +3755,7 @@ static void Task_LoadSizeScreen(u8 taskId)
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 1;
gSprites[spriteId].oam.priority = 0;
- gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset;
+ gSprites[spriteId].y2 = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset;
SetOamMatrix(1, gPokedexEntries[sPokedexListItem->dexNum].trainerScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].trainerScale);
LoadPalette(sSizeScreenSilhouette_Pal, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
gTasks[taskId].data[5] = spriteId;
@@ -3766,7 +3766,7 @@ static void Task_LoadSizeScreen(u8 taskId)
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 2;
gSprites[spriteId].oam.priority = 0;
- gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset;
+ gSprites[spriteId].y2 = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset;
SetOamMatrix(2, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale);
LoadPalette(sSizeScreenSilhouette_Pal, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
gTasks[taskId].tMonSpriteId = spriteId;
@@ -4054,15 +4054,15 @@ static void Task_ExitCaughtMonPage(u8 taskId)
static void SpriteCB_SlideCaughtMonToCenter(struct Sprite *sprite)
{
- if (sprite->pos1.x < 0x78)
- sprite->pos1.x += 2;
- if (sprite->pos1.x > 0x78)
- sprite->pos1.x -= 2;
+ if (sprite->x < 0x78)
+ sprite->x += 2;
+ if (sprite->x > 0x78)
+ sprite->x -= 2;
- if (sprite->pos1.y < 0x50)
- sprite->pos1.y += 1;
- if (sprite->pos1.y > 0x50)
- sprite->pos1.y -= 1;
+ if (sprite->y < 0x50)
+ sprite->y += 1;
+ if (sprite->y > 0x50)
+ sprite->y -= 1;
}
#undef tState
@@ -5570,7 +5570,7 @@ static void SpriteCB_SearchParameterScrollArrow(struct Sprite *sprite)
sprite->invisible = FALSE;
}
val = sprite->data[2] + sprite->sIsDownArrow * 128;
- sprite->pos2.y = gSineTable[val] / 128;
+ sprite->y2 = gSineTable[val] / 128;
sprite->data[2] += 8;
}
else
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 14:15:40 +0000