Merge new_menu_helpers and menu

This commit is contained in:
Diegoisawesome
2018-02-07 00:07:42 -06:00
parent 18abda9dca
commit d396a8f89c
19 changed files with 510 additions and 554 deletions

View File

@@ -247,7 +247,6 @@ SECTIONS {
src/battle_dome_cards.o(.text);
src/lilycove_lady.o(.text);
asm/battle_frontier_1.o(.text);
src/new_menu_helpers.o(.text);
src/menu.o(.text);
asm/battle_frontier_2.o(.text);
asm/item_menu.o(.text);
@@ -520,7 +519,6 @@ SECTIONS {
src/battle_dome_cards.o(.rodata);
src/lilycove_lady.o(.rodata);
data/battle_frontier_1.o(.rodata);
src/new_menu_helpers.o(.rodata);
src/menu.o(.rodata);
data/battle_frontier_2.o(.rodata);
data/item_menu.o(.rodata);