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

Merge branch 'master' into dodrio_berry_picking

Browse Source
This commit is contained in:
PikalaxALT
2019-04-05 08:41:31 -04:00
parent a677d1f4cb 9e74409bb2
commit a58d9a16dd
306 changed files with 20985 additions and 31720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+27 -21
View File
@@ -55,14 +55,17 @@ SECTIONS {
src/link.o(.text);
src/link_rfu.o(.text);
src/union_room.o(.text);
asm/union_room.o(.text);
src/mystery_gift.o(.text);
src/union_room_player_avatar.o(.text);
src/union_room_battle.o(.text);
src/mevent2.o(.text);
asm/mevent_801BAAC.o(.text);
asm/mevent_server.o(.text);
asm/mevent_server_ish.o(.text);
asm/mevent_server_helpers.o(.text);
asm/mevent_news.o(.text);
asm/union_room_chat.o(.text);
src/mevent_801BAAC.o(.text);
src/mevent_server.o(.text);
src/mevent_client.o(.text);
src/mevent_server_helpers.o(.text);
src/mevent_news.o(.text);
src/union_room_chat.o(.text);
src/berry_crush.o(.text);
asm/berry_crush.o(.text);
src/berry_powder.o(.text);
src/dodrio_berry_picking.o(.text);
@@ -120,10 +123,10 @@ SECTIONS {
src/palette.o(.text);
src/sound.o(.text);
src/battle_anim.o(.text);
src/battle_anim_80A5C6C.o(.text);
src/battle_anim_mons.o(.text);
src/task.o(.text);
src/reshow_battle_screen.o(.text);
src/battle_anim_80A9C70.o(.text);
src/battle_anim_status_effects.o(.text);
src/title_screen.o(.text);
src/field_weather.o(.text);
src/field_weather_effect.o(.text);
@@ -145,7 +148,7 @@ SECTIONS {
src/mail_data.o(.text);
src/map_name_popup.o(.text);
src/item_menu_icons.o(.text);
src/battle_anim_80D51AC.o(.text);
src/battle_anim_mon_movement.o(.text);
src/item.o(.text);
src/contest.o(.text);
src/shop.o(.text);
@@ -247,7 +250,7 @@ SECTIONS {
src/intro.o(.text);
src/reset_save_heap.o(.text);
src/field_region_map.o(.text);
src/battle_anim_8170478.o(.text);
src/battle_anim_special.o(.text);
src/hall_of_fame.o(.text);
src/credits.o(.text);
src/lottery_corner.o(.text);
@@ -301,7 +304,6 @@ SECTIONS {
asm/pokenav.o(.text);
src/pokenav_match_call.o(.text);
src/menu_specialized.o(.text);
asm/menu_specialized.o(.text);
src/ereader_helpers.o(.text);
src/faraway_island.o(.text);
src/ereader_screen.o(.text);
@@ -409,11 +411,15 @@ SECTIONS {
src/link.o(.rodata);
src/link_rfu.o(.rodata);
src/union_room.o(.rodata);
data/union_room.o(.rodata);
src/mystery_gift.o(.rodata);
src/union_room_player_avatar.o(.rodata);
src/union_room_battle.o(.rodata);
src/mevent2.o(.rodata);
data/mevent_801BAAC.o(.rodata);
data/mevent_server.o(.rodata);
data/union_room_chat.o(.rodata);
src/mevent_801BAAC.o(.rodata);
src/mevent_server.o(.rodata);
src/mevent_client.o(.rodata);
src/mevent_scripts.o(.rodata);
src/union_room_chat.o(.rodata);
data/berry_crush.o(.rodata);
data/berry_powder.o(.rodata);
src/dodrio_berry_picking.o(.rodata);
@@ -461,9 +467,9 @@ SECTIONS {
src/palette.o(.rodata);
src/sound.o(.rodata);
src/battle_anim.o(.rodata);
src/battle_anim_80A5C6C.o(.rodata);
src/battle_anim_mons.o(.rodata);
data/map_events.o(.rodata);
src/battle_anim_80A9C70.o(.rodata);
src/battle_anim_status_effects.o(.rodata);
src/title_screen.o(.rodata);
src/field_weather.o(.rodata);
src/field_weather_effect.o(.rodata);
@@ -482,9 +488,9 @@ SECTIONS {
src/fldeff_cut.o(.rodata);
src/map_name_popup.o(.rodata);
src/item_menu_icons.o(.rodata);
src/battle_anim_80D51AC.o(.rodata);
src/battle_anim_mon_movement.o(.rodata);
src/item.o(.rodata);
data/contest.o(.rodata);
src/contest.o(.rodata);
src/shop.o(.rodata);
src/fldeff_escalator.o(.rodata);
src/berry.o(.rodata);
@@ -566,7 +572,7 @@ SECTIONS {
src/player_pc.o(.rodata);
src/intro.o(.rodata);
src/field_region_map.o(.rodata);
src/battle_anim_8170478.o(.rodata);
src/battle_anim_special.o(.rodata);
src/hall_of_fame.o(.rodata);
src/credits.o(.rodata);
src/lottery_corner.o(.rodata);