Merge branch 'master' into battle

2019-09-25 13:49:16 -04:00
parent 2599dac8ac 6539884c88
commit 0e217e22d8
67 changed files with 3363 additions and 3782 deletions
@@ -212,7 +212,7 @@ SECTIONS {
        src/intro.o(.text);
        asm/battle_anim_special.o(.text);
        asm/hall_of_fame.o(.text);
-        asm/credits.o(.text);
+        src/credits.o(.text);
        src/diploma.o(.text);
        asm/save_failed_screen.o(.text);
        asm/clear_save_data_screen.o(.text);
@@ -434,6 +434,7 @@ SECTIONS {
        data/data_83FECCC.o(.rodata.83FEDE4);
        src/intro.o(.rodata);
        data/data_83FECCC.o(.rodata.battle_anim_special);
+        src/credits.o(.rodata);
        src/diploma.o(.rodata);
        data/strings.o(.rodata);
        data/data_83FECCC.o(.rodata.841EE44);