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

fix rom3 conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-10-13 19:58:45 +02:00
parent 20d158cf4a 3040c1e1aa
commit 72ed861715
93 changed files with 13360 additions and 18899 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+3 -3
View File
@@ -117,7 +117,7 @@ SECTIONS {
asm/battle_anim.o(.text);
asm/rom_80A5C6C.o(.text);
src/task.o(.text);
asm/reshow_battle_screen.o(.text);
src/reshow_battle_screen.o(.text);
asm/battle_anim_80A9C70.o(.text);
asm/title_screen.o(.text);
asm/field_screen.o(.text);
@@ -149,7 +149,7 @@ SECTIONS {
asm/contest_effect.o(.text);
asm/record_mixing.o(.text);
asm/secret_base.o(.text);
asm/tv.o(.text);
src/tv.o(.text);
asm/contest_link_80F57C4.o(.text);
asm/script_pokemon_util_80F87D8.o(.text);
asm/field_poison.o(.text);
@@ -388,7 +388,7 @@ SECTIONS {
data/contest_effect.o(.rodata);
data/record_mixing.o(.rodata);
data/secret_base.o(.rodata);
data/tv.o(.rodata);
src/tv.o(.rodata);
data/contest_link_80F57C4.o(.rodata);
data/script_pokemon_util_80F87D8.o(.rodata);
src/pokemon_size_record.o(.rodata)