finish battle tower data except sRubyFacilityClassToEmerald

2018-12-04 12:09:35 -05:00
parent e69cb6b276
commit 80c3258504
12 changed files with 23990 additions and 28737 deletions
@@ -31,10 +31,7 @@

 extern void sub_81A4C30(void);

-extern const u16 gBattleFrontierHeldItems[];
 extern const u16 gUnknown_085DFA46[];
-extern const struct FacilityMon gBattleFrontierMons[];
-extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];

 extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[];
 extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[];
@@ -79,15 +76,192 @@ static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderT
 static u8 SetTentPtrsGetLevel(void);

 // Const rom data.
+const u16 gBattleFrontierHeldItems[] = 
+{
+    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
+};

+#include "data/battle_frontier/battle_frontier_trainer_mons.h"
+#include "data/battle_frontier/battle_frontier_trainers.h"
+#include "data/battle_frontier/battle_frontier_mons.h"

+const u8 gTowerMaleFacilityClasses[] = 
+{
+    FACILITY_CLASS_RUIN_MANIAC,
+    FACILITY_CLASS_TUBER_M,
+    FACILITY_CLASS_COOLTRAINER_M,
+    FACILITY_CLASS_RICH_BOY,
+    FACILITY_CLASS_POKEMANIAC,
+    FACILITY_CLASS_SWIMMER_M,
+    FACILITY_CLASS_BLACK_BELT,
+    FACILITY_CLASS_GUITARIST,
+    FACILITY_CLASS_KINDLER,
+    FACILITY_CLASS_CAMPER,
+    FACILITY_CLASS_BUG_MANIAC,
+    FACILITY_CLASS_PSYCHIC_M,
+    FACILITY_CLASS_GENTLEMAN,
+    FACILITY_CLASS_SCHOOL_KID_M,
+    FACILITY_CLASS_POKEFAN_M,
+    FACILITY_CLASS_EXPERT_M,
+    FACILITY_CLASS_YOUNGSTER,
+    FACILITY_CLASS_FISHERMAN,
+    FACILITY_CLASS_CYCLING_TRIATHLETE_M,
+    FACILITY_CLASS_RUNNING_TRIATHLETE_M,
+    FACILITY_CLASS_SWIMMING_TRIATHLETE_M,
+    FACILITY_CLASS_DRAGON_TAMER,
+    FACILITY_CLASS_BIRD_KEEPER,
+    FACILITY_CLASS_NINJA_BOY,
+    FACILITY_CLASS_SAILOR,
+    FACILITY_CLASS_COLLECTOR,
+    FACILITY_CLASS_PKMN_BREEDER_M,
+    FACILITY_CLASS_PKMN_RANGER_M,
+    FACILITY_CLASS_BUG_CATCHER,
+    FACILITY_CLASS_HIKER
+};

+const u8 gTowerFemaleFacilityClasses[] = 
+{
+    FACILITY_CLASS_AROMA_LADY,
+    FACILITY_CLASS_TUBER_F,
+    FACILITY_CLASS_COOLTRAINER_F,
+    FACILITY_CLASS_HEX_MANIAC,
+    FACILITY_CLASS_LADY,
+    FACILITY_CLASS_BEAUTY,
+    FACILITY_CLASS_PSYCHIC_F,
+    FACILITY_CLASS_SCHOOL_KID_F,
+    FACILITY_CLASS_POKEFAN_F,
+    FACILITY_CLASS_EXPERT_F,
+    FACILITY_CLASS_CYCLING_TRIATHLETE_F,
+    FACILITY_CLASS_RUNNING_TRIATHLETE_F,
+    FACILITY_CLASS_SWIMMING_TRIATHLETE_F,
+    FACILITY_CLASS_BATTLE_GIRL,
+    FACILITY_CLASS_PARASOL_LADY,
+    FACILITY_CLASS_SWIMMER_F,
+    FACILITY_CLASS_PICNICKER,
+    FACILITY_CLASS_POKEMON_BREEDER_F,
+    FACILITY_CLASS_PKMN_RANGER_F,
+    FACILITY_CLASS_LASS
+};

+const u8 gTowerMaleTrainerGfxIds[] = 
+{
+    EVENT_OBJ_GFX_HIKER,
+    EVENT_OBJ_GFX_TUBER_M,
+    EVENT_OBJ_GFX_MAN_3,
+    EVENT_OBJ_GFX_RICH_BOY,
+    EVENT_OBJ_GFX_MANIAC,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
+    EVENT_OBJ_GFX_BLACK_BELT,
+    EVENT_OBJ_GFX_MAN_5,
+    EVENT_OBJ_GFX_MAN_5,
+    EVENT_OBJ_GFX_CAMPER,
+    EVENT_OBJ_GFX_MANIAC,
+    EVENT_OBJ_GFX_PSYCHIC_M,
+    EVENT_OBJ_GFX_GENTLEMAN,
+    EVENT_OBJ_GFX_SCHOOL_KID_M,
+    EVENT_OBJ_GFX_POKEFAN_M,
+    EVENT_OBJ_GFX_EXPERT_M,
+    EVENT_OBJ_GFX_YOUNGSTER,
+    EVENT_OBJ_GFX_FISHERMAN,
+    EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
+    EVENT_OBJ_GFX_MAN_3,
+    EVENT_OBJ_GFX_MAN_5,
+    EVENT_OBJ_GFX_NINJA_BOY,
+    EVENT_OBJ_GFX_SAILOR,
+    EVENT_OBJ_GFX_MANIAC,
+    EVENT_OBJ_GFX_MAN_4,
+    EVENT_OBJ_GFX_CAMPER,
+    EVENT_OBJ_GFX_BUG_CATCHER,
+    EVENT_OBJ_GFX_HIKER
+};

-
-
-
-
+const u8 gTowerFemaleTrainerGfxIds[] = 
+{
+    EVENT_OBJ_GFX_WOMAN_2,
+    EVENT_OBJ_GFX_TUBER_F,
+    EVENT_OBJ_GFX_WOMAN_5,
+    EVENT_OBJ_GFX_HEX_MANIAC,
+    EVENT_OBJ_GFX_WOMAN_2,
+    EVENT_OBJ_GFX_BEAUTY,
+    EVENT_OBJ_GFX_LASS,
+    EVENT_OBJ_GFX_GIRL_3,
+    EVENT_OBJ_GFX_POKEFAN_F,
+    EVENT_OBJ_GFX_EXPERT_F,
+    EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
+    EVENT_OBJ_GFX_GIRL_3,
+    EVENT_OBJ_GFX_WOMAN_5,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
+    EVENT_OBJ_GFX_PICNICKER,
+    EVENT_OBJ_GFX_WOMAN_2,
+    EVENT_OBJ_GFX_PICNICKER,
+    EVENT_OBJ_GFX_LASS
+};

 extern const u8 sRubyFacilityClassToEmerald[82][2];
 /*