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

fixing merge conflicts

Browse Source
This commit is contained in:
golem galvanize
2018-12-07 14:47:20 -05:00
parent 18124740a4 6df2042b3b
commit 53fac4417b
1142 changed files with 128897 additions and 161276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ld_script.txt
+120 -75
View File
@@ -54,7 +54,6 @@ SECTIONS {
src/string_util.o(.text);
src/link.o(.text);
src/link_rfu.o(.text);
asm/link_rfu.o(.text);
src/rom_8011DC0.o(.text);
asm/rom_8011DC0.o(.text);
src/rtc.o(.text);
@@ -92,7 +91,6 @@ SECTIONS {
src/field_camera.o(.text);
src/field_door.o(.text);
src/field_player_avatar.o(.text);
asm/field_player_avatar.o(.text);
src/event_object_movement.o(.text);
src/field_message_box.o(.text);
src/event_obj_lock.o(.text);
@@ -138,9 +136,9 @@ SECTIONS {
src/contest.o(.text);
asm/contest.o(.text);
src/shop.o(.text);
asm/shop.o(.text);
src/fldeff_escalator.o(.text);
src/berry.o(.text);
asm/script_menu.o(.text);
src/script_menu.o(.text);
src/naming_screen.o(.text);
src/money.o(.text);
src/contest_effect.o(.text);
@@ -148,7 +146,7 @@ SECTIONS {
src/secret_base.o(.text);
src/tv.o(.text);
asm/contest_link_80F57C4.o(.text);
asm/script_pokemon_util_80F87D8.o(.text);
src/script_pokemon_util_80F87D8.o(.text);
src/field_poison.o(.text);
src/pokemon_size_record.o(.text);
asm/fldeff_80F9BCC.o(.text);
@@ -157,7 +155,25 @@ SECTIONS {
src/safari_zone.o(.text);
asm/contest_link_80FC4F4.o(.text);
src/item_use.o(.text);
asm/battle_anim_80FE840.o(.text);
asm/battle_anim_effects_1.o(.text);
asm/battle_anim_effects_2.o(.text);
asm/water.o(.text);
asm/fire.o(.text);
asm/electric.o(.text);
asm/ice.o(.text);
src/fight.o(.text);
src/poison.o(.text);
asm/flying.o(.text);
asm/psychic.o(.text);
src/bug.o(.text);
src/rock.o(.text);
asm/ghost.o(.text);
src/dragon.o(.text);
asm/dark.o(.text);
src/ground.o(.text);
src/normal.o(.text);
src/battle_anim_utility_funcs.o(.text);
asm/battle_intro.o(.text);
src/bike.o(.text);
src/easy_chat.o(.text);
asm/easy_chat.o(.text);
@@ -171,6 +187,7 @@ SECTIONS {
asm/cute_sketch.o(.text);
src/decoration.o(.text);
src/slot_machine.o(.text);
src/contest_painting.o(.text);
asm/contest_painting.o(.text);
src/battle_ai_script_commands.o(.text);
src/trader.o(.text);
@@ -179,16 +196,16 @@ SECTIONS {
src/rom6.o(.text);
src/pokeblock.o(.text);
src/fldeff_flash.o(.text);
asm/post_battle_event_funcs.o(.text);
src/post_battle_event_funcs.o(.text);
src/time_events.o(.text);
src/birch_pc.o(.text);
src/hof_pc.o(.text);
src/field_specials.o(.text);
src/battle_records.o(.text);
asm/pokedex_area_screen.o(.text);
src/pokedex_area_screen.o(.text);
src/evolution_scene.o(.text);
asm/roulette.o(.text);
asm/pokedex_cry_screen.o(.text);
src/pokedex_cry_screen.o(.text);
src/coins.o(.text);
src/landmark.o(.text);
src/fldeff_strength.o(.text);
@@ -212,7 +229,6 @@ SECTIONS {
src/decoration_inventory.o(.text);
src/roamer.o(.text);
src/battle_tower.o(.text);
asm/battle_tower.o(.text);
src/use_pokeblock.o(.text);
asm/use_pokeblock.o(.text);
src/battle_controller_wally.o(.text);
@@ -243,12 +259,17 @@ SECTIONS {
src/trainer_pokemon_sprites.o(.text);
src/lilycove_lady.o(.text);
src/battle_dome.o(.text);
src/battle_frontier_1.o(.text);
src/battle_palace.o(.text);
asm/battle_frontier_1.o(.text);
src/menu.o(.text);
src/battle_factory.o(.text);
src/battle_factory_screen.o(.text);
src/apprentice.o(.text);
asm/battle_frontier_2.o(.text);
src/frontier_util.o(.text);
src/battle_arena.o(.text);
src/battle_factory.o(.text);
src/battle_pike.o(.text);
src/mossdeep_gym.o(.text);
src/battle_pyramid.o(.text);
src/item_menu.o(.text);
src/list_menu.o(.text);
src/dynamic_placeholder_text_util.o(.text);
@@ -263,7 +284,6 @@ SECTIONS {
src/battle_controller_player_partner.o(.text);
src/fldeff_groundshake.o(.text);
src/fossil_specials.o(.text);
asm/fossil_specials.o(.text);
src/berry_fix_program.o(.text);
src/pokemon_summary_screen.o(.text);
src/unk_pokedex_area_screen_helper.o(.text);
@@ -277,7 +297,6 @@ SECTIONS {
src/gym_leader_rematch.o(.text);
src/unk_transition.o(.text);
src/international_string_util.o(.text);
asm/international_string_util.o(.text);
} =0
script_data :
@@ -420,7 +439,6 @@ SECTIONS {
src/tileset_anims.o(.rodata);
src/palette.o(.rodata);
data/fanfares.o(.rodata);
data/battle_anims.o(.rodata);
src/battle_anim.o(.rodata);
src/battle_anim_80A5C6C.o(.rodata);
data/map_events.o(.rodata);
@@ -435,7 +453,6 @@ SECTIONS {
src/field_effect.o(.rodata);
src/option_menu.o(.rodata);
src/pokedex.o(.rodata);
data/pokedex.o(.rodata);
data/trainer_card.o(.rodata);
src/pokemon_storage_system.o(.rodata);
data/pokemon_storage_system.o(.rodata);
@@ -443,10 +460,13 @@ 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/item.o(.rodata);
data/contest.o(.rodata);
data/shop.o(.rodata);
src/shop.o(.rodata);
src/fldeff_escalator.o(.rodata);
src/berry.o(.rodata);
data/script_menu.o(.rodata);
src/script_menu.o(.rodata);
src/naming_screen.o(.rodata);
src/money.o(.rodata);
src/contest_effect.o(.rodata);
@@ -454,13 +474,31 @@ SECTIONS {
src/secret_base.o(.rodata);
src/tv.o(.rodata);
data/contest_link_80F57C4.o(.rodata);
data/script_pokemon_util_80F87D8.o(.rodata);
src/script_pokemon_util_80F87D8.o(.rodata);
src/pokemon_size_record.o(.rodata)
data/field_effect_misc.o(.rodata);
src/field_special_scene.o(.rodata);
src/rotating_gate.o(.rodata);
src/item_use.o(.rodata);
data/battle_anim_80FE840.o(.rodata);
src/effects_1.o(.rodata);
src/effects_2.o(.rodata);
src/water.o(.rodata);
src/fire.o(.rodata);
src/electric.o(.rodata);
src/ice.o(.rodata);
src/fight.o(.rodata);
src/poison.o(.rodata);
src/flying.o(.rodata);
src/psychic.o(.rodata);
src/bug.o(.rodata);
src/rock.o(.rodata);
src/ghost.o(.rodata);
src/dragon.o(.rodata);
src/dark.o(.rodata);
src/ground.o(.rodata);
src/normal.o(.rodata);
src/battle_anim_utility_funcs.o(.rodata);
src/battle_intro.o(.rodata);
src/bike.o(.rodata);
data/easy_chat.o(.rodata);
src/mon_markings.o(.rodata);
@@ -483,10 +521,10 @@ SECTIONS {
src/time_events.o(.rodata);
src/field_specials.o(.rodata);
src/battle_records.o(.rodata);
data/pokedex_area_screen.o(.rodata);
src/pokedex_area_screen.o(.rodata);
src/evolution_scene.o(.rodata);
data/roulette.o(.rodata);
data/pokedex_cry_screen.o(.rodata);
src/pokedex_cry_screen.o(.rodata);
src/landmark.o(.rodata);
src/battle_transition.o(.rodata);
src/battle_controller_link_partner.o(.rodata);
@@ -501,6 +539,7 @@ SECTIONS {
src/learn_move.o(.rodata);
src/roamer.o(.rodata);
data/battle_tower.o(.rodata);
src/battle_tower.o(.rodata);
src/use_pokeblock.o(.rodata);
data/use_pokeblock.o(.rodata);
src/battle_controller_wally.o(.rodata);
@@ -529,11 +568,17 @@ SECTIONS {
src/trainer_pokemon_sprites.o(.rodata);
src/lilycove_lady.o(.rodata);
src/battle_dome.o(.rodata);
src/battle_palace.o(.rodata);
data/battle_frontier_1.o(.rodata);
src/menu.o(.rodata);
src/battle_factory.o(.rodata);
src/battle_factory_screen.o(.rodata);
src/apprentice.o(.rodata);
data/battle_frontier_2.o(.rodata);
src/frontier_util.o(.rodata);
src/battle_arena.o(.rodata);
src/battle_factory.o(.rodata);
src/battle_pike.o(.rodata);
data/mossdeep_gym.o(.rodata);
src/battle_pyramid.o(.rodata);
src/item_menu.o(.rodata);
src/list_menu.o(.rodata);
src/save_location.o(.rodata);
@@ -570,10 +615,10 @@ SECTIONS {
{
sound/songs/midi/mus_dummy.o(.rodata);
sound/songs/midi/se_kaifuku.o(.rodata);
sound/songs/se_pc_login.o(.rodata);
sound/songs/se_pc_off.o(.rodata);
sound/songs/se_pc_on.o(.rodata);
sound/songs/se_select.o(.rodata);
sound/songs/midi/se_pc_login.o(.rodata);
sound/songs/midi/se_pc_off.o(.rodata);
sound/songs/midi/se_pc_on.o(.rodata);
sound/songs/midi/se_select.o(.rodata);
sound/songs/se_win_open.o(.rodata);
sound/songs/se_wall_hit.o(.rodata);
sound/songs/midi/se_door.o(.rodata);
@@ -584,12 +629,12 @@ SECTIONS {
sound/songs/midi/se_kouka_m.o(.rodata);
sound/songs/midi/se_kouka_h.o(.rodata);
sound/songs/midi/se_bowa2.o(.rodata);
sound/songs/se_poke_dead.o(.rodata);
sound/songs/se_nigeru.o(.rodata);
sound/songs/midi/se_poke_dead.o(.rodata);
sound/songs/midi/se_nigeru.o(.rodata);
sound/songs/midi/se_jido_doa.o(.rodata);
sound/songs/se_naminori.o(.rodata);
sound/songs/midi/se_naminori.o(.rodata);
sound/songs/midi/se_ban.o(.rodata);
sound/songs/se_pin.o(.rodata);
sound/songs/midi/se_pin.o(.rodata);
sound/songs/midi/se_boo.o(.rodata);
sound/songs/midi/se_bowa.o(.rodata);
sound/songs/midi/se_jyuni.o(.rodata);
@@ -597,21 +642,21 @@ SECTIONS {
sound/songs/midi/se_i.o(.rodata);
sound/songs/se_u.o(.rodata);
sound/songs/midi/se_e.o(.rodata);
sound/songs/se_o.o(.rodata);
sound/songs/se_n.o(.rodata);
sound/songs/se_seikai.o(.rodata);
sound/songs/midi/se_o.o(.rodata);
sound/songs/midi/se_n.o(.rodata);
sound/songs/midi/se_seikai.o(.rodata);
sound/songs/midi/se_hazure.o(.rodata);
sound/songs/midi/se_exp.o(.rodata);
sound/songs/midi/se_jite_pyoko.o(.rodata);
sound/songs/se_mu_pachi.o(.rodata);
sound/songs/midi/se_mu_pachi.o(.rodata);
sound/songs/se_tk_kasya.o(.rodata);
sound/songs/midi/se_fu_zaku.o(.rodata);
sound/songs/midi/se_fu_zaku2.o(.rodata);
sound/songs/midi/se_fu_zuzuzu.o(.rodata);
sound/songs/se_ru_gashin.o(.rodata);
sound/songs/se_ru_gasyan.o(.rodata);
sound/songs/se_ru_bari.o(.rodata);
sound/songs/se_ru_hyuu.o(.rodata);
sound/songs/midi/se_ru_gashin.o(.rodata);
sound/songs/midi/se_ru_gasyan.o(.rodata);
sound/songs/midi/se_ru_bari.o(.rodata);
sound/songs/midi/se_ru_hyuu.o(.rodata);
sound/songs/midi/se_ki_gasyan.o(.rodata);
sound/songs/se_tk_warpin.o(.rodata);
sound/songs/se_tk_warpout.o(.rodata);
@@ -621,15 +666,15 @@ SECTIONS {
sound/songs/se_track_stop.o(.rodata);
sound/songs/se_track_haiki.o(.rodata);
sound/songs/se_track_door.o(.rodata);
sound/songs/se_moter.o(.rodata);
sound/songs/midi/se_moter.o(.rodata);
sound/songs/midi/se_card.o(.rodata);
sound/songs/se_save.o(.rodata);
sound/songs/midi/se_save.o(.rodata);
sound/songs/midi/se_kon.o(.rodata);
sound/songs/midi/se_kon2.o(.rodata);
sound/songs/midi/se_kon3.o(.rodata);
sound/songs/midi/se_kon4.o(.rodata);
sound/songs/se_suikomu.o(.rodata);
sound/songs/se_nageru.o(.rodata);
sound/songs/midi/se_suikomu.o(.rodata);
sound/songs/midi/se_nageru.o(.rodata);
sound/songs/se_toy_c.o(.rodata);
sound/songs/se_toy_d.o(.rodata);
sound/songs/se_toy_e.o(.rodata);
@@ -638,10 +683,10 @@ SECTIONS {
sound/songs/se_toy_a.o(.rodata);
sound/songs/se_toy_b.o(.rodata);
sound/songs/se_toy_c1.o(.rodata);
sound/songs/se_mizu.o(.rodata);
sound/songs/midi/se_mizu.o(.rodata);
sound/songs/midi/se_hashi.o(.rodata);
sound/songs/midi/se_daugi.o(.rodata);
sound/songs/se_pinpon.o(.rodata);
sound/songs/midi/se_pinpon.o(.rodata);
sound/songs/midi/se_fuusen1.o(.rodata);
sound/songs/midi/se_fuusen2.o(.rodata);
sound/songs/midi/se_fuusen3.o(.rodata);
@@ -649,37 +694,37 @@ SECTIONS {
sound/songs/se_toy_dango.o(.rodata);
sound/songs/midi/se_doku.o(.rodata);
sound/songs/midi/se_esuka.o(.rodata);
sound/songs/se_t_ame.o(.rodata);
sound/songs/se_t_ame_e.o(.rodata);
sound/songs/se_t_ooame.o(.rodata);
sound/songs/se_t_ooame_e.o(.rodata);
sound/songs/se_t_koame.o(.rodata);
sound/songs/se_t_koame_e.o(.rodata);
sound/songs/se_t_kami.o(.rodata);
sound/songs/se_t_kami2.o(.rodata);
sound/songs/midi/se_t_ame.o(.rodata);
sound/songs/midi/se_t_ame_e.o(.rodata);
sound/songs/midi/se_t_ooame.o(.rodata);
sound/songs/midi/se_t_ooame_e.o(.rodata);
sound/songs/midi/se_t_koame.o(.rodata);
sound/songs/midi/se_t_koame_e.o(.rodata);
sound/songs/midi/se_t_kami.o(.rodata);
sound/songs/midi/se_t_kami2.o(.rodata);
sound/songs/midi/se_elebeta.o(.rodata);
sound/songs/midi/se_hinsi.o(.rodata);
sound/songs/midi/se_expmax.o(.rodata);
sound/songs/se_tamakoro.o(.rodata);
sound/songs/se_tamakoro_e.o(.rodata);
sound/songs/midi/se_basabasa.o(.rodata);
sound/songs/se_regi.o(.rodata);
sound/songs/midi/se_regi.o(.rodata);
sound/songs/midi/se_c_gaji.o(.rodata);
sound/songs/midi/se_c_maku_u.o(.rodata);
sound/songs/midi/se_c_maku_d.o(.rodata);
sound/songs/midi/se_c_pasi.o(.rodata);
sound/songs/midi/se_c_syu.o(.rodata);
sound/songs/midi/se_c_pikon.o(.rodata);
sound/songs/se_reapoke.o(.rodata);
sound/songs/se_op_basyu.o(.rodata);
sound/songs/midi/se_reapoke.o(.rodata);
sound/songs/midi/se_op_basyu.o(.rodata);
sound/songs/midi/se_bt_start.o(.rodata);
sound/songs/midi/se_dendou.o(.rodata);
sound/songs/midi/se_jihanki.o(.rodata);
sound/songs/se_tama.o(.rodata);
sound/songs/se_z_scroll.o(.rodata);
sound/songs/se_z_page.o(.rodata);
sound/songs/se_pn_on.o(.rodata);
sound/songs/se_pn_off.o(.rodata);
sound/songs/midi/se_pn_on.o(.rodata);
sound/songs/midi/se_pn_off.o(.rodata);
sound/songs/midi/se_z_search.o(.rodata);
sound/songs/se_tamago.o(.rodata);
sound/songs/se_tb_start.o(.rodata);
@@ -816,21 +861,21 @@ SECTIONS {
sound/songs/se_w287b.o(.rodata);
sound/songs/se_w114.o(.rodata);
sound/songs/se_w063b.o(.rodata);
sound/songs/se_rg_w_door.o(.rodata);
sound/songs/se_rg_card1.o(.rodata);
sound/songs/se_rg_card2.o(.rodata);
sound/songs/se_rg_card3.o(.rodata);
sound/songs/se_rg_bag1.o(.rodata);
sound/songs/se_rg_bag2.o(.rodata);
sound/songs/se_rg_getting.o(.rodata);
sound/songs/se_rg_shop.o(.rodata);
sound/songs/se_rg_kiteki.o(.rodata);
sound/songs/se_rg_help_op.o(.rodata);
sound/songs/se_rg_help_cl.o(.rodata);
sound/songs/se_rg_help_ng.o(.rodata);
sound/songs/se_rg_deomov.o(.rodata);
sound/songs/se_rg_excellent.o(.rodata);
sound/songs/se_rg_nawamiss.o(.rodata);
sound/songs/midi/se_rg_w_door.o(.rodata);
sound/songs/midi/se_rg_card1.o(.rodata);
sound/songs/midi/se_rg_card2.o(.rodata);
sound/songs/midi/se_rg_card3.o(.rodata);
sound/songs/midi/se_rg_bag1.o(.rodata);
sound/songs/midi/se_rg_bag2.o(.rodata);
sound/songs/midi/se_rg_getting.o(.rodata);
sound/songs/midi/se_rg_shop.o(.rodata);
sound/songs/midi/se_rg_kiteki.o(.rodata);
sound/songs/midi/se_rg_help_op.o(.rodata);
sound/songs/midi/se_rg_help_cl.o(.rodata);
sound/songs/midi/se_rg_help_ng.o(.rodata);
sound/songs/midi/se_rg_deomov.o(.rodata);
sound/songs/midi/se_rg_excellent.o(.rodata);
sound/songs/midi/se_rg_nawamiss.o(.rodata);
sound/songs/se_toreeye.o(.rodata);
sound/songs/se_toreoff.o(.rodata);
sound/songs/midi/se_hantei1.o(.rodata);