diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_effect.h | 2 | ||||
| -rw-r--r-- | include/field_specials.h | 1 | ||||
| -rw-r--r-- | include/menu.h | 11 | ||||
| -rw-r--r-- | include/script_menu.h | 8 | ||||
| -rw-r--r-- | include/strings.h | 261 |
5 files changed, 275 insertions, 8 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index e05ded621..3fa39aae0 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -237,5 +237,7 @@ void sub_80B7CAC(struct Sprite*); void sub_80B7A58(struct Sprite*); void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); +void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId); +u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_specials.h b/include/field_specials.h index 50823ba7d..5adc7f3cb 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -15,6 +15,7 @@ bool32 sub_8138168(void); bool32 sub_81381B0(void); bool32 sub_81381F8(void); bool32 CountSSTidalStep(u16 delta); +void sub_813A128(void); void sub_813A878(u8 a0); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/menu.h b/include/menu.h index 842f33c0b..eb525efe9 100644 --- a/include/menu.h +++ b/include/menu.h @@ -31,7 +31,8 @@ void PrintPlayerNameOnWindow(u8, const u8*, u16, u16); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void sub_8197434(u8 windowId, bool8 copyToVram); void SetStandardWindowBorderStyle(u8 a0, u8 a1); -void sub_8197930(void); +void DisplayYesNoMenu(void); +u32 GetPlayerTextSpeed(void); u8 GetPlayerTextSpeedDelay(void); void sub_81978B0(u16 arg0); void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16)); @@ -43,8 +44,8 @@ void schedule_bg_copy_tilemap_to_vram(u8 bgNum); void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs); u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 numItems, u8 initialCursorPos); u8 GetMenuCursorPos(void); -s8 ProcessMenuInput(void); -s8 Menu_ProcessInputNoWrapAround(void); +s8 Menu_ProcessInput(void); +s8 Menu_ProcessInputNoWrap(void); void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y); void reset_temp_tile_data_buffers(void); void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode); @@ -52,7 +53,7 @@ bool8 free_temp_tile_data_buffers_if_possible(void); struct WindowTemplate CreateWindowTemplate(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock); void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos); void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, int size, u16 offset, u8 mode); -s8 Menu_ProcessInputNoWrap_(void); +s8 Menu_ProcessInputNoWrapClearOnChoose(void); s8 ProcessMenuInput_other(void); void do_scheduled_bg_tilemap_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void); @@ -87,5 +88,7 @@ void sub_8199C30(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void sub_8199D3C(void *ptr, int delta, int width, int height, bool32 is8BPP); void sub_8198204(const u8 *string, const u8 *string2, u8 a3, u8 a4, bool8 copyToVram); void sub_8197AE8(bool8 copyToVram); +void sub_81997AC(u8 windowId, u8 a4, u8 a6, u8 a7, const struct MenuAction *strs); +s8 Menu_ProcessInputGridLayout(void); #endif // GUARD_MENU_H diff --git a/include/script_menu.h b/include/script_menu.h index 8870e80b9..a6d52c31e 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -1,7 +1,7 @@ #ifndef GUARD_SCRIPT_MENU_H #define GUARD_SCRIPT_MENU_H -extern const u8 *const gUnknown_0858BAF0[9]; +extern const u8 *const gUnknown_0858BAF0[]; bool8 ScriptMenu_Multichoice(u8 left, u8 top, u8 var3, u8 var4); bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 var3, u8 var4, u8 var5); @@ -9,10 +9,10 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2); bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount); bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3); bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void); -s32 convert_pixel_width_to_tile_width(s32); +int convert_pixel_width_to_tile_width(int); u8 CreateWindowFromRect(u8, u8, u8, u8); void sub_80E2A78(u8); -u32 display_text_and_get_width(const u8*, u32); -u8 sub_80E2D5C(u8 arg0, u8 tileWidth); +int display_text_and_get_width(const u8*, int); +int sub_80E2D5C(int arg0, int tileWidth); #endif //GUARD_SCRIPT_MENU_H diff --git a/include/strings.h b/include/strings.h index 9338ae624..3746e459a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -15,6 +15,28 @@ extern const u8 gText_Cute[]; extern const u8 gText_Smart[]; extern const u8 gText_Tough[]; +extern const u8 gText_Normal[]; +extern const u8 gText_Super[]; +extern const u8 gText_Hyper[]; +extern const u8 gText_Master[]; + +extern const u8 gText_Cool2[]; +extern const u8 gText_Beauty2[]; +extern const u8 gText_Cute2[]; +extern const u8 gText_Smart2[]; +extern const u8 gText_Tough2[]; + +extern const u8 gText_Items[]; +extern const u8 gText_Key_Items[]; +extern const u8 gText_Poke_Balls[]; +extern const u8 gText_TMs_Hms[]; +extern const u8 gText_Berries2[]; + +extern const u8 gText_Single2[]; +extern const u8 gText_Double2[]; +extern const u8 gText_Multi[]; +extern const u8 gText_MultiLink[]; + extern const u8 gText_Single[]; extern const u8 gText_Double[]; @@ -201,6 +223,14 @@ extern const u8 gText_Peak[]; extern const u8 gText_SafariBallStock[]; extern const u8 gText_BattlePyramidFloor[]; +extern const u8 gText_MenuOptionPokedex[]; +extern const u8 gText_MenuOptionPokemon[]; +extern const u8 gText_MenuOptionBag[]; +extern const u8 gText_MenuOptionPokenav[]; +extern const u8 gText_MenuOptionSave[]; +extern const u8 gText_MenuOptionOption[]; +extern const u8 gText_MenuOptionExit[]; + // save menu texts extern const u8 gText_ConfirmSave[]; extern const u8 gText_DifferentSaveFile[]; @@ -877,6 +907,237 @@ extern const u8 gText_PokemonOnHook[]; extern const u8 gText_NotEvenANibble[]; extern const u8 gText_ItGotAway[]; +extern const u8 gText_HallOfFame[]; +extern const u8 gText_LogOff[]; +extern const u8 gText_LanettesPC[]; +extern const u8 gText_SomeonesPC[]; +extern const u8 gText_PlayersPC[]; +extern const u8 gText_WhichPCShouldBeAccessed[]; + +extern const u8 gUnknown_085EAD37[]; +extern const u8 gUnknown_085EAD41[]; +extern const u8 gUnknown_085EAD67[]; +extern const u8 gUnknown_085EAD6D[]; +extern const u8 gUnknown_085EAD72[]; +extern const u8 gUnknown_085EAD84[]; +extern const u8 gUnknown_085EAD96[]; +extern const u8 gUnknown_085EADA4[]; +extern const u8 gUnknown_085EADB5[]; +extern const u8 gUnknown_085EADC4[]; +extern const u8 gUnknown_085EADD5[]; +extern const u8 gUnknown_085EADE7[]; +extern const u8 gUnknown_085EADF9[]; +extern const u8 gUnknown_085EAE04[]; +extern const u8 gUnknown_085EAE12[]; +extern const u8 gUnknown_085EAE1B[]; +extern const u8 gUnknown_085EAE27[]; +extern const u8 gUnknown_085EAE2C[]; +extern const u8 gUnknown_085EAE31[]; +extern const u8 gUnknown_085EAE35[]; +extern const u8 gUnknown_085EAE39[]; +extern const u8 gUnknown_085EAE3D[]; +extern const u8 gUnknown_085EAE41[]; +extern const u8 gUnknown_085EAD5F[]; +extern const u8 gUnknown_085EAE53[]; +extern const u8 gUnknown_085EAE5A[]; +extern const u8 gText_Yes[]; +extern const u8 gText_No[]; +extern const u8 gUnknown_085EAEA2[]; +extern const u8 gUnknown_085EAEAC[]; +extern const u8 gUnknown_0827ECBC[]; +extern const u8 gUnknown_0827ECC3[]; +extern const u8 gUnknown_0827ECCD[]; +extern const u8 gUnknown_0827ECD5[]; +extern const u8 gUnknown_0827ECDD[]; +extern const u8 gUnknown_0827ECE3[]; +extern const u8 gUnknown_0827ECEB[]; +extern const u8 gUnknown_0827ECF2[]; +extern const u8 gUnknown_0827ECF8[]; +extern const u8 gUnknown_0827ED00[]; +extern const u8 gUnknown_0827ED06[]; +extern const u8 gUnknown_0827ED10[]; +extern const u8 gUnknown_0827ED18[]; +extern const u8 gUnknown_0827ED22[]; +extern const u8 gUnknown_0827ED2C[]; +extern const u8 gUnknown_0827ED36[]; +extern const u8 gUnknown_0827ED40[]; +extern const u8 gUnknown_0827ED46[]; +extern const u8 gUnknown_0827ED4F[]; +extern const u8 gUnknown_0827ED59[]; +extern const u8 gUnknown_0827ED65[]; +extern const u8 gUnknown_0827ED70[]; +extern const u8 gUnknown_0827ED74[]; +extern const u8 gUnknown_0827ED78[]; +extern const u8 gUnknown_0827ED80[]; +extern const u8 gUnknown_0827ED95[]; +extern const u8 gUnknown_0827EDAA[]; +extern const u8 gUnknown_0827EDB5[]; +extern const u8 gUnknown_0827EDBA[]; +extern const u8 gUnknown_0827EDC1[]; +extern const u8 gUnknown_0827EDC9[]; +extern const u8 gUnknown_0827EDD5[]; +extern const u8 gUnknown_0827EDE4[]; +extern const u8 gUnknown_0827EDF0[]; +extern const u8 gUnknown_0827EDF5[]; +extern const u8 gUnknown_0827EDF7[]; +extern const u8 gUnknown_0827EDF9[]; +extern const u8 gUnknown_0827EDFB[]; +extern const u8 gUnknown_0827EDFD[]; +extern const u8 gUnknown_0827EDFF[]; +extern const u8 gUnknown_0827EE01[]; +extern const u8 gUnknown_0827EE03[]; +extern const u8 gUnknown_0827EE05[]; +extern const u8 gUnknown_0827EE07[]; +extern const u8 gUnknown_0827EE09[]; +extern const u8 gUnknown_085EAEC3[]; +extern const u8 gUnknown_085EAED6[]; +extern const u8 gUnknown_085EAEE6[]; +extern const u8 gUnknown_085EAEF6[]; +extern const u8 gUnknown_085EAF02[]; +extern const u8 gUnknown_085EAF0E[]; +extern const u8 gUnknown_085EAF1B[]; +extern const u8 gUnknown_085EAF24[]; +extern const u8 gUnknown_085EAF2F[]; +extern const u8 gUnknown_085EAF34[]; +extern const u8 gUnknown_085EAF3E[]; +extern const u8 gUnknown_085EAF4B[]; +extern const u8 gUnknown_085EAF58[]; +extern const u8 gUnknown_085EAF65[]; +extern const u8 gUnknown_085EAF70[]; +extern const u8 gUnknown_085EAF7D[]; +extern const u8 gUnknown_085EAF87[]; +extern const u8 gUnknown_085EAF93[]; +extern const u8 gUnknown_085EAF9F[]; +extern const u8 gUnknown_085EAFAB[]; +extern const u8 gUnknown_085EAFB6[]; +extern const u8 gUnknown_085EAFCF[]; +extern const u8 gUnknown_085EAFE8[]; +extern const u8 gUnknown_085EB089[]; +extern const u8 gUnknown_085EB09C[]; +extern const u8 gUnknown_085EB0AF[]; +extern const u8 gUnknown_085EB0C2[]; +extern const u8 gUnknown_085EB0D5[]; +extern const u8 gUnknown_085EB002[]; +extern const u8 gUnknown_085EB017[]; +extern const u8 gUnknown_085EB02A[]; +extern const u8 gUnknown_085EB034[]; +extern const u8 gText_LilycoveCity[]; +extern const u8 gUnknown_085EB07E[]; +extern const u8 gUnknown_085EB084[]; +extern const u8 gUnknown_085EB040[]; +extern const u8 gUnknown_085EB04A[]; +extern const u8 gUnknown_085EB057[]; +extern const u8 gUnknown_085EB062[]; +extern const u8 gText_Opponent[]; +extern const u8 gText_Tourney_Tree[]; +extern const u8 gText_ReadyToStart[]; +extern const u8 gUnknown_085EB5BC[]; +extern const u8 gUnknown_085EB5C3[]; +extern const u8 gUnknown_085EB5C8[]; +extern const u8 gUnknown_085EB29A[]; +extern const u8 gUnknown_085EB2A3[]; +extern const u8 gUnknown_085EB372[]; +extern const u8 gUnknown_085EB37F[]; +extern const u8 gUnknown_085EB389[]; +extern const u8 gUnknown_085EAE6E[]; +extern const u8 gUnknown_085EAE7C[]; +extern const u8 gUnknown_085EAE8A[]; +extern const u8 gUnknown_085EAD6D[]; +extern const u8 gUnknown_085EB397[]; +extern const u8 gUnknown_085EB3A4[]; +extern const u8 gUnknown_085EB3B1[]; +extern const u8 gUnknown_085EB3D4[]; +extern const u8 gUnknown_085EB3C6[]; +extern const u8 gText_NormalRank[]; +extern const u8 gText_SuperRank[]; +extern const u8 gText_HyperRank[]; +extern const u8 gText_MasterRank[]; +extern const u8 gText_BattleBag[]; +extern const u8 gText_HeldItem[]; +extern const u8 gText_LinkContest[]; +extern const u8 gText_AboutE_Mode[]; +extern const u8 gText_AboutG_Mode[]; +extern const u8 gText_E_Mode[]; +extern const u8 gText_G_Mode[]; +extern const u8 gUnknown_085EB278[]; +extern const u8 gUnknown_085EB28A[]; +extern const u8 gUnknown_085EB290[]; +extern const u8 gUnknown_085EB295[]; +extern const u8 gUnknown_085EB2E4[]; +extern const u8 gUnknown_085EB2F0[]; +extern const u8 gUnknown_085EB2FC[]; +extern const u8 gUnknown_085EB3DF[]; +extern const u8 gUnknown_085EB3EA[]; +extern const u8 gUnknown_085EB3F1[]; +extern const u8 gUnknown_085EB3FC[]; +extern const u8 gUnknown_085EB40A[]; +extern const u8 gUnknown_085EB415[]; +extern const u8 gUnknown_085EB41D[]; +extern const u8 gUnknown_085EB424[]; +extern const u8 gUnknown_085EB45C[]; +extern const u8 gUnknown_085EB469[]; +extern const u8 gUnknown_085EB475[]; +extern const u8 gUnknown_085EB482[]; +extern const u8 gUnknown_085EB42F[]; +extern const u8 gUnknown_085EB43A[]; +extern const u8 gUnknown_085EB444[]; +extern const u8 gUnknown_085EB451[]; +extern const u8 gUnknown_085EB48E[]; +extern const u8 gUnknown_085EB496[]; +extern const u8 gUnknown_085EB4A3[]; +extern const u8 gUnknown_085EB4AD[]; +extern const u8 gUnknown_085EB4B9[]; +extern const u8 gUnknown_085EB4C7[]; +extern const u8 gUnknown_085EB4D4[]; +extern const u8 gUnknown_085EB4E0[]; +extern const u8 gUnknown_085EB532[]; +extern const u8 gUnknown_085EB543[]; +extern const u8 gUnknown_085EB555[]; +extern const u8 gUnknown_085EB563[]; +extern const u8 gUnknown_085EB56E[]; +extern const u8 gUnknown_085EB57E[]; +extern const u8 gUnknown_085EB589[]; +extern const u8 gUnknown_085EB5B6[]; +extern const u8 gUnknown_085EE14B[]; +extern const u8 gUnknown_085EE14F[]; +extern const u8 gUnknown_085EB2FF[]; +extern const u8 gUnknown_085EB310[]; +extern const u8 gUnknown_085EB317[]; +extern const u8 gUnknown_085EB31F[]; +extern const u8 gText_CaveOfOrigin[]; +extern const u8 gText_MtPyre[]; +extern const u8 gText_SkyPillar[]; +extern const u8 gText_DontRemember[]; +extern const u8 gUnknown_085EB597[]; +extern const u8 gUnknown_085EB32D[]; +extern const u8 gUnknown_085EB33E[]; +extern const u8 gUnknown_085EB350[]; +extern const u8 gUnknown_085EB361[]; + +extern const u8 OldaleTown_PokemonCenter_2F_Text_277F1B[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_277F5A[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_277F96[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_278831[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787FC[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_278831[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787FC[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_277F1B[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_277F5A[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27879F[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_2787D5[]; +extern const u8 OldaleTown_PokemonCenter_2F_Text_27889C[]; + // Frontier records. extern const u8 gText_WinStreak[]; extern const u8 gText_Record[]; |