diff options
| -rw-r--r-- | data/battle_tower.s | 3 | ||||
| -rw-r--r-- | data/battle_tower/held_items.inc | 65 | ||||
| -rw-r--r-- | src/battle_tower.c | 68 |
3 files changed, 68 insertions, 68 deletions
diff --git a/data/battle_tower.s b/data/battle_tower.s index ac0810eb7..a135d68c5 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -3,9 +3,6 @@ .section .rodata -@ 8403860 - .include "data/battle_tower/held_items.inc" - @ 84038E0 .include "data/battle_tower/level_50_mons.inc" 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 diff --git a/src/battle_tower.c b/src/battle_tower.c index a9d79df17..570d18720 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -3,6 +3,7 @@ #include "data2.h" #include "easy_chat.h" #include "event_data.h" +#include "items.h" #include "map_object_constants.h" #include "moves.h" #include "pokedex.h" @@ -14,6 +15,73 @@ #include "data/battle_tower/trainers.h" +const u16 gBattleTowerHeldItems[] = { + ITEM_NONE, + ITEM_KINGS_ROCK, + ITEM_SITRUS_BERRY, + ITEM_ORAN_BERRY, + ITEM_CHESTO_BERRY, + ITEM_HARD_STONE, + ITEM_FOCUS_BAND, + ITEM_PERSIM_BERRY, + ITEM_MIRACLE_SEED, + ITEM_BERRY_JUICE, + ITEM_MACHO_BRACE, + ITEM_SILVER_POWDER, + ITEM_CHERI_BERRY, + ITEM_BLACK_GLASSES, + ITEM_BLACK_BELT, + ITEM_SOUL_DEW, + ITEM_CHOICE_BAND, + ITEM_MAGNET, + ITEM_SILK_SCARF, + ITEM_WHITE_HERB, + ITEM_DEEP_SEA_SCALE, + ITEM_DEEP_SEA_TOOTH, + ITEM_MYSTIC_WATER, + ITEM_SHARP_BEAK, + ITEM_QUICK_CLAW, + ITEM_LEFTOVERS, + ITEM_RAWST_BERRY, + ITEM_LIGHT_BALL, + ITEM_POISON_BARB, + ITEM_NEVER_MELT_ICE, + ITEM_ASPEAR_BERRY, + ITEM_SPELL_TAG, + ITEM_BRIGHT_POWDER, + ITEM_LEPPA_BERRY, + ITEM_SCOPE_LENS, + ITEM_TWISTED_SPOON, + ITEM_METAL_COAT, + ITEM_MENTAL_HERB, + ITEM_CHARCOAL, + ITEM_PECHA_BERRY, + ITEM_SOFT_SAND, + ITEM_LUM_BERRY, + ITEM_DRAGON_SCALE, + ITEM_DRAGON_FANG, + ITEM_IAPAPA_BERRY, + ITEM_WIKI_BERRY, + ITEM_SEA_INCENSE, + ITEM_SHELL_BELL, + ITEM_SALAC_BERRY, + ITEM_LANSAT_BERRY, + ITEM_APICOT_BERRY, + ITEM_STARF_BERRY, + ITEM_LIECHI_BERRY, + ITEM_STICK, + ITEM_LAX_INCENSE, + ITEM_AGUAV_BERRY, + ITEM_FIGY_BERRY, + ITEM_THICK_CLUB, + ITEM_MAGO_BERRY, + ITEM_METAL_POWDER, + ITEM_PETAYA_BERRY, + ITEM_LUCKY_PUNCH, + ITEM_GANLON_BERRY, +}; + + extern u8 gUnknown_08400E23[]; extern u8 gUnknown_08400E29[]; extern u8 gUnknown_08400E2E[]; |