Merge branch 'master' into slot_machine

1 files changed, 93 insertions, 57 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 3057ccdb7..0fcc799e3 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -61,10 +61,10 @@ SECTIONS {
         src/sprite.o(.text);
         src/string_util.o(.text);
         asm/link.o(.text);
-        asm/multiboot.o(.text);
+        src/multiboot.o(.text);
         asm/main_menu.o(.text);
         asm/battle_controllers.o(.text);
-        asm/decompress.o(.text);
+        src/decompress.o(.text);
         asm/battle_1.o(.text);
         asm/battle_2.o(.text);
         asm/battle_util.o(.text);
@@ -76,7 +76,6 @@ SECTIONS {
         asm/battle_ai_switch_items.o(.text);
         asm/battle_controller_link_opponent.o(.text);
         src/pokemon.o(.text);
-        asm/pokemon_3.o(.text);
         src/trig.o(.text);
         src/random.o(.text);
         src/util.o(.text);
@@ -87,7 +86,7 @@ SECTIONS {
         asm/pokeball.o(.text);
         src/load_save.o(.text);
         asm/trade.o(.text);
-        asm/play_time.o(.text);
+        src/play_time.o(.text);
         asm/new_game.o(.text);
         asm/overworld.o(.text);
         src/fieldmap.o(.text);
@@ -112,12 +111,12 @@ SECTIONS {
         asm/palette.o(.text);
         src/sound.o(.text);
         asm/battle_anim.o(.text);
-        asm/battle_anim_8074480.o(.text);
+        asm/battle_anim_mons.o(.text);
         src/task.o(.text);
         asm/reshow_battle_screen.o(.text);
-        asm/battle_anim_8078178.o(.text);
+        asm/battle_anim_status_effects.o(.text);
         asm/title_screen.o(.text);
-        asm/reset_save_heap.o(.text);
+        src/reset_save_heap.o(.text);
         asm/field_weather.o(.text);
         asm/field_weather_effects.o(.text);
         asm/field_fadetransition.o(.text);
@@ -135,108 +134,126 @@ SECTIONS {
         asm/pokemon_icon.o(.text);
         asm/script_movement.o(.text);
         asm/fldeff_cut.o(.text);
-        asm/mail_data.o(.text);
+        src/mail_data.o(.text);
         asm/map_name_popup.o(.text);
-        asm/item_menu_icons.o(.text);
-        asm/battle_anim_80989F8.o(.text);
-        asm/item.o(.text);
+        src/item_menu_icons.o(.text);
+        src/battle_anim_mon_movement.o(.text);
+        src/item.o(.text);
         asm/shop.o(.text);
         src/berry.o(.text);
         asm/script_menu.o(.text);
         asm/naming_screen.o(.text);
         src/money.o(.text);
         asm/script_pokemon_util_80A0058.o(.text);
-        asm/field_poison.o(.text);
+        src/field_poison.o(.text);
         asm/pokemon_size_record.o(.text);
         asm/pc_screen_effect.o(.text);
-        asm/fldeff_poison.o(.text);
+        src/fldeff_poison.o(.text);
         src/fldeff_berrytree.o(.text);
-        asm/field_special_scene.o(.text);
-        asm/safari_zone.o(.text);
-        asm/item_use.o(.text);
-        asm/battle_anim_80A22E8.o(.text);
+        src/field_special_scene.o(.text);
+        src/safari_zone.o(.text);
+        src/item_use.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);
+        asm/fighting.o(.text);
+        asm/poison.o(.text);
+        asm/flying.o(.text);
+        asm/psychic.o(.text);
+        asm/bug.o(.text);
+        asm/rock.o(.text);
+        asm/ghost.o(.text);
+        asm/dragon.o(.text);
+        asm/dark.o(.text);
+        asm/ground.o(.text);
+        asm/normal.o(.text);
+        asm/battle_anim_utility_funcs.o(.text);
         asm/bike.o(.text);
         asm/easy_chat.o(.text);
         asm/mon_markings.o(.text);
         asm/mail.o(.text);
-        asm/menu_helpers.o(.text);
+        src/menu_helpers.o(.text);
         asm/script_pokemon_util_80BF8FC.o(.text);
         src/heal_location.o(.text);
         asm/region_map.o(.text);
         src/battle_ai_script_commands.o(.text);
-        asm/rom6.o(.text);
+        src/fldeff_rocksmash.o(.text);
+        src/fldeff_dig.o(.text);
         asm/fldeff_flash.o(.text);
         asm/post_battle_event_funcs.o(.text);
         src/prof_pc.o(.text);
-        asm/hof_pc.o(.text);
+        src/hof_pc.o(.text);
         asm/field_specials.o(.text);
-        asm/battle_records.o(.text);
+        src/battle_records.o(.text);
         asm/evolution_scene.o(.text);
         src/coins.o(.text);
-        asm/fldeff_strength.o(.text);
+        src/fldeff_strength.o(.text);
         asm/battle_transition.o(.text);
         asm/battle_controller_link_partner.o(.text);
         asm/battle_message.o(.text);
         src/math_util.o(.text);
         src/roulette_util.o(.text);
-        asm/cable_car_util.o(.text);
+        src/cable_car_util.o(.text);
         src/save.o(.text);
         src/mystery_event_script.o(.text);
         asm/field_effect_helpers.o(.text);
         asm/battle_anim_sound_tasks.o(.text);
         asm/battle_controller_safari.o(.text);
-        asm/fldeff_sweetscent.o(.text);
-        asm/battle_anim_80DE2C0.o(.text);
+        src/fldeff_sweetscent.o(.text);
+        asm/battle_anim_effects_3.o(.text);
         asm/learn_move.o(.text);
-        asm/fldeff_softboiled.o(.text);
+        src/fldeff_softboiled.o(.text);
         asm/battle_tower.o(.text);
         asm/battle_controller_oak.o(.text);
         asm/player_pc.o(.text);
-        asm/intro.o(.text);
-        asm/battle_anim_80EEC0C.o(.text);
+        src/intro.o(.text);
+        asm/battle_anim_special.o(.text);
         asm/hall_of_fame.o(.text);
         asm/credits.o(.text);
-        asm/diploma.o(.text);
+        src/diploma.o(.text);
         asm/save_failed_screen.o(.text);
         asm/clear_save_data_screen.o(.text);
         asm/evolution_graphics.o(.text);
         src/fldeff_teleport.o(.text);
-        asm/new_menu_helpers.o(.text);
+        src/new_menu_helpers.o(.text);
         asm/box_party_pokemon_dropdown.o(.text);
         asm/save_menu_util.o(.text);
         asm/map_preview_screen.o(.text);
         asm/link_rfu_2.o(.text);
         asm/link_rfu.o(.text);
         asm/pokedex_screen.o(.text);
-        asm/list_menu.o(.text);
+        src/list_menu.o(.text);
         asm/item_menu.o(.text);
-        asm/save_location.o(.text);
+        src/save_location.o(.text);
         src/bag.o(.text);
         src/trainer_pokemon_sprites.o(.text);
         src/vs_seeker.o(.text);
-        asm/item_pc.o(.text);
+        src/item_pc.o(.text);
         asm/mailbox_pc.o(.text);
-        asm/menu.o(.text);
+        src/menu.o(.text);
         src/quest_log.o(.text);
         asm/link_rfu_3.o(.text);
         asm/pokemon_special_anim.o(.text);
         asm/party_menu.o(.text);
         asm/union_room_chat.o(.text);
-        asm/help_system_812B1E0.o(.text);
+        src/help_system_812B1E0.o(.text);
         src/quest_log_battle.o(.text);
         src/fame_checker.o(.text);
         src/menu2.o(.text);
         src/oak_speech.o(.text);
         src/tm_case.o(.text);
-        asm/menu_indicators.o(.text);
+        src/menu_indicators.o(.text);
         asm/pokedex_area_markers.o(.text);
         asm/pokemon_summary_screen.o(.text);
-        asm/help_system.o(.text);
+        src/help_system.o(.text);
         asm/wild_pokemon_area.o(.text);
-        asm/unk_text_util.o(.text);
+        src/dynamic_placeholder_text_util.o(.text);
         asm/berry_pouch.o(.text);
         asm/itemfinder.o(.text);
-        asm/buy_menu_helpers.o(.text);
+        src/buy_menu_helpers.o(.text);
         src/slot_machine.o(.text);
         asm/slot_machine.o(.text);
         src/roamer.o(.text);
@@ -261,15 +278,15 @@ SECTIONS {
         src/unk_8159F40.o(.text);
         src/dodrio_berry_picking_2.o(.text);
         asm/dodrio_berry_picking_2.o(.text);
-        asm/teachy_tv.o(.text);
-        asm/ereader_helpers.o(.text);
+        src/teachy_tv.o(.text);
+        src/ereader_helpers.o(.text);
         src/unk_815C980.o(.text);
-        asm/ss_anne.o(.text);
-        asm/cereader_tool.o(.text);
+        src/ss_anne.o(.text);
+        src/cereader_tool.o(.text);
         src/trainer_tower.o(.text);
-        asm/unk_815EDDC.o(.text);
-        asm/unk_815F138.o(.text);
-        asm/berry_fix_program.o(.text);
+        src/berry_powder.o(.text);
+        src/unk_815F138.o(.text);
+        src/berry_fix_program.o(.text);
     } =0
 
     script_data :
@@ -364,6 +381,7 @@ SECTIONS {
         src/bg_regs.o(.rodata);
         src/string_util.o(.rodata);
         data/data.o(.rodata);
+        src/pokemon.o(.rodata);
         src/trig.o(.rodata);
         src/util.o(.rodata);
         src/daycare.o(.rodata);
@@ -391,31 +409,50 @@ SECTIONS {
         data/title_screen.o(.rodata);
         data/field_weather.o(.rodata);
         data/data_835B488.o(.rodata);
+        src/item_menu_icons.o(.rodata);
+        src/battle_anim_mon_movement.o(.rodata);
+        src/item.o(.rodata);
+        data/data_835B488.o(.rodata.83DF09C);
         src/heal_location.o(.rodata);
         data/data_835B488.o(.rodata.83EEC98);
         src/battle_ai_script_commands.o(.rodata);
         data/data_83F5738.o(.rodata);
+        src/battle_records.o(.rodata);
+        data/data_83F5738.o(.rodata.83F6C90);
         src/save.o(.rodata);
         data/data_83FECCC.o(.rodata);
+		src/intro.o(.rodata);
+        data/data_83FECCC.o(.rodata.battle_anim_special);
+        src/diploma.o(.rodata);
+        data/strings.o(.rodata);
+        data/data_83FECCC.o(.rodata.841EE44);
+        src/new_menu_helpers.o(.rodata);
+        data/data_83FECCC.o(.rodata.841F4B4);
+        src/list_menu.o(.rodata);
+        data/data_83FECCC.o(.rodata.8452CF4);
+        src/save_location.o(.rodata);
         src/bag.o(.rodata);
         src/trainer_pokemon_sprites.o(.rodata);
         src/vs_seeker.o(.rodata);
+        src/item_pc.o(.rodata);
         data/data_83FECCC.o(.rodata.8453F6C);
+        src/menu.o(.rodata);
         src/quest_log.o(.rodata);
         data/data_83FECCC.o(.rodata.8456C74);
+        src/help_system_812B1E0.o(.rodata);
         src/fame_checker.o(.rodata);
         src/menu2.o(.rodata);
         src/oak_speech.o(.rodata);
         src/tm_case.o(.rodata);
-        data/menu_indicators.o(.rodata);
+        src/menu_indicators.o(.rodata);
         data/pokedex_area_markers.o(.rodata);
         data/pokemon_summary_screen.o(.rodata);
-        data/help_system.o(.rodata);
+        src/help_system.o(.rodata);
         data/wild_pokemon_area.o(.rodata);
-        data/unk_text_util.o(.rodata);
+        src/dynamic_placeholder_text_util.o(.rodata);
         data/berry_pouch.o(.rodata);
         data/itemfinder.o(.rodata);
-        data/buy_menu_helpers.o(.rodata);
+        src/buy_menu_helpers.o(.rodata);
         src/slot_machine.o(.rodata);
         data/slot_machine.o(.rodata);
         src/roamer.o(.rodata);
@@ -435,9 +472,14 @@ SECTIONS {
         src/text_window_graphics.o(.rodata);
         src/quest_log_8150454.o(.rodata);
         data/data_8471F00.o(.rodata);
+        src/teachy_tv.o(.rodata);
         src/unk_815C980.o(.rodata);
         data/data_8471F00.o(.rodata.8479668);
+        src/ss_anne.o(.rodata);
+        src/cereader_tool.o(.rodata);
         src/trainer_tower.o(.rodata);
+        src/unk_815F138.o(.rodata);
+        src/berry_fix_program.o(.rodata);
         data/data_8471F00.o(.rodata.after_trainer_tower);
         src/mystery_event_msg.o(.rodata);
         data/mystery_event_msg.o(.rodata);
@@ -505,13 +547,7 @@ SECTIONS {
         data/multiboot_pokemon_colosseum.o(.rodata);
     } =0
 
-    gap1 :
-    {
-        gap1_start = ABSOLUTE(.);
-        BYTE(0xFF)
-        . = 0x8D00000 - gap1_start;
-    } =0xFF
-
+	. = 0x08D00000;
     gfx_data :
     ALIGN(4)
     {