Merge branch 'master' into cable_car

1 files changed, 171 insertions, 35 deletions

diff --git a/ld_script.txt b/ld_script.txt
index 84785c7b9..a1e1d969d 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -9,8 +9,6 @@ SECTIONS {
     ewram (NOLOAD) :
     ALIGN(4)
     {
-        . = 0x20000;
-
 <EWRAM>
 
         . = 0x40000;
@@ -67,7 +65,7 @@ SECTIONS {
         src/pokemon/pokemon_3.o(.text);
         src/de_rom_8040FE0.o(.text);
         src/engine/trig.o(.text);
-        src/engine/rng.o(.text);
+        src/engine/random.o(.text);
         src/engine/util.o(.text);
         src/engine/blend_palette.o(.text);
         src/field/daycare.o(.text);
@@ -113,7 +111,7 @@ SECTIONS {
         src/battle/battle_anim_807B69C.o(.text);
         src/scene/title_screen.o(.text);
         src/field/field_weather.o(.text);
-        asm/field_weather.o(.text);
+        src/field/field_weather_effects.o(.text);
         src/field/field_fadetransition.o(.text);
         src/field/field_screen_effect.o(.text);
         src/battle/battle_setup.o(.text);
@@ -129,13 +127,12 @@ SECTIONS {
         src/engine/trainer_card.o(.text);
         src/engine/save_menu_util.o(.text);
         src/battle/battle_party_menu.o(.text);
+        asm/unk_text_8095904.o(.text);
         asm/pokemon_storage_system.o(.text);
         src/pokemon/pokemon_storage_system.o(.text);
         asm/pokemon_storage_system.o(.text_8098A38);
         src/pokemon/pokemon_icon.o(.text);
-        asm/pokemon_summary_screen.o(.text);
         src/pokemon/pokemon_summary_screen.o(.text);
-        asm/pokemon_summary_screen.o(.text_80A0958);
         src/field/script_movement.o(.text);
         src/field/fldeff_cut.o(.text);
         src/pokemon/mail_data.o(.text);
@@ -154,25 +151,162 @@ SECTIONS {
         src/engine/record_mixing.o(.text);
         src/debug/sound_check_menu.o(.text);
         src/field/secret_base.o(.text);
-        asm/secret_base.o(.text_80BC1D0);
         src/field/tv.o(.text);
         asm/contest_link_80C2020.o(.text);
         src/script_pokemon_util_80C4BF0.o(.text);
         src/field/field_poison.o(.text);
         src/pokemon/pokemon_size_record.o(.text);
-        asm/fldeff_80C5CD4.o(.text);
+        src/field/pc_screen_effect.o(.text);
+        asm/pc_screen_effect.o(.text);
+        src/field/fldeff_secretpower.o(.text);
+        src/field/fldeff_secret_base_pc.o(.text);
+        src/field/fldeff_decoration.o(.text);
+        src/field/fldeff_poison.o(.text);
+        src/field/fldeff_berrytree.o(.text);
+        src/field/fldeff_recordmixing.o(.text);
         src/field/field_special_scene.o(.text);
         src/field/rotating_gate.o(.text);
         src/field/safari_zone.o(.text);
         asm/contest_link_80C857C.o(.text);
         src/battle/contest_link_80C857C.o(.text);
         src/field/item_use.o(.text);
-        asm/battle_anim_80CA710.o(.text);
+        src/battle/anim/powder.o(.text);
+        src/battle/anim/orbs.o(.text);
+        src/battle/anim/seed.o(.text);
+        src/battle/anim/orbit.o(.text);
+        src/battle/anim/leaf.o(.text);
+        src/battle/anim/cutter.o(.text);
+        src/battle/anim/tendrils.o(.text);
+        src/battle/anim/silhouette.o(.text);
+        src/battle/anim/copy_orb.o(.text);
+        src/battle/anim/roots.o(.text);
+        src/battle/anim/osmose.o(.text);
+        src/battle/anim/hop.o(.text);
+        src/battle/anim/heal.o(.text);
+        src/battle/anim/hop_2.o(.text);
+        src/battle/anim/switch.o(.text);
+        src/battle/anim/flying_path.o(.text);
+        src/battle/anim/flying_petals.o(.text);
+        src/battle/anim/shimmer.o(.text);
+        src/battle/anim/homing.o(.text);
+        src/battle/anim/whip.o(.text);
+        src/battle/anim/unused_1.o(.text);
+        src/battle/anim/slice.o(.text);
+        src/battle/anim/unused_2.o(.text);
+        src/battle/anim/shield.o(.text);
+        src/battle/anim/bottle.o(.text);
+        src/battle/anim/glitter.o(.text);
+        src/battle/anim/unused_3.o(.text);
+        src/battle/anim/sleep.o(.text);
+        src/battle/anim/scan.o(.text);
+        src/battle/anim/lunge_1.o(.text);
+        src/battle/anim/unused_4.o(.text);
+        src/battle/anim/lunge_2.o(.text);
+        src/battle/anim/slash.o(.text);
+        src/battle/anim/brace.o(.text);
+        src/battle/anim/cube.o(.text);
+        src/battle/anim/tile_in.o(.text);
+        src/battle/anim/tile_out.o(.text);
+        src/battle/anim/moon.o(.text);
+        src/battle/anim/twinkle.o(.text);
+        src/battle/anim/flash.o(.text);
+        src/battle/anim/strike.o(.text);
+        src/battle/anim/evasion.o(.text);
+        src/battle/anim/fang.o(.text);
+        src/battle/anim/note_wave.o(.text);
+        src/battle/anim/note_scatter.o(.text);
+        src/battle/anim/drum.o(.text);
+        src/battle/anim/note_scatter_2.o(.text);
+        src/battle/anim/thought.o(.text);
+        src/battle/anim/wave_finger.o(.text);
+        src/battle/anim/spin_finger.o(.text);
+        src/battle/anim/taunt_finger.o(.text);
+        src/battle/anim/unused_5.o(.text);
+        src/battle/anim/unused_6.o(.text);
+        src/battle/anim/unused_7.o(.text);
+        src/battle/anim/unused_8.o(.text);
+        src/battle/anim/withdraw.o(.text);
+        src/battle/anim/alert.o(.text);
+        src/battle/anim/sword.o(.text);
+        src/battle/anim/sonic.o(.text);
+        src/battle/anim/sonic_task.o(.text);
+        src/battle/anim/unused_9.o(.text);
+        src/battle/anim/money.o(.text);
+        src/battle/anim/bullet.o(.text);
+        src/battle/anim/cyclone.o(.text);
+        src/battle/anim/grip.o(.text);
+        src/battle/anim/guillotine.o(.text);
+        src/battle/anim/shadow_enlarge.o(.text);
+        src/battle/anim/shadow_minimize.o(.text);
+        src/battle/anim/splash.o(.text);
+        src/battle/anim/grow.o(.text);
+        src/battle/anim/breath.o(.text);
+        src/battle/anim/anger.o(.text);
+        src/battle/anim/thrashing.o(.text);
+        src/battle/anim/draw.o(.text);
+        src/battle/anim/ring.o(.text);
+        src/battle/anim/egg.o(.text);
+        src/battle/anim/espeed.o(.text);
+        src/battle/anim/smoke.o(.text);
+        src/battle/anim/glow.o(.text);
+        src/battle/anim/note_rain.o(.text);
+        src/battle/anim/heart_1.o(.text);
+        src/battle/anim/curtain.o(.text);
+        src/battle/anim/startle.o(.text);
+        src/battle/anim/blow_kiss.o(.text);
+        src/battle/anim/kiss_fountain.o(.text);
+        src/battle/anim/flying_hearts.o(.text);
+        src/battle/anim/love_bg.o(.text);
+        src/battle/anim/scary_face.o(.text);
+        src/battle/anim/orbit_fast.o(.text);
+        src/battle/anim/orbit_scatter.o(.text);
+        src/battle/anim/spit.o(.text);
+        src/battle/anim/perceive.o(.text);
+        src/battle/anim/angel.o(.text);
+        src/battle/anim/angel_kiss.o(.text);
+        src/battle/anim/devil.o(.text);
+        src/battle/anim/swipe.o(.text);
+        src/battle/anim/struggle.o(.text);
+        src/battle/anim/uproar.o(.text);
+        src/battle/anim/noise.o(.text);
+        src/battle/anim/note_spin.o(.text);
+        src/battle/anim/guard.o(.text);
+        src/battle/anim/fury_cutter_count.o(.text);
+        src/battle/anim/rain.o(.text);
+        src/battle/anim/bubble.o(.text);
+        src/battle/anim/aurora.o(.text);
+        src/battle/anim/energy_wave.o(.text);
+        src/battle/anim/water.o(.text);
+        asm/water.o(.text);
+        asm/fire.o(.text);
+        src/battle/anim/sunlight.o(.text);
+        asm/fire_2.o(.text);
+        src/battle/anim/heated_rock.o(.text);
+        src/battle/anim/wisp_orb.o(.text);
+        asm/wisp_fire.o(.text);
+        src/battle/anim/thunder.o(.text);
+        src/battle/anim/beta_beat_up.o(.text);
+        src/battle/anim/shock.o(.text);
+        asm/current.o(.text);
+        asm/ice.o(.text);
+        asm/fight.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_intro.o(.text);
         src/field/bike.o(.text);
         asm/easy_chat.o(.text);
         src/field/easy_chat.o(.text);
+        src/pokenav_before.o(.text);
         asm/pokenav.o(.text);
-        src/field/pokenav.o(.text);
+        src/pokenav_after.o(.text);
         asm/pokenav.o(.text_80F708C);
         src/pokemon/mon_markings.o(.text);
         src/field/mauville_man.o(.text);
@@ -233,7 +367,7 @@ SECTIONS {
         src/field/fldeff_softboiled.o(.text);
         src/field/decoration_inventory.o(.text);
         src/field/roamer.o(.text);
-        asm/battle_tower.o(.text);
+        src/field/battle_tower.o(.text);
         src/field/use_pokeblock.o(.text);
         src/battle/battle_controller_wally.o(.text);
         src/field/player_pc.o(.text);
@@ -313,7 +447,7 @@ SECTIONS {
         src/engine/string_util.o(.rodata);
         src/engine/link.o(.rodata);
         src/engine/rtc.o(.rodata);
-        data/main_menu.o(.rodata);
+        src/engine/main_menu.o(.rodata);
         data/data2a.o(.rodata);
         src/battle/battle_4.o(.rodata);
         src/battle/battle_controller_player.o(.rodata);
@@ -338,21 +472,21 @@ SECTIONS {
         data/maps.o(.rodata);
         src/field/fieldmap.o(.rodata);
         src/field/metatile_behavior.o(.rodata);
-        data/field_door.o(.rodata);
+        src/field/field_door.o(.rodata);
         src/field/field_player_avatar.o(.rodata);
         src/field/field_map_obj.o(.rodata);
         src/field/field_ground_effect.o(.rodata);
         data/field_map_obj_helpers.o(.rodata);
-        data/text_window.o(.rodata);
+        src/engine/text_window.o(.rodata);
         src/engine/script.o(.rodata);
         src/field/scrcmd.o(.rodata);
         src/field/coord_event_weather.o(.rodata);
         src/field/field_tasks.o(.rodata);
-        data/reset_rtc_screen.o(.rodata);
+        src/engine/reset_rtc_screen.o(.rodata);
         src/field/party_menu.o(.rodata);
         src/field/start_menu.o(.rodata);
         src/engine/menu.o(.rodata);
-        data/tileset_anim.o(.rodata);
+        src/engine/tileset_anim.o(.rodata);
         src/engine/palette.o(.rodata);
         src/engine/sound.o(.rodata);
         data/battle_anim.o(.rodata);
@@ -363,15 +497,15 @@ SECTIONS {
         src/engine/task.o(.rodata);
         src/battle/battle_anim_807B69C.o(.rodata);
         src/scene/title_screen.o(.rodata);
-        data/field_weather.o(.rodata);
+        src/field/field_weather.o(.rodata);
+        src/field/field_weather_effects.o(.rodata);
         src/field/field_screen_effect.o(.rodata);
         src/battle/battle_setup.o(.rodata);
-        data/cable_club.o(.rodata);
-        data/mori_debug_menu.o(.rodata);
+        src/engine/cable_club.o(.rodata);
+        src/debug/mori_debug_menu.o(.rodata);
         src/field/trainer_see.o(.rodata);
         data/trainer_see.o(.rodata);
         src/field/wild_encounter.o(.rodata);
-        data/wild_encounter.o(.rodata);
         src/field/field_effect.o(.rodata);
         src/pokemon/pokemon_menu.o(.rodata);
         src/engine/option_menu.o(.rodata);
@@ -380,39 +514,42 @@ SECTIONS {
         src/battle/battle_party_menu.o(.rodata);
         data/pokemon_storage_system.o(.rodata);
         src/pokemon/pokemon_icon.o(.rodata);
-        data/pokemon_summary_screen.o(.rodata);
-        data/fldeff_cut.o(.rodata);
+        src/pokemon/pokemon_summary_screen.o(.rodata);
+        src/field/fldeff_cut.o(.rodata);
         src/field/item_menu.o(.rodata);
         data/battle_anim_80A7E7C.o(.rodata);
         src/field/item.o(.rodata);
-        data/matsuda_debug_menu.o(.rodata);
+        src/debug/matsuda_debug_menu.o(.rodata);
         data/contest.o(.rodata);
         src/field/shop.o(.rodata);
         src/field/berry.o(.rodata);
         src/field/script_menu.o(.rodata);
         src/engine/naming_screen.o(.rodata);
         data/naming_screen.o(.rodata);
-        data/money.o(.rodata);
+        src/field/money.o(.rodata);
         data/contest_effect.o(.rodata);
         src/engine/record_mixing.o(.data);
         src/engine/record_mixing.o(.rodata);
         src/debug/sound_check_menu.o(.rodata);
-        data/secret_base.o(.rodata);
-        data/tv.o(.rodata);
+        src/field/secret_base.o(.rodata);
+        src/field/tv.o(.rodata);
         data/contest_link_80C2020.o(.rodata);
         src/pokemon/pokemon_size_record.o(.rodata);
-        data/fldeff_80C5CD4.o(.rodata);
+        src/field/pc_screen_effect.o(.rodata);
+        data/pc_screen_effect.o(.rodata);
+        src/field/fldeff_secretpower.o(.rodata);
+        src/field/fldeff_decoration.o(.rodata);
+        src/field/fldeff_recordmixing.o(.rodata);
         src/field/field_special_scene.o(.rodata);
-        data/field_special_scene.o(.rodata);
         src/field/rotating_gate.o(.rodata);
         src/field/item_use.o(.rodata);
         data/battle_anim_80CA710.o(.rodata);
         src/field/bike.o(.rodata);
         data/easy_chat.o(.rodata);
         data/pokenav.o(.rodata);
-        data/mon_markings.o(.rodata);
+        src/pokemon/mon_markings.o(.rodata);
         src/field/mauville_man.o(.rodata);
-        data/mail.o(.rodata);
+        src/pokemon/mail.o(.rodata);
         src/field/menu_helpers.o(.rodata);
         src/field/heal_location.o(.rodata);
         src/field/region_map.o(.rodata);
@@ -425,17 +562,17 @@ SECTIONS {
         src/field/starter_choose.o(.rodata);
         src/field/wallclock.o(.rodata);
         src/field/pokeblock.o(.rodata);
-        data/fldeff_flash.o(.rodata);
+        src/field/fldeff_flash.o(.rodata);
         src/engine/time_events.o(.rodata);
         src/field/field_specials.o(.rodata);
         data/pokedex_area_screen.o(.rodata);
         src/scene/evolution_scene.o(.rodata);
         data/roulette.o(.rodata);
         data/pokedex_cry_screen.o(.rodata);
-        data/landmark.o(.rodata);
+        src/field/landmark.o(.rodata);
         src/battle/battle_transition.o(.rodata);
         src/battle/battle_controller_linkpartner.o(.rodata);
-        data/battle_message.o(.rodata);
+        src/battle/battle_message.o(.rodata);
         src/field/choose_party.o(.rodata);
         src/scene/cable_car.o(.rodata);
         src/engine/save.o(.rodata);
@@ -446,7 +583,7 @@ SECTIONS {
         src/pokemon/learn_move.o(.rodata);
         src/field/decoration_inventory.o(.rodata);
         src/field/roamer.o(.rodata);
-        data/battle_tower.o(.rodata);
+        src/field/battle_tower.o(.rodata);
         src/field/use_pokeblock.o(.rodata);
         src/battle/battle_controller_wally.o(.rodata);
         src/field/player_pc.o(.rodata);
@@ -454,7 +591,6 @@ SECTIONS {
         data/battle_anim_813F0F4.o(.rodata);
         src/scene/hall_of_fame.o(.rodata);
         src/scene/credits.o(.rodata);
-        data/credits.o(.rodata);
         src/field/lottery_corner.o(.rodata);
         src/field/diploma.o(.rodata);
         src/strings.o(.rodata);