diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/battle_frontier.h | 71 | ||||
| -rw-r--r-- | include/constants/event_objects.h | 3 | ||||
| -rw-r--r-- | include/constants/trainers.h | 162 | ||||
| -rw-r--r-- | include/constants/vars.h | 2 | ||||
| -rw-r--r-- | include/constants/weather.h | 1 |
5 files changed, 158 insertions, 81 deletions
diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index b5ad4f072..55b14b642 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -41,4 +41,75 @@ // For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special. #define RESULTS_LINK_CONTEST 7 +#define F_EV_SPREAD_HP (1 << 0) +#define F_EV_SPREAD_ATTACK (1 << 1) +#define F_EV_SPREAD_DEFENSE (1 << 2) +#define F_EV_SPREAD_SPEED (1 << 3) +#define F_EV_SPREAD_SP_ATTACK (1 << 4) +#define F_EV_SPREAD_SP_DEFENSE (1 << 5) + +#define BATTLE_FRONTIER_ITEM_NONE 0 +#define BATTLE_FRONTIER_ITEM_KINGS_ROCK 1 +#define BATTLE_FRONTIER_ITEM_SITRUS_BERRY 2 +#define BATTLE_FRONTIER_ITEM_ORAN_BERRY 3 +#define BATTLE_FRONTIER_ITEM_CHESTO_BERRY 4 +#define BATTLE_FRONTIER_ITEM_HARD_STONE 5 +#define BATTLE_FRONTIER_ITEM_FOCUS_BAND 6 +#define BATTLE_FRONTIER_ITEM_PERSIM_BERRY 7 +#define BATTLE_FRONTIER_ITEM_MIRACLE_SEED 8 +#define BATTLE_FRONTIER_ITEM_BERRY_JUICE 9 +#define BATTLE_FRONTIER_ITEM_MACHO_BRACE 10 +#define BATTLE_FRONTIER_ITEM_SILVER_POWDER 11 +#define BATTLE_FRONTIER_ITEM_CHERI_BERRY 12 +#define BATTLE_FRONTIER_ITEM_BLACK_GLASSES 13 +#define BATTLE_FRONTIER_ITEM_BLACK_BELT 14 +#define BATTLE_FRONTIER_ITEM_SOUL_DEW 15 +#define BATTLE_FRONTIER_ITEM_CHOICE_BAND 16 +#define BATTLE_FRONTIER_ITEM_MAGNET 17 +#define BATTLE_FRONTIER_ITEM_SILK_SCARF 18 +#define BATTLE_FRONTIER_ITEM_WHITE_HERB 19 +#define BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE 20 +#define BATTLE_FRONTIER_ITEM_DEEP_SEA_TOOTH 21 +#define BATTLE_FRONTIER_ITEM_MYSTIC_WATER 22 +#define BATTLE_FRONTIER_ITEM_SHARP_BEAK 23 +#define BATTLE_FRONTIER_ITEM_QUICK_CLAW 24 +#define BATTLE_FRONTIER_ITEM_LEFTOVERS 25 +#define BATTLE_FRONTIER_ITEM_RAWST_BERRY 26 +#define BATTLE_FRONTIER_ITEM_LIGHT_BALL 27 +#define BATTLE_FRONTIER_ITEM_POISON_BARB 28 +#define BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE 29 +#define BATTLE_FRONTIER_ITEM_ASPEAR_BERRY 30 +#define BATTLE_FRONTIER_ITEM_SPELL_TAG 31 +#define BATTLE_FRONTIER_ITEM_BRIGHT_POWDER 32 +#define BATTLE_FRONTIER_ITEM_LEPPA_BERRY 33 +#define BATTLE_FRONTIER_ITEM_SCOPE_LENS 34 +#define BATTLE_FRONTIER_ITEM_TWISTED_SPOON 35 +#define BATTLE_FRONTIER_ITEM_METAL_COAT 36 +#define BATTLE_FRONTIER_ITEM_MENTAL_HERB 37 +#define BATTLE_FRONTIER_ITEM_CHARCOAL 38 +#define BATTLE_FRONTIER_ITEM_PECHA_BERRY 39 +#define BATTLE_FRONTIER_ITEM_SOFT_SAND 40 +#define BATTLE_FRONTIER_ITEM_LUM_BERRY 41 +#define BATTLE_FRONTIER_ITEM_DRAGON_SCALE 42 +#define BATTLE_FRONTIER_ITEM_DRAGON_FANG 43 +#define BATTLE_FRONTIER_ITEM_IAPAPA_BERRY 44 +#define BATTLE_FRONTIER_ITEM_WIKI_BERRY 45 +#define BATTLE_FRONTIER_ITEM_SEA_INCENSE 46 +#define BATTLE_FRONTIER_ITEM_SHELL_BELL 47 +#define BATTLE_FRONTIER_ITEM_SALAC_BERRY 48 +#define BATTLE_FRONTIER_ITEM_LANSAT_BERRY 49 +#define BATTLE_FRONTIER_ITEM_APICOT_BERRY 50 +#define BATTLE_FRONTIER_ITEM_STARF_BERRY 51 +#define BATTLE_FRONTIER_ITEM_LIECHI_BERRY 52 +#define BATTLE_FRONTIER_ITEM_STICK 53 +#define BATTLE_FRONTIER_ITEM_LAX_INCENSE 54 +#define BATTLE_FRONTIER_ITEM_AGUAV_BERRY 55 +#define BATTLE_FRONTIER_ITEM_FIGY_BERRY 56 +#define BATTLE_FRONTIER_ITEM_THICK_CLUB 57 +#define BATTLE_FRONTIER_ITEM_MAGO_BERRY 58 +#define BATTLE_FRONTIER_ITEM_METAL_POWDER 59 +#define BATTLE_FRONTIER_ITEM_PETAYA_BERRY 60 +#define BATTLE_FRONTIER_ITEM_LUCKY_PUNCH 61 +#define BATTLE_FRONTIER_ITEM_GANLON_BERRY 62 + #endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 4967c814d..7a97c4caf 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -260,4 +260,7 @@ #define TRACKS_FOOT 1 #define TRACKS_BIKE_TIRE 2 +#define EVENT_OBJ_ID_PLAYER 0xFF +#define EVENT_OBJ_ID_CAMERA 0x7F + #endif // GUARD_CONSTANTS_EVENT_OBJECTS_H diff --git a/include/constants/trainers.h b/include/constants/trainers.h index cf6eaf929..2a6c306b4 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -117,88 +117,90 @@ #define TRAINER_BACK_PIC_WALLY 6 #define TRAINER_BACK_PIC_STEVEN 7 -#define FACILITY_CLASS_HIKER 0x0 -#define FACILITY_CLASS_AQUA_GRUNT_M 0x1 -#define FACILITY_CLASS_POKEMON_BREEDER_F 0x2 -#define FACILITY_CLASS_COOLTRAINER_M 0x3 -#define FACILITY_CLASS_BIRD_KEEPER 0x4 -#define FACILITY_CLASS_COLLECTOR 0x5 -#define FACILITY_CLASS_AQUA_GRUNT_F 0x6 -#define FACILITY_CLASS_SWIMMER_M 0x7 -#define FACILITY_CLASS_MAGMA_GRUNT_M 0x8 -#define FACILITY_CLASS_EXPERT_M 0x9 -#define FACILITY_CLASS_BLACK_BELT 0xa -#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0xb -#define FACILITY_CLASS_HEX_MANIAC 0xc -#define FACILITY_CLASS_AROMA_LADY 0xd -#define FACILITY_CLASS_RUIN_MANIAC 0xe -#define FACILITY_CLASS_INTERVIEWER 0xf -#define FACILITY_CLASS_TUBER_F 0x10 -#define FACILITY_CLASS_TUBER_M 0x11 -#define FACILITY_CLASS_COOLTRAINER_F 0x12 -#define FACILITY_CLASS_LADY 0x13 -#define FACILITY_CLASS_BEAUTY 0x14 -#define FACILITY_CLASS_RICH_BOY 0x15 -#define FACILITY_CLASS_EXPERT_F 0x16 -#define FACILITY_CLASS_POKEMANIAC 0x17 -#define FACILITY_CLASS_MAGMA_GRUNT_F 0x18 -#define FACILITY_CLASS_GUITARIST 0x19 -#define FACILITY_CLASS_KINDLER 0x1a -#define FACILITY_CLASS_CAMPER 0x1b -#define FACILITY_CLASS_PICNICKER 0x1c -#define FACILITY_CLASS_BUG_MANIAC 0x1d -#define FACILITY_CLASS_PSYCHIC_M 0x1e -#define FACILITY_CLASS_PSYCHIC_F 0x1f -#define FACILITY_CLASS_GENTLEMAN 0x20 -#define FACILITY_CLASS_ELITE_FOUR_SIDNEY 0x21 -#define FACILITY_CLASS_ELITE_FOUR_PHOEBE 0x22 -#define FACILITY_CLASS_LEADER_ROXANNE 0x23 -#define FACILITY_CLASS_LEADER_BRAWLY 0x24 -#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 -#define FACILITY_CLASS_SCHOOL_KID_M 0x26 -#define FACILITY_CLASS_SCHOOL_KID_F 0x27 -#define FACILITY_CLASS_SR_AND_JR 0x28 -#define FACILITY_CLASS_POKEFAN_M 0x29 -#define FACILITY_CLASS_POKEFAN_F 0x2a -#define FACILITY_CLASS_YOUNGSTER 0x2b -#define FACILITY_CLASS_CHAMPION_WALLACE 0x2c -#define FACILITY_CLASS_FISHERMAN 0x2d -#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e -#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f -#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 -#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 +#define FACILITY_CLASS_HIKER 0x0 +#define FACILITY_CLASS_AQUA_GRUNT_M 0x1 +#define FACILITY_CLASS_POKEMON_BREEDER_F 0x2 +#define FACILITY_CLASS_COOLTRAINER_M 0x3 +#define FACILITY_CLASS_BIRD_KEEPER 0x4 +#define FACILITY_CLASS_COLLECTOR 0x5 +#define FACILITY_CLASS_AQUA_GRUNT_F 0x6 +#define FACILITY_CLASS_SWIMMER_M 0x7 +#define FACILITY_CLASS_MAGMA_GRUNT_M 0x8 +#define FACILITY_CLASS_EXPERT_M 0x9 +#define FACILITY_CLASS_BLACK_BELT 0xa +#define FACILITY_CLASS_AQUA_LEADER_ARCHIE 0xb +#define FACILITY_CLASS_HEX_MANIAC 0xc +#define FACILITY_CLASS_AROMA_LADY 0xd +#define FACILITY_CLASS_RUIN_MANIAC 0xe +#define FACILITY_CLASS_INTERVIEWER 0xf +#define FACILITY_CLASS_TUBER_F 0x10 +#define FACILITY_CLASS_TUBER_M 0x11 +#define FACILITY_CLASS_COOLTRAINER_F 0x12 +#define FACILITY_CLASS_LADY 0x13 +#define FACILITY_CLASS_BEAUTY 0x14 +#define FACILITY_CLASS_RICH_BOY 0x15 +#define FACILITY_CLASS_EXPERT_F 0x16 +#define FACILITY_CLASS_POKEMANIAC 0x17 +#define FACILITY_CLASS_MAGMA_GRUNT_F 0x18 +#define FACILITY_CLASS_GUITARIST 0x19 +#define FACILITY_CLASS_KINDLER 0x1a +#define FACILITY_CLASS_CAMPER 0x1b +#define FACILITY_CLASS_PICNICKER 0x1c +#define FACILITY_CLASS_BUG_MANIAC 0x1d +#define FACILITY_CLASS_PSYCHIC_M 0x1e +#define FACILITY_CLASS_PSYCHIC_F 0x1f +#define FACILITY_CLASS_GENTLEMAN 0x20 +#define FACILITY_CLASS_ELITE_FOUR_SIDNEY 0x21 +#define FACILITY_CLASS_ELITE_FOUR_PHOEBE 0x22 +#define FACILITY_CLASS_LEADER_ROXANNE 0x23 +#define FACILITY_CLASS_LEADER_BRAWLY 0x24 +#define FACILITY_CLASS_LEADER_TATE_AND_LIZA 0x25 +#define FACILITY_CLASS_SCHOOL_KID_M 0x26 +#define FACILITY_CLASS_SCHOOL_KID_F 0x27 +#define FACILITY_CLASS_SR_AND_JR 0x28 +#define FACILITY_CLASS_POKEFAN_M 0x29 +#define FACILITY_CLASS_POKEFAN_F 0x2a +#define FACILITY_CLASS_YOUNGSTER 0x2b +#define FACILITY_CLASS_CHAMPION_WALLACE 0x2c +#define FACILITY_CLASS_FISHERMAN 0x2d +#define FACILITY_CLASS_CYCLING_TRIATHLETE_M 0x2e +#define FACILITY_CLASS_CYCLING_TRIATHLETE_F 0x2f +#define FACILITY_CLASS_RUNNING_TRIATHLETE_M 0x30 +#define FACILITY_CLASS_RUNNING_TRIATHLETE_F 0x31 #define FACILITY_CLASS_SWIMMING_TRIATHLETE_M 0x32 #define FACILITY_CLASS_SWIMMING_TRIATHLETE_F 0x33 -#define FACILITY_CLASS_DRAGON_TAMER 0x34 -#define FACILITY_CLASS_NINJA_BOY 0x35 -#define FACILITY_CLASS_BATTLE_GIRL 0x36 -#define FACILITY_CLASS_PARASOL_LADY 0x37 -#define FACILITY_CLASS_SWIMMER_F 0x38 -#define FACILITY_CLASS_TWINS 0x39 -#define FACILITY_CLASS_SAILOR 0x3a -#define FACILITY_CLASS_WALLY 0x3b -#define FACILITY_CLASS_BRENDAN 0x3c -#define FACILITY_CLASS_BRENDAN_2 0x3d -#define FACILITY_CLASS_BRENDAN_3 0x3e -#define FACILITY_CLASS_MAY 0x3f -#define FACILITY_CLASS_MAY_2 0x40 -#define FACILITY_CLASS_MAY_3 0x41 -#define FACILITY_CLASS_PKMN_BREEDER_M 0x42 -#define FACILITY_CLASS_BUG_CATCHER 0x43 -#define FACILITY_CLASS_PKMN_RANGER_M 0x44 -#define FACILITY_CLASS_PKMN_RANGER_F 0x45 -#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 0x46 -#define FACILITY_CLASS_LASS 0x47 -#define FACILITY_CLASS_YOUNG_COUPLE 0x48 -#define FACILITY_CLASS_OLD_COUPLE 0x49 -#define FACILITY_CLASS_SIS_AND_BRO 0x4a -#define FACILITY_CLASS_STEVEN 0x4b -#define FACILITY_CLASS_SALON_MAIDEN_ANABEL 0x4c -#define FACILITY_CLASS_DOME_ACE_TUCKER 0x4d -#define FACILITY_CLASS_RED 0x4e -#define FACILITY_CLASS_LEAF 0x4f -#define FACILITY_CLASS_RS_BRENDAN 0x50 -#define FACILITY_CLASS_RS_MAY 0x51 +#define FACILITY_CLASS_DRAGON_TAMER 0x34 +#define FACILITY_CLASS_NINJA_BOY 0x35 +#define FACILITY_CLASS_BATTLE_GIRL 0x36 +#define FACILITY_CLASS_PARASOL_LADY 0x37 +#define FACILITY_CLASS_SWIMMER_F 0x38 +#define FACILITY_CLASS_TWINS 0x39 +#define FACILITY_CLASS_SAILOR 0x3a +#define FACILITY_CLASS_WALLY 0x3b +#define FACILITY_CLASS_BRENDAN 0x3c +#define FACILITY_CLASS_BRENDAN_2 0x3d +#define FACILITY_CLASS_BRENDAN_3 0x3e +#define FACILITY_CLASS_MAY 0x3f +#define FACILITY_CLASS_MAY_2 0x40 +#define FACILITY_CLASS_MAY_3 0x41 +#define FACILITY_CLASS_PKMN_BREEDER_M 0x42 +#define FACILITY_CLASS_BUG_CATCHER 0x43 +#define FACILITY_CLASS_PKMN_RANGER_M 0x44 +#define FACILITY_CLASS_PKMN_RANGER_F 0x45 +#define FACILITY_CLASS_MAGMA_LEADER_MAXIE 0x46 +#define FACILITY_CLASS_LASS 0x47 +#define FACILITY_CLASS_YOUNG_COUPLE 0x48 +#define FACILITY_CLASS_OLD_COUPLE 0x49 +#define FACILITY_CLASS_SIS_AND_BRO 0x4a +#define FACILITY_CLASS_STEVEN 0x4b +#define FACILITY_CLASS_SALON_MAIDEN_ANABEL 0x4c +#define FACILITY_CLASS_DOME_ACE_TUCKER 0x4d +#define FACILITY_CLASS_RED 0x4e +#define FACILITY_CLASS_LEAF 0x4f +#define FACILITY_CLASS_RS_BRENDAN 0x50 +#define FACILITY_CLASS_RS_MAY 0x51 + +#define FACILITY_CLASSES_COUNT 0x52 #define TRAINER_CLASS_PKMN_TRAINER_1 0x0 #define TRAINER_CLASS_PKMN_TRAINER_2 0x1 diff --git a/include/constants/vars.h b/include/constants/vars.h index 9854ec5a2..faffe7c70 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -100,7 +100,7 @@ #define VAR_0x4051 0x4051 #define VAR_0x4052 0x4052 #define VAR_0x4053 0x4053 -#define VAR_0x4054 0x4054 +#define VAR_CURRENT_SECRET_BASE 0x4054 #define VAR_0x4055 0x4055 #define VAR_0x4056 0x4056 #define VAR_0x4057 0x4057 diff --git a/include/constants/weather.h b/include/constants/weather.h index 953cc2753..d0a81c34c 100644 --- a/include/constants/weather.h +++ b/include/constants/weather.h @@ -16,6 +16,7 @@ #define WEATHER_DROUGHT 12 #define WEATHER_RAIN_HEAVY 13 #define WEATHER_BUBBLES 14 +#define WEATHER_15 15 #define WEATHER_ROUTE119_CYCLE 20 #define WEATHER_ROUTE123_CYCLE 21 |