Merge branch 'master' into field_map_obj

2017-09-16 15:41:54 -04:00
parent c7f28f034c 19d2d73c70
commit 559833ccf6
96 changed files with 5928 additions and 10623 deletions
@@ -73,6 +73,7 @@ SECTIONS {
        src/pokemon_2.o(.text);
        asm/pokemon_2.o(.text);
        asm/pokemon_item_effect.o(.text);
+        src/pokemon_3.o(.text);
        asm/pokemon_3.o(.text);
        src/trig.o(.text);
        src/rng.o(.text);
@@ -138,7 +139,7 @@ SECTIONS {
        asm/item.o(.text);
        asm/contest.o(.text);
        asm/shop.o(.text);
-        asm/berry.o(.text);
+        src/berry.o(.text);
        asm/script_menu.o(.text);
        asm/naming_screen.o(.text);
        src/money.o(.text);
@@ -308,6 +309,8 @@ SECTIONS {
        src/trig.o(.rodata);
        src/util.o(.rodata);
        data/data3.o(.rodata);
+        src/berry.o(.rodata);
+        data/data3_a1.o(.rodata);
        src/pokemon_size_record.o(.rodata)
        data/data3a.o(.rodata)
        data/data3b.o(.rodata);