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

2018-08-11 16:32:03 -07:00
parent 57b3393192 94eef0bfa5
commit cf9518f237
11 changed files with 1552 additions and 2256 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -530,6 +530,7 @@ SECTIONS {
        src/fossil_specials.o(.rodata);
        src/fldeff_groundshake.o(.rodata);
        src/berry_fix_program.o(.rodata);
+        src/pokemon_summary_screen.o(.rodata);
        data/pokemon_summary_screen.o(.rodata);
        data/pokenav.o(.rodata);
        src/match_call.o(.rodata);