diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:49:16 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-25 13:49:16 -0400 |
commit | 0e217e22d8fa3e075416cb332435c3756548357e (patch) | |
tree | 59ef21892a02c9d266f5cac36872458bdbe0de61 /ld_script.txt | |
parent | 2599dac8ac8c12268fca902910bfe1aab40a68ca (diff) | |
parent | 6539884c8850aca6c2057017dba9c3d78ca15784 (diff) |
Merge branch 'master' into battle
Diffstat (limited to 'ld_script.txt')
-rw-r--r-- | ld_script.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ld_script.txt b/ld_script.txt index ca862eb17..7952b2cd8 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -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); |