diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_specials.h | 1 | ||||
| -rw-r--r-- | include/menu.h | 10 | ||||
| -rw-r--r-- | include/script_menu.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 7 |
4 files changed, 15 insertions, 5 deletions
diff --git a/include/field_specials.h b/include/field_specials.h index 0e2daf9c3..8422af061 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -15,5 +15,6 @@ bool32 sub_8138168(void); bool32 sub_81381B0(void); bool32 sub_81381F8(void); bool32 CountSSTidalStep(u16 delta); +void sub_813A128(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/menu.h b/include/menu.h index d105eb5ec..f4960119e 100644 --- a/include/menu.h +++ b/include/menu.h @@ -32,7 +32,7 @@ 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); u8 GetPlayerTextSpeed(void); void sub_81978B0(u16 arg0); void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextSubPrinter *, u16)); @@ -44,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); @@ -53,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); @@ -88,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 8dd65263a..587e3e08b 100644 --- a/include/script_menu.h +++ b/include/script_menu.h @@ -13,6 +13,6 @@ s32 convert_pixel_width_to_tile_width(s32); u8 CreateWindowFromRect(u8, u8, u8, u8); void sub_80E2A78(u8); u32 display_text_and_get_width(const u8*, u32); -u32 sub_80E2D5C(u8 arg0, u8 tileWidth); +u32 sub_80E2D5C(u8 arg0, u32 tileWidth); #endif //GUARD_SCRIPT_MENU_H diff --git a/include/strings.h b/include/strings.h index c563353ec..3600dd891 100644 --- a/include/strings.h +++ b/include/strings.h @@ -877,4 +877,11 @@ 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[]; + #endif //GUARD_STRINGS_H |