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

Merge branch 'master' into heal_location

Browse Source
This commit is contained in:
PikalaxALT
2017-11-15 09:01:56 -05:00
parent 79609d52c8 055a419830
commit 89b695278d
2869 changed files with 155560 additions and 13742 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+14 -7
View File
@@ -60,9 +60,9 @@ SECTIONS {
src/battle_2.o(.text);
src/battle_util.o(.text);
src/battle_script_commands.o(.text);
asm/battle_5.o(.text);
src/battle_util2.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);
@@ -175,7 +176,7 @@ SECTIONS {
asm/contest_painting.o(.text);
src/battle_ai_script_commands.o(.text);
asm/trader.o(.text);
asm/starter_choose.o(.text);
src/starter_choose.o(.text);
asm/wallclock.o(.text);
asm/rom6.o(.text);
asm/battle_records.o(.text);
@@ -214,7 +215,7 @@ SECTIONS {
src/reset_save_heap.o(.text);
src/field_region_map.o(.text);
asm/battle_anim_8170478.o(.text);
asm/hall_of_fame.o(.text);
src/hall_of_fame.o(.text);
asm/credits.o(.text);
src/lottery_corner.o(.text);
src/diploma.o(.text);
@@ -344,13 +345,15 @@ 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/tilesets.o(.rodata);
data/maps.o(.rodata);
data/fieldmap.o(.rodata);
src/metatile_behavior.o(.rodata);
data/rom_8486FEC.o(.rodata);
@@ -371,6 +374,8 @@ SECTIONS {
data/battle_anims.o(.rodata);
src/battle_anim.o(.rodata);
data/rom_8525F58.o(.rodata);
data/map_events.o(.rodata);
data/battle_anim_80A9C70.o(.rodata);
data/title_screen.o(.rodata);
data/field_screen.o(.rodata);
data/battle_setup.o(.rodata);
@@ -418,6 +423,8 @@ SECTIONS {
data/contest_painting.o(.rodata);
src/battle_ai_script_commands.o(.rodata);
data/data4.o(.rodata);
data/starter_choose.o(.rodata);
data/data4c.o(.rodata);
src/battle_controller_link_partner.o(.rodata);
src/battle_message.o(.rodata);
data/cable_car.o(.rodata);
@@ -435,7 +442,7 @@ SECTIONS {
data/intro.o(.rodata);
src/field_region_map.o(.rodata);
data/battle_anim_8170478.o(.rodata);
data/hall_of_fame.o(.rodata);
src/hall_of_fame.o(.rodata);
data/credits.o(.rodata);
src/lottery_corner.o(.rodata);
src/diploma.o(.rodata);