Merge branch 'master' into apprentice

ld_script.txt

@@ -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);