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

2019-07-12 17:11:58 -04:00
parent f64421dd8c ad274b9561
commit 09b94d8b34
13 changed files with 309 additions and 653 deletions
@@ -214,7 +214,7 @@ SECTIONS {
        asm/battle_anim_special.o(.text);
        asm/hall_of_fame.o(.text);
        asm/credits.o(.text);
-        asm/diploma.o(.text);
+        src/diploma.o(.text);
        asm/save_failed_screen.o(.text);
        asm/clear_save_data_screen.o(.text);
        asm/evolution_graphics.o(.text);