remove subdirectories

ld_script.txt

@@ -38,15 +38,15 @@ SECTIONS {
     ALIGN(4)
     {
         src/crt0.o(.text);
-        src/engine/main.o(.text);
-        src/engine/sprite.o(.text);
-        src/engine/text.o(.text);
-        src/engine/string_util.o(.text);
-        src/engine/link.o(.text);
-        src/engine/rtc.o(.text);
-        src/engine/main_menu.o(.text);
+        src/main.o(.text);
+        src/sprite.o(.text);
+        src/text.o(.text);
+        src/string_util.o(.text);
+        src/link.o(.text);
+        src/rtc.o(.text);
+        src/main_menu.o(.text);
         src/rom3.o(.text);
-        src/engine/decompress.o(.text);
+        src/decompress.o(.text);
         asm/battle_1.o(.text);
         src/rom_800D42C.o(.text);
         asm/battle_1.o(.text_800DC24);
@@ -58,63 +58,63 @@ SECTIONS {
         src/battle/battle_controller_opponent.o(.text);
         asm/battle_9.o(.text);
         src/battle/battle_controller_linkopponent.o(.text);
-        src/pokemon/pokemon_1.o(.text);
+        src/pokemon_1.o(.text);
         src/battle/calculate_base_damage.o(.text);
-        src/pokemon/pokemon_2.o(.text);
-        src/pokemon/pokemon_item_effect.o(.text);
-        src/pokemon/pokemon_3.o(.text);
+        src/pokemon_2.o(.text);
+        src/pokemon_item_effect.o(.text);
+        src/pokemon_3.o(.text);
         src/de_rom_8040FE0.o(.text);
-        src/engine/trig.o(.text);
-        src/engine/random.o(.text);
-        src/engine/util.o(.text);
-        src/engine/blend_palette.o(.text);
-        src/field/daycare.o(.text);
-        src/scene/egg_hatch.o(.text);
+        src/trig.o(.text);
+        src/random.o(.text);
+        src/util.o(.text);
+        src/blend_palette.o(.text);
+        src/daycare.o(.text);
+        src/egg_hatch.o(.text);
         src/battle/battle_interface.o(.text);
         src/battle/smokescreen.o(.text);
         src/battle/pokeball.o(.text);
-        src/engine/load_save.o(.text);
-        src/engine/trade.o(.text);
-        src/scene/berry_blender.o(.text);
-        src/engine/play_time.o(.text);
-        src/scene/new_game.o(.text);
-        src/field/overworld.o(.text);
-        src/field/fieldmap.o(.text);
-        src/field/metatile_behavior.o(.text);
-        src/field/field_camera.o(.text);
-        src/field/field_door.o(.text);
-        src/field/field_player_avatar.o(.text);
-        src/field/event_object_movement.o(.text);
-        src/field/field_message_box.o(.text);
-        src/field/map_obj_lock.o(.text);
-        src/engine/text_window.o(.text);
-        src/engine/script.o(.text);
-        src/field/scrcmd.o(.text);
-        src/field/field_control_avatar.o(.text);
-        src/field/event_data.o(.text);
-        src/field/coord_event_weather.o(.text);
-        src/field/field_tasks.o(.text);
-        src/engine/clock.o(.text);
-        src/engine/reset_rtc_screen.o(.text);
-        src/field/party_menu.o(.text);
-        src/field/start_menu.o(.text);
+        src/load_save.o(.text);
+        src/trade.o(.text);
+        src/berry_blender.o(.text);
+        src/play_time.o(.text);
+        src/new_game.o(.text);
+        src/overworld.o(.text);
+        src/fieldmap.o(.text);
+        src/metatile_behavior.o(.text);
+        src/field_camera.o(.text);
+        src/field_door.o(.text);
+        src/field_player_avatar.o(.text);
+        src/event_object_movement.o(.text);
+        src/field_message_box.o(.text);
+        src/map_obj_lock.o(.text);
+        src/text_window.o(.text);
+        src/script.o(.text);
+        src/scrcmd.o(.text);
+        src/field_control_avatar.o(.text);
+        src/event_data.o(.text);
+        src/coord_event_weather.o(.text);
+        src/field_tasks.o(.text);
+        src/clock.o(.text);
+        src/reset_rtc_screen.o(.text);
+        src/party_menu.o(.text);
+        src/start_menu.o(.text);
         src/debug/start_menu_debug.o(.text);
-        src/engine/menu.o(.text);
-        src/engine/tileset_anim.o(.text);
-        src/engine/palette.o(.text);
-        src/engine/sound.o(.text);
+        src/menu.o(.text);
+        src/tileset_anim.o(.text);
+        src/palette.o(.text);
+        src/sound.o(.text);
         src/battle/battle_anim.o(.text);
         src/rom_8077ABC.o(.text);
-        src/engine/task.o(.text);
+        src/task.o(.text);
         src/battle/reshow_battle_screen.o(.text);
         src/battle/battle_anim_807B69C.o(.text);
-        src/scene/title_screen.o(.text);
-        src/field/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/title_screen.o(.text);
+        src/field_weather.o(.text);
+        src/field_weather_effects.o(.text);
+        src/field_fadetransition.o(.text);
+        src/field_screen_effect.o(.text);
         src/battle/battle_setup.o(.text);
-        src/engine/cable_club.o(.text);
+        src/cable_club.o(.text);
         src/debug/tomomichi_debug_menu.o(.text);
         asm/tomomichi_debug_menu.o(.text);
         src/debug/nohara_debug_menu.o(.text);
@@ -122,66 +122,66 @@ SECTIONS {
         src/debug/mori_debug_menu.o(.text);
         asm/taya_debug_window.o(.text);
         src/debug/taya_debug_window.o(.text);
-        src/field/trainer_see.o(.text);
-        src/field/wild_encounter.o(.text);
-        src/field/field_effect.o(.text);
+        src/trainer_see.o(.text);
+        src/wild_encounter.o(.text);
+        src/field_effect.o(.text);
         src/scanline_effect.o(.text);
-        src/pokemon/pokemon_menu.o(.text);
-        src/engine/option_menu.o(.text);
-        src/pokemon/pokedex.o(.text);
-        src/engine/trainer_card.o(.text);
-        src/engine/save_menu_util.o(.text);
+        src/pokemon_menu.o(.text);
+        src/option_menu.o(.text);
+        src/pokedex.o(.text);
+        src/trainer_card.o(.text);
+        src/save_menu_util.o(.text);
         src/battle/battle_party_menu.o(.text);
         src/unk_text_8095904.o(.text);
-        src/pokemon/pokemon_storage_system.o(.text);
-        src/pokemon/pokemon_storage_system_2.o(.text);
-        src/pokemon/pokemon_storage_system_3.o(.text);
-        src/pokemon/pokemon_storage_system_4.o(.text);
-        src/pokemon/pokemon_storage_system_5.o(.text);
+        src/pokemon_storage_system.o(.text);
+        src/pokemon_storage_system_2.o(.text);
+        src/pokemon_storage_system_3.o(.text);
+        src/pokemon_storage_system_4.o(.text);
+        src/pokemon_storage_system_5.o(.text);
         asm/pokemon_storage_system.o(.text);
-        src/pokemon/pokemon_icon.o(.text);
-        src/pokemon/pokemon_summary_screen.o(.text);
-        src/field/script_movement.o(.text);
-        src/field/fldeff_cut.o(.text);
+        src/pokemon_icon.o(.text);
+        src/pokemon_summary_screen.o(.text);
+        src/script_movement.o(.text);
+        src/fldeff_cut.o(.text);
         src/debug/kagaya_debug_menu.o(.text);
-        src/pokemon/mail_data.o(.text);
-        src/field/map_name_popup.o(.text);
-        src/field/item_menu.o(.text);
+        src/mail_data.o(.text);
+        src/map_name_popup.o(.text);
+        src/item_menu.o(.text);
         src/battle/battle_anim_80A7E7C.o(.text);
-        src/field/item.o(.text);
+        src/item.o(.text);
         src/debug/matsuda_debug_menu.o(.text);
         src/debug/crash.o(.text);
         src/contest.o(.text);
-        src/field/shop.o(.text);
-        src/field/fldeff_escalator.o(.text);
-        src/field/berry.o(.text);
+        src/shop.o(.text);
+        src/fldeff_escalator.o(.text);
+        src/berry.o(.text);
         src/debug/watanabe_debug_menu.o(.text);
         asm/watanabe_debug_menu.o(.text);
-        src/field/script_menu.o(.text);
-        src/engine/naming_screen.o(.text);
-        src/field/money.o(.text);
+        src/script_menu.o(.text);
+        src/naming_screen.o(.text);
+        src/money.o(.text);
         asm/contest_effect.o(.text);
-        src/engine/record_mixing.o(.text);
+        src/record_mixing.o(.text);
         src/debug/sound_check_menu.o(.text);
-        src/field/secret_base.o(.text);
-        src/field/tv.o(.text);
+        src/secret_base.o(.text);
+        src/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);
-        src/field/pc_screen_effect.o(.text);
+        src/field_poison.o(.text);
+        src/pokemon_size_record.o(.text);
+        src/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);
+        src/fldeff_secretpower.o(.text);
+        src/fldeff_secret_base_pc.o(.text);
+        src/fldeff_decoration.o(.text);
+        src/fldeff_poison.o(.text);
+        src/fldeff_berrytree.o(.text);
+        src/fldeff_recordmixing.o(.text);
+        src/field_special_scene.o(.text);
+        src/rotating_gate.o(.text);
+        src/safari_zone.o(.text);
         src/battle/contest_link_80C857C.o(.text);
-        src/field/item_use.o(.text);
+        src/item_use.o(.text);
         src/battle/anim/powder.o(.text);
         src/battle/anim/orbs.o(.text);
         src/battle/anim/seed.o(.text);
@@ -313,96 +313,96 @@ SECTIONS {
         asm/ground.o(.text);
         asm/normal.o(.text);
         src/battle/anim/battle_intro.o(.text);
-        src/field/bike.o(.text);
+        src/bike.o(.text);
         src/easy_chat_1.o(.text);
         src/easy_chat_2.o(.text);
         src/pokenav_before.o(.text);
         asm/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);
-        src/pokemon/mail.o(.text);
-        src/field/menu_helpers.o(.text);
+        src/mon_markings.o(.text);
+        src/mauville_man.o(.text);
+        src/mail.o(.text);
+        src/menu_helpers.o(.text);
         src/script_pokemon_util_80F99CC.o(.text);
-        src/field/dewford_trend.o(.text);
-        src/field/heal_location.o(.text);
-        src/field/region_map.o(.text);
-        src/scene/cute_sketch.o(.text);
+        src/dewford_trend.o(.text);
+        src/heal_location.o(.text);
+        src/region_map.o(.text);
+        src/cute_sketch.o(.text);
         asm/cute_sketch.o(.text);
-        src/field/decoration.o(.text);
-        src/field/slot_machine.o(.text);
-        src/scene/contest_painting.o(.text);
+        src/decoration.o(.text);
+        src/slot_machine.o(.text);
+        src/contest_painting.o(.text);
         src/battle/battle_ai.o(.text);
-        src/field/trader.o(.text);
-        src/field/starter_choose.o(.text);
-        src/field/wallclock.o(.text);
+        src/trader.o(.text);
+        src/starter_choose.o(.text);
+        src/wallclock.o(.text);
         src/rom6.o(.text);
-        src/field/pokeblock.o(.text);
-        src/field/fldeff_flash.o(.text);
+        src/pokeblock.o(.text);
+        src/fldeff_flash.o(.text);
         src/battle/post_battle_event_funcs.o(.text);
-        src/engine/time_events.o(.text);
-        src/field/birch_pc.o(.text);
-        src/field/hof_pc.o(.text);
-        src/field/field_specials.o(.text);
+        src/time_events.o(.text);
+        src/birch_pc.o(.text);
+        src/hof_pc.o(.text);
+        src/field_specials.o(.text);
         src/battle/battle_records.o(.text);
         asm/pokedex_area_screen.o(.text);
-        src/scene/evolution_scene.o(.text);
+        src/evolution_scene.o(.text);
         src/roulette.o(.text);
         asm/pokedex_cry_screen.o(.text);
-        src/pokemon/pokedex_cry_screen.o(.text);
+        src/pokedex_cry_screen.o(.text);
         asm/pokedex_cry_screen.o(.text_811A4F8);
-        src/field/coins.o(.text);
-        src/field/landmark.o(.text);
-        src/field/fldeff_strength.o(.text);
+        src/coins.o(.text);
+        src/landmark.o(.text);
+        src/fldeff_strength.o(.text);
         src/battle/battle_transition.o(.text);
         src/battle/battle_controller_linkpartner.o(.text);
         src/battle/battle_message.o(.text);
-        src/field/choose_party.o(.text);
-        src/scene/cable_car.o(.text);
+        src/choose_party.o(.text);
+        src/cable_car.o(.text);
         src/roulette_util.o(.text);
-        src/engine/cable_car_util.o(.text);
+        src/cable_car_util.o(.text);
         src/unused_8124F94.o(.text);
-        src/engine/save.o(.text);
-        src/engine/mystery_event_script.o(.text);
+        src/save.o(.text);
+        src/mystery_event_script.o(.text);
         asm/unk_debug_menu_3.o(.text);
-        src/field/field_effect_helpers.o(.text);
+        src/field_effect_helpers.o(.text);
         src/contest_ai.o(.text);
         src/unused_81258BC.o(.text);
         src/battle/anim/sfx.o(.text);
         src/battle/battle_controller_safari.o(.text);
-        src/field/fldeff_sweetscent.o(.text);
+        src/fldeff_sweetscent.o(.text);
         asm/battle_anim_812C144.o(.text);
-        src/pokemon/learn_move.o(.text);
-        src/field/fldeff_softboiled.o(.text);
-        src/field/decoration_inventory.o(.text);
-        src/field/roamer.o(.text);
-        src/field/battle_tower.o(.text);
-        src/field/use_pokeblock.o(.text);
+        src/learn_move.o(.text);
+        src/fldeff_softboiled.o(.text);
+        src/decoration_inventory.o(.text);
+        src/roamer.o(.text);
+        src/battle_tower.o(.text);
+        src/use_pokeblock.o(.text);
         src/battle/battle_controller_wally.o(.text);
-        src/field/player_pc.o(.text);
-        src/scene/intro.o(.text);
-        src/field/field_region_map.o(.text);
+        src/player_pc.o(.text);
+        src/intro.o(.text);
+        src/field_region_map.o(.text);
         asm/battle_anim_813F0F4.o(.text);
-        src/scene/hall_of_fame.o(.text);
-        src/scene/credits.o(.text);
-        src/field/lottery_corner.o(.text);
-        src/field/diploma.o(.text);
-        src/field/berry_tag_screen.o(.text);
-        src/engine/mystery_event_menu.o(.text);
-        src/engine/save_failed_screen.o(.text);
-        src/field/braille_puzzles.o(.text);
-        src/pokemon/pokeblock_feed.o(.text);
-        src/engine/clear_save_data_menu.o(.text);
+        src/hall_of_fame.o(.text);
+        src/credits.o(.text);
+        src/lottery_corner.o(.text);
+        src/diploma.o(.text);
+        src/berry_tag_screen.o(.text);
+        src/mystery_event_menu.o(.text);
+        src/save_failed_screen.o(.text);
+        src/braille_puzzles.o(.text);
+        src/pokeblock_feed.o(.text);
+        src/clear_save_data_menu.o(.text);
         src/debug/nakamura_debug_menu.o(.text);
         asm/nakamura_debug_menu.o(.text);
-        src/scene/intro_credits_graphics.o(.text);
-        src/scene/evolution_graphics.o(.text);
-        src/field/bard_music.o(.text);
-        src/field/fldeff_teleport.o(.text);
+        src/intro_credits_graphics.o(.text);
+        src/evolution_graphics.o(.text);
+        src/bard_music.o(.text);
+        src/fldeff_teleport.o(.text);
         src/debug/unknown_debug_menu.o(.text);
-        src/engine/name_string_util.o(.text);
-        src/engine/menu_cursor.o(.text);
+        src/name_string_util.o(.text);
+        src/menu_cursor.o(.text);
     } =0
 
     script_data :
@@ -486,14 +486,14 @@ SECTIONS {
     .rodata :
     ALIGN(4)
     {
-        src/engine/main.o(.rodata);
-        src/engine/sprite.o(.rodata);
+        src/main.o(.rodata);
+        src/sprite.o(.rodata);
         . += 0x8; /* Why the gap? */
-        src/engine/text.o(.rodata);
-        src/engine/string_util.o(.rodata);
-        src/engine/link.o(.rodata);
-        src/engine/rtc.o(.rodata);
-        src/engine/main_menu.o(.rodata);
+        src/text.o(.rodata);
+        src/string_util.o(.rodata);
+        src/link.o(.rodata);
+        src/rtc.o(.rodata);
+        src/main_menu.o(.rodata);
         data/mon_attrs.o(.rodata);
         data/btl_attrs.o(.rodata);
         src/battle/battle_4.o(.rodata);
@@ -504,45 +504,45 @@ SECTIONS {
         src/battle/battle_controller_linkopponent.o(.rodata);
         data/battle_moves.o(.rodata);
         src/battle/battle_util.o(.rodata);
-        src/pokemon/pokemon_1.o(.rodata);
-        src/pokemon/pokemon_1.o(.data); /* gEvolutionTable needs to be non-const to match */
+        src/pokemon_1.o(.rodata);
+        src/pokemon_1.o(.data); /* gEvolutionTable needs to be non-const to match */
         src/battle/calculate_base_damage.o(.rodata);
-        src/pokemon/pokemon_2.o(.rodata);
-        src/pokemon/pokemon_item_effect.o(.rodata);
-        src/pokemon/pokemon_3.o(.rodata);
+        src/pokemon_2.o(.rodata);
+        src/pokemon_item_effect.o(.rodata);
+        src/pokemon_3.o(.rodata);
         . = ALIGN(4);
-        src/engine/trig.o(.rodata);
-        src/engine/util.o(.rodata);
-        src/field/daycare.o(.rodata);
-        src/scene/egg_hatch.o(.rodata);
+        src/trig.o(.rodata);
+        src/util.o(.rodata);
+        src/daycare.o(.rodata);
+        src/egg_hatch.o(.rodata);
         data/battle_interface.o(.rodata);
         src/battle/pokeball.o(.rodata);
-        src/engine/trade.o(.rodata);
-        src/scene/berry_blender.o(.rodata);
-        src/scene/new_game.o(.rodata);
-        src/field/overworld.o(.rodata);
+        src/trade.o(.rodata);
+        src/berry_blender.o(.rodata);
+        src/new_game.o(.rodata);
+        src/overworld.o(.rodata);
         data/tilesets.o(.rodata);
         data/maps.o(.rodata);
-        src/field/fieldmap.o(.rodata);
-        src/field/metatile_behavior.o(.rodata);
-        src/field/field_door.o(.rodata);
-        src/field/field_player_avatar.o(.rodata);
-        src/field/event_object_movement.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);
-        src/engine/reset_rtc_screen.o(.rodata);
-        src/field/party_menu.o(.rodata);
-        src/field/start_menu.o(.rodata);
+        src/fieldmap.o(.rodata);
+        src/metatile_behavior.o(.rodata);
+        src/field_door.o(.rodata);
+        src/field_player_avatar.o(.rodata);
+        src/event_object_movement.o(.rodata);
+        src/text_window.o(.rodata);
+        src/script.o(.rodata);
+        src/scrcmd.o(.rodata);
+        src/coord_event_weather.o(.rodata);
+        src/field_tasks.o(.rodata);
+        src/reset_rtc_screen.o(.rodata);
+        src/party_menu.o(.rodata);
+        src/start_menu.o(.rodata);
         src/debug/start_menu_debug.o(.data);
         src/debug/start_menu_debug.o(.rodata);
         data/start_menu_debug.o(.rodata);
-        src/engine/menu.o(.rodata);
-        src/engine/tileset_anim.o(.rodata);
-        src/engine/palette.o(.rodata);
-        src/engine/sound.o(.rodata);
+        src/menu.o(.rodata);
+        src/tileset_anim.o(.rodata);
+        src/palette.o(.rodata);
+        src/sound.o(.rodata);
         src/battle/battle_anim.o(.rodata);
         src/rom_8077ABC.o(.rodata);
         data/map_events.o(.rodata);
@@ -552,132 +552,132 @@ SECTIONS {
         data/unused_paw.o(.rodata);
         data/unused_hit.o(.rodata);
         data/unused_orb2.o(.rodata);
-        src/engine/task.o(.rodata);
+        src/task.o(.rodata);
         src/battle/battle_anim_807B69C.o(.rodata);
-        src/scene/title_screen.o(.rodata);
-        src/field/field_weather.o(.rodata);
-        src/field/field_weather_effects.o(.rodata);
-        src/field/field_screen_effect.o(.rodata);
+        src/title_screen.o(.rodata);
+        src/field_weather.o(.rodata);
+        src/field_weather_effects.o(.rodata);
+        src/field_screen_effect.o(.rodata);
         src/battle/battle_setup.o(.rodata);
-        src/engine/cable_club.o(.rodata);
+        src/cable_club.o(.rodata);
         data/debug_menu_tomomichi.o(.rodata);
         data/debug_menu_nohara.o(.rodata);
         src/debug/mori_debug_menu.o(.rodata);
         data/debug_menu_taya.o(.rodata);
-        src/field/trainer_see.o(.rodata);
-        src/field/wild_encounter.o(.rodata);
-        src/field/field_effect.o(.rodata);
-        src/pokemon/pokemon_menu.o(.rodata);
-        src/engine/option_menu.o(.rodata);
-        src/pokemon/pokedex.o(.rodata);
-        src/engine/trainer_card.o(.rodata);
+        src/trainer_see.o(.rodata);
+        src/wild_encounter.o(.rodata);
+        src/field_effect.o(.rodata);
+        src/pokemon_menu.o(.rodata);
+        src/option_menu.o(.rodata);
+        src/pokedex.o(.rodata);
+        src/trainer_card.o(.rodata);
         src/battle/battle_party_menu.o(.rodata);
-        src/pokemon/pokemon_storage_system.o(.rodata);
-        src/pokemon/pokemon_storage_system_2.o(.rodata);
-        src/pokemon/pokemon_storage_system_3.o(.rodata);
-        src/pokemon/pokemon_storage_system_4.o(.rodata);
-        src/pokemon/pokemon_storage_system_5.o(.rodata);
+        src/pokemon_storage_system.o(.rodata);
+        src/pokemon_storage_system_2.o(.rodata);
+        src/pokemon_storage_system_3.o(.rodata);
+        src/pokemon_storage_system_4.o(.rodata);
+        src/pokemon_storage_system_5.o(.rodata);
         data/pokemon_storage_system.o(.rodata);
-        src/pokemon/pokemon_icon.o(.rodata);
-        src/pokemon/pokemon_summary_screen.o(.rodata);
-        src/field/fldeff_cut.o(.rodata);
+        src/pokemon_icon.o(.rodata);
+        src/pokemon_summary_screen.o(.rodata);
+        src/fldeff_cut.o(.rodata);
         src/debug/kagaya_debug_menu.o(.rodata);
-        src/field/item_menu.o(.rodata);
+        src/item_menu.o(.rodata);
         src/battle/battle_anim_80A7E7C.o(.rodata);
-        src/field/item.o(.rodata);
+        src/item.o(.rodata);
         src/debug/matsuda_debug_menu.o(.rodata);
         data/contest.o(.rodata);
-        src/field/shop.o(.rodata);
-        src/field/fldeff_escalator.o(.rodata);
-        src/field/berry.o(.rodata);
+        src/shop.o(.rodata);
+        src/fldeff_escalator.o(.rodata);
+        src/berry.o(.rodata);
         data/debug_menu_watanabe.o(.rodata);
-        src/field/script_menu.o(.rodata);
-        src/engine/naming_screen.o(.rodata);
-        src/field/money.o(.rodata);
+        src/script_menu.o(.rodata);
+        src/naming_screen.o(.rodata);
+        src/money.o(.rodata);
         data/contest_effect.o(.rodata);
-        src/engine/record_mixing.o(.data);
-        src/engine/record_mixing.o(.rodata);
+        src/record_mixing.o(.data);
+        src/record_mixing.o(.rodata);
         src/debug/sound_check_menu.o(.rodata);
-        src/field/secret_base.o(.rodata);
-        src/field/tv.o(.rodata);
+        src/secret_base.o(.rodata);
+        src/tv.o(.rodata);
         data/contest_link_80C2020.o(.rodata);
-        src/pokemon/pokemon_size_record.o(.rodata);
-        src/field/pc_screen_effect.o(.rodata);
+        src/pokemon_size_record.o(.rodata);
+        src/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);
-        src/field/rotating_gate.o(.rodata);
-        src/field/item_use.o(.rodata);
+        src/fldeff_secretpower.o(.rodata);
+        src/fldeff_decoration.o(.rodata);
+        src/fldeff_recordmixing.o(.rodata);
+        src/field_special_scene.o(.rodata);
+        src/rotating_gate.o(.rodata);
+        src/item_use.o(.rodata);
         data/battle_anim_80CA710.o(.rodata);
         src/battle/anim/battle_intro.o(.rodata);
-        src/field/bike.o(.rodata);
+        src/bike.o(.rodata);
         src/easy_chat_1.o(.rodata);
         src/easy_chat_2.o(.rodata);
         data/easy_chat.o(.rodata);
         data/pokenav.o(.rodata);
-        src/pokemon/mon_markings.o(.rodata);
-        src/field/mauville_man.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);
+        src/mon_markings.o(.rodata);
+        src/mauville_man.o(.rodata);
+        src/mail.o(.rodata);
+        src/menu_helpers.o(.rodata);
+        src/heal_location.o(.rodata);
+        src/region_map.o(.rodata);
         data/cute_sketch.o(.rodata);
-        src/field/decoration.o(.rodata);
-        src/field/slot_machine.o(.rodata);
-        src/scene/contest_painting.o(.rodata);
+        src/decoration.o(.rodata);
+        src/slot_machine.o(.rodata);
+        src/contest_painting.o(.rodata);
         src/battle/battle_ai.o(.rodata);
-        src/field/trader.o(.rodata);
-        src/field/starter_choose.o(.rodata);
-        src/field/wallclock.o(.rodata);
-        src/field/pokeblock.o(.rodata);
-        src/field/fldeff_flash.o(.rodata);
-        src/engine/time_events.o(.rodata);
-        src/field/field_specials.o(.rodata);
+        src/trader.o(.rodata);
+        src/starter_choose.o(.rodata);
+        src/wallclock.o(.rodata);
+        src/pokeblock.o(.rodata);
+        src/fldeff_flash.o(.rodata);
+        src/time_events.o(.rodata);
+        src/field_specials.o(.rodata);
         src/battle/battle_records.o(.rodata);
         data/pokedex_area_screen.o(.rodata);
-        src/scene/evolution_scene.o(.rodata);
+        src/evolution_scene.o(.rodata);
         data/roulette.o(.rodata);
         data/pokedex_cry_screen.o(.rodata);
-        src/field/landmark.o(.rodata);
+        src/landmark.o(.rodata);
         src/battle/battle_transition.o(.rodata);
         src/battle/battle_controller_linkpartner.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);
+        src/choose_party.o(.rodata);
+        src/cable_car.o(.rodata);
+        src/save.o(.rodata);
         data/unk_debug_menu_3.o(.rodata);
-        src/field/field_effect_helpers.o(.rodata);
+        src/field_effect_helpers.o(.rodata);
         src/contest_ai.o(.rodata);
         src/battle/battle_controller_safari.o(.rodata);
         data/battle_anim_812C144.o(.rodata);
-        src/pokemon/learn_move.o(.rodata);
-        src/field/decoration_inventory.o(.rodata);
-        src/field/roamer.o(.rodata);
-        src/field/battle_tower.o(.rodata);
-        src/field/use_pokeblock.o(.rodata);
+        src/learn_move.o(.rodata);
+        src/decoration_inventory.o(.rodata);
+        src/roamer.o(.rodata);
+        src/battle_tower.o(.rodata);
+        src/use_pokeblock.o(.rodata);
         src/battle/battle_controller_wally.o(.rodata);
-        src/field/player_pc.o(.rodata);
-        src/scene/intro.o(.rodata);
+        src/player_pc.o(.rodata);
+        src/intro.o(.rodata);
         data/battle_anim_813F0F4.o(.rodata);
-        src/scene/hall_of_fame.o(.rodata);
-        src/scene/credits.o(.rodata);
-        src/field/lottery_corner.o(.rodata);
-        src/field/diploma.o(.rodata);
+        src/hall_of_fame.o(.rodata);
+        src/credits.o(.rodata);
+        src/lottery_corner.o(.rodata);
+        src/diploma.o(.rodata);
         src/strings.o(.rodata);
-        src/field/berry_tag_screen.o(.rodata);
-        src/engine/mystery_event_menu.o(.rodata);
-        src/engine/save_failed_screen.o(.rodata);
-        src/pokemon/pokeblock_feed.o(.rodata);
+        src/berry_tag_screen.o(.rodata);
+        src/mystery_event_menu.o(.rodata);
+        src/save_failed_screen.o(.rodata);
+        src/pokeblock_feed.o(.rodata);
         src/debug/nakamura_debug_menu.o(.rodata);
-        src/scene/intro_credits_graphics.o(.rodata);
-        src/scene/evolution_graphics.o(.rodata);
-        src/field/bard_music.o(.rodata);
+        src/intro_credits_graphics.o(.rodata);
+        src/evolution_graphics.o(.rodata);
+        src/bard_music.o(.rodata);
         src/debug/unknown_debug_menu.o(.rodata);
         data/strings2.o(.rodata);
-        src/engine/menu_cursor.o(.rodata);
-        src/engine/mystery_event_msg.o(.rodata);
+        src/menu_cursor.o(.rodata);
+        src/mystery_event_msg.o(.rodata);
         data/debug_menu_3.o(.rodata);
         src/libs/m4a_tables.o(.rodata);
         data/sound_data.o(.rodata);

src/bard_music.c

@@ -141,9 +141,9 @@ static const u32 sBardSoundLengthDeltas[] = {
 };
 
 #if ENGLISH
-#include "../src/data/bard_music_en.h"
+#include "data/bard_music_en.h"
 #elif GERMAN
-#include "../src/data/bard_music_de.h"
+#include "data/bard_music_de.h"
 #endif // ENGLISH/GERMAN
 
 static const struct BardSound (*const gBardMusicTable[])[6] = {

src/battle_tower.c

@@ -28,9 +28,9 @@
 #include "ewram.h"
 
 #if ENGLISH
-#include "../data/battle_tower/trainers.h"
+#include "data/battle_tower/trainers.h"
 #elif GERMAN
-#include "../data/battle_tower/trainers_de.h"
+#include "data/battle_tower/trainers_de.h"
 #endif
 
 static const u16 sBattleTowerHeldItems[] =
@@ -100,8 +100,8 @@ static const u16 sBattleTowerHeldItems[] =
     ITEM_GANLON_BERRY,
 };
 
-#include "../data/battle_tower/level_50_mons.h"
-#include "../data/battle_tower/level_100_mons.h"
+#include "data/battle_tower/level_50_mons.h"
+#include "data/battle_tower/level_100_mons.h"
 
 static const u8 sMaleTrainerClasses[] =
 {

src/credits.c

@@ -246,9 +246,9 @@ const u8 gUnknown_0840B878[] =
 };
 
 #ifdef GERMAN
-#include "../data/credits_de.h"
+#include "data/credits_de.h"
 #else
-#include "../data/credits_en.h"
+#include "data/credits_en.h"
 #endif
 
 const u8 gUnknown_0840CA00[][2] =

src/daycare.c

@@ -35,7 +35,7 @@ static void ClearDaycareMail(struct DayCareMail *);
 static void SetInitialEggData(struct Pokemon *, u16, struct DayCare *);
 static u8 GetDaycareCompatibilityScore(struct DayCare *);
 
-#include "../data/pokemon/egg_moves.h"
+#include "data/pokemon/egg_moves.h"
 
 static const u8 *const sCompatibilityMessages[] = {
     DaycareText_GetAlongVeryWell,

src/decoration.c

@@ -622,7 +622,7 @@ const u8 DecorDesc_REGISTEEL_DOLL[] = _(
     "Place it on a mat\n"
     "or a desk.");
 #elif GERMAN
-#include "../data/decoration/descriptions_de.h"
+#include "data/decoration/descriptions_de.h"
 #endif
 
 const u16 DecorGfx_SMALL_DESK[] = {
@@ -1392,7 +1392,7 @@ const struct Decoration gDecorations[] = {
     {DECOR_REGISTEEL_DOLL,  _("REGISTEEL DOLL"),   DECORPERM_SOLID_MAT,   DECORSHAPE_1x2, DECORCAT_DOLL,     10000, DecorDesc_REGISTEEL_DOLL, DecorGfx_REGISTEEL_DOLL}
 };
 #elif GERMAN
-#include "../data/decoration/decorations.h"
+#include "data/decoration/decorations.h"
 #endif
 
 const u8 *const gUnknown_083EC5E4[] = {

src/event_object_movement.c

@@ -1578,13 +1578,13 @@ void (*const gUnknown_0836DA88[])(struct Sprite *) =
 const u8 gUnknown_0836DBBC[] = {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 const u8 gUnknown_0836DC09[] = {DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_NORTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH};
 
-#include "../data/field_map_obj/map_object_graphics_info_pointers.h"
-#include "../data/field_map_obj/field_effect_object_template_pointers.h"
-#include "../data/field_map_obj/map_object_pic_tables.h"
-#include "../data/field_map_obj/map_object_anims.h"
-#include "../data/field_map_obj/base_oam.h"
-#include "../data/field_map_obj/map_object_subsprites.h"
-#include "../data/field_map_obj/map_object_graphics_info.h"
+#include "data/field_map_obj/map_object_graphics_info_pointers.h"
+#include "data/field_map_obj/field_effect_object_template_pointers.h"
+#include "data/field_map_obj/map_object_pic_tables.h"
+#include "data/field_map_obj/map_object_anims.h"
+#include "data/field_map_obj/base_oam.h"
+#include "data/field_map_obj/map_object_subsprites.h"
+#include "data/field_map_obj/map_object_graphics_info.h"
 
 const struct SpritePalette gUnknown_0837377C[] = {
     {gMapObjectPalette0, 0x1103},
@@ -1790,14 +1790,14 @@ const u16 *const gUnknown_0837399C[] = {
     Unknown_8373988
 };
 
-#include "../data/field_map_obj/berry_tree_graphics_tables.h"
-#include "../data/field_map_obj/field_effect_objects.h"
+#include "data/field_map_obj/berry_tree_graphics_tables.h"
+#include "data/field_map_obj/field_effect_objects.h"
 
 const s16 gUnknown_0837520C[] = {0x20, 0x40, 0x60, 0x80};
 const s16 gUnknown_08375204[] = {0x20, 0x40, 0x80, 0xc0};
 const s16 gUnknown_0837521C[] = {0x20, 0x30, 0x40, 0x50};
 
-#include "../data/field_map_obj/callback_subroutine_pointers.h"
+#include "data/field_map_obj/callback_subroutine_pointers.h"
 
 const u8 gUnknown_083755F4[] = {0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01};
 const u8 gUnknown_083755FD[] = {0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05};
@@ -1886,7 +1886,7 @@ const u8 gUnknown_08375767[][4] = {
     {3, 4, 2, 1}
 };
 
-#include "../data/field_map_obj/anim_func_ptrs.h"
+#include "data/field_map_obj/anim_func_ptrs.h"
 
 // text
 

src/item.c

@@ -50,11 +50,11 @@ enum
 };
 
 #if ENGLISH
-#include "../data/item_descriptions_en.h"
-#include "../data/items_en.h"
+#include "data/item_descriptions_en.h"
+#include "data/items_en.h"
 #elif GERMAN
-#include "../data/item_descriptions_de.h"
-#include "../data/items_de.h"
+#include "data/item_descriptions_de.h"
+#include "data/items_de.h"
 #endif
 
 static void CompactPCItems(void);

src/menu_cursor.c

@@ -12,9 +12,9 @@ EWRAM_DATA static u8 gUnknown_0203A3D3 = 0;
 EWRAM_DATA static u8 gUnknown_0203A3D4 = 0;
 
 #if ENGLISH
-#include "../src/data/menu_cursor_en.h"
+#include "data/menu_cursor_en.h"
 #elif GERMAN
-#include "../src/data/menu_cursor_de.h"
+#include "data/menu_cursor_de.h"
 #endif // ENGLISH/GERMAN
 
 void sub_814A590(void)