dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

More DISPLAY_WIDTH/HEIGHT constant usage

Browse Source
This commit is contained in:
GriffinR
2023-08-10 01:42:38 -04:00
parent 18319e8da3
commit d5d46bb438
15 changed files with 62 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pokedex.c
View File

@@ -3755,7 +3755,7 @@ static void Task_LoadSizeScreen(u8 taskId)
StringCopy(string, gText_SizeComparedTo);
StringAppend(string, gSaveBlock2Ptr->playerName);
PrintInfoScreenText(string, GetStringCenterAlignXOffset(FONT_NORMAL, string, 0xF0), 0x79);
PrintInfoScreenText(string, GetStringCenterAlignXOffset(FONT_NORMAL, string, DISPLAY_WIDTH), 121);
gMain.state++;
}
break;
@@ -4072,14 +4072,14 @@ static void Task_ExitCaughtMonPage(u8 taskId)
static void SpriteCB_SlideCaughtMonToCenter(struct Sprite *sprite)
{
if (sprite->x < 0x78)
if (sprite->x < DISPLAY_WIDTH / 2)
sprite->x += 2;
if (sprite->x > 0x78)
if (sprite->x > DISPLAY_WIDTH / 2)
sprite->x -= 2;
if (sprite->y < 0x50)
if (sprite->y < DISPLAY_HEIGHT / 2)
sprite->y += 1;
if (sprite->y > 0x50)
if (sprite->y > DISPLAY_HEIGHT / 2)
sprite->y -= 1;
}
@@ -4103,7 +4103,7 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry)
const u8 *description;
if (newEntry)
PrintInfoScreenText(gText_PokedexRegistration, GetStringCenterAlignXOffset(FONT_NORMAL, gText_PokedexRegistration, 0xF0), 0);
PrintInfoScreenText(gText_PokedexRegistration, GetStringCenterAlignXOffset(FONT_NORMAL, gText_PokedexRegistration, DISPLAY_WIDTH), 0);
if (value == 0)
value = NationalToHoennOrder(num);
else
@@ -4142,7 +4142,7 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry)
description = gPokedexEntries[num].description;
else
description = sExpandedPlaceholder_PokedexDescription;
PrintInfoScreenText(description, GetStringCenterAlignXOffset(FONT_NORMAL, description, 0xF0), 0x5F);
PrintInfoScreenText(description, GetStringCenterAlignXOffset(FONT_NORMAL, description, DISPLAY_WIDTH), 95);
}
static void PrintMonHeight(u16 height, u8 left, u8 top)