Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into update-macros

1 files changed, 19 insertions, 19 deletions

diff --git a/ld_script.txt b/ld_script.txt
index cecb8f23c..61f61ab86 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -312,17 +312,17 @@ SECTIONS {
         src/battle_pyramid_bag.o(.text);
         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_match_call_1.o(.text);
-        src/pokenav_match_call_2.o(.text);
+        src/pokenav_list.o(.text);
+        src/pokenav_menu_handler.o(.text);
+        src/pokenav_menu_handler_gfx.o(.text);
+        src/pokenav_match_call_list.o(.text);
+        src/pokenav_match_call_gfx.o(.text);
         src/pokenav_region_map.o(.text);
-        src/pokenav_conditions_1.o(.text);
-        src/pokenav_conditions_2.o(.text);
-        src/pokenav_conditions_3.o(.text);
-        src/pokenav_ribbons_1.o(.text);
-        src/pokenav_ribbons_2.o(.text);
+        src/pokenav_conditions.o(.text);
+        src/pokenav_conditions_gfx.o(.text);
+        src/pokenav_conditions_search_results.o(.text);
+        src/pokenav_ribbons_list.o(.text);
+        src/pokenav_ribbons_summary.o(.text);
         src/pokenav_match_call_data.o(.text);
         src/menu_specialized.o(.text);
         src/ereader_helpers.o(.text);
@@ -669,16 +669,16 @@ SECTIONS {
         src/battle_pyramid_bag.o(.rodata);
         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_match_call_1.o(.rodata);
-        src/pokenav_match_call_2.o(.rodata);
+        src/pokenav_list.o(.rodata);
+        src/pokenav_menu_handler.o(.rodata);
+        src/pokenav_menu_handler_gfx.o(.rodata);
+        src/pokenav_match_call_list.o(.rodata);
+        src/pokenav_match_call_gfx.o(.rodata);
         src/pokenav_region_map.o(.rodata);
-        src/pokenav_conditions_2.o(.rodata);
-        src/pokenav_conditions_3.o(.rodata);
-        src/pokenav_ribbons_1.o(.rodata);
-        src/pokenav_ribbons_2.o(.rodata);
+        src/pokenav_conditions_gfx.o(.rodata);
+        src/pokenav_conditions_search_results.o(.rodata);
+        src/pokenav_ribbons_list.o(.rodata);
+        src/pokenav_ribbons_summary.o(.rodata);
         src/pokenav_match_call_data.o(.rodata);
         src/menu_specialized.o(.rodata);
         src/ereader_helpers.o(.rodata);