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

Fix merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-09-20 13:12:43 +02:00
parent 67a8ac72ec f94074b602
commit 3919b7130b
60 changed files with 8390 additions and 21788 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+4 -2
View File
@@ -96,7 +96,7 @@ SECTIONS {
asm/field_camera.o(.text);
asm/field_door.o(.text);
asm/field_player_avatar.o(.text);
asm/field_map_obj.o(.text);
src/field_map_obj.o(.text);
asm/field_ground_effect.o(.text);
asm/map_obj_8097404.o(.text);
asm/field_message_box.o(.text);
@@ -341,7 +341,9 @@ SECTIONS {
src/util.o(.rodata);
data/data3.o(.rodata);
src/egg_hatch.o(.rodata);
data/data3_a0.o(.rodata);
data/data3_a0_A.o(.rodata);
data/field_map_obj.o(.rodata);
data/data3_a0_B.o(.rodata);
src/berry.o(.rodata);
data/data3_a1.o(.rodata);
src/pokemon_size_record.o(.rodata)