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

pokeblock merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-21 23:12:36 +01:00
parent df479661ff a705a863d1
commit bcffcb0c1c
51 changed files with 5037 additions and 1907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ld_script.txt
View File

@@ -123,7 +123,6 @@ SECTIONS {
src/battle_setup.o(.text);
asm/cable_club.o(.text);
src/trainer_see.o(.text);
asm/trainer_see.o(.text);
src/wild_encounter.o(.text);
asm/field_effect.o(.text);
asm/unknown_task.o(.text);
@@ -383,7 +382,7 @@ SECTIONS {
data/field_screen.o(.rodata);
src/battle_setup.o(.rodata);
data/cable_club.o(.rodata);
data/trainer_see.o(.rodata);
src/trainer_see.o(.rodata);
data/wild_encounter.o(.rodata);
data/field_effect.o(.rodata);
data/option_menu.o(.rodata);