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

This commit is contained in:
Diegoisawesome
2018-07-24 21:18:36 -07:00
1092 changed files with 39655 additions and 38981 deletions

View File

@@ -55,6 +55,7 @@ SECTIONS {
src/link.o(.text);
src/link_rfu.o(.text);
asm/link_rfu.o(.text);
src/rom_8011DC0.o(.text);
asm/rom_8011DC0.o(.text);
src/rtc.o(.text);
src/main_menu.o(.text);
@@ -366,11 +367,14 @@ SECTIONS {
src/string_util.o(.rodata);
src/link.o(.rodata);
src/link_rfu.o(.rodata);
src/rom_8011DC0.o(.rodata);
data/rom_8011DC0.o(.rodata);
src/rtc.o(.rodata);
src/main_menu.o(.rodata);
src/rom_8034C54.o(.rodata);
data/data2b.o(.rodata);
src/battle_data.o(.rodata);
data/data2c.o(.rodata);
src/battle_main.o(.rodata);
src/battle_util.o(.rodata);
src/battle_script_commands.o(.rodata);