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

2020-03-28 18:04:45 -04:00
parent f3a632156b d8c9214e0a
commit 781aa8949c
11 changed files with 461 additions and 939 deletions
@@ -180,7 +180,7 @@ SECTIONS {
        src/normal.o(.text);
        src/battle_anim_utility_funcs.o(.text);
        src/battle_intro.o(.text);
-        asm/bike.o(.text);
+        src/bike.o(.text);
        src/easy_chat.o(.text);
        src/mon_markings.o(.text);
        src/mail.o(.text);
@@ -499,7 +499,7 @@ SECTIONS {
        src/normal.o(.rodata);
        src/battle_anim_utility_funcs.o(.rodata);
        src/battle_intro.o(.rodata);
-        data/bike.o(.rodata);
+        src/bike.o(.rodata);
        src/easy_chat.o(.rodata);
        src/mon_markings.o(.rodata);
        src/mail.o(.rodata);