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

2020-03-02 10:15:07 -05:00
parent 2f8ac698c8 fc51c579d4
commit d758ae0dc2
23 changed files with 1164 additions and 2701 deletions
@@ -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);