Merge branch 'master' into shop

2018-10-13 12:55:06 -05:00
parent b24559d69b 0c1d33da4f
commit 32fbf67d47
29 changed files with 1378 additions and 2896 deletions
@@ -118,7 +118,7 @@ SECTIONS {
        src/title_screen.o(.text);
        asm/field_screen.o(.text);
        src/battle_setup.o(.text);
-        asm/cable_club.o(.text);
+        src/cable_club.o(.text);
        src/trainer_see.o(.text);
        src/wild_encounter.o(.text);
        src/field_effect.o(.text);
@@ -428,7 +428,7 @@ SECTIONS {
        src/title_screen.o(.rodata);
        data/field_screen.o(.rodata);
        src/battle_setup.o(.rodata);
-        data/cable_club.o(.rodata);
+        src/cable_club.o(.rodata);
        src/trainer_see.o(.rodata);
        src/wild_encounter.o(.rodata);
        src/field_effect.o(.rodata);