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

Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj

Browse Source
This commit is contained in:
GriffinR
2020-02-12 13:05:57 -05:00
parent 9c934c9664 66c6b7a38b
commit 956090b05f
71 changed files with 4332 additions and 2506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+22 -25
View File
@@ -297,7 +297,7 @@ SECTIONS {
src/battle_tent.o(.text);
src/unk_text_util_2.o(.text);
src/multiboot.o(.text);
src/unk_81BAD84.o(.text);
src/berry_fix_graphics.o(.text);
src/battle_controller_player_partner.o(.text);
src/mirage_tower.o(.text);
src/berry_fix_program.o(.text);
@@ -307,16 +307,16 @@ SECTIONS {
src/pokenav.o(.text);
src/pokenav_main_menu.o(.text);
src/pokenav_match_call_ui.o(.text);
src/pokenav_unk_1.o(.text);
src/pokenav_unk_2.o(.text);
src/pokenav_unk_3.o(.text);
src/pokenav_unk_4.o(.text);
src/pokenav_unk_5.o(.text);
src/pokenav_unk_6.o(.text);
src/pokenav_unk_7.o(.text);
src/pokenav_unk_8.o(.text);
src/pokenav_unk_9.o(.text);
src/pokenav_unk_10.o(.text);
src/pokenav_menu_handler_1.o(.text);
src/pokenav_menu_handler_2.o(.text);
src/pokenav_match_call_1.o(.text);
src/pokenav_match_call_2.o(.text);
src/pokenav_region_map.o(.text);
src/pokenav_conditions_1.o(.text);
src/pokenav_conditions_2.o(.text);
src/pokenav_conditions_3.o(.text);
src/pokenav_ribbons_1.o(.text);
src/pokenav_ribbons_2.o(.text);
src/pokenav_match_call_data.o(.text);
src/menu_specialized.o(.text);
src/ereader_helpers.o(.text);
@@ -455,7 +455,7 @@ SECTIONS {
src/union_room_chat.o(.rodata);
src/berry_crush.o(.rodata);
data/berry_crush.o(.rodata);
data/berry_powder.o(.rodata);
src/berry_powder.o(.rodata);
src/dodrio_berry_picking.o(.rodata);
src/pokemon_jump.o(.rodata);
src/rtc.o(.rodata);
@@ -539,7 +539,6 @@ SECTIONS {
src/secret_base.o(.rodata);
src/tv.o(.rodata);
src/contest_link_80F57C4.o(.rodata);
data/contest_link_80F57C4.o(.rodata);
src/script_pokemon_util_80F87D8.o(.rodata);
src/pokemon_size_record.o(.rodata)
src/fldeff_misc.o(.rodata);
@@ -578,7 +577,6 @@ SECTIONS {
data/image_processing_effects.o(.rodata);
src/decoration.o(.rodata);
src/slot_machine.o(.rodata);
data/slot_machine.o(.rodata);
src/contest_painting.o(.rodata);
src/battle_ai_script_commands.o(.rodata);
src/trader.o(.rodata);
@@ -644,7 +642,6 @@ SECTIONS {
src/battle_factory.o(.rodata);
src/battle_pike.o(.rodata);
src/rotating_tile_puzzle.o(.rodata);
data/rotating_tile_puzzle.o(.rodata);
src/battle_pyramid.o(.rodata);
src/item_menu.o(.rodata);
src/list_menu.o(.rodata);
@@ -654,7 +651,7 @@ SECTIONS {
src/battle_tent.o(.rodata);
src/unk_text_util_2.o(.rodata);
src/multiboot.o(.rodata);
src/unk_81BAD84.o(.rodata);
src/berry_fix_graphics.o(.rodata);
src/battle_controller_player_partner.o(.rodata);
src/mirage_tower.o(.rodata);
src/berry_fix_program.o(.rodata);
@@ -664,15 +661,15 @@ SECTIONS {
src/pokenav.o(.rodata);
src/pokenav_main_menu.o(.rodata);
src/pokenav_match_call_ui.o(.rodata);
src/pokenav_unk_1.o(.rodata);
src/pokenav_unk_2.o(.rodata);
src/pokenav_unk_3.o(.rodata);
src/pokenav_unk_4.o(.rodata);
src/pokenav_unk_5.o(.rodata);
src/pokenav_unk_7.o(.rodata);
src/pokenav_unk_8.o(.rodata);
src/pokenav_unk_9.o(.rodata);
src/pokenav_unk_10.o(.rodata);
src/pokenav_menu_handler_1.o(.rodata);
src/pokenav_menu_handler_2.o(.rodata);
src/pokenav_match_call_1.o(.rodata);
src/pokenav_match_call_2.o(.rodata);
src/pokenav_region_map.o(.rodata);
src/pokenav_conditions_2.o(.rodata);
src/pokenav_conditions_3.o(.rodata);
src/pokenav_ribbons_1.o(.rodata);
src/pokenav_ribbons_2.o(.rodata);
src/pokenav_match_call_data.o(.rodata);
src/menu_specialized.o(.rodata);
src/ereader_helpers.o(.rodata);