fix merge conflicts

1 files changed, 0 insertions, 65 deletions

diff --git a/data/battle_tower/held_items.inc b/data/battle_tower/held_items.inc
deleted file mode 100644
index 6c4f0838b..000000000
--- a/data/battle_tower/held_items.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-	.align 1
-gBattleTowerHeldItems:: @ 8403860
-	.2byte ITEM_NONE
-	.2byte ITEM_KINGS_ROCK
-	.2byte ITEM_SITRUS_BERRY
-	.2byte ITEM_ORAN_BERRY
-	.2byte ITEM_CHESTO_BERRY
-	.2byte ITEM_HARD_STONE
-	.2byte ITEM_FOCUS_BAND
-	.2byte ITEM_PERSIM_BERRY
-	.2byte ITEM_MIRACLE_SEED
-	.2byte ITEM_BERRY_JUICE
-	.2byte ITEM_MACHO_BRACE
-	.2byte ITEM_SILVER_POWDER
-	.2byte ITEM_CHERI_BERRY
-	.2byte ITEM_BLACK_GLASSES
-	.2byte ITEM_BLACK_BELT
-	.2byte ITEM_SOUL_DEW
-	.2byte ITEM_CHOICE_BAND
-	.2byte ITEM_MAGNET
-	.2byte ITEM_SILK_SCARF
-	.2byte ITEM_WHITE_HERB
-	.2byte ITEM_DEEP_SEA_SCALE
-	.2byte ITEM_DEEP_SEA_TOOTH
-	.2byte ITEM_MYSTIC_WATER
-	.2byte ITEM_SHARP_BEAK
-	.2byte ITEM_QUICK_CLAW
-	.2byte ITEM_LEFTOVERS
-	.2byte ITEM_RAWST_BERRY
-	.2byte ITEM_LIGHT_BALL
-	.2byte ITEM_POISON_BARB
-	.2byte ITEM_NEVER_MELT_ICE
-	.2byte ITEM_ASPEAR_BERRY
-	.2byte ITEM_SPELL_TAG
-	.2byte ITEM_BRIGHT_POWDER
-	.2byte ITEM_LEPPA_BERRY
-	.2byte ITEM_SCOPE_LENS
-	.2byte ITEM_TWISTED_SPOON
-	.2byte ITEM_METAL_COAT
-	.2byte ITEM_MENTAL_HERB
-	.2byte ITEM_CHARCOAL
-	.2byte ITEM_PECHA_BERRY
-	.2byte ITEM_SOFT_SAND
-	.2byte ITEM_LUM_BERRY
-	.2byte ITEM_DRAGON_SCALE
-	.2byte ITEM_DRAGON_FANG
-	.2byte ITEM_IAPAPA_BERRY
-	.2byte ITEM_WIKI_BERRY
-	.2byte ITEM_SEA_INCENSE
-	.2byte ITEM_SHELL_BELL
-	.2byte ITEM_SALAC_BERRY
-	.2byte ITEM_LANSAT_BERRY
-	.2byte ITEM_APICOT_BERRY
-	.2byte ITEM_STARF_BERRY
-	.2byte ITEM_LIECHI_BERRY
-	.2byte ITEM_STICK
-	.2byte ITEM_LAX_INCENSE
-	.2byte ITEM_AGUAV_BERRY
-	.2byte ITEM_FIGY_BERRY
-	.2byte ITEM_THICK_CLUB
-	.2byte ITEM_MAGO_BERRY
-	.2byte ITEM_METAL_POWDER
-	.2byte ITEM_PETAYA_BERRY
-	.2byte ITEM_LUCKY_PUNCH
-	.2byte ITEM_GANLON_BERRY