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

2020-03-05 14:38:26 -05:00
parent 7f81fdc8df 3d5d298c63
commit 83137b4005
219 changed files with 6271 additions and 9187 deletions
@@ -509,7 +509,7 @@ SECTIONS {
        src/hall_of_fame.o(.rodata);
        src/credits.o(.rodata);
        src/diploma.o(.rodata);
-        data/strings.o(.rodata);
+        src/strings.o(.rodata);
        src/save_failed_screen.o(.rodata);
        data/clear_save_data_screen.o(.rodata);
        src/evolution_graphics.o(.rodata);