diff --git a/include/alph_puzzle.h b/include/alph_puzzle.h index 0a5a2d303..8d44da443 100644 --- a/include/alph_puzzle.h +++ b/include/alph_puzzle.h @@ -9,7 +9,7 @@ #include "save.h" #include "task.h" #include "unk_0200CF18.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #include "yes_no_prompt.h" typedef enum AlphPuzzles { diff --git a/include/bag_types_def.h b/include/bag_types_def.h index ed6dbe7bf..4633a527e 100644 --- a/include/bag_types_def.h +++ b/include/bag_types_def.h @@ -7,7 +7,7 @@ #include "field_types_def.h" #include "item.h" #include "save.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" /* * Return value of Bag_TryRegisterItem diff --git a/include/berry_pots_app_internal.h b/include/berry_pots_app_internal.h index 57ce4e1d5..d0208a821 100644 --- a/include/berry_pots_app_internal.h +++ b/include/berry_pots_app_internal.h @@ -5,7 +5,7 @@ #include "launch_application.h" #include "overlay_16.h" #include "sprite.h" -#include "unk_02018424.h" +#include "touchscreen_list_menu.h" enum BerryPotsApp_022036FC_Action { BERRY_POTS_APP_022036FC_ACTION_0, diff --git a/include/field_system.h b/include/field_system.h index cd7ceb751..7785098f5 100644 --- a/include/field_system.h +++ b/include/field_system.h @@ -21,7 +21,7 @@ #include "scrcmd_9.h" #include "sys_task.h" #include "sys_task_api.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct FollowMon { LocalMapObject *mapObject; diff --git a/include/mail_misc.h b/include/mail_misc.h index 102dd0e29..5a708f7e5 100644 --- a/include/mail_misc.h +++ b/include/mail_misc.h @@ -8,7 +8,7 @@ #include "pokedex.h" #include "pokemon.h" #include "save.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct MsgBankMsgNo { u16 msgBank; diff --git a/include/unk_020183F0.h b/include/menu_input_state.h similarity index 74% rename from include/unk_020183F0.h rename to include/menu_input_state.h index e8b6f82cf..7112dc07c 100644 --- a/include/unk_020183F0.h +++ b/include/menu_input_state.h @@ -1,5 +1,5 @@ -#ifndef POKEHEARTGOLD_UNK_020183F0_H -#define POKEHEARTGOLD_UNK_020183F0_H +#ifndef POKEHEARTGOLD_MENU_INPUT_STATE_H +#define POKEHEARTGOLD_MENU_INPUT_STATE_H #include "global.h" @@ -15,4 +15,4 @@ typedef struct MenuInputStateMgr { MenuInputState MenuInputStateMgr_GetState(MenuInputStateMgr *stateMgr); void MenuInputStateMgr_SetState(MenuInputStateMgr *stateMgr, MenuInputState state); -#endif // POKEHEARTGOLD_UNK_020183F0_H +#endif // POKEHEARTGOLD_MENU_INPUT_STATE_H diff --git a/include/move_relearner.h b/include/move_relearner.h index bfb61519a..3a5c1beaa 100644 --- a/include/move_relearner.h +++ b/include/move_relearner.h @@ -3,7 +3,7 @@ #include "player_data.h" #include "pokemon_types_def.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #define MOVE_RELEARNER_TUTOR 0 #define MOVE_RELEARNER_RELEARN 1 diff --git a/include/options_app.h b/include/options_app.h index 04567443b..a548005d3 100644 --- a/include/options_app.h +++ b/include/options_app.h @@ -3,7 +3,7 @@ #include "options.h" #include "overlay_manager.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct OptionsApp_Args { u32 unk0; diff --git a/include/overlay_108.h b/include/overlay_108.h index 205d3188d..f5ebd388a 100644 --- a/include/overlay_108.h +++ b/include/overlay_108.h @@ -3,7 +3,7 @@ #include "overlay_manager.h" #include "save.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct SafariAreaCustomizerArgs { SaveData *saveData; diff --git a/include/overlay_109.h b/include/overlay_109.h index ec3061ddf..a32e4168c 100644 --- a/include/overlay_109.h +++ b/include/overlay_109.h @@ -3,7 +3,7 @@ #include "overlay_manager.h" #include "save.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct PhotoAlbumArgs { u8 unk0; diff --git a/include/overlay_113.h b/include/overlay_113.h index 0d818fb0f..b11edaa68 100644 --- a/include/overlay_113.h +++ b/include/overlay_113.h @@ -3,7 +3,7 @@ #include "overlay_manager.h" #include "save.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct UnownReportArgs { MenuInputStateMgr *menuInputStatePtr; diff --git a/include/overlay_14.h b/include/overlay_14.h index 4255c532a..b50f07e33 100644 --- a/include/overlay_14.h +++ b/include/overlay_14.h @@ -3,7 +3,7 @@ #include "overlay_manager.h" #include "save.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct PCBoxArgs { SaveData *saveData; diff --git a/include/overlay_18.h b/include/overlay_18.h index 9963f3ea6..97f0481ab 100644 --- a/include/overlay_18.h +++ b/include/overlay_18.h @@ -4,7 +4,7 @@ #include "overlay_manager.h" #include "player_data.h" #include "pokedex.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct PokedexArgs { Pokedex *pokedex; diff --git a/include/overlay_43.h b/include/overlay_43.h index c799c7fd9..8d3190a00 100644 --- a/include/overlay_43.h +++ b/include/overlay_43.h @@ -3,7 +3,7 @@ #include "overlay_manager.h" #include "save.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct PalPadArgs { SaveData *saveData; diff --git a/include/overlay_54.h b/include/overlay_54.h index d748667e8..3ddb1b7ce 100644 --- a/include/overlay_54.h +++ b/include/overlay_54.h @@ -3,7 +3,7 @@ #include "options.h" #include "overlay_manager.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct OptionsMenuArgs { u8 unk0[0x4]; diff --git a/include/overlay_58.h b/include/overlay_58.h index fe613d033..b74e06cc4 100644 --- a/include/overlay_58.h +++ b/include/overlay_58.h @@ -3,7 +3,7 @@ #include "overlay_manager.h" #include "save.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct ApricornBoxArgs { u8 unk0; diff --git a/include/overlay_73.h b/include/overlay_73.h index 02e58a6c1..ba34496c7 100644 --- a/include/overlay_73.h +++ b/include/overlay_73.h @@ -6,7 +6,7 @@ #include "overlay_manager.h" #include "save.h" #include "script.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct UnkStruct_0203F4F8 { SaveData *saveData; diff --git a/include/overlay_trainer_card.h b/include/overlay_trainer_card.h index 075a6506f..6f8e8a39e 100644 --- a/include/overlay_trainer_card.h +++ b/include/overlay_trainer_card.h @@ -3,7 +3,7 @@ #include "overlay_manager.h" #include "save.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #define HEAP_ID_TRAINER_CARD ((HeapID)94) diff --git a/include/unk_02018424.h b/include/touchscreen_list_menu.h similarity index 93% rename from include/unk_02018424.h rename to include/touchscreen_list_menu.h index 14e17a463..d90e9fa3c 100644 --- a/include/unk_02018424.h +++ b/include/touchscreen_list_menu.h @@ -1,5 +1,5 @@ -#ifndef GUARD_POKEHEARTGOLD_UNK_02108424_H -#define GUARD_POKEHEARTGOLD_UNK_02108424_H +#ifndef GUARD_POKEHEARTGOLD_TOUCHSCREEN_LIST_MENU_H +#define GUARD_POKEHEARTGOLD_TOUCHSCREEN_LIST_MENU_H #include "bg_window.h" #include "heap.h" @@ -70,4 +70,4 @@ void TouchscreenListMenu_Destroy(TouchscreenListMenu *menu); void TouchscreenListMenu_DestroyButtons(TouchscreenListMenu *menu); int TouchscreenListMenu_HandleInput(TouchscreenListMenu *menu); -#endif // GUARD_POKEHEARTGOLD_UNK_02108424_H +#endif // GUARD_POKEHEARTGOLD_TOUCHSCREEN_LIST_MENU_H diff --git a/include/unk_02088288.h b/include/unk_02088288.h index 001905a64..b41da745e 100644 --- a/include/unk_02088288.h +++ b/include/unk_02088288.h @@ -5,7 +5,7 @@ #include "player_data.h" #include "pokemon_types_def.h" #include "save_special_ribbons.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" extern struct OVY_MGR_TEMPLATE gOverlayTemplate_PokemonSummary; diff --git a/include/voltorb_flip/voltorb_flip.h b/include/voltorb_flip/voltorb_flip.h index 40f169f2f..05eef5a23 100644 --- a/include/voltorb_flip/voltorb_flip.h +++ b/include/voltorb_flip/voltorb_flip.h @@ -5,7 +5,7 @@ #include "overlay_manager.h" #include "player_data.h" #include "save.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef struct VoltorbFlipArgs { Options *options; diff --git a/include/voltorb_flip/voltorb_flip_data.h b/include/voltorb_flip/voltorb_flip_data.h index 65f50d820..62303cec3 100644 --- a/include/voltorb_flip/voltorb_flip_data.h +++ b/include/voltorb_flip/voltorb_flip_data.h @@ -2,7 +2,7 @@ #define POKEHEARTGOLD_VOLTORB_FLIP_DATA_H #include "bg_window.h" -#include "unk_02018424.h" +#include "touchscreen_list_menu.h" typedef struct Ov122_021E9278 { u8 unk0[5][2]; diff --git a/include/voltorb_flip/voltorb_flip_work.h b/include/voltorb_flip/voltorb_flip_work.h index 9514cdec7..d720ffca9 100644 --- a/include/voltorb_flip/voltorb_flip_work.h +++ b/include/voltorb_flip/voltorb_flip_work.h @@ -10,8 +10,8 @@ #include "options.h" #include "player_data.h" #include "unk_0200CF18.h" -#include "unk_020183F0.h" -#include "unk_02018424.h" +#include "menu_input_state.h" +#include "touchscreen_list_menu.h" typedef struct Ov122_021E70B8 { BgConfig *bgConfig; diff --git a/include/yes_no_prompt.h b/include/yes_no_prompt.h index c58c60bed..a94ea9a20 100644 --- a/include/yes_no_prompt.h +++ b/include/yes_no_prompt.h @@ -5,7 +5,7 @@ #include "heap.h" #include "palette.h" #include "touch_hitbox_controller.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" typedef enum YesNoResponse { YESNORESPONSE_WAIT = 0, diff --git a/main.lsf b/main.lsf index 242f92a0b..1db1e0489 100644 --- a/main.lsf +++ b/main.lsf @@ -58,8 +58,8 @@ Static main Object asm/unk_02017FAC.o Object asm/unk_02018000.o Object src/unk_02018380.o - Object src/unk_020183F0.o - Object src/unk_02018424.o + Object src/menu_input_state.o + Object src/touchscreen_list_menu.o Object src/camera_translation.o Object asm/unk_020192D0.o Object src/system.o diff --git a/src/alph_puzzle.c b/src/alph_puzzle.c index 2af48cf01..5d14cc3c7 100644 --- a/src/alph_puzzle.c +++ b/src/alph_puzzle.c @@ -27,7 +27,7 @@ #include "unk_0200B150.h" #include "unk_0200CF18.h" #include "unk_0200FA24.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #include "unk_020210A0.h" #include "vram_transfer_manager.h" #include "yes_no_prompt.h" diff --git a/src/application/view_photo.c b/src/application/view_photo.c index 940abf501..5df8c3409 100644 --- a/src/application/view_photo.c +++ b/src/application/view_photo.c @@ -14,7 +14,7 @@ #include "text.h" #include "touchscreen.h" #include "unk_02005D10.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #include "unk_02068F84.h" typedef enum ViewPhotoTaskState { diff --git a/src/bag_view.c b/src/bag_view.c index e95b4312e..e0be06343 100644 --- a/src/bag_view.c +++ b/src/bag_view.c @@ -17,7 +17,7 @@ #include "player_data.h" #include "save.h" #include "seal_case.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" static u16 GetCoinCount(SaveData *saveData); static u32 GetSealCount(SaveData *saveData); diff --git a/src/berry_pots_app.c b/src/berry_pots_app.c index 3b36eafda..f2ed7de85 100644 --- a/src/berry_pots_app.c +++ b/src/berry_pots_app.c @@ -28,7 +28,7 @@ #include "unk_0200B150.h" #include "unk_0200CF18.h" #include "unk_0200FA24.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #include "unk_020210A0.h" #include "vram_transfer_manager.h" #include "yes_no_prompt.h" diff --git a/src/mail_misc.c b/src/mail_misc.c index b8854f2d2..caae33b52 100644 --- a/src/mail_misc.c +++ b/src/mail_misc.c @@ -12,7 +12,7 @@ #include "player_data.h" #include "save_vars_flags.h" #include "sys_flags.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" EasyChatArgs *EasyChat_CreateArgs(u8 args, u8 a1, SaveData *saveData, MenuInputStateMgr *menuInputStateMgr, HeapID heapId) { EasyChatArgs *ptr = AllocFromHeap(heapId, sizeof(EasyChatArgs)); diff --git a/src/unk_020183F0.c b/src/menu_input_state.c similarity index 93% rename from src/unk_020183F0.c rename to src/menu_input_state.c index 9c6ba7d61..cca950e7b 100644 --- a/src/unk_020183F0.c +++ b/src/menu_input_state.c @@ -1,4 +1,4 @@ -#include "unk_020183F0.h" +#include "menu_input_state.h" #include "global.h" diff --git a/src/naming_screen.c b/src/naming_screen.c index 5f8dd8857..6200968a9 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -30,7 +30,7 @@ #include "unk_0200FA24.h" #include "unk_02013534.h" #include "unk_020163E0.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #include "vram_transfer_manager.h" #define NAME_SCREEN_CONTROL_DAKU 0xD001 // unused diff --git a/src/options_app.c b/src/options_app.c index c9953c4c7..5e18bbab2 100644 --- a/src/options_app.c +++ b/src/options_app.c @@ -22,7 +22,7 @@ #include "unk_02005D10.h" #include "unk_0200CF18.h" #include "unk_0200FA24.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #include "unk_0203A3B0.h" #include "vram_transfer_manager.h" diff --git a/src/party_menu.c b/src/party_menu.c index 37cc1cb62..bb9676ab0 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -25,7 +25,7 @@ #include "system.h" #include "unk_02005D10.h" #include "unk_0200FA24.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #include "unk_020210A0.h" #include "unk_0203A3B0.h" #include "unk_02066EDC.h" diff --git a/src/start_menu.c b/src/start_menu.c index 16247380c..c1623f85b 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -29,7 +29,7 @@ #include "unk_02005D10.h" #include "unk_0200ACF0.h" #include "unk_0200FA24.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #include "unk_02034B0C.h" #include "unk_02037C94.h" #include "unk_02054E00.h" diff --git a/src/touch_save_app.c b/src/touch_save_app.c index 869b12f14..2ef31d1f5 100644 --- a/src/touch_save_app.c +++ b/src/touch_save_app.c @@ -20,7 +20,7 @@ #include "task.h" #include "text.h" #include "unk_02005D10.h" -#include "unk_020183F0.h" +#include "menu_input_state.h" #include "yes_no_prompt.h" FS_EXTERN_OVERLAY(OVY_123); diff --git a/src/unk_02018424.c b/src/touchscreen_list_menu.c similarity index 99% rename from src/unk_02018424.c rename to src/touchscreen_list_menu.c index 44c651209..0b2e0283f 100644 --- a/src/unk_02018424.c +++ b/src/touchscreen_list_menu.c @@ -1,4 +1,4 @@ -#include "unk_02018424.h" +#include "touchscreen_list_menu.h" #include "global.h" diff --git a/src/voltorb_flip/voltorb_flip.c b/src/voltorb_flip/voltorb_flip.c index 18479254f..f46837d0a 100644 --- a/src/voltorb_flip/voltorb_flip.c +++ b/src/voltorb_flip/voltorb_flip.c @@ -37,8 +37,8 @@ #include "unk_02009D48.h" #include "unk_0200CF18.h" #include "unk_0200FA24.h" -#include "unk_020183F0.h" -#include "unk_02018424.h" +#include "menu_input_state.h" +#include "touchscreen_list_menu.h" #include "yes_no_prompt.h" typedef enum CoinDisplay {