diff options
author | camthesaxman <cameronghall@cox.net> | 2018-02-18 19:59:51 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2018-02-18 19:59:51 -0600 |
commit | daa05c1b7c5e079ad8554e88a290e07b333bd2db (patch) | |
tree | f635e307268f6e6027423369d221e2adf32b438d /src | |
parent | 2e21a867487e2187a954a351f775bd3f3a9535b1 (diff) |
remove subdirectories
Diffstat (limited to 'src')
-rw-r--r-- | src/bard_music.c (renamed from src/field/bard_music.c) | 4 | ||||
-rw-r--r-- | src/battle_tower.c (renamed from src/field/battle_tower.c) | 8 | ||||
-rw-r--r-- | src/berry.c (renamed from src/field/berry.c) | 0 | ||||
-rw-r--r-- | src/berry_blender.c (renamed from src/scene/berry_blender.c) | 0 | ||||
-rw-r--r-- | src/berry_tag_screen.c (renamed from src/field/berry_tag_screen.c) | 0 | ||||
-rw-r--r-- | src/bike.c (renamed from src/field/bike.c) | 0 | ||||
-rw-r--r-- | src/birch_pc.c (renamed from src/field/birch_pc.c) | 0 | ||||
-rw-r--r-- | src/blend_palette.c (renamed from src/engine/blend_palette.c) | 0 | ||||
-rw-r--r-- | src/braille_puzzles.c (renamed from src/field/braille_puzzles.c) | 0 | ||||
-rw-r--r-- | src/cable_car.c (renamed from src/scene/cable_car.c) | 0 | ||||
-rw-r--r-- | src/cable_car_util.c (renamed from src/engine/cable_car_util.c) | 0 | ||||
-rw-r--r-- | src/cable_club.c (renamed from src/engine/cable_club.c) | 0 | ||||
-rw-r--r-- | src/choose_party.c (renamed from src/field/choose_party.c) | 0 | ||||
-rw-r--r-- | src/clear_save_data_menu.c (renamed from src/engine/clear_save_data_menu.c) | 0 | ||||
-rw-r--r-- | src/clock.c (renamed from src/engine/clock.c) | 0 | ||||
-rw-r--r-- | src/coins.c (renamed from src/field/coins.c) | 0 | ||||
-rw-r--r-- | src/contest_painting.c (renamed from src/scene/contest_painting.c) | 0 | ||||
-rw-r--r-- | src/coord_event_weather.c (renamed from src/field/coord_event_weather.c) | 0 | ||||
-rw-r--r-- | src/credits.c (renamed from src/scene/credits.c) | 4 | ||||
-rw-r--r-- | src/cute_sketch.c (renamed from src/scene/cute_sketch.c) | 0 | ||||
-rw-r--r-- | src/daycare.c (renamed from src/field/daycare.c) | 2 | ||||
-rw-r--r-- | src/decompress.c (renamed from src/engine/decompress.c) | 0 | ||||
-rw-r--r-- | src/decoration.c (renamed from src/field/decoration.c) | 4 | ||||
-rw-r--r-- | src/decoration_inventory.c (renamed from src/field/decoration_inventory.c) | 0 | ||||
-rw-r--r-- | src/dewford_trend.c (renamed from src/field/dewford_trend.c) | 0 | ||||
-rw-r--r-- | src/diploma.c (renamed from src/field/diploma.c) | 0 | ||||
-rw-r--r-- | src/egg_hatch.c (renamed from src/scene/egg_hatch.c) | 0 | ||||
-rw-r--r-- | src/event_data.c (renamed from src/field/event_data.c) | 0 | ||||
-rw-r--r-- | src/event_object_movement.c (renamed from src/field/event_object_movement.c) | 22 | ||||
-rw-r--r-- | src/evolution_graphics.c (renamed from src/scene/evolution_graphics.c) | 0 | ||||
-rw-r--r-- | src/evolution_scene.c (renamed from src/scene/evolution_scene.c) | 0 | ||||
-rw-r--r-- | src/field_camera.c (renamed from src/field/field_camera.c) | 0 | ||||
-rw-r--r-- | src/field_control_avatar.c (renamed from src/field/field_control_avatar.c) | 0 | ||||
-rw-r--r-- | src/field_door.c (renamed from src/field/field_door.c) | 0 | ||||
-rw-r--r-- | src/field_effect.c (renamed from src/field/field_effect.c) | 0 | ||||
-rw-r--r-- | src/field_effect_helpers.c (renamed from src/field/field_effect_helpers.c) | 0 | ||||
-rw-r--r-- | src/field_fadetransition.c (renamed from src/field/field_fadetransition.c) | 0 | ||||
-rw-r--r-- | src/field_message_box.c (renamed from src/field/field_message_box.c) | 0 | ||||
-rw-r--r-- | src/field_player_avatar.c (renamed from src/field/field_player_avatar.c) | 0 | ||||
-rw-r--r-- | src/field_poison.c (renamed from src/field/field_poison.c) | 0 | ||||
-rw-r--r-- | src/field_region_map.c (renamed from src/field/field_region_map.c) | 0 | ||||
-rw-r--r-- | src/field_screen_effect.c (renamed from src/field/field_screen_effect.c) | 0 | ||||
-rw-r--r-- | src/field_special_scene.c (renamed from src/field/field_special_scene.c) | 0 | ||||
-rw-r--r-- | src/field_specials.c (renamed from src/field/field_specials.c) | 0 | ||||
-rw-r--r-- | src/field_tasks.c (renamed from src/field/field_tasks.c) | 0 | ||||
-rw-r--r-- | src/field_weather.c (renamed from src/field/field_weather.c) | 0 | ||||
-rw-r--r-- | src/field_weather_effects.c (renamed from src/field/field_weather_effects.c) | 0 | ||||
-rw-r--r-- | src/fieldmap.c (renamed from src/field/fieldmap.c) | 0 | ||||
-rw-r--r-- | src/fldeff_berrytree.c (renamed from src/field/fldeff_berrytree.c) | 0 | ||||
-rw-r--r-- | src/fldeff_cut.c (renamed from src/field/fldeff_cut.c) | 0 | ||||
-rw-r--r-- | src/fldeff_decoration.c (renamed from src/field/fldeff_decoration.c) | 0 | ||||
-rw-r--r-- | src/fldeff_escalator.c (renamed from src/field/fldeff_escalator.c) | 0 | ||||
-rw-r--r-- | src/fldeff_flash.c (renamed from src/field/fldeff_flash.c) | 0 | ||||
-rw-r--r-- | src/fldeff_poison.c (renamed from src/field/fldeff_poison.c) | 0 | ||||
-rw-r--r-- | src/fldeff_recordmixing.c (renamed from src/field/fldeff_recordmixing.c) | 0 | ||||
-rw-r--r-- | src/fldeff_secret_base_pc.c (renamed from src/field/fldeff_secret_base_pc.c) | 0 | ||||
-rw-r--r-- | src/fldeff_secretpower.c (renamed from src/field/fldeff_secretpower.c) | 0 | ||||
-rw-r--r-- | src/fldeff_softboiled.c (renamed from src/field/fldeff_softboiled.c) | 0 | ||||
-rw-r--r-- | src/fldeff_strength.c (renamed from src/field/fldeff_strength.c) | 0 | ||||
-rw-r--r-- | src/fldeff_sweetscent.c (renamed from src/field/fldeff_sweetscent.c) | 0 | ||||
-rw-r--r-- | src/fldeff_teleport.c (renamed from src/field/fldeff_teleport.c) | 0 | ||||
-rw-r--r-- | src/hall_of_fame.c (renamed from src/scene/hall_of_fame.c) | 0 | ||||
-rw-r--r-- | src/heal_location.c (renamed from src/field/heal_location.c) | 0 | ||||
-rw-r--r-- | src/hof_pc.c (renamed from src/field/hof_pc.c) | 0 | ||||
-rw-r--r-- | src/intro.c (renamed from src/scene/intro.c) | 0 | ||||
-rw-r--r-- | src/intro_credits_graphics.c (renamed from src/scene/intro_credits_graphics.c) | 0 | ||||
-rw-r--r-- | src/item.c (renamed from src/field/item.c) | 8 | ||||
-rw-r--r-- | src/item_menu.c (renamed from src/field/item_menu.c) | 0 | ||||
-rw-r--r-- | src/item_use.c (renamed from src/field/item_use.c) | 0 | ||||
-rw-r--r-- | src/landmark.c (renamed from src/field/landmark.c) | 0 | ||||
-rw-r--r-- | src/learn_move.c (renamed from src/pokemon/learn_move.c) | 0 | ||||
-rw-r--r-- | src/link.c (renamed from src/engine/link.c) | 0 | ||||
-rw-r--r-- | src/load_save.c (renamed from src/engine/load_save.c) | 0 | ||||
-rw-r--r-- | src/lottery_corner.c (renamed from src/field/lottery_corner.c) | 0 | ||||
-rw-r--r-- | src/mail.c (renamed from src/pokemon/mail.c) | 0 | ||||
-rw-r--r-- | src/mail_data.c (renamed from src/pokemon/mail_data.c) | 0 | ||||
-rw-r--r-- | src/main.c (renamed from src/engine/main.c) | 0 | ||||
-rw-r--r-- | src/main_menu.c (renamed from src/engine/main_menu.c) | 0 | ||||
-rw-r--r-- | src/map_name_popup.c (renamed from src/field/map_name_popup.c) | 0 | ||||
-rw-r--r-- | src/map_obj_lock.c (renamed from src/field/map_obj_lock.c) | 0 | ||||
-rw-r--r-- | src/mauville_man.c (renamed from src/field/mauville_man.c) | 0 | ||||
-rw-r--r-- | src/menu.c (renamed from src/engine/menu.c) | 0 | ||||
-rw-r--r-- | src/menu_cursor.c (renamed from src/engine/menu_cursor.c) | 4 | ||||
-rw-r--r-- | src/menu_helpers.c (renamed from src/field/menu_helpers.c) | 0 | ||||
-rw-r--r-- | src/metatile_behavior.c (renamed from src/field/metatile_behavior.c) | 0 | ||||
-rw-r--r-- | src/mon_markings.c (renamed from src/pokemon/mon_markings.c) | 0 | ||||
-rw-r--r-- | src/money.c (renamed from src/field/money.c) | 0 | ||||
-rw-r--r-- | src/mystery_event_menu.c (renamed from src/engine/mystery_event_menu.c) | 0 | ||||
-rw-r--r-- | src/mystery_event_msg.c (renamed from src/engine/mystery_event_msg.c) | 0 | ||||
-rw-r--r-- | src/mystery_event_script.c (renamed from src/engine/mystery_event_script.c) | 0 | ||||
-rw-r--r-- | src/name_string_util.c (renamed from src/engine/name_string_util.c) | 0 | ||||
-rw-r--r-- | src/naming_screen.c (renamed from src/engine/naming_screen.c) | 0 | ||||
-rw-r--r-- | src/new_game.c (renamed from src/scene/new_game.c) | 0 | ||||
-rw-r--r-- | src/option_menu.c (renamed from src/engine/option_menu.c) | 0 | ||||
-rw-r--r-- | src/overworld.c (renamed from src/field/overworld.c) | 0 | ||||
-rw-r--r-- | src/palette.c (renamed from src/engine/palette.c) | 0 | ||||
-rw-r--r-- | src/party_menu.c (renamed from src/field/party_menu.c) | 0 | ||||
-rw-r--r-- | src/pc_screen_effect.c (renamed from src/field/pc_screen_effect.c) | 0 | ||||
-rw-r--r-- | src/play_time.c (renamed from src/engine/play_time.c) | 0 | ||||
-rw-r--r-- | src/player_pc.c (renamed from src/field/player_pc.c) | 0 | ||||
-rw-r--r-- | src/pokeblock.c (renamed from src/field/pokeblock.c) | 0 | ||||
-rw-r--r-- | src/pokeblock_feed.c (renamed from src/pokemon/pokeblock_feed.c) | 0 | ||||
-rw-r--r-- | src/pokedex.c (renamed from src/pokemon/pokedex.c) | 6 | ||||
-rw-r--r-- | src/pokedex_area_screen.c (renamed from src/field/pokedex_area_screen.c) | 0 | ||||
-rw-r--r-- | src/pokedex_cry_screen.c (renamed from src/pokemon/pokedex_cry_screen.c) | 0 | ||||
-rw-r--r-- | src/pokemon_1.c (renamed from src/pokemon/pokemon_1.c) | 18 | ||||
-rw-r--r-- | src/pokemon_2.c (renamed from src/pokemon/pokemon_2.c) | 0 | ||||
-rw-r--r-- | src/pokemon_3.c (renamed from src/pokemon/pokemon_3.c) | 0 | ||||
-rw-r--r-- | src/pokemon_icon.c (renamed from src/pokemon/pokemon_icon.c) | 0 | ||||
-rw-r--r-- | src/pokemon_item_effect.c (renamed from src/pokemon/pokemon_item_effect.c) | 0 | ||||
-rw-r--r-- | src/pokemon_menu.c (renamed from src/pokemon/pokemon_menu.c) | 0 | ||||
-rw-r--r-- | src/pokemon_size_record.c (renamed from src/pokemon/pokemon_size_record.c) | 0 | ||||
-rw-r--r-- | src/pokemon_storage_system.c (renamed from src/pokemon/pokemon_storage_system.c) | 0 | ||||
-rw-r--r-- | src/pokemon_storage_system_2.c (renamed from src/pokemon/pokemon_storage_system_2.c) | 0 | ||||
-rw-r--r-- | src/pokemon_storage_system_3.c (renamed from src/pokemon/pokemon_storage_system_3.c) | 0 | ||||
-rw-r--r-- | src/pokemon_storage_system_4.c (renamed from src/pokemon/pokemon_storage_system_4.c) | 0 | ||||
-rw-r--r-- | src/pokemon_storage_system_5.c (renamed from src/pokemon/pokemon_storage_system_5.c) | 0 | ||||
-rw-r--r-- | src/pokemon_summary_screen.c (renamed from src/pokemon/pokemon_summary_screen.c) | 8 | ||||
-rw-r--r-- | src/pokenav.c (renamed from src/field/pokenav.c) | 0 | ||||
-rw-r--r-- | src/random.c (renamed from src/engine/random.c) | 0 | ||||
-rw-r--r-- | src/record_mixing.c (renamed from src/engine/record_mixing.c) | 0 | ||||
-rw-r--r-- | src/region_map.c (renamed from src/field/region_map.c) | 6 | ||||
-rw-r--r-- | src/reset_rtc_screen.c (renamed from src/engine/reset_rtc_screen.c) | 0 | ||||
-rw-r--r-- | src/roamer.c (renamed from src/field/roamer.c) | 0 | ||||
-rw-r--r-- | src/rotating_gate.c (renamed from src/field/rotating_gate.c) | 0 | ||||
-rw-r--r-- | src/rtc.c (renamed from src/engine/rtc.c) | 0 | ||||
-rw-r--r-- | src/safari_zone.c (renamed from src/field/safari_zone.c) | 0 | ||||
-rw-r--r-- | src/save.c (renamed from src/engine/save.c) | 0 | ||||
-rw-r--r-- | src/save_failed_screen.c (renamed from src/engine/save_failed_screen.c) | 0 | ||||
-rw-r--r-- | src/save_menu_util.c (renamed from src/engine/save_menu_util.c) | 0 | ||||
-rw-r--r-- | src/scrcmd.c (renamed from src/field/scrcmd.c) | 0 | ||||
-rw-r--r-- | src/script.c (renamed from src/engine/script.c) | 0 | ||||
-rw-r--r-- | src/script_menu.c (renamed from src/field/script_menu.c) | 0 | ||||
-rw-r--r-- | src/script_movement.c (renamed from src/field/script_movement.c) | 0 | ||||
-rw-r--r-- | src/secret_base.c (renamed from src/field/secret_base.c) | 0 | ||||
-rw-r--r-- | src/shop.c (renamed from src/field/shop.c) | 0 | ||||
-rw-r--r-- | src/slot_machine.c (renamed from src/field/slot_machine.c) | 0 | ||||
-rw-r--r-- | src/sound.c (renamed from src/engine/sound.c) | 0 | ||||
-rw-r--r-- | src/sprite.c (renamed from src/engine/sprite.c) | 0 | ||||
-rw-r--r-- | src/start_menu.c (renamed from src/field/start_menu.c) | 0 | ||||
-rw-r--r-- | src/starter_choose.c (renamed from src/field/starter_choose.c) | 0 | ||||
-rw-r--r-- | src/string_util.c (renamed from src/engine/string_util.c) | 0 | ||||
-rw-r--r-- | src/task.c (renamed from src/engine/task.c) | 0 | ||||
-rw-r--r-- | src/text.c (renamed from src/engine/text.c) | 12 | ||||
-rw-r--r-- | src/text_window.c (renamed from src/engine/text_window.c) | 0 | ||||
-rw-r--r-- | src/tileset_anim.c (renamed from src/engine/tileset_anim.c) | 0 | ||||
-rw-r--r-- | src/time_events.c (renamed from src/engine/time_events.c) | 0 | ||||
-rw-r--r-- | src/title_screen.c (renamed from src/scene/title_screen.c) | 0 | ||||
-rw-r--r-- | src/trade.c (renamed from src/engine/trade.c) | 0 | ||||
-rw-r--r-- | src/trader.c (renamed from src/field/trader.c) | 0 | ||||
-rw-r--r-- | src/trainer_card.c (renamed from src/engine/trainer_card.c) | 0 | ||||
-rw-r--r-- | src/trainer_see.c (renamed from src/field/trainer_see.c) | 0 | ||||
-rw-r--r-- | src/trig.c (renamed from src/engine/trig.c) | 0 | ||||
-rw-r--r-- | src/tv.c (renamed from src/field/tv.c) | 0 | ||||
-rw-r--r-- | src/use_pokeblock.c (renamed from src/field/use_pokeblock.c) | 0 | ||||
-rw-r--r-- | src/util.c (renamed from src/engine/util.c) | 0 | ||||
-rw-r--r-- | src/wallclock.c (renamed from src/field/wallclock.c) | 0 | ||||
-rw-r--r-- | src/wild_encounter.c (renamed from src/field/wild_encounter.c) | 0 |
158 files changed, 53 insertions, 53 deletions
diff --git a/src/field/bard_music.c b/src/bard_music.c index 5c48749cf..4518cf09b 100644 --- a/src/field/bard_music.c +++ b/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] = { diff --git a/src/field/battle_tower.c b/src/battle_tower.c index d4dbba120..8c44b71a3 100644 --- a/src/field/battle_tower.c +++ b/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[] = { diff --git a/src/field/berry.c b/src/berry.c index 9313c458b..9313c458b 100644 --- a/src/field/berry.c +++ b/src/berry.c diff --git a/src/scene/berry_blender.c b/src/berry_blender.c index bf634a49f..bf634a49f 100644 --- a/src/scene/berry_blender.c +++ b/src/berry_blender.c diff --git a/src/field/berry_tag_screen.c b/src/berry_tag_screen.c index 9fbfd0681..9fbfd0681 100644 --- a/src/field/berry_tag_screen.c +++ b/src/berry_tag_screen.c diff --git a/src/field/bike.c b/src/bike.c index 28439e6bb..28439e6bb 100644 --- a/src/field/bike.c +++ b/src/bike.c diff --git a/src/field/birch_pc.c b/src/birch_pc.c index 4b0025504..4b0025504 100644 --- a/src/field/birch_pc.c +++ b/src/birch_pc.c diff --git a/src/engine/blend_palette.c b/src/blend_palette.c index 843c50ac1..843c50ac1 100644 --- a/src/engine/blend_palette.c +++ b/src/blend_palette.c diff --git a/src/field/braille_puzzles.c b/src/braille_puzzles.c index f11fb5fb3..f11fb5fb3 100644 --- a/src/field/braille_puzzles.c +++ b/src/braille_puzzles.c diff --git a/src/scene/cable_car.c b/src/cable_car.c index 8c3f9885d..8c3f9885d 100644 --- a/src/scene/cable_car.c +++ b/src/cable_car.c diff --git a/src/engine/cable_car_util.c b/src/cable_car_util.c index 02bfbc195..02bfbc195 100644 --- a/src/engine/cable_car_util.c +++ b/src/cable_car_util.c diff --git a/src/engine/cable_club.c b/src/cable_club.c index 0da23c5f3..0da23c5f3 100644 --- a/src/engine/cable_club.c +++ b/src/cable_club.c diff --git a/src/field/choose_party.c b/src/choose_party.c index 4766b2fbb..4766b2fbb 100644 --- a/src/field/choose_party.c +++ b/src/choose_party.c diff --git a/src/engine/clear_save_data_menu.c b/src/clear_save_data_menu.c index b6053715a..b6053715a 100644 --- a/src/engine/clear_save_data_menu.c +++ b/src/clear_save_data_menu.c diff --git a/src/engine/clock.c b/src/clock.c index fceccdfcb..fceccdfcb 100644 --- a/src/engine/clock.c +++ b/src/clock.c diff --git a/src/field/coins.c b/src/coins.c index 2c217e635..2c217e635 100644 --- a/src/field/coins.c +++ b/src/coins.c diff --git a/src/scene/contest_painting.c b/src/contest_painting.c index 0aa02312f..0aa02312f 100644 --- a/src/scene/contest_painting.c +++ b/src/contest_painting.c diff --git a/src/field/coord_event_weather.c b/src/coord_event_weather.c index 60b87fa30..60b87fa30 100644 --- a/src/field/coord_event_weather.c +++ b/src/coord_event_weather.c diff --git a/src/scene/credits.c b/src/credits.c index e31e2c797..9a85265e4 100644 --- a/src/scene/credits.c +++ b/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] = diff --git a/src/scene/cute_sketch.c b/src/cute_sketch.c index 5317bc334..5317bc334 100644 --- a/src/scene/cute_sketch.c +++ b/src/cute_sketch.c diff --git a/src/field/daycare.c b/src/daycare.c index da0838d29..e26db531f 100644 --- a/src/field/daycare.c +++ b/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, diff --git a/src/engine/decompress.c b/src/decompress.c index 69edf01aa..69edf01aa 100644 --- a/src/engine/decompress.c +++ b/src/decompress.c diff --git a/src/field/decoration.c b/src/decoration.c index 0e7fa5f41..477414993 100644 --- a/src/field/decoration.c +++ b/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[] = { diff --git a/src/field/decoration_inventory.c b/src/decoration_inventory.c index 8f7f5eb92..8f7f5eb92 100644 --- a/src/field/decoration_inventory.c +++ b/src/decoration_inventory.c diff --git a/src/field/dewford_trend.c b/src/dewford_trend.c index 9afb7a16d..9afb7a16d 100644 --- a/src/field/dewford_trend.c +++ b/src/dewford_trend.c diff --git a/src/field/diploma.c b/src/diploma.c index b31fc7dec..b31fc7dec 100644 --- a/src/field/diploma.c +++ b/src/diploma.c diff --git a/src/scene/egg_hatch.c b/src/egg_hatch.c index 282ad31fb..282ad31fb 100644 --- a/src/scene/egg_hatch.c +++ b/src/egg_hatch.c diff --git a/src/field/event_data.c b/src/event_data.c index 9d6d2372b..9d6d2372b 100644 --- a/src/field/event_data.c +++ b/src/event_data.c diff --git a/src/field/event_object_movement.c b/src/event_object_movement.c index 7a5f62456..155ce33f5 100644 --- a/src/field/event_object_movement.c +++ b/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 diff --git a/src/scene/evolution_graphics.c b/src/evolution_graphics.c index b9ef5b402..b9ef5b402 100644 --- a/src/scene/evolution_graphics.c +++ b/src/evolution_graphics.c diff --git a/src/scene/evolution_scene.c b/src/evolution_scene.c index 3ba325574..3ba325574 100644 --- a/src/scene/evolution_scene.c +++ b/src/evolution_scene.c diff --git a/src/field/field_camera.c b/src/field_camera.c index 8384ad8d1..8384ad8d1 100644 --- a/src/field/field_camera.c +++ b/src/field_camera.c diff --git a/src/field/field_control_avatar.c b/src/field_control_avatar.c index 3ae422512..3ae422512 100644 --- a/src/field/field_control_avatar.c +++ b/src/field_control_avatar.c diff --git a/src/field/field_door.c b/src/field_door.c index 89dae725c..89dae725c 100644 --- a/src/field/field_door.c +++ b/src/field_door.c diff --git a/src/field/field_effect.c b/src/field_effect.c index f85bc520e..f85bc520e 100644 --- a/src/field/field_effect.c +++ b/src/field_effect.c diff --git a/src/field/field_effect_helpers.c b/src/field_effect_helpers.c index bc4a1770e..bc4a1770e 100644 --- a/src/field/field_effect_helpers.c +++ b/src/field_effect_helpers.c diff --git a/src/field/field_fadetransition.c b/src/field_fadetransition.c index 35ea3952a..35ea3952a 100644 --- a/src/field/field_fadetransition.c +++ b/src/field_fadetransition.c diff --git a/src/field/field_message_box.c b/src/field_message_box.c index 5eec7a14b..5eec7a14b 100644 --- a/src/field/field_message_box.c +++ b/src/field_message_box.c diff --git a/src/field/field_player_avatar.c b/src/field_player_avatar.c index 1552381b2..1552381b2 100644 --- a/src/field/field_player_avatar.c +++ b/src/field_player_avatar.c diff --git a/src/field/field_poison.c b/src/field_poison.c index 8365351f9..8365351f9 100644 --- a/src/field/field_poison.c +++ b/src/field_poison.c diff --git a/src/field/field_region_map.c b/src/field_region_map.c index 54091459f..54091459f 100644 --- a/src/field/field_region_map.c +++ b/src/field_region_map.c diff --git a/src/field/field_screen_effect.c b/src/field_screen_effect.c index 61301c5a9..61301c5a9 100644 --- a/src/field/field_screen_effect.c +++ b/src/field_screen_effect.c diff --git a/src/field/field_special_scene.c b/src/field_special_scene.c index 2010ebcf4..2010ebcf4 100644 --- a/src/field/field_special_scene.c +++ b/src/field_special_scene.c diff --git a/src/field/field_specials.c b/src/field_specials.c index 715086f00..715086f00 100644 --- a/src/field/field_specials.c +++ b/src/field_specials.c diff --git a/src/field/field_tasks.c b/src/field_tasks.c index ce5fc6c0e..ce5fc6c0e 100644 --- a/src/field/field_tasks.c +++ b/src/field_tasks.c diff --git a/src/field/field_weather.c b/src/field_weather.c index 5857145ef..5857145ef 100644 --- a/src/field/field_weather.c +++ b/src/field_weather.c diff --git a/src/field/field_weather_effects.c b/src/field_weather_effects.c index 386925531..386925531 100644 --- a/src/field/field_weather_effects.c +++ b/src/field_weather_effects.c diff --git a/src/field/fieldmap.c b/src/fieldmap.c index 7383bb174..7383bb174 100644 --- a/src/field/fieldmap.c +++ b/src/fieldmap.c diff --git a/src/field/fldeff_berrytree.c b/src/fldeff_berrytree.c index 6b03e9952..6b03e9952 100644 --- a/src/field/fldeff_berrytree.c +++ b/src/fldeff_berrytree.c diff --git a/src/field/fldeff_cut.c b/src/fldeff_cut.c index c8f942fe5..c8f942fe5 100644 --- a/src/field/fldeff_cut.c +++ b/src/fldeff_cut.c diff --git a/src/field/fldeff_decoration.c b/src/fldeff_decoration.c index 1859fc00b..1859fc00b 100644 --- a/src/field/fldeff_decoration.c +++ b/src/fldeff_decoration.c diff --git a/src/field/fldeff_escalator.c b/src/fldeff_escalator.c index 981233480..981233480 100644 --- a/src/field/fldeff_escalator.c +++ b/src/fldeff_escalator.c diff --git a/src/field/fldeff_flash.c b/src/fldeff_flash.c index 30ddd0f6c..30ddd0f6c 100644 --- a/src/field/fldeff_flash.c +++ b/src/fldeff_flash.c diff --git a/src/field/fldeff_poison.c b/src/fldeff_poison.c index 52afc2516..52afc2516 100644 --- a/src/field/fldeff_poison.c +++ b/src/fldeff_poison.c diff --git a/src/field/fldeff_recordmixing.c b/src/fldeff_recordmixing.c index 716447f9c..716447f9c 100644 --- a/src/field/fldeff_recordmixing.c +++ b/src/fldeff_recordmixing.c diff --git a/src/field/fldeff_secret_base_pc.c b/src/fldeff_secret_base_pc.c index 394c4bc56..394c4bc56 100644 --- a/src/field/fldeff_secret_base_pc.c +++ b/src/fldeff_secret_base_pc.c diff --git a/src/field/fldeff_secretpower.c b/src/fldeff_secretpower.c index d1df03d84..d1df03d84 100644 --- a/src/field/fldeff_secretpower.c +++ b/src/fldeff_secretpower.c diff --git a/src/field/fldeff_softboiled.c b/src/fldeff_softboiled.c index 3c64ec520..3c64ec520 100644 --- a/src/field/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c diff --git a/src/field/fldeff_strength.c b/src/fldeff_strength.c index 9f9cd4013..9f9cd4013 100644 --- a/src/field/fldeff_strength.c +++ b/src/fldeff_strength.c diff --git a/src/field/fldeff_sweetscent.c b/src/fldeff_sweetscent.c index b9dbf619d..b9dbf619d 100644 --- a/src/field/fldeff_sweetscent.c +++ b/src/fldeff_sweetscent.c diff --git a/src/field/fldeff_teleport.c b/src/fldeff_teleport.c index af48fb414..af48fb414 100644 --- a/src/field/fldeff_teleport.c +++ b/src/fldeff_teleport.c diff --git a/src/scene/hall_of_fame.c b/src/hall_of_fame.c index 2b790e97d..2b790e97d 100644 --- a/src/scene/hall_of_fame.c +++ b/src/hall_of_fame.c diff --git a/src/field/heal_location.c b/src/heal_location.c index a10c7a7b8..a10c7a7b8 100644 --- a/src/field/heal_location.c +++ b/src/heal_location.c diff --git a/src/field/hof_pc.c b/src/hof_pc.c index 267ed4274..267ed4274 100644 --- a/src/field/hof_pc.c +++ b/src/hof_pc.c diff --git a/src/scene/intro.c b/src/intro.c index 5c0e7a67d..5c0e7a67d 100644 --- a/src/scene/intro.c +++ b/src/intro.c diff --git a/src/scene/intro_credits_graphics.c b/src/intro_credits_graphics.c index 6aadafc58..6aadafc58 100644 --- a/src/scene/intro_credits_graphics.c +++ b/src/intro_credits_graphics.c diff --git a/src/field/item.c b/src/item.c index af05c0a21..41cbb7a1e 100644 --- a/src/field/item.c +++ b/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); diff --git a/src/field/item_menu.c b/src/item_menu.c index 32b14e021..32b14e021 100644 --- a/src/field/item_menu.c +++ b/src/item_menu.c diff --git a/src/field/item_use.c b/src/item_use.c index a0fbb13b2..a0fbb13b2 100644 --- a/src/field/item_use.c +++ b/src/item_use.c diff --git a/src/field/landmark.c b/src/landmark.c index 476821ec6..476821ec6 100644 --- a/src/field/landmark.c +++ b/src/landmark.c diff --git a/src/pokemon/learn_move.c b/src/learn_move.c index 356a31b00..356a31b00 100644 --- a/src/pokemon/learn_move.c +++ b/src/learn_move.c diff --git a/src/engine/link.c b/src/link.c index 45807830a..45807830a 100644 --- a/src/engine/link.c +++ b/src/link.c diff --git a/src/engine/load_save.c b/src/load_save.c index 8424b1121..8424b1121 100644 --- a/src/engine/load_save.c +++ b/src/load_save.c diff --git a/src/field/lottery_corner.c b/src/lottery_corner.c index 03de26054..03de26054 100644 --- a/src/field/lottery_corner.c +++ b/src/lottery_corner.c diff --git a/src/pokemon/mail.c b/src/mail.c index 4497c98fb..4497c98fb 100644 --- a/src/pokemon/mail.c +++ b/src/mail.c diff --git a/src/pokemon/mail_data.c b/src/mail_data.c index 4249b9f48..4249b9f48 100644 --- a/src/pokemon/mail_data.c +++ b/src/mail_data.c diff --git a/src/engine/main.c b/src/main.c index 54a443e80..54a443e80 100644 --- a/src/engine/main.c +++ b/src/main.c diff --git a/src/engine/main_menu.c b/src/main_menu.c index 5a3f55b29..5a3f55b29 100644 --- a/src/engine/main_menu.c +++ b/src/main_menu.c diff --git a/src/field/map_name_popup.c b/src/map_name_popup.c index 49a470cc1..49a470cc1 100644 --- a/src/field/map_name_popup.c +++ b/src/map_name_popup.c diff --git a/src/field/map_obj_lock.c b/src/map_obj_lock.c index 3bd25dbdf..3bd25dbdf 100644 --- a/src/field/map_obj_lock.c +++ b/src/map_obj_lock.c diff --git a/src/field/mauville_man.c b/src/mauville_man.c index a68d5071d..a68d5071d 100644 --- a/src/field/mauville_man.c +++ b/src/mauville_man.c diff --git a/src/engine/menu.c b/src/menu.c index 86e20d0eb..86e20d0eb 100644 --- a/src/engine/menu.c +++ b/src/menu.c diff --git a/src/engine/menu_cursor.c b/src/menu_cursor.c index 35116d40b..f2eb31f16 100644 --- a/src/engine/menu_cursor.c +++ b/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) diff --git a/src/field/menu_helpers.c b/src/menu_helpers.c index 388d98ec7..388d98ec7 100644 --- a/src/field/menu_helpers.c +++ b/src/menu_helpers.c diff --git a/src/field/metatile_behavior.c b/src/metatile_behavior.c index d05ba0b89..d05ba0b89 100644 --- a/src/field/metatile_behavior.c +++ b/src/metatile_behavior.c diff --git a/src/pokemon/mon_markings.c b/src/mon_markings.c index dcdc54434..dcdc54434 100644 --- a/src/pokemon/mon_markings.c +++ b/src/mon_markings.c diff --git a/src/field/money.c b/src/money.c index 3b7268dbc..3b7268dbc 100644 --- a/src/field/money.c +++ b/src/money.c diff --git a/src/engine/mystery_event_menu.c b/src/mystery_event_menu.c index 56801ff53..56801ff53 100644 --- a/src/engine/mystery_event_menu.c +++ b/src/mystery_event_menu.c diff --git a/src/engine/mystery_event_msg.c b/src/mystery_event_msg.c index 03ef22727..03ef22727 100644 --- a/src/engine/mystery_event_msg.c +++ b/src/mystery_event_msg.c diff --git a/src/engine/mystery_event_script.c b/src/mystery_event_script.c index 6fcad66ac..6fcad66ac 100644 --- a/src/engine/mystery_event_script.c +++ b/src/mystery_event_script.c diff --git a/src/engine/name_string_util.c b/src/name_string_util.c index 32e9358e1..32e9358e1 100644 --- a/src/engine/name_string_util.c +++ b/src/name_string_util.c diff --git a/src/engine/naming_screen.c b/src/naming_screen.c index 59b9b4d84..59b9b4d84 100644 --- a/src/engine/naming_screen.c +++ b/src/naming_screen.c diff --git a/src/scene/new_game.c b/src/new_game.c index e64dc91e3..e64dc91e3 100644 --- a/src/scene/new_game.c +++ b/src/new_game.c diff --git a/src/engine/option_menu.c b/src/option_menu.c index a2d32ffb6..a2d32ffb6 100644 --- a/src/engine/option_menu.c +++ b/src/option_menu.c diff --git a/src/field/overworld.c b/src/overworld.c index 6376aa1af..6376aa1af 100644 --- a/src/field/overworld.c +++ b/src/overworld.c diff --git a/src/engine/palette.c b/src/palette.c index 2a6602503..2a6602503 100644 --- a/src/engine/palette.c +++ b/src/palette.c diff --git a/src/field/party_menu.c b/src/party_menu.c index 9caaa05b9..9caaa05b9 100644 --- a/src/field/party_menu.c +++ b/src/party_menu.c diff --git a/src/field/pc_screen_effect.c b/src/pc_screen_effect.c index dcc3bc9c9..dcc3bc9c9 100644 --- a/src/field/pc_screen_effect.c +++ b/src/pc_screen_effect.c diff --git a/src/engine/play_time.c b/src/play_time.c index 9882c9c4b..9882c9c4b 100644 --- a/src/engine/play_time.c +++ b/src/play_time.c diff --git a/src/field/player_pc.c b/src/player_pc.c index 27427ecaa..27427ecaa 100644 --- a/src/field/player_pc.c +++ b/src/player_pc.c diff --git a/src/field/pokeblock.c b/src/pokeblock.c index 6804f55d6..6804f55d6 100644 --- a/src/field/pokeblock.c +++ b/src/pokeblock.c diff --git a/src/pokemon/pokeblock_feed.c b/src/pokeblock_feed.c index 2f2ce2f8f..2f2ce2f8f 100644 --- a/src/pokemon/pokeblock_feed.c +++ b/src/pokeblock_feed.c diff --git a/src/pokemon/pokedex.c b/src/pokedex.c index 090873f9d..711dc69fa 100644 --- a/src/pokemon/pokedex.c +++ b/src/pokedex.c @@ -185,7 +185,7 @@ static const u8 gUnknown_0839FA7C[] = INCBIN_U8("graphics/pokedex/noball.4bpp.lz extern const u8 gUnknown_0839FA7C[]; #endif -#include "../data/pokedex_orders.h" +#include "data/pokedex_orders.h" static const struct OamData gOamData_83A0404 = { .y = 160, @@ -514,9 +514,9 @@ static const u8 gUnknown_083A05F1[] = {16, 8, 4, 2, 1}; const u8 gEmptySpacce_83A05F6[] = {0, 0}; // Padding, maybe? static const u8 gUnknown_083A05F8[] = _(""); #if ENGLISH -#include "../data/pokedex_entries_en.h" +#include "data/pokedex_entries_en.h" #elif GERMAN -#include "../data/pokedex_entries_de.h" +#include "data/pokedex_entries_de.h" #endif static const u16 gUnknown_083B4EC4[16] = {0}; static const u8 *const sMonFootprintTable[] = diff --git a/src/field/pokedex_area_screen.c b/src/pokedex_area_screen.c index 67ca276c4..67ca276c4 100644 --- a/src/field/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c diff --git a/src/pokemon/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index 912b9aabd..912b9aabd 100644 --- a/src/pokemon/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c diff --git a/src/pokemon/pokemon_1.c b/src/pokemon_1.c index 80d245b52..a23bb3324 100644 --- a/src/pokemon/pokemon_1.c +++ b/src/pokemon_1.c @@ -41,7 +41,7 @@ const struct SpindaSpot gSpindaSpotGraphics[] = {34, 33, INCBIN_U16("graphics/spinda_spots/spot_3.bin")} }; -#include "../data/pokemon/item_effects.h" +#include "data/pokemon/item_effects.h" const s8 gNatureStatTable[][5] = { @@ -73,14 +73,14 @@ const s8 gNatureStatTable[][5] = { 0, 0, 0, 0, 0} // Quirky }; -#include "../data/pokemon/tmhm_learnsets.h" -#include "../data/pokemon/trainer_class_lookups.h" -#include "../data/pokemon/cry_ids.h" -#include "../data/pokemon/experience_tables.h" -#include "../data/pokemon/base_stats.h" -#include "../data/pokemon/level_up_learnsets.h" -#include "../data/pokemon/evolution.h" -#include "../data/pokemon/level_up_learnset_pointers.h" +#include "data/pokemon/tmhm_learnsets.h" +#include "data/pokemon/trainer_class_lookups.h" +#include "data/pokemon/cry_ids.h" +#include "data/pokemon/experience_tables.h" +#include "data/pokemon/base_stats.h" +#include "data/pokemon/level_up_learnsets.h" +#include "data/pokemon/evolution.h" +#include "data/pokemon/level_up_learnset_pointers.h" void ZeroBoxMonData(struct BoxPokemon *boxMon) { diff --git a/src/pokemon/pokemon_2.c b/src/pokemon_2.c index 7fd1aa7b2..7fd1aa7b2 100644 --- a/src/pokemon/pokemon_2.c +++ b/src/pokemon_2.c diff --git a/src/pokemon/pokemon_3.c b/src/pokemon_3.c index 9346031a6..9346031a6 100644 --- a/src/pokemon/pokemon_3.c +++ b/src/pokemon_3.c diff --git a/src/pokemon/pokemon_icon.c b/src/pokemon_icon.c index b1b462761..b1b462761 100644 --- a/src/pokemon/pokemon_icon.c +++ b/src/pokemon_icon.c diff --git a/src/pokemon/pokemon_item_effect.c b/src/pokemon_item_effect.c index 4ebece3b3..4ebece3b3 100644 --- a/src/pokemon/pokemon_item_effect.c +++ b/src/pokemon_item_effect.c diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon_menu.c index 532340ce4..532340ce4 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon_menu.c diff --git a/src/pokemon/pokemon_size_record.c b/src/pokemon_size_record.c index f92a95bfb..f92a95bfb 100644 --- a/src/pokemon/pokemon_size_record.c +++ b/src/pokemon_size_record.c diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon_storage_system.c index 1ea8bc205..1ea8bc205 100644 --- a/src/pokemon/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index 0331abf3e..0331abf3e 100644 --- a/src/pokemon/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index da26c6fc5..da26c6fc5 100644 --- a/src/pokemon/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 2f9f79a54..2f9f79a54 100644 --- a/src/pokemon/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c diff --git a/src/pokemon/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c index b7c3d42f5..b7c3d42f5 100644 --- a/src/pokemon/pokemon_storage_system_5.c +++ b/src/pokemon_storage_system_5.c diff --git a/src/pokemon/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 0acf465f6..75ddb52d0 100644 --- a/src/pokemon/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -158,11 +158,11 @@ EWRAM_DATA u8 gUnknown_020384F0 = 0; EWRAM_DATA struct Sprite *gUnknown_020384F4 = NULL; #if ENGLISH -#include "../data/text/move_descriptions_en.h" -#include "../data/text/nature_names_en.h" +#include "data/text/move_descriptions_en.h" +#include "data/text/nature_names_en.h" #elif GERMAN -#include "../data/text/move_descriptions_de.h" -#include "../data/text/nature_names_de.h" +#include "data/text/move_descriptions_de.h" +#include "data/text/nature_names_de.h" #endif static const u8 * const sPageHeaderTexts[] = { diff --git a/src/field/pokenav.c b/src/pokenav.c index f57a98df6..f57a98df6 100644 --- a/src/field/pokenav.c +++ b/src/pokenav.c diff --git a/src/engine/random.c b/src/random.c index 8f82b722f..8f82b722f 100644 --- a/src/engine/random.c +++ b/src/random.c diff --git a/src/engine/record_mixing.c b/src/record_mixing.c index a2660bf82..a2660bf82 100644 --- a/src/engine/record_mixing.c +++ b/src/record_mixing.c diff --git a/src/field/region_map.c b/src/region_map.c index 6d50701d6..e40fb7752 100644 --- a/src/field/region_map.c +++ b/src/region_map.c @@ -141,12 +141,12 @@ static const u16 sRegionMapBkgnd_Pal[] = INCBIN_U16("graphics/pokenav/region_map static const u8 sRegionMapBkgnd_ImageLZ[] = INCBIN_U8("graphics/pokenav/region_map.8bpp.lz"); static const u8 sRegionMapBkgnd_TilemapLZ[] = INCBIN_U8("graphics/pokenav/region_map_map.bin.lz"); -#include "../data/region_map_layout.h" +#include "data/region_map_layout.h" #if ENGLISH -#include "../data/region_map_names_en.h" +#include "data/region_map_names_en.h" #elif GERMAN -#include "../data/region_map_names_de.h" +#include "data/region_map_names_de.h" #endif struct RegionMapLocation diff --git a/src/engine/reset_rtc_screen.c b/src/reset_rtc_screen.c index 8c2c23569..8c2c23569 100644 --- a/src/engine/reset_rtc_screen.c +++ b/src/reset_rtc_screen.c diff --git a/src/field/roamer.c b/src/roamer.c index 6ed5b6c89..6ed5b6c89 100644 --- a/src/field/roamer.c +++ b/src/roamer.c diff --git a/src/field/rotating_gate.c b/src/rotating_gate.c index 69f655a65..69f655a65 100644 --- a/src/field/rotating_gate.c +++ b/src/rotating_gate.c diff --git a/src/engine/rtc.c b/src/rtc.c index 5462298ed..5462298ed 100644 --- a/src/engine/rtc.c +++ b/src/rtc.c diff --git a/src/field/safari_zone.c b/src/safari_zone.c index f371b08b3..f371b08b3 100644 --- a/src/field/safari_zone.c +++ b/src/safari_zone.c diff --git a/src/engine/save.c b/src/save.c index 0b7a3dd79..0b7a3dd79 100644 --- a/src/engine/save.c +++ b/src/save.c diff --git a/src/engine/save_failed_screen.c b/src/save_failed_screen.c index f57315d09..f57315d09 100644 --- a/src/engine/save_failed_screen.c +++ b/src/save_failed_screen.c diff --git a/src/engine/save_menu_util.c b/src/save_menu_util.c index ccf4d9f6f..ccf4d9f6f 100644 --- a/src/engine/save_menu_util.c +++ b/src/save_menu_util.c diff --git a/src/field/scrcmd.c b/src/scrcmd.c index e5272bc9c..e5272bc9c 100644 --- a/src/field/scrcmd.c +++ b/src/scrcmd.c diff --git a/src/engine/script.c b/src/script.c index 8625cfdc2..8625cfdc2 100644 --- a/src/engine/script.c +++ b/src/script.c diff --git a/src/field/script_menu.c b/src/script_menu.c index 9d901a03c..9d901a03c 100644 --- a/src/field/script_menu.c +++ b/src/script_menu.c diff --git a/src/field/script_movement.c b/src/script_movement.c index 653dffcbf..653dffcbf 100644 --- a/src/field/script_movement.c +++ b/src/script_movement.c diff --git a/src/field/secret_base.c b/src/secret_base.c index 210d49835..210d49835 100644 --- a/src/field/secret_base.c +++ b/src/secret_base.c diff --git a/src/field/shop.c b/src/shop.c index 87dbbeb97..87dbbeb97 100644 --- a/src/field/shop.c +++ b/src/shop.c diff --git a/src/field/slot_machine.c b/src/slot_machine.c index 8075f24e4..8075f24e4 100644 --- a/src/field/slot_machine.c +++ b/src/slot_machine.c diff --git a/src/engine/sound.c b/src/sound.c index 159ad3f70..159ad3f70 100644 --- a/src/engine/sound.c +++ b/src/sound.c diff --git a/src/engine/sprite.c b/src/sprite.c index a9d84e01a..a9d84e01a 100644 --- a/src/engine/sprite.c +++ b/src/sprite.c diff --git a/src/field/start_menu.c b/src/start_menu.c index f2d53eb7f..f2d53eb7f 100644 --- a/src/field/start_menu.c +++ b/src/start_menu.c diff --git a/src/field/starter_choose.c b/src/starter_choose.c index 418488774..418488774 100644 --- a/src/field/starter_choose.c +++ b/src/starter_choose.c diff --git a/src/engine/string_util.c b/src/string_util.c index 7316f533a..7316f533a 100644 --- a/src/engine/string_util.c +++ b/src/string_util.c diff --git a/src/engine/task.c b/src/task.c index 3e8a5588c..3e8a5588c 100644 --- a/src/engine/task.c +++ b/src/task.c diff --git a/src/engine/text.c b/src/text.c index fe18a6d79..234e6085d 100644 --- a/src/engine/text.c +++ b/src/text.c @@ -234,12 +234,12 @@ static const u8 sBrailleGlyphs[] = INCBIN_U8("graphics/fonts/font6_braille.1bpp" static const u32 sDownArrowTiles[] = INCBIN_U32("graphics/fonts/down_arrow.4bpp"); // clang-format off -#include "../data/text/type1_map.h" -#include "../data/text/type3_map.h" -#include "../data/text/font1_widths.h" -#include "../data/text/font4_widths.h" -#include "../data/text/font0_widths.h" -#include "../data/text/font3_widths.h" +#include "data/text/type1_map.h" +#include "data/text/type3_map.h" +#include "data/text/font1_widths.h" +#include "data/text/font4_widths.h" +#include "data/text/font0_widths.h" +#include "data/text/font3_widths.h" // clang-format on const u16 gUnknownPalette_81E6692[] = INCBIN_U16("graphics/fonts/unknown_81E6692.gbapal"); diff --git a/src/engine/text_window.c b/src/text_window.c index ade349f4e..ade349f4e 100644 --- a/src/engine/text_window.c +++ b/src/text_window.c diff --git a/src/engine/tileset_anim.c b/src/tileset_anim.c index abd38edad..abd38edad 100644 --- a/src/engine/tileset_anim.c +++ b/src/tileset_anim.c diff --git a/src/engine/time_events.c b/src/time_events.c index 4bd732788..4bd732788 100644 --- a/src/engine/time_events.c +++ b/src/time_events.c diff --git a/src/scene/title_screen.c b/src/title_screen.c index a1c8e081d..a1c8e081d 100644 --- a/src/scene/title_screen.c +++ b/src/title_screen.c diff --git a/src/engine/trade.c b/src/trade.c index 36e6fc757..36e6fc757 100644 --- a/src/engine/trade.c +++ b/src/trade.c diff --git a/src/field/trader.c b/src/trader.c index 885557d5a..885557d5a 100644 --- a/src/field/trader.c +++ b/src/trader.c diff --git a/src/engine/trainer_card.c b/src/trainer_card.c index 8d16aa9bf..8d16aa9bf 100644 --- a/src/engine/trainer_card.c +++ b/src/trainer_card.c diff --git a/src/field/trainer_see.c b/src/trainer_see.c index 2913a0a5a..2913a0a5a 100644 --- a/src/field/trainer_see.c +++ b/src/trainer_see.c diff --git a/src/engine/trig.c b/src/trig.c index e16a69e63..e16a69e63 100644 --- a/src/engine/trig.c +++ b/src/trig.c diff --git a/src/field/tv.c b/src/tv.c index 6c24170ae..6c24170ae 100644 --- a/src/field/tv.c +++ b/src/tv.c diff --git a/src/field/use_pokeblock.c b/src/use_pokeblock.c index 8ea93aab8..8ea93aab8 100644 --- a/src/field/use_pokeblock.c +++ b/src/use_pokeblock.c diff --git a/src/engine/util.c b/src/util.c index 582b9f806..582b9f806 100644 --- a/src/engine/util.c +++ b/src/util.c diff --git a/src/field/wallclock.c b/src/wallclock.c index 1f743a61a..1f743a61a 100644 --- a/src/field/wallclock.c +++ b/src/wallclock.c diff --git a/src/field/wild_encounter.c b/src/wild_encounter.c index 19778e29b..19778e29b 100644 --- a/src/field/wild_encounter.c +++ b/src/wild_encounter.c |