Merge pull request #591 from sphericalice/doc-oak-speech

Document oak_speech.c
This commit is contained in:
GriffinR
2023-01-05 09:22:56 -05:00
committed by GitHub
25 changed files with 1211 additions and 934 deletions
+38 -29
View File
@@ -124,41 +124,41 @@ gNameChoice_Momo::
gNameChoice_Suzi::
.string "SUZI$"
gNewGame_HelpDocs1::
gControlsGuide_Text_Intro::
.string "The various buttons will be explained in\n"
.string "the order of their importance.$"
gNewGame_HelpDocs2::
gControlsGuide_Text_DPad::
.string "Moves the main character.\n"
.string "Also used to choose various data\n"
.string "headings.$"
gNewGame_HelpDocs3::
gControlsGuide_Text_AButton::
.string "Used to confirm a choice, check\n"
.string "things, chat, and scroll text.$"
gNewGame_HelpDocs4::
gControlsGuide_Text_BButton::
.string "Used to exit, cancel a choice,\n"
.string "and cancel a mode.$"
gNewGame_HelpDocs5::
gControlsGuide_Text_StartButton::
.string "Press this button to open the\n"
.string "MENU.$"
gNewGame_HelpDocs6::
gControlsGuide_Text_SelectButton::
.string "Used to shift items and to use\n"
.string "a registered item.$"
gNewGame_HelpDocs7::
gControlsGuide_Text_LRButtons::
.string "If you need help playing the\n"
.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?$"
gNewGameAdventureIntro1::
gPikachuIntro_Text_Page1::
.string "In the world which you are about to\n"
.string "enter, you will embark on a grand\n"
.string "adventure with you as the hero.\n"
@@ -168,7 +168,7 @@ gNewGameAdventureIntro1::
.string "or caves. Gather information and\n"
.string "hints from every source.$"
gNewGameAdventureIntro2::
gPikachuIntro_Text_Page2::
.string "New paths will open to you by helping\n"
.string "people in need, overcoming challenges,\n"
.string "and solving mysteries.\n"
@@ -177,7 +177,7 @@ gNewGameAdventureIntro2::
.string "others and attacked by wild creatures.\n"
.string "Be brave and keep pushing on.$"
gNewGameAdventureIntro3::
gPikachuIntro_Text_Page3::
.string "Through your adventure, we hope\n"
.string "that you will interact with all sorts\n"
.string "of people and achieve personal growth.\n"
@@ -186,49 +186,58 @@ gNewGameAdventureIntro3::
.string "Press the A Button, and let your\n"
.string "adventure begin!$"
gOakText_WelcomeToTheWorld::
gOakSpeech_Text_WelcomeToTheWorld::
.string "Hello, there!\n"
.string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n"
.string "Glad to meet you!\p"
.string "Welcome to the world of POKéMON!\p"
.string "My name is OAK.\p"
.string "People affectionately refer to me\n"
.string "as the POKéMON PROFESSOR.\p$"
gOakText_WorldInhabited1::
gOakSpeech_Text_ThisWorld::
.string "This world…$"
gOakText_WorldInhabited2::
gOakSpeech_Text_IsInhabitedFarAndWide::
.string "…is inhabited far and wide by\n"
.string "creatures called POKéMON.\p$"
gOakText_PetsBattlingStudy::
gOakSpeech_Text_IStudyPokemon::
.string "For some people, POKéMON are pets.\n"
.string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$"
.string "Others use them for battling.\p"
.string "As for myself…\p"
.string "I study POKéMON as a profession.\p$"
gOakText_TellMeALittleAboutYourself::
gOakSpeech_Text_TellMeALittleAboutYourself::
.string "But first, tell me a little about\n"
.string "yourself.\p$"
gOakText_AskPlayerName::
gOakSpeech_Text_YourNameWhatIsIt::
.string "Let's begin with your name.\n"
.string "What is it?\p$"
gOakText_FinalizePlayerName::
gOakSpeech_Text_SoYourNameIsPlayer::
.string "Right…\n"
.string "So your name is {PLAYER}.$"
gOakText_IntroduceRival::
.string "This is my grandson.\pHe's been your rival since you both\n"
.string "were babies.\p…Erm, what was his name now?$"
gOakSpeech_Text_WhatWasHisName::
.string "This is my grandson.\p"
.string "He's been your rival since you both\n"
.string "were babies.\p"
.string "…Erm, what was his name now?$"
gOakText_AskRivalName::
gOakSpeech_Text_YourRivalsNameWhatWasIt::
.string "Your rival's name, what was it now?$"
gOakText_ConfirmRivalName::
gOakSpeech_Text_ConfirmRivalName::
.string "…Er, was it {RIVAL}?$"
gOakText_RememberRivalName::
gOakSpeech_Text_RememberRivalsName::
.string "That's right! I remember now!\n"
.string "His name is {RIVAL}!\p$"
gOakText_LegendAboutToUnfold::
.string "{PLAYER}!\pYour very own POKéMON legend is\n"
.string "about to unfold!\pA world of dreams and adventures\n"
gOakSpeech_Text_LetsGo::
.string "{PLAYER}!\p"
.string "Your very own POKéMON legend is\n"
.string "about to unfold!\p"
.string "A world of dreams and adventures\n"
.string "with POKéMON awaits! Let's go!$"

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 110 B

After

Width:  |  Height:  |  Size: 110 B

Before

Width:  |  Height:  |  Size: 414 B

After

Width:  |  Height:  |  Size: 414 B

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 297 B

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 187 B

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 341 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 970 B

After

Width:  |  Height:  |  Size: 970 B

+23 -23
View File
@@ -748,29 +748,29 @@ extern const u8 gNameChoice_Norie[];
extern const u8 gNameChoice_Sai[];
extern const u8 gNameChoice_Momo[];
extern const u8 gNameChoice_Suzi[];
extern const u8 gNewGame_HelpDocs1[];
extern const u8 gNewGame_HelpDocs2[];
extern const u8 gNewGame_HelpDocs3[];
extern const u8 gNewGame_HelpDocs4[];
extern const u8 gNewGame_HelpDocs5[];
extern const u8 gNewGame_HelpDocs6[];
extern const u8 gNewGame_HelpDocs7[];
extern const u8 gOakText_AskPlayerGender[];
extern const u8 gNewGameAdventureIntro1[];
extern const u8 gNewGameAdventureIntro2[];
extern const u8 gNewGameAdventureIntro3[];
extern const u8 gOakText_WelcomeToTheWorld[];
extern const u8 gOakText_WorldInhabited1[];
extern const u8 gOakText_WorldInhabited2[];
extern const u8 gOakText_PetsBattlingStudy[];
extern const u8 gOakText_TellMeALittleAboutYourself[];
extern const u8 gOakText_AskPlayerName[];
extern const u8 gOakText_FinalizePlayerName[];
extern const u8 gOakText_IntroduceRival[];
extern const u8 gOakText_AskRivalName[];
extern const u8 gOakText_ConfirmRivalName[];
extern const u8 gOakText_RememberRivalName[];
extern const u8 gOakText_LegendAboutToUnfold[];
extern const u8 gControlsGuide_Text_Intro[];
extern const u8 gControlsGuide_Text_DPad[];
extern const u8 gControlsGuide_Text_AButton[];
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 gOakSpeech_Text_AskPlayerGender[];
extern const u8 gPikachuIntro_Text_Page1[];
extern const u8 gPikachuIntro_Text_Page2[];
extern const u8 gPikachuIntro_Text_Page3[];
extern const u8 gOakSpeech_Text_WelcomeToTheWorld[];
extern const u8 gOakSpeech_Text_ThisWorld[];
extern const u8 gOakSpeech_Text_IsInhabitedFarAndWide[];
extern const u8 gOakSpeech_Text_IStudyPokemon[];
extern const u8 gOakSpeech_Text_TellMeALittleAboutYourself[];
extern const u8 gOakSpeech_Text_YourNameWhatIsIt[];
extern const u8 gOakSpeech_Text_SoYourNameIsPlayer[];
extern const u8 gOakSpeech_Text_WhatWasHisName[];
extern const u8 gOakSpeech_Text_YourRivalsNameWhatWasIt[];
extern const u8 gOakSpeech_Text_ConfirmRivalName[];
extern const u8 gOakSpeech_Text_RememberRivalsName[];
extern const u8 gOakSpeech_Text_LetsGo[];
// Help System
extern const u8 Help_Text_WhatShouldIDo[];
+2 -2
View File
@@ -36,8 +36,8 @@ extern const struct SpriteTemplate gBallSpriteTemplates[];
#define POKEBALL_OPPONENT_SENDOUT 0xFE
u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow);
void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
u8 CreateTradePokeballSprite(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h);
void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 monPalNum, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 delay, u32 fadePalettes);
u8 CreateTradePokeballSprite(u8 monSpriteId, u8 monPalNum, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 delay, u32 fadePalettes);
void DoHitAnimHealthboxEffect(u8 bank);
void LoadBallGfx(u8 ballId);
void FreeBallGfx(u8 ballId);
+1148 -880
View File
File diff suppressed because it is too large Load Diff