Merge branch 'master' into contest

2018-05-11 09:25:26 -04:00
parent c15b50ac68 3e93615e38
commit 4488bbe9e6
51 changed files with 4132 additions and 9099 deletions
@@ -121,7 +121,7 @@ SECTIONS {
        asm/cable_club.o(.text);
        src/trainer_see.o(.text);
        src/wild_encounter.o(.text);
-        asm/field_effect.o(.text);
+        src/field_effect.o(.text);
        src/scanline_effect.o(.text);
        src/option_menu.o(.text);
        src/pokedex.o(.text);
@@ -423,7 +423,7 @@ SECTIONS {
        data/cable_club.o(.rodata);
        src/trainer_see.o(.rodata);
        src/wild_encounter.o(.rodata);
-        data/field_effect.o(.rodata);
+        src/field_effect.o(.rodata);
        src/option_menu.o(.rodata);
        src/pokedex.o(.rodata);
        data/pokedex.o(.rodata);