From 0348b58899397829df6dd2abe4902ec77ee730c3 Mon Sep 17 00:00:00 2001 From: SphericalIce Date: Sat, 31 Dec 2022 14:39:34 +0000 Subject: [PATCH] Rename gOakText_AskPlayerGender to fit naming convention --- data/text/new_game_intro.inc | 2 +- include/event_scripts.h | 2 +- src/oak_speech.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/text/new_game_intro.inc b/data/text/new_game_intro.inc index da895d316..103a41c39 100644 --- a/data/text/new_game_intro.inc +++ b/data/text/new_game_intro.inc @@ -154,7 +154,7 @@ gControlsGuide_Text_LRButtons:: .string "game, or on how to do things,\n" .string "press the L or R Button.$" -gOakText_AskPlayerGender:: +gOakSpeech_Text_AskPlayerGender:: .string "Now tell me. Are you a boy?\n" .string "Or are you a girl?$" diff --git a/include/event_scripts.h b/include/event_scripts.h index 388cc598a..a9603119c 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -755,7 +755,7 @@ extern const u8 gControlsGuide_Text_BButton[]; extern const u8 gControlsGuide_Text_StartButton[]; extern const u8 gControlsGuide_Text_SelectButton[]; extern const u8 gControlsGuide_Text_LRButtons[]; -extern const u8 gOakText_AskPlayerGender[]; +extern const u8 gOakSpeech_Text_AskPlayerGender[]; extern const u8 gPikachuIntro_Text_Page1[]; extern const u8 gPikachuIntro_Text_Page2[]; extern const u8 gPikachuIntro_Text_Page3[]; diff --git a/src/oak_speech.c b/src/oak_speech.c index 32a9a6a37..c576abdfb 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -1276,7 +1276,7 @@ static void Task_OakSpeech_AskPlayerGender(u8 taskId) { tTrainerPicPosX = -60; ClearTrainerPic(); - OakSpeechPrintMessage(gOakText_AskPlayerGender, sOakSpeechResources->textSpeed); + OakSpeechPrintMessage(gOakSpeech_Text_AskPlayerGender, sOakSpeechResources->textSpeed); gTasks[taskId].func = Task_OakSpeech_ShowGenderOptions; } } @@ -1374,6 +1374,7 @@ static void Task_OakSpeech_FadeOutForPlayerNamingScreen(u8 taskId) gTasks[taskId].func = Task_OakSpeech_DoNamingScreen; } } + static void Task_OakSpeech_MoveRivalDisplayNameOptions(u8 taskId) { s16 *data = gTasks[taskId].data;