diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/vars.h | 2 | ||||
| -rw-r--r-- | include/event_scripts.h | 132 | ||||
| -rw-r--r-- | include/field_specials.h | 1 | ||||
| -rw-r--r-- | include/help_system.h | 2 | ||||
| -rw-r--r-- | include/menu.h | 11 | ||||
| -rw-r--r-- | include/new_menu_helpers.h | 14 | ||||
| -rw-r--r-- | include/oak_speech.h | 3 | ||||
| -rw-r--r-- | include/pokemon_3.h | 2 | ||||
| -rw-r--r-- | include/text.h | 2 |
9 files changed, 86 insertions, 83 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 886bae93c..2f817fb02 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -54,7 +54,7 @@ #define VAR_0x402F 0x402F #define VAR_0x4030 0x4030 -#define VAR_0x4031 0x4031 +#define VAR_STARTER_MON 0x4031 #define VAR_0x4032 0x4032 #define VAR_ENIGMA_BERRY_AVAILABLE 0x4033 diff --git a/include/event_scripts.h b/include/event_scripts.h index d925f4b52..1762faf8e 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -705,71 +705,71 @@ extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni3[]; extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni4[]; extern const u8 gFameCheckerFlavorTextOriginObjectName_Giovanni5[]; -extern const u8 gUnknown_81C574F[]; -extern const u8 gUnknown_81C5758[]; -extern const u8 gUnknown_81C575E[]; -extern const u8 gUnknown_81C575E[]; -extern const u8 gUnknown_81C5767[]; -extern const u8 gUnknown_81C5767[]; -extern const u8 gUnknown_81C576C[]; -extern const u8 gUnknown_81C5771[]; -extern const u8 gUnknown_81C5775[]; -extern const u8 gUnknown_81C577A[]; -extern const u8 gUnknown_81C577E[]; -extern const u8 gUnknown_81C5783[]; -extern const u8 gUnknown_81C5788[]; -extern const u8 gUnknown_81C578C[]; -extern const u8 gUnknown_81C5792[]; -extern const u8 gUnknown_81C5797[]; -extern const u8 gUnknown_81C579D[]; -extern const u8 gUnknown_81C57A2[]; -extern const u8 gUnknown_81C57A9[]; -extern const u8 gUnknown_81C57AF[]; -extern const u8 gUnknown_81C57B4[]; -extern const u8 gUnknown_81C57B8[]; -extern const u8 gUnknown_81C57BC[]; -extern const u8 gUnknown_81C57C2[]; -extern const u8 gUnknown_81C57C6[]; -extern const u8 gUnknown_81C57CB[]; -extern const u8 gUnknown_81C57D0[]; -extern const u8 gUnknown_81C57D4[]; -extern const u8 gUnknown_81C57D9[]; -extern const u8 gUnknown_81C57E0[]; -extern const u8 gUnknown_81C57E8[]; -extern const u8 gUnknown_81C57EE[]; -extern const u8 gUnknown_81C57F4[]; -extern const u8 gUnknown_81C57FA[]; -extern const u8 gUnknown_81C57FF[]; -extern const u8 gUnknown_81C5806[]; -extern const u8 gUnknown_81C580A[]; -extern const u8 gUnknown_81C580F[]; -extern const u8 gUnknown_81C5814[]; -extern const u8 gUnknown_81C5819[]; -extern const u8 gUnknown_81C581F[]; -extern const u8 gUnknown_81C5823[]; -extern const u8 gUnknown_81C5828[]; -extern const u8 gUnknown_81C582D[]; -extern const u8 gUnknown_81C5875[]; -extern const u8 gUnknown_81C58BA[]; -extern const u8 gUnknown_81C58F9[]; -extern const u8 gUnknown_81C592B[]; -extern const u8 gUnknown_81C594F[]; -extern const u8 gUnknown_81C5981[]; -extern const u8 gUnknown_81C59D5[]; -extern const u8 gUnknown_81C5A04[]; -extern const u8 gUnknown_81C5AEB[]; -extern const u8 gUnknown_81C5BB9[]; -extern const u8 gUnknown_81C5C78[]; -extern const u8 gUnknown_81C5D06[]; -extern const u8 gUnknown_81C5D12[]; -extern const u8 gUnknown_81C5D4B[]; -extern const u8 gUnknown_81C5DBD[]; -extern const u8 gUnknown_81C5DEA[]; -extern const u8 gUnknown_81C5E13[]; -extern const u8 gUnknown_81C5E2E[]; -extern const u8 gUnknown_81C5E91[]; -extern const u8 gUnknown_81C5EB5[]; -extern const u8 gUnknown_81C5EC5[]; -extern const u8 gUnknown_81C5EF4[]; +extern const u8 gOtherText_NewName[]; +extern const u8 gNameChoice_Green[]; +extern const u8 gNameChoice_Red[]; +extern const u8 gNameChoice_Red[]; +extern const u8 gNameChoice_Fire[]; +extern const u8 gNameChoice_Fire[]; +extern const u8 gNameChoice_Gary[]; +extern const u8 gNameChoice_Kaz[]; +extern const u8 gNameChoice_Toru[]; +extern const u8 gNameChoice_Ash[]; +extern const u8 gNameChoice_Kene[]; +extern const u8 gNameChoice_Geki[]; +extern const u8 gNameChoice_Jak[]; +extern const u8 gNameChoice_Janne[]; +extern const u8 gNameChoice_Jonn[]; +extern const u8 gNameChoice_Kamon[]; +extern const u8 gNameChoice_Karl[]; +extern const u8 gNameChoice_Taylor[]; +extern const u8 gNameChoice_Oscar[]; +extern const u8 gNameChoice_Hiro[]; +extern const u8 gNameChoice_Max[]; +extern const u8 gNameChoice_Jon[]; +extern const u8 gNameChoice_Ralph[]; +extern const u8 gNameChoice_Kay[]; +extern const u8 gNameChoice_Tosh[]; +extern const u8 gNameChoice_Roak[]; +extern const u8 gNameChoice_Omi[]; +extern const u8 gNameChoice_Jodi[]; +extern const u8 gNameChoice_Amanda[]; +extern const u8 gNameChoice_Hillary[]; +extern const u8 gNameChoice_Makey[]; +extern const u8 gNameChoice_Michi[]; +extern const u8 gNameChoice_Paula[]; +extern const u8 gNameChoice_June[]; +extern const u8 gNameChoice_Cassie[]; +extern const u8 gNameChoice_Rey[]; +extern const u8 gNameChoice_Seda[]; +extern const u8 gNameChoice_Kiko[]; +extern const u8 gNameChoice_Mina[]; +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[]; #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/field_specials.h b/include/field_specials.h index 2d495fdd5..c1bc8e8c9 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -6,5 +6,6 @@ u8 GetLeadMonIndex(void); u8 CountDigits(u16 number); void TV_PrintIntToStringVar(u8, int); +u16 ScrSpecial_GetStarter(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/help_system.h b/include/help_system.h index 0192809fc..3ef5f53e4 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -6,6 +6,6 @@ extern bool8 gUnknown_3005ECC; void sub_812B484(void); -void sub_812B1F0(u8); +void HelpSystem_SetSomeVariable2(u8); #endif //GUARD_HELP_SYSTEM_H diff --git a/include/menu.h b/include/menu.h index 3394603c8..f26c7efde 100644 --- a/include/menu.h +++ b/include/menu.h @@ -38,12 +38,15 @@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSp void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); void sub_810F4D8(u8 windowId, bool32 someBool); void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); -void sub_810F558(u8, u8, u8, u8, u16); -void sub_810F650(const u8 *, const u8 *, u8, u32, u8); -void sub_810F5E8(const u8 *, u32, u8); +void CreateWindow_SnapRight_StdPal(u8, u8, u8, u8, u16); +void Menu_PrintHelpSystemUIHeader(const u8 *, const u8 *, u8, u32, u8); +void PrintTextOnRightSnappedWindow(const u8 *, u32, u8); void sub_810F71C(void); void sub_810F740(void); -void sub_810F7D8(u8, u8, u8, u8, u8, u8, u8); +u8 ProgramAndPlaceMenuCursorOnWindow(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPosition); void sub_810FF60(const struct WindowTemplate *, u8, u8, u8, u16, u8, u8); +void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority); +bool8 IsBlendTaskActive(void); + #endif // GUARD_MENU_H diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 0157896cb..fe8b5b754 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -15,18 +15,18 @@ void sub_8197434(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); u8 GetPlayerTextSpeed(void); -void sub_80F6F54(u8, u8); -u8 sub_80F78A8(void); +void ClearDialogWindowAndFrame(u8, u8); +u8 GetTextSpeedSetting(void); void sub_80F6E9C(void); -void sub_80F6EE4(u8 windowId, bool8 transfer); +void DrawDialogueFrame(u8 windowId, bool8 transfer); void sub_80F7974(const u8 *); u8 GetStartMenuWindowId(void); void sub_80F7998(void); void sub_80F69E8(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); -void sub_80F6F1C(u8 windowId, bool8 copyNow); -void sub_80F6C6C(void); -void sub_80F6C98(void); -void sub_80F77CC(u16); +void DrawStdWindowFrame(u8 windowId, bool8 copyNow); +void InitStandardTextBoxWindows(void); +void ResetBg0(void); +void Menu_LoadStdPalAt(u16); void * malloc_and_decompress(const void * src, u32 * size); u16 sub_80F796C(void); diff --git a/include/oak_speech.h b/include/oak_speech.h index 5ee916b86..d5d94bc83 100644 --- a/include/oak_speech.h +++ b/include/oak_speech.h @@ -1,7 +1,6 @@ #ifndef GUARD_OAK_SPEECH_H #define GUARD_OAK_SPEECH_H -void OakSpeech_StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority); -bool8 OakSpeech_IsBlendTaskActive(void); +void StartNewGameScene(void); #endif //GUARD_OAK_SPEECH_H diff --git a/include/pokemon_3.h b/include/pokemon_3.h index f6226f40d..e65bc85fc 100644 --- a/include/pokemon_3.h +++ b/include/pokemon_3.h @@ -5,7 +5,7 @@ const u8* GetTrainerClassNameFromId(u16 trainerId); const u8* GetTrainerNameFromId(u16 trainerId); -void sub_8044AF0(u8, u8); +void * SetUpMonSpriteManagerMaybe(u8, u8); void sub_8044D80(void); void * sub_8044E00(u8 buffId); diff --git a/include/text.h b/include/text.h index c8835fbde..d2c2ecf42 100644 --- a/include/text.h +++ b/include/text.h @@ -250,7 +250,7 @@ s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese); s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese); s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese); void sub_80062B0(struct Sprite *sprite); -u8 sub_8006300(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority); +u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority); void sub_8006398(u8 spriteId); #endif // GUARD_TEXT_H |