diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-12 17:13:50 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-12 17:13:50 -0500 |
commit | ffe2970e30f64f46a7539ac69d61ab4ea353a92c (patch) | |
tree | c48cd6c4063694006a372aa86573307c32e77d2f | |
parent | baeacbe2f10ef69468d3bdb223d8ca74c963e9d6 (diff) |
Rename pokenav menu handler files
-rw-r--r-- | include/pokenav.h | 4 | ||||
-rw-r--r-- | ld_script.txt | 8 | ||||
-rw-r--r-- | src/pokenav_menu_handler.c (renamed from src/pokenav_menu_handler_1.c) | 0 | ||||
-rw-r--r-- | src/pokenav_menu_handler_gfx.c (renamed from src/pokenav_menu_handler_2.c) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/pokenav.h b/include/pokenav.h index 6dc88cab7..59f670089 100644 --- a/include/pokenav.h +++ b/include/pokenav.h @@ -370,7 +370,7 @@ bool32 WaitForPokenavShutdownFade(void); void SetActiveMenuLoopTasks(void *func1, void *func2); void ShutdownPokenav(void); -// pokenav_menu_handler_1.c +// pokenav_menu_handler.c bool32 PokenavCallback_Init_MainMenuCursorOnMap(void); bool32 PokenavCallback_Init_MainMenuCursorOnMatchCall(void); bool32 PokenavCallback_Init_MainMenuCursorOnRibbons(void); @@ -383,7 +383,7 @@ int GetPokenavCursorPos(void); int GetCurrentMenuItemId(void); u16 GetHelpBarTextId(void); -// pokenav_menu_handler_2.c +// pokenav_menu_handler_gfx.c bool32 OpenPokenavMenuInitial(void); bool32 OpenPokenavMenuNotInitial(void); void CreateMenuHandlerLoopedTask(s32 ltIdx); diff --git a/ld_script.txt b/ld_script.txt index c4283265d..257fb3c6e 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -311,8 +311,8 @@ SECTIONS { src/pokenav.o(.text); src/pokenav_main_menu.o(.text); src/pokenav_match_call_ui.o(.text); - src/pokenav_menu_handler_1.o(.text); - src/pokenav_menu_handler_2.o(.text); + src/pokenav_menu_handler.o(.text); + src/pokenav_menu_handler_gfx.o(.text); src/pokenav_match_call_1.o(.text); src/pokenav_match_call_2.o(.text); src/pokenav_region_map.o(.text); @@ -666,8 +666,8 @@ SECTIONS { src/pokenav.o(.rodata); src/pokenav_main_menu.o(.rodata); src/pokenav_match_call_ui.o(.rodata); - src/pokenav_menu_handler_1.o(.rodata); - src/pokenav_menu_handler_2.o(.rodata); + src/pokenav_menu_handler.o(.rodata); + src/pokenav_menu_handler_gfx.o(.rodata); src/pokenav_match_call_1.o(.rodata); src/pokenav_match_call_2.o(.rodata); src/pokenav_region_map.o(.rodata); diff --git a/src/pokenav_menu_handler_1.c b/src/pokenav_menu_handler.c index b72247742..b72247742 100644 --- a/src/pokenav_menu_handler_1.c +++ b/src/pokenav_menu_handler.c diff --git a/src/pokenav_menu_handler_2.c b/src/pokenav_menu_handler_gfx.c index 1738142ac..1738142ac 100644 --- a/src/pokenav_menu_handler_2.c +++ b/src/pokenav_menu_handler_gfx.c |