dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename gOakText_AskPlayerGender to fit naming convention

Browse Source
This commit is contained in:
SphericalIce
2022-12-31 14:39:34 +00:00
parent d080ebd0f0
commit 0348b58899
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/text/new_game_intro.inc
+1 -1
View File
@@ -154,7 +154,7 @@ gControlsGuide_Text_LRButtons::
.string "game, or on how to do things,\n" .string "game, or on how to do things,\n"
.string "press the L or R Button.$" .string "press the L or R Button.$"
gOakText_AskPlayerGender:: gOakSpeech_Text_AskPlayerGender::
.string "Now tell me. Are you a boy?\n" .string "Now tell me. Are you a boy?\n"
.string "Or are you a girl?$" .string "Or are you a girl?$"
include/event_scripts.h
+1 -1
View File
@@ -755,7 +755,7 @@ extern const u8 gControlsGuide_Text_BButton[];
extern const u8 gControlsGuide_Text_StartButton[]; extern const u8 gControlsGuide_Text_StartButton[];
extern const u8 gControlsGuide_Text_SelectButton[]; extern const u8 gControlsGuide_Text_SelectButton[];
extern const u8 gControlsGuide_Text_LRButtons[]; 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_Page1[];
extern const u8 gPikachuIntro_Text_Page2[]; extern const u8 gPikachuIntro_Text_Page2[];
extern const u8 gPikachuIntro_Text_Page3[]; extern const u8 gPikachuIntro_Text_Page3[];
src/oak_speech.c
+2 -1
View File
@@ -1276,7 +1276,7 @@ static void Task_OakSpeech_AskPlayerGender(u8 taskId)
{ {
tTrainerPicPosX = -60; tTrainerPicPosX = -60;
ClearTrainerPic(); ClearTrainerPic();
OakSpeechPrintMessage(gOakText_AskPlayerGender, sOakSpeechResources->textSpeed); OakSpeechPrintMessage(gOakSpeech_Text_AskPlayerGender, sOakSpeechResources->textSpeed);
gTasks[taskId].func = Task_OakSpeech_ShowGenderOptions; gTasks[taskId].func = Task_OakSpeech_ShowGenderOptions;
} }
} }
@@ -1374,6 +1374,7 @@ static void Task_OakSpeech_FadeOutForPlayerNamingScreen(u8 taskId)
gTasks[taskId].func = Task_OakSpeech_DoNamingScreen; gTasks[taskId].func = Task_OakSpeech_DoNamingScreen;
} }
} }
static void Task_OakSpeech_MoveRivalDisplayNameOptions(u8 taskId) static void Task_OakSpeech_MoveRivalDisplayNameOptions(u8 taskId)
{ {
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;