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

fix merge conflicts, review changes

Browse Source
This commit is contained in:
DizzyEggg
2017-11-13 20:00:20 +01:00
parent 19d9cff2ff d1fe93bf4a
commit 516a5b2219
65 changed files with 2684 additions and 4645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+4 -3
View File
@@ -62,7 +62,7 @@ SECTIONS {
src/battle_script_commands.o(.text);
asm/battle_5.o(.text);
src/battle_controller_player.o(.text);
asm/battle_7.o(.text);
src/battle_gfx_sfx_util.o(.text);
src/battle_controller_opponent.o(.text);
src/battle_ai_switch_items.o(.text);
src/battle_controller_link_opponent.o(.text);
@@ -85,6 +85,7 @@ SECTIONS {
src/load_save.o(.text);
asm/load_save.o(.text);
asm/trade.o(.text);
src/berry_blender.o(.text);
asm/berry_blender.o(.text);
src/play_time.o(.text);
src/new_game.o(.text);
@@ -344,11 +345,11 @@ SECTIONS {
src/util.o(.rodata);
data/daycare.o(.rodata);
src/egg_hatch.o(.rodata);
data/battle_7.o(.rodata);
src/battle_gfx_sfx_util.o(.rodata);
src/battle_interface.o(.rodata);
data/pokeball.o(.rodata);
data/trade.o(.rodata);
data/berry_blender.o(.rodata);
src/berry_blender.o(.rodata);
src/new_game.o(.rodata);
data/rom4.o(.rodata);
data/fieldmap.o(.rodata);