diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-08-16 05:59:10 -0400 |
commit | 65bd2faf9460d4e5986c30e54b283d7674d77c55 (patch) | |
tree | 250c345d17b8d8f910d327d98f577afddfb3a64a /src/main_menu.c | |
parent | 2749948eebe65aa8b55738d820e4a0252dd45c1a (diff) | |
parent | 25f45ffa8441b0f0a999355c9755782ccb4809dc (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
Diffstat (limited to 'src/main_menu.c')
-rw-r--r-- | src/main_menu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index 91931e581..a4de99207 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -1,7 +1,6 @@ #include "global.h" #include "trainer_pokemon_sprites.h" #include "bg.h" -#include "constants/flags.h" #include "constants/rgb.h" #include "constants/songs.h" #include "constants/species.h" @@ -1610,7 +1609,7 @@ static void Task_NewGameBirchSpeech_StartNamingScreen(u8 taskId) FreeAndDestroyMonPicSprite(gTasks[taskId].tLotadSpriteId); NewGameBirchSpeech_SetDefaultPlayerName(Random() % 20); DestroyTask(taskId); - DoNamingScreen(0, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_NewGameBirchSpeech_ReturnFromNamingScreen); + DoNamingScreen(NAMING_SCREEN_PLAYER, gSaveBlock2Ptr->playerName, gSaveBlock2Ptr->playerGender, 0, 0, CB2_NewGameBirchSpeech_ReturnFromNamingScreen); } } |