diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/flags.h | 20 | ||||
| -rw-r--r-- | include/constants/items.h | 14 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 22 |
3 files changed, 31 insertions, 25 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 1163e394f..e0b383d7b 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1353,22 +1353,24 @@ #define SYSTEM_FLAGS (TRAINER_FLAGS_END + 1) // 0x860 -#define FLAG_SYS_POKEMON_GET (SYSTEM_FLAGS + 0) // FLAG_0x860 -#define FLAG_SYS_POKEDEX_GET (SYSTEM_FLAGS + 1) -#define FLAG_SYS_POKENAV_GET (SYSTEM_FLAGS + 2) -#define FLAG_SYS_GAME_CLEAR (SYSTEM_FLAGS + 4) -#define FLAG_SYS_CHAT_USED (SYSTEM_FLAGS + 5) -#define FLAG_SYS_HIPSTER_MEET (SYSTEM_FLAGS + 6) +#define FLAG_SYS_POKEMON_GET (SYSTEM_FLAGS + 0x0) // FLAG_0x860 +#define FLAG_SYS_POKEDEX_GET (SYSTEM_FLAGS + 0x1) +#define FLAG_SYS_POKENAV_GET (SYSTEM_FLAGS + 0x2) +#define FLAG_UNUSED_0x863 (SYSTEM_FLAGS + 0x3) +#define FLAG_SYS_GAME_CLEAR (SYSTEM_FLAGS + 0x4) +#define FLAG_SYS_CHAT_USED (SYSTEM_FLAGS + 0x5) +#define FLAG_SYS_HIPSTER_MEET (SYSTEM_FLAGS + 0x6) // Badges -#define FLAG_BADGE01_GET (SYSTEM_FLAGS + 7) -#define FLAG_BADGE02_GET (SYSTEM_FLAGS + 8) -#define FLAG_BADGE03_GET (SYSTEM_FLAGS + 9) +#define FLAG_BADGE01_GET (SYSTEM_FLAGS + 0x7) +#define FLAG_BADGE02_GET (SYSTEM_FLAGS + 0x8) +#define FLAG_BADGE03_GET (SYSTEM_FLAGS + 0x9) #define FLAG_BADGE04_GET (SYSTEM_FLAGS + 0xA) #define FLAG_BADGE05_GET (SYSTEM_FLAGS + 0xB) #define FLAG_BADGE06_GET (SYSTEM_FLAGS + 0xC) #define FLAG_BADGE07_GET (SYSTEM_FLAGS + 0xD) #define FLAG_BADGE08_GET (SYSTEM_FLAGS + 0xE) +#define NUM_BADGES (1 + FLAG_BADGE08_GET - FLAG_BADGE01_GET) // Towns and Cities #define FLAG_VISITED_LITTLEROOT_TOWN (SYSTEM_FLAGS + 0xF) diff --git a/include/constants/items.h b/include/constants/items.h index c23816901..fafcac8b1 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -478,13 +478,13 @@ #define FIRST_ROUTE_114_MAN_BERRY ITEM_RAZZ_BERRY #define LAST_ROUTE_114_MAN_BERRY ITEM_PINAP_BERRY -#define NUM_BERRY_MASTER_BERRIES LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1 -#define NUM_BERRY_MASTER_BERRIES_SKIPPED FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX -#define NUM_BERRY_MASTER_WIFE_BERRIES LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1 -#define NUM_KIRI_BERRIES LAST_KIRI_BERRY - FIRST_KIRI_BERRY + 1 -#define NUM_KIRI_BERRIES_SKIPPED FIRST_KIRI_BERRY - FIRST_BERRY_INDEX -#define NUM_ROUTE_114_MAN_BERRIES LAST_ROUTE_114_MAN_BERRY - FIRST_ROUTE_114_MAN_BERRY + 1 -#define NUM_ROUTE_114_MAN_BERRIES_SKIPPED FIRST_ROUTE_114_MAN_BERRY - FIRST_BERRY_INDEX +#define NUM_BERRY_MASTER_BERRIES (LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1) +#define NUM_BERRY_MASTER_BERRIES_SKIPPED (FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX) +#define NUM_BERRY_MASTER_WIFE_BERRIES (LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1) +#define NUM_KIRI_BERRIES (LAST_KIRI_BERRY - FIRST_KIRI_BERRY + 1) +#define NUM_KIRI_BERRIES_SKIPPED (FIRST_KIRI_BERRY - FIRST_BERRY_INDEX) +#define NUM_ROUTE_114_MAN_BERRIES (LAST_ROUTE_114_MAN_BERRY - FIRST_ROUTE_114_MAN_BERRY + 1) +#define NUM_ROUTE_114_MAN_BERRIES_SKIPPED (FIRST_ROUTE_114_MAN_BERRY - FIRST_BERRY_INDEX) #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 97e3f0686..b5c60f64d 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -203,15 +203,16 @@ #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF -#define FRIENDSHIP_EVENT_GROW_LEVEL 0 -#define FRIENDSHIP_EVENT_VITAMIN 1 // unused -#define FRIENDSHIP_EVENT_BATTLE_ITEM 2 // unused -#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3 -#define FRIENDSHIP_EVENT_LEARN_TMHM 4 -#define FRIENDSHIP_EVENT_WALKING 5 -#define FRIENDSHIP_EVENT_FAINT_SMALL 6 -#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 7 -#define FRIENDSHIP_EVENT_FAINT_LARGE 8 +// Constants for AdjustFriendship +#define FRIENDSHIP_EVENT_GROW_LEVEL 0 +#define FRIENDSHIP_EVENT_VITAMIN 1 // unused, handled by PokemonUseItemEffects +#define FRIENDSHIP_EVENT_BATTLE_ITEM 2 // unused, handled by PokemonUseItemEffects +#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3 +#define FRIENDSHIP_EVENT_LEARN_TMHM 4 +#define FRIENDSHIP_EVENT_WALKING 5 +#define FRIENDSHIP_EVENT_FAINT_SMALL 6 +#define FRIENDSHIP_EVENT_FAINT_FIELD_PSN 7 +#define FRIENDSHIP_EVENT_FAINT_LARGE 8 // If opponent was >= 30 levels higher. See AdjustFriendshipOnBattleFaint #define MAX_FRIENDSHIP 0xFF @@ -278,4 +279,7 @@ #define EVOS_PER_MON 5 +#define NUM_MALE_LINK_FACILITY_CLASSES 8 +#define NUM_FEMALE_LINK_FACILITY_CLASSES 8 + #endif // GUARD_CONSTANTS_POKEMON_H |