Merge branch 'master' into battle_records

2019-07-14 11:29:23 -04:00
parent 31c26e862a 53b950019a
commit 939bd127bb
48 changed files with 1191 additions and 3782 deletions
@@ -234,7 +234,7 @@ SECTIONS {
        src/vs_seeker.o(.text);
        src/item_pc.o(.text);
        asm/mailbox_pc.o(.text);
-        asm/menu.o(.text);
+        src/menu.o(.text);
        src/quest_log.o(.text);
        asm/link_rfu_3.o(.text);
        asm/pokemon_special_anim.o(.text);
@@ -435,6 +435,7 @@ SECTIONS {
        src/vs_seeker.o(.rodata);
        src/item_pc.o(.rodata);
        data/data_83FECCC.o(.rodata.8453F6C);
+        src/menu.o(.rodata);
        src/quest_log.o(.rodata);
        data/data_83FECCC.o(.rodata.8456C74);
        src/help_system_812B1E0.o(.rodata);