From 2d9327a1ff21ac142c17e270755c658491eee5aa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 27 Feb 2020 14:21:13 -0500 Subject: Document Four Island scripts, trainer_card.inc --- include/constants/flags.h | 2 +- include/constants/trainer_card.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 include/constants/trainer_card.h (limited to 'include/constants') diff --git a/include/constants/flags.h b/include/constants/flags.h index 7555f3c6b..44ef7e22f 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -670,7 +670,7 @@ #define FLAG_SILPH_11F_DOOR 0x28D #define FLAG_0x28E 0x28E #define FLAG_0x28F 0x28F -#define FLAG_MET_STICKER_LADY 0x290 +#define FLAG_MET_STICKER_MAN 0x290 #define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN 0x291 #define FLAG_GOT_VS_SEEKER 0x292 #define FLAG_GOT_TM19_FROM_ERIKA 0x293 diff --git a/include/constants/trainer_card.h b/include/constants/trainer_card.h new file mode 100644 index 000000000..cdc69d610 --- /dev/null +++ b/include/constants/trainer_card.h @@ -0,0 +1,15 @@ +#ifndef GUARD_CONSTANTS_TRAINER_CARD_H +#define GUARD_CONSTANTS_TRAINER_CARD_H + +#define TRAINER_CARD_PROFILE_LENGTH 4 +#define TRAINER_CARD_STICKER_TYPES 3 + +#define CARD_TYPE_FRLG 0 +#define CARD_TYPE_RSE 1 + +#define MON_ICON_TINT_NORMAL 0 +#define MON_ICON_TINT_BLACK 1 +#define MON_ICON_TINT_PINK 2 +#define MON_ICON_TINT_SEPIA 3 + +#endif // GUARD_CONSTANTS_TRAINER_CARD_H -- cgit v1.2.3 From 968ac4742adbc86148e344c7c0cb9b9f27addc6c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 27 Feb 2020 17:15:27 -0500 Subject: Sync trainer_card.c --- include/constants/facility_trainer_classes.h | 8 ++++---- include/constants/flags.h | 3 +++ include/constants/trainer_card.h | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'include/constants') diff --git a/include/constants/facility_trainer_classes.h b/include/constants/facility_trainer_classes.h index 10500ff35..fe94608dd 100644 --- a/include/constants/facility_trainer_classes.h +++ b/include/constants/facility_trainer_classes.h @@ -133,10 +133,10 @@ #define FACILITY_CLASS_CRUSH_KIN 0x81 #define FACILITY_CLASS_SIS_AND_BRO_2 0x82 #define FACILITY_CLASS_PKMN_PROF 0x83 -#define FACILITY_CLASS_PLAYER 0x84 -#define FACILITY_CLASS_PLAYER_2 0x85 -#define FACILITY_CLASS_PLAYER_3 0x86 -#define FACILITY_CLASS_PLAYER_4 0x87 +#define FACILITY_CLASS_BRENDAN 0x84 +#define FACILITY_CLASS_MAY 0x85 +#define FACILITY_CLASS_RED 0x86 +#define FACILITY_CLASS_LEAF 0x87 #define FACILITY_CLASS_TEAM_ROCKET_2 0x88 #define FACILITY_CLASS_PSYCHIC_4 0x89 #define FACILITY_CLASS_CRUSH_GIRL 0x8A diff --git a/include/constants/flags.h b/include/constants/flags.h index 44ef7e22f..11b09512f 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1327,6 +1327,7 @@ #define FLAG_0x808 (SYS_FLAGS + 0x8) #define PERMA_SYS_FLAGS_START 0x820 + #define FLAG_BADGE01_GET (SYS_FLAGS + 0x20) #define FLAG_BADGE02_GET (SYS_FLAGS + 0x21) #define FLAG_BADGE03_GET (SYS_FLAGS + 0x22) @@ -1335,6 +1336,8 @@ #define FLAG_BADGE06_GET (SYS_FLAGS + 0x25) #define FLAG_BADGE07_GET (SYS_FLAGS + 0x26) #define FLAG_BADGE08_GET (SYS_FLAGS + 0x27) +#define NUM_BADGES (1 + FLAG_BADGE08_GET - FLAG_BADGE01_GET) + #define FLAG_SYS_POKEMON_GET (SYS_FLAGS + 0x28) #define FLAG_SYS_POKEDEX_GET (SYS_FLAGS + 0x29) #define FLAG_0x82A (SYS_FLAGS + 0x2A) diff --git a/include/constants/trainer_card.h b/include/constants/trainer_card.h index cdc69d610..67901eb27 100644 --- a/include/constants/trainer_card.h +++ b/include/constants/trainer_card.h @@ -12,4 +12,6 @@ #define MON_ICON_TINT_PINK 2 #define MON_ICON_TINT_SEPIA 3 +#define NUM_LINK_TRAINER_CARD_CLASSES 8 + #endif // GUARD_CONSTANTS_TRAINER_CARD_H -- cgit v1.2.3 From 7d7c51973ca025f03de1391b87b37876d3d9e90d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 28 Feb 2020 00:22:34 -0500 Subject: Document Five Island scripts --- include/constants/metatile_labels.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/constants') diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index 01140a160..75804bfd9 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -190,4 +190,8 @@ #define METATILE_FuchsiaCity_SafariZoneTreeTopMiddle_Mowed 0x311 #define METATILE_FuchsiaCity_SafariZoneTreeTopRight_Mowed 0x312 +// gTileset_SeviiIslands45 +#define METATILE_SeviiIslands45_RocketWarehouseDoor_Locked 0x30B +#define METATILE_SeviiIslands45_RocketWarehouseDoor_Unlocked 0x2AF + #endif // GUARD_METATILE_LABELS_H -- cgit v1.2.3