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.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main_menu.c b/src/main_menu.c
index 33bffcb93..3237663a5 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -766,7 +766,7 @@ static void Task_NewGameSpeech1(u8 taskId)
gTasks[taskId].data[3] = 0xFF;
gTasks[taskId].tFrameCounter = 216; //Wait 3.6 seconds (216 frames) before starting speech
- PlayBGM(MUS_DOORO_X4);
+ PlayBGM(MUS_ROUTE122);
}
static void Task_NewGameSpeech2(u8 taskId)
@@ -782,7 +782,7 @@ static void Task_NewGameSpeech2(u8 taskId)
gSprites[spriteId].pos1.x = 136;
gSprites[spriteId].pos1.y = 60;
- gSprites[spriteId].invisible = 0;
+ gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
StartSpriteFadeIn(taskId, 10);
StartBackgroundFadeIn(taskId, 20);
@@ -833,7 +833,7 @@ static void Task_NewGameSpeech6(u8 taskId)
gSprites[spriteId].pos1.x = 104;
gSprites[spriteId].pos1.y = 72;
- gSprites[spriteId].invisible = 0;
+ gSprites[spriteId].invisible = FALSE;
gSprites[spriteId].data[0] = 0;
CreatePokeballSprite(spriteId, gSprites[spriteId].oam.paletteNum, 0x70, 0x3A, 0, 0, 0x20, 0x0000FFFF);
gTasks[taskId].func = Task_NewGameSpeech7;
@@ -1439,26 +1439,26 @@ void AddBirchSpeechObjects(u8 taskId)
spriteId = CreateBirchSprite(136, 60, 1);
gSprites[spriteId].callback = nullsub_34;
gSprites[spriteId].oam.priority = 0;
- gSprites[spriteId].invisible = 1;
+ gSprites[spriteId].invisible = TRUE;
gTasks[taskId].tBirchSpriteId = spriteId;
spriteId = CreateAzurillSprite(0x68, 0x48);
gSprites[spriteId].callback = nullsub_34;
gSprites[spriteId].oam.priority = 0;
- gSprites[spriteId].invisible = 1;
+ gSprites[spriteId].invisible = TRUE;
gTasks[taskId].tAzurillSpriteId = spriteId;
//Create Brendan sprite
spriteId = CreateTrainerSprite(0, 120, 60, 0, eBrendanSprite);
gSprites[spriteId].callback = nullsub_34;
- gSprites[spriteId].invisible = 1;
+ gSprites[spriteId].invisible = TRUE;
gSprites[spriteId].oam.priority = 0;
gTasks[taskId].tBrendanSpriteId = spriteId;
//Create May sprite
spriteId = CreateTrainerSprite(1, 120, 60, 0, eMaySprite);
gSprites[spriteId].callback = nullsub_34;
- gSprites[spriteId].invisible = 1;
+ gSprites[spriteId].invisible = TRUE;
gSprites[spriteId].oam.priority = 0;
gTasks[taskId].tMaySpriteId = spriteId;
}