dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

merge with master, fix conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-10-20 10:49:21 +02:00
parent 9ccc472b97 ae5aa3c4df
commit b65da491a9
60 changed files with 6252 additions and 10191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ld_script.txt
View File

@@ -54,7 +54,7 @@ SECTIONS {
asm/link.o(.text);
src/rtc.o(.text);
asm/main_menu.o(.text);
asm/rom3.o(.text);
src/battle_controllers.o(.text);
src/decompress.o(.text);
asm/battle_1.o(.text);
src/battle_2.o(.text);
@@ -113,7 +113,7 @@ SECTIONS {
src/tileset_anims.o(.text);
src/palette.o(.text);
src/sound.o(.text);
asm/battle_anim.o(.text);
src/battle_anim.o(.text);
asm/rom_80A5C6C.o(.text);
src/task.o(.text);
src/reshow_battle_screen.o(.text);
@@ -364,6 +364,8 @@ SECTIONS {
src/palette.o(.rodata);
data/fanfares.o(.rodata);
data/battle_anims.o(.rodata);
src/battle_anim.o(.rodata);
data/rom_8525F58.o(.rodata);
data/title_screen.o(.rodata);
data/field_screen.o(.rodata);
data/battle_setup.o(.rodata);