Merge branch 'master' of github.com:pret/pokefirered into field_effect

ld_script.txt

@@ -120,7 +120,7 @@ SECTIONS {
         src/field_fadetransition.o(.text);
         src/field_screen_effect.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);
@@ -441,7 +441,7 @@ SECTIONS {
         data/field_weather.o(.rodata);
         src/field_screen_effect.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);