diff options
70 files changed, 69 insertions, 69 deletions
diff --git a/common_syms/rom4.txt b/common_syms/overworld.txt index ecdb190b2..ecdb190b2 100644 --- a/common_syms/rom4.txt +++ b/common_syms/overworld.txt diff --git a/include/rom4.h b/include/overworld.h index 81f37ae8b..81f37ae8b 100644 --- a/include/rom4.h +++ b/include/overworld.h diff --git a/ld_script.txt b/ld_script.txt index 5c37f87ac..dc1f4752f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -85,7 +85,7 @@ SECTIONS { src/berry_blender.o(.text); src/play_time.o(.text); src/new_game.o(.text); - src/rom4.o(.text); + src/overworld.o(.text); src/fieldmap.o(.text); src/metatile_behavior.o(.text); src/field_camera.o(.text); diff --git a/src/battle_records.c b/src/battle_records.c index 61dc09792..d848a10b8 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -3,7 +3,7 @@ #include "game_stat.h" #include "link.h" #include "menu.h" -#include "rom4.h" +#include "overworld.h" #include "string_util.h" #include "strings2.h" #include "trainer_card.h" diff --git a/src/battle_setup.c b/src/battle_setup.c index dba2a6ed4..fcc76a389 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -18,7 +18,7 @@ #include "opponent_constants.h" #include "palette.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "safari_zone.h" #include "script.h" #include "script_pokemon_80C4.h" diff --git a/src/battle_transition.c b/src/battle_transition.c index 8c4280838..53d32d03a 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1,7 +1,7 @@ #include "global.h" #include "battle_transition.h" #include "main.h" -#include "rom4.h" +#include "overworld.h" #include "task.h" #include "palette.h" #include "trig.h" diff --git a/src/berry_blender.c b/src/berry_blender.c index 029d352df..455aabc45 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -12,7 +12,7 @@ #include "string_util.h" #include "link.h" #include "task.h" -#include "rom4.h" +#include "overworld.h" #include "item.h" #include "items.h" #include "rng.h" diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c index a965f386c..1413a02ca 100644 --- a/src/berry_tag_screen.c +++ b/src/berry_tag_screen.c @@ -10,7 +10,7 @@ #include "menu.h" #include "menu_helpers.h" #include "palette.h" -#include "rom4.h" +#include "overworld.h" #include "songs.h" #include "sound.h" #include "sprite.h" diff --git a/src/bike.c b/src/bike.c index cd0324bd5..80cab0850 100644 --- a/src/bike.c +++ b/src/bike.c @@ -6,7 +6,7 @@ #include "flags.h" #include "global.fieldmap.h" #include "metatile_behavior.h" -#include "rom4.h" +#include "overworld.h" #include "songs.h" #include "sound.h" diff --git a/src/cable_club.c b/src/cable_club.c index b81905cc5..271bf1e3b 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -11,7 +11,7 @@ #include "menu.h" #include "palette.h" #include "record_mixing.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "script_pokemon_80C4.h" #include "songs.h" diff --git a/src/choose_party.c b/src/choose_party.c index 27181cf74..9cdf63fc8 100644 --- a/src/choose_party.c +++ b/src/choose_party.c @@ -9,7 +9,7 @@ #include "pokemon_menu.h" #include "pokemon.h" #include "pokemon_summary_screen.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "songs.h" #include "sound.h" diff --git a/src/clock.c b/src/clock.c index 1f2aac9fd..9635514d2 100644 --- a/src/clock.c +++ b/src/clock.c @@ -7,7 +7,7 @@ #include "field_weather.h" #include "lottery_corner.h" #include "main.h" -#include "rom4.h" +#include "overworld.h" #include "rtc.h" #include "time_events.h" #include "tv.h" diff --git a/src/decoration.c b/src/decoration.c index da33b3ab7..1b23bb306 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1,7 +1,7 @@ #include "global.h" #include "main.h" #include "map_object_constants.h" -#include "rom4.h" +#include "overworld.h" #include "sound.h" #include "songs.h" #include "string_util.h" diff --git a/src/diploma.c b/src/diploma.c index ba7de58aa..beb3d3be4 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -4,7 +4,7 @@ #include "menu.h" #include "palette.h" #include "pokedex.h" -#include "rom4.h" +#include "overworld.h" #include "sprite.h" #include "string_util.h" #include "strings2.h" diff --git a/src/egg_hatch.c b/src/egg_hatch.c index aa3d45250..90d1ee039 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -6,7 +6,7 @@ #include "task.h" #include "script.h" #include "palette.h" -#include "rom4.h" +#include "overworld.h" #include "main.h" #include "event_data.h" #include "sound.h" diff --git a/src/evolution_scene.c b/src/evolution_scene.c index d0bd219cd..e312b081f 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -19,7 +19,7 @@ #include "species.h" #include "sound.h" #include "songs.h" -#include "rom4.h" +#include "overworld.h" #include "battle_message.h" #include "pokemon_summary_screen.h" #include "menu_cursor.h" diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 80c04652b..befa546ad 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -13,7 +13,7 @@ #include "flags.h" #include "item_menu.h" #include "metatile_behavior.h" -#include "rom4.h" +#include "overworld.h" #include "safari_zone.h" #include "script.h" #include "secret_base.h" diff --git a/src/field_effect.c b/src/field_effect.c index 79c00edff..0625e9d18 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -9,7 +9,7 @@ #include "menu.h" #include "palette.h" #include "text.h" -#include "rom4.h" +#include "overworld.h" #include "task.h" #include "sound.h" #include "songs.h" diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index d1890013a..d95177821 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -15,7 +15,7 @@ #include "map_obj_lock.h" #include "metatile_behavior.h" #include "palette.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "songs.h" #include "sound.h" diff --git a/src/field_map_obj.c b/src/field_map_obj.c index b8dce3dc2..a453fd2c1 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -11,7 +11,7 @@ #include "fieldmap.h" #include "palette.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "sprite.h" #include "metatile_behavior.h" #include "map_constants.h" diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index e7636e57c..5d06e5fb1 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -14,7 +14,7 @@ #include "metatile_behavior.h" #include "party_menu.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "rotating_gate.h" #include "script.h" #include "songs.h" diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index c6a442f39..dedd80237 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -3,7 +3,7 @@ #include "field_camera.h" #include "menu.h" #include "palette.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "task.h" #include "text.h" diff --git a/src/field_special_scene.c b/src/field_special_scene.c index c9b7ee363..d118fe2ec 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -8,7 +8,7 @@ #include "fieldmap.h" #include "main.h" #include "palette.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "script_movement.h" #include "songs.h" diff --git a/src/field_specials.c b/src/field_specials.c index 000992ffe..66f945cf8 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -12,7 +12,7 @@ #include "field_player_avatar.h" #include "main.h" #include "map_constants.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "songs.h" #include "string_util.h" diff --git a/src/field_tasks.c b/src/field_tasks.c index d8c07b67d..2be54f923 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -10,7 +10,7 @@ #include "item.h" #include "items.h" #include "event_data.h" -#include "rom4.h" +#include "overworld.h" #include "clock.h" #include "script.h" #include "field_special_scene.h" diff --git a/src/fieldmap.c b/src/fieldmap.c index af1d5f6b6..3ad190a4b 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -1,7 +1,7 @@ #include "global.h" #include "fieldmap.h" #include "palette.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "secret_base.h" #include "tv.h" diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index edc1b578c..1bcb3843d 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -8,7 +8,7 @@ #include "metatile_behavior.h" #include "metatile_behaviors.h" #include "pokemon_menu.h" -#include "rom4.h" +#include "overworld.h" #include "rom6.h" #include "script.h" #include "songs.h" diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index c965d3f64..1ee8a8f05 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -4,7 +4,7 @@ #include "main.h" #include "palette.h" #include "pokemon_menu.h" -#include "rom4.h" +#include "overworld.h" #include "rom6.h" #include "script.h" #include "songs.h" diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c index 3835d9eb6..e1576c5ef 100644 --- a/src/fldeff_teleport.c +++ b/src/fldeff_teleport.c @@ -3,7 +3,7 @@ #include "field_effect.h" #include "field_player_avatar.h" #include "pokemon_menu.h" -#include "rom4.h" +#include "overworld.h" #include "rom6.h" #include "task.h" diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 78909e289..10c999ef3 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -11,7 +11,7 @@ #include "menu.h" #include "save.h" #include "species.h" -#include "rom4.h" +#include "overworld.h" #include "m4a.h" #include "data2.h" #include "decompress.h" diff --git a/src/hof_pc.c b/src/hof_pc.c index 83d39a9b5..aeeb7fe17 100644 --- a/src/hof_pc.c +++ b/src/hof_pc.c @@ -2,7 +2,7 @@ #include "hall_of_fame.h" #include "main.h" #include "palette.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "script_menu.h" #include "task.h" diff --git a/src/item_menu.c b/src/item_menu.c index 6c7c643ab..891eb135f 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -23,7 +23,7 @@ #include "party_menu.h" #include "player_pc.h" #include "pokemon_menu.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "songs.h" #include "sound.h" diff --git a/src/item_use.c b/src/item_use.c index c5fd990d2..0d78d8d9a 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -26,7 +26,7 @@ #include "pokeblock.h" #include "pokemon_item_effect.h" #include "pokemon_menu.h" -#include "rom4.h" +#include "overworld.h" #include "rom_8094928.h" #include "script.h" #include "songs.h" diff --git a/src/learn_move.c b/src/learn_move.c index 51de68171..33252c66b 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -6,7 +6,7 @@ #include "menu_cursor.h" #include "palette.h" #include "pokemon.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "songs.h" #include "sound.h" diff --git a/src/load_save.c b/src/load_save.c index 730aea2b8..8424b1121 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -3,7 +3,7 @@ #include "load_save.h" #include "main.h" #include "pokemon.h" -#include "rom4.h" +#include "overworld.h" extern u8 gPlayerPartyCount; diff --git a/src/mail.c b/src/mail.c index fb9251a5d..c5dd119e3 100644 --- a/src/mail.c +++ b/src/mail.c @@ -8,7 +8,7 @@ #include "name_string_util.h" #include "palette.h" #include "pokemon_icon.h" -#include "rom4.h" +#include "overworld.h" #include "sprite.h" #include "string_util.h" #include "strings2.h" diff --git a/src/main.c b/src/main.c index afaa0e77a..d7c11b6c8 100644 --- a/src/main.c +++ b/src/main.c @@ -9,7 +9,7 @@ #include "play_time.h" #include "rng.h" #include "rom3.h" -#include "rom4.h" +#include "overworld.h" #include "rtc.h" #include "siirtc.h" #include "sound.h" diff --git a/src/main_menu.c b/src/main_menu.c index f4e7a3247..e0af86f3d 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -10,7 +10,7 @@ #include "option_menu.h" #include "palette.h" #include "pokeball.h" -#include "rom4.h" +#include "overworld.h" #include "rtc.h" #include "save_menu_util.h" #include "songs.h" diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c index 3665cabd8..c7d81f502 100644 --- a/src/matsuda_debug_menu.c +++ b/src/matsuda_debug_menu.c @@ -8,7 +8,7 @@ #include "main.h" #include "menu.h" #include "palette.h" -#include "rom4.h" +#include "overworld.h" #include "sprite.h" #include "start_menu.h" #include "string_util.h" diff --git a/src/mauville_man.c b/src/mauville_man.c index 4a77717f1..33bc39648 100644 --- a/src/mauville_man.c +++ b/src/mauville_man.c @@ -6,7 +6,7 @@ #include "field_message_box.h" #include "m4a.h" #include "menu.h" -#include "rom4.h" +#include "overworld.h" #include "rng.h" #include "script.h" #include "songs.h" diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 9915d67ac..eb00e72da 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -7,7 +7,7 @@ #include "map_constants.h" #include "menu.h" #include "menu_helpers.h" -#include "rom4.h" +#include "overworld.h" #include "songs.h" #include "sound.h" #include "sprite.h" diff --git a/src/new_game.c b/src/new_game.c index 46df14acd..3f9e9f5a1 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -20,7 +20,7 @@ #include "pokemon_storage_system.h" #include "rng.h" #include "roamer.h" -#include "rom4.h" +#include "overworld.h" #include "rtc.h" #include "script.h" #include "secret_base.h" diff --git a/src/rom4.c b/src/overworld.c index e1c8932b8..119b25a79 100644 --- a/src/rom4.c +++ b/src/overworld.c @@ -1,5 +1,5 @@ #include "global.h" -#include "rom4.h" +#include "overworld.h" #include "battle_setup.h" #include "berry.h" #include "cable_club.h" diff --git a/src/player_pc.c b/src/player_pc.c index 64e2734db..83e6dd221 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -18,7 +18,7 @@ #include "songs.h" #include "name_string_util.h" #include "mail.h" -#include "rom4.h" +#include "overworld.h" #include "player_pc.h" extern void DisplayItemMessageOnField(u8, const u8*, TaskFunc, u16); diff --git a/src/pokeblock.c b/src/pokeblock.c index 9f74a0cf4..d69c41639 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -3,7 +3,7 @@ // #include "global.h" -#include "rom4.h" +#include "overworld.h" #include "sprite.h" #include "script.h" #include "strings.h" diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index db4db55a7..ccbb391af 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -6,7 +6,7 @@ #include "text.h" #include "text_window.h" #include "menu.h" -#include "rom4.h" +#include "overworld.h" #include "decompress.h" #include "data2.h" #include "sprite.h" diff --git a/src/pokedex.c b/src/pokedex.c index c132635cb..603b5ae48 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -16,7 +16,7 @@ #include "pokedex_cry_screen.h" #include "pokemon.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "songs.h" #include "sound.h" #include "species.h" diff --git a/src/pokemon_1.c b/src/pokemon_1.c index 9c46e54d5..5fd74fbec 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -4,7 +4,7 @@ #include "main.h" #include "pokemon.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "species.h" #include "sprite.h" #include "string_util.h" diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 4f7655a34..e51d3187b 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -11,7 +11,7 @@ #include "main.h" #include "pokemon.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "rom_8077ABC.h" #include "rom_8094928.h" #include "rtc.h" diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c index d460833c3..bc5150a16 100644 --- a/src/pokemon_menu.c +++ b/src/pokemon_menu.c @@ -8,7 +8,7 @@ #include "songs.h" #include "sound.h" #include "main.h" -#include "rom4.h" +#include "overworld.h" #include "menu_helpers.h" #include "pokemon_summary_screen.h" #include "moves.h" diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index 8d85705c8..58b1197db 100644 --- a/src/post_battle_event_funcs.c +++ b/src/post_battle_event_funcs.c @@ -4,7 +4,7 @@ #include "load_save.h" #include "main.h" #include "pokemon.h" -#include "rom4.h" +#include "overworld.h" #include "script_pokemon_80C4.h" extern u8 gUnknown_02039324; diff --git a/src/record_mixing.c b/src/record_mixing.c index 30bcb29d1..d02d89467 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -14,7 +14,7 @@ #include "menu.h" #include "mystery_event_script.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "save.h" #include "script.h" #include "secret_base.h" diff --git a/src/region_map.c b/src/region_map.c index 1d567fcf0..900c9ad71 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -9,7 +9,7 @@ #include "palette.h" #include "pokemon_menu.h" #include "region_map.h" -#include "rom4.h" +#include "overworld.h" #include "secret_base.h" #include "songs.h" #include "sprite.h" diff --git a/src/rom6.c b/src/rom6.c index 9308dfe0c..3dc7c2fa8 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -6,7 +6,7 @@ #include "field_player_avatar.h" #include "item_use.h" #include "pokemon_menu.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "songs.h" #include "sound.h" diff --git a/src/safari_zone.c b/src/safari_zone.c index a47c8e951..d15ff7567 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -4,7 +4,7 @@ #include "field_fadetransition.h" #include "field_player_avatar.h" #include "main.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "string_util.h" #include "text.h" diff --git a/src/save.c b/src/save.c index adf39268e..eae3f4470 100644 --- a/src/save.c +++ b/src/save.c @@ -3,7 +3,7 @@ #include "gba/flash_internal.h" #include "save.h" #include "load_save.h" -#include "rom4.h" +#include "overworld.h" #include "save_failed_screen.h" #define GETVALIDSTATUSBITFIELD ((1 << ARRAY_COUNT(gSaveSectionLocations)) - 1) diff --git a/src/scrcmd.c b/src/scrcmd.c index 6a746b65d..d8b762ed8 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -31,7 +31,7 @@ #include "party_menu.h" #include "pokemon.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "rtc.h" #include "script.h" #include "script_menu.h" diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index 6a60a5402..8133d8ac0 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -18,7 +18,7 @@ #include "pokedex.h" #include "pokemon.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "script_pokemon_80C4.h" #include "species.h" #include "task.h" diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index 2b48cc0d8..04418b31b 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -9,7 +9,7 @@ #include "party_menu.h" #include "pokemon.h" #include "pokemon_summary_screen.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "script_pokemon_80F9.h" #include "sound.h" diff --git a/src/secret_base.c b/src/secret_base.c index 4e8331f5c..16f7c4e2c 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -14,7 +14,7 @@ #include "metatile_behavior.h" #include "palette.h" #include "pokemon.h" -#include "rom4.h" +#include "overworld.h" #include "script.h" #include "string_util.h" #include "strings.h" diff --git a/src/shop.c b/src/shop.c index 10c530a45..22250b1c4 100644 --- a/src/shop.c +++ b/src/shop.c @@ -23,7 +23,7 @@ #include "decoration.h" #include "items.h" #include "songs.h" -#include "rom4.h" +#include "overworld.h" #include "decoration_inventory.h" #include "field_camera.h" diff --git a/src/start_menu.c b/src/start_menu.c index 411690aff..7e3af9886 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -15,7 +15,7 @@ #include "pokedex.h" #include "pokemon_menu.h" #include "pokenav.h" -#include "rom4.h" +#include "overworld.h" #include "safari_zone.h" #include "save.h" #include "save_menu_util.h" diff --git a/src/time_events.c b/src/time_events.c index ab3d6b9d4..c316f73ce 100644 --- a/src/time_events.c +++ b/src/time_events.c @@ -4,7 +4,7 @@ #include "field_weather.h" #include "pokemon.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "rtc.h" #include "script.h" #include "task.h" diff --git a/src/trainer_card.c b/src/trainer_card.c index e64ec1c86..bcb62ede6 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -10,7 +10,7 @@ #include "money.h" #include "palette.h" #include "pokedex.h" -#include "rom4.h" +#include "overworld.h" #include "script_pokemon_80C4.h" #include "songs.h" #include "sound.h" @@ -15,7 +15,7 @@ #include "species.h" #include "pokedex.h" #include "naming_screen.h" -#include "rom4.h" +#include "overworld.h" #include "map_constants.h" #include "strings.h" #include "battle.h" @@ -31,7 +31,7 @@ #include "pokedex.h" #include "region_map.h" #include "rng.h" -#include "rom4.h" +#include "overworld.h" #include "rtc.h" #include "script_menu.h" #include "species.h" diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 0c8f59959..be3003680 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -5,7 +5,7 @@ #include "global.h" #include "main.h" -#include "rom4.h" +#include "overworld.h" #include "string_util.h" #include "strings.h" #include "sprite.h" diff --git a/src/wild_encounter.c b/src/wild_encounter.c index f7f005737..519cd7893 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -10,7 +10,7 @@ #include "pokeblock.h" #include "rng.h" #include "roamer.h" -#include "rom4.h" +#include "overworld.h" #include "safari_zone.h" #include "script.h" #include "species.h" diff --git a/sym_bss.txt b/sym_bss.txt index 088c7d7ba..ab1d8c280 100644 --- a/sym_bss.txt +++ b/sym_bss.txt @@ -30,7 +30,7 @@ gUnknown_03000508: @ 3000508 .include "src/berry_blender.o" .include "src/play_time.o" - .include "src/rom4.o" + .include "src/overworld.o" @ unused variable? .align 2 diff --git a/sym_common.txt b/sym_common.txt index 6d65557ce..d9da3ec3b 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -118,7 +118,7 @@ gUnknown_03004828: @ 3004828 .space 0x8 .include "berry_blender.o" - .include "rom4.o" + .include "overworld.o" .include "fieldmap.o" .include "field_camera.o" .include "field_map_obj.o" diff --git a/sym_ewram.txt b/sym_ewram.txt index 8c6999307..040173cfd 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -310,7 +310,7 @@ gUnknown_020297D8: @ 20297D8 .include "src/berry_blender.o" .include "src/new_game.o" - .include "src/rom4.o" + .include "src/overworld.o" .include "src/fieldmap.o" .include "src/field_camera.o" .include "src/field_player_avatar.o" |