diff --git a/include/rom_818CFC8.h b/include/rom_818CFC8.h deleted file mode 100644 index c1fc78e1e4..0000000000 --- a/include/rom_818CFC8.h +++ /dev/null @@ -1,11 +0,0 @@ -// -// Created by Scott Norton on 9/6/17. -// - -#ifndef GUARD_ROM_818CFC8_H -#define GUARD_ROM_818CFC8_H - -bool8 InBattlePyramid(void); -u8 GetNumBattlePyramidEventObjects(void); - -#endif //GUARD_ROM_818CFC8_H diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 845e41dadf..ba62db10da 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1,4 +1,6 @@ #include "global.h" +#include "alloc.h" +#include "battle_pyramid.h" #include "berry.h" #include "decoration.h" #include "event_data.h" @@ -9,14 +11,12 @@ #include "field_effect_helpers.h" #include "field_player_avatar.h" #include "fieldmap.h" -#include "alloc.h" #include "mauville_old_man.h" #include "metatile_behavior.h" #include "overworld.h" #include "palette.h" #include "pokenav.h" #include "random.h" -#include "rom_818CFC8.h" #include "sprite.h" #include "task.h" #include "trainer_see.h" diff --git a/src/field_poison.c b/src/field_poison.c index 89cd027284..532c7f0273 100644 --- a/src/field_poison.c +++ b/src/field_poison.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_pike.h" +#include "battle_pyramid.h" #include "event_data.h" #include "field_message_box.h" #include "field_poison.h" @@ -8,7 +9,6 @@ #include "frontier_util.h" #include "party_menu.h" #include "pokenav.h" -#include "rom_818CFC8.h" #include "script.h" #include "string_util.h" #include "strings.h" diff --git a/src/item_menu.c b/src/item_menu.c index 24a50aa9a0..43f2afce34 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -2,6 +2,7 @@ #include "item_menu.h" #include "battle.h" #include "battle_controllers.h" +#include "battle_pyramid.h" #include "frontier_util.h" #include "berry_tag_screen.h" #include "bg.h" @@ -33,7 +34,6 @@ #include "player_pc.h" #include "pokemon.h" #include "pokemon_summary_screen.h" -#include "rom_818CFC8.h" #include "scanline_effect.h" #include "script.h" #include "shop.h" diff --git a/src/item_use.c b/src/item_use.c index 0ea5f6acf7..97d6292c45 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -1,6 +1,7 @@ #include "global.h" #include "item_use.h" #include "battle.h" +#include "battle_pyramid.h" #include "battle_pyramid_bag.h" #include "berry.h" #include "bike.h" @@ -24,7 +25,6 @@ #include "party_menu.h" #include "pokeblock.h" #include "pokemon.h" -#include "rom_818CFC8.h" #include "script.h" #include "sound.h" #include "strings.h" diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 0d88815c00..cdb4c3330d 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle_pyramid.h" #include "bg.h" #include "event_data.h" #include "gpu_regs.h" @@ -7,7 +8,6 @@ #include "map_name_popup.h" #include "palette.h" #include "region_map.h" -#include "rom_818CFC8.h" #include "start_menu.h" #include "string_util.h" #include "task.h" diff --git a/src/start_menu.c b/src/start_menu.c index 334330b672..d5eec76d23 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -15,7 +15,6 @@ #include "overworld.h" #include "link.h" #include "frontier_util.h" -#include "rom_818CFC8.h" #include "field_specials.h" #include "event_object_movement.h" #include "script.h"