summaryrefslogtreecommitdiff
path: root/src/main_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/main_menu.c')
-rw-r--r--src/main_menu.c71
1 files changed, 33 insertions, 38 deletions
diff --git a/src/main_menu.c b/src/main_menu.c
index d2ec55d3e..ec5a3785f 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -896,8 +896,8 @@ static bool8 HandleMainMenuInput(u8 taskId)
{
PlaySE(SE_SELECT);
BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_WHITEALPHA);
- SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240));
- SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, 160));
+ SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, DISPLAY_WIDTH));
+ SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, DISPLAY_HEIGHT));
gTasks[taskId].func = Task_HandleMainMenuBPressed;
}
else if ((JOY_NEW(DPAD_UP)) && tCurrItem > 0)
@@ -1306,8 +1306,8 @@ static void Task_NewGameBirchSpeech_WaitToShowBirch(u8 taskId)
else
{
spriteId = gTasks[taskId].tBirchSpriteId;
- gSprites[spriteId].pos1.x = 136;
- gSprites[spriteId].pos1.y = 60;
+ gSprites[spriteId].x = 136;
+ gSprites[spriteId].y = 60;
gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 10);
@@ -1369,8 +1369,8 @@ static void Task_NewGameBirchSpeechSub_InitPokeBall(u8 taskId)
{
u8 spriteId = gTasks[sBirchSpeechMainTaskId].tLotadSpriteId;
- gSprites[spriteId].pos1.x = 100;
- gSprites[spriteId].pos1.y = 75;
+ gSprites[spriteId].x = 100;
+ gSprites[spriteId].y = 75;
gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].data[0] = 0;
@@ -1387,11 +1387,9 @@ static void Task_NewGameBirchSpeechSub_WaitForLotad(u8 taskId)
switch (tState)
{
case 0:
- if (sprite->callback == SpriteCallbackDummy)
- {
- sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
- goto incrementStateAndTimer;
- }
+ if (sprite->callback != SpriteCallbackDummy)
+ return;
+ sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
break;
case 1:
if (gTasks[sBirchSpeechMainTaskId].tTimer >= 96)
@@ -1400,14 +1398,11 @@ static void Task_NewGameBirchSpeechSub_WaitForLotad(u8 taskId)
if (gTasks[sBirchSpeechMainTaskId].tTimer < 0x4000)
gTasks[sBirchSpeechMainTaskId].tTimer++;
}
- break;
- incrementStateAndTimer:
- default:
- tState++;
- if (gTasks[sBirchSpeechMainTaskId].tTimer < 0x4000)
- gTasks[sBirchSpeechMainTaskId].tTimer++;
- break;
+ return;
}
+ tState++;
+ if (gTasks[sBirchSpeechMainTaskId].tTimer < 0x4000)
+ gTasks[sBirchSpeechMainTaskId].tTimer++;
}
#undef tState
@@ -1464,8 +1459,8 @@ static void Task_NewGameBirchSpeech_StartPlayerFadeIn(u8 taskId)
{
u8 spriteId = gTasks[taskId].tBrendanSpriteId;
- gSprites[spriteId].pos1.x = 180;
- gSprites[spriteId].pos1.y = 60;
+ gSprites[spriteId].x = 180;
+ gSprites[spriteId].y = 60;
gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
gTasks[taskId].tPlayerSpriteId = spriteId;
@@ -1538,7 +1533,7 @@ static void Task_NewGameBirchSpeech_SlideOutOldGenderSprite(u8 taskId)
u8 spriteId = gTasks[taskId].tPlayerSpriteId;
if (gTasks[taskId].tIsDoneFadingSprites == 0)
{
- gSprites[spriteId].pos1.x += 4;
+ gSprites[spriteId].x += 4;
}
else
{
@@ -1547,8 +1542,8 @@ static void Task_NewGameBirchSpeech_SlideOutOldGenderSprite(u8 taskId)
spriteId = gTasks[taskId].tMaySpriteId;
else
spriteId = gTasks[taskId].tBrendanSpriteId;
- gSprites[spriteId].pos1.x = 240;
- gSprites[spriteId].pos1.y = 60;
+ gSprites[spriteId].x = DISPLAY_WIDTH;
+ gSprites[spriteId].y = 60;
gSprites[spriteId].invisible = FALSE;
gTasks[taskId].tPlayerSpriteId = spriteId;
gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
@@ -1561,13 +1556,13 @@ static void Task_NewGameBirchSpeech_SlideInNewGenderSprite(u8 taskId)
{
u8 spriteId = gTasks[taskId].tPlayerSpriteId;
- if (gSprites[spriteId].pos1.x > 180)
+ if (gSprites[spriteId].x > 180)
{
- gSprites[spriteId].pos1.x -= 4;
+ gSprites[spriteId].x -= 4;
}
else
{
- gSprites[spriteId].pos1.x = 180;
+ gSprites[spriteId].x = 180;
if (gTasks[taskId].tIsDoneFadingSprites)
{
gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
@@ -1668,13 +1663,13 @@ static void Task_NewGameBirchSpeech_ReshowBirchLotad(u8 taskId)
gSprites[gTasks[taskId].tBrendanSpriteId].invisible = TRUE;
gSprites[gTasks[taskId].tMaySpriteId].invisible = TRUE;
spriteId = gTasks[taskId].tBirchSpriteId;
- gSprites[spriteId].pos1.x = 136;
- gSprites[spriteId].pos1.y = 60;
+ gSprites[spriteId].x = 136;
+ gSprites[spriteId].y = 60;
gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
spriteId = gTasks[taskId].tLotadSpriteId;
- gSprites[spriteId].pos1.x = 100;
- gSprites[spriteId].pos1.y = 75;
+ gSprites[spriteId].x = 100;
+ gSprites[spriteId].y = 75;
gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 2);
@@ -1721,8 +1716,8 @@ static void Task_NewGameBirchSpeech_AreYouReady(u8 taskId)
spriteId = gTasks[taskId].tMaySpriteId;
else
spriteId = gTasks[taskId].tBrendanSpriteId;
- gSprites[spriteId].pos1.x = 120;
- gSprites[spriteId].pos1.y = 60;
+ gSprites[spriteId].x = 120;
+ gSprites[spriteId].y = 60;
gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
gTasks[taskId].tPlayerSpriteId = spriteId;
@@ -1838,8 +1833,8 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void)
gTasks[taskId].tPlayerGender = MALE;
spriteId = gTasks[taskId].tBrendanSpriteId;
}
- gSprites[spriteId].pos1.x = 180;
- gSprites[spriteId].pos1.y = 60;
+ gSprites[spriteId].x = 180;
+ gSprites[spriteId].y = 60;
gSprites[spriteId].invisible = FALSE;
gTasks[taskId].tPlayerSpriteId = spriteId;
SetGpuReg(REG_OFFSET_BG1HOFS, -60);
@@ -1874,8 +1869,8 @@ static void SpriteCB_MovePlayerDownWhileShrinking(struct Sprite *sprite)
{
u32 y;
- y = (sprite->pos1.y << 16) + sprite->data[0] + 0xC000;
- sprite->pos1.y = y >> 16;
+ y = (sprite->y << 16) + sprite->data[0] + 0xC000;
+ sprite->y = y >> 16;
sprite->data[0] = y;
}
@@ -2129,8 +2124,8 @@ static void CreateMainMenuErrorWindow(const u8* str)
PutWindowTilemap(7);
CopyWindowToVram(7, 2);
DrawMainMenuWindowBorder(&sWindowTemplates_MainMenu[7], MAIN_MENU_BORDER_TILE);
- SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(9, 231));
- SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(113, 159));
+ SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(9, DISPLAY_WIDTH - 9));
+ SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(113, DISPLAY_HEIGHT - 1));
}
static void MainMenu_FormatSavegameText(void)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 11:04:25 +0000