diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-20 20:20:45 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-20 20:20:45 -0400 |
| commit | 2aeefdc5de73c630a79b183e7bc2a66ad48ed424 (patch) | |
| tree | 3833a23f869ab66a7c58cb9c43d8628ece27fc46 /include | |
| parent | b3951b48ecf169463d917c3fca9c218e16fe961e (diff) | |
update famechecker macro
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/fame_checker.h | 4 | ||||
| -rw-r--r-- | include/constants/flags.h | 64 | ||||
| -rw-r--r-- | include/fame_checker.h | 6 |
3 files changed, 36 insertions, 38 deletions
diff --git a/include/constants/fame_checker.h b/include/constants/fame_checker.h index d9c44413d..e09279bb4 100644 --- a/include/constants/fame_checker.h +++ b/include/constants/fame_checker.h @@ -19,4 +19,8 @@ #define FAMECHECKER_GIOVANNI 15 #define NUM_FAMECHECKER_PERSONS 16 +#define FCPICKSTATE_NO_DRAW 0 +#define FCPICKSTATE_SILHOUETTE 1 +#define FCPICKSTATE_COLORED 2 + #endif //GUARD_CONSTANTS_FAME_CHECKER_H diff --git a/include/constants/flags.h b/include/constants/flags.h index b38c79938..78f6cdce9 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -573,38 +573,38 @@ #define FLAG_0x22F 0x22F // Story flags -#define FLAG_0x230 0x230 -#define FLAG_0x231 0x231 -#define FLAG_0x232 0x232 -#define FLAG_0x233 0x233 -#define FLAG_0x234 0x234 -#define FLAG_0x235 0x235 -#define FLAG_0x236 0x236 -#define FLAG_0x237 0x237 -#define FLAG_0x238 0x238 -#define FLAG_0x239 0x239 -#define FLAG_0x23A 0x23A -#define FLAG_0x23B 0x23B -#define FLAG_0x23C 0x23C -#define FLAG_0x23D 0x23D -#define FLAG_0x23E 0x23E -#define FLAG_0x23F 0x23F -#define FLAG_0x240 0x240 -#define FLAG_0x241 0x241 -#define FLAG_0x242 0x242 -#define FLAG_GOT_COIN_CASE 0x243 -#define FLAG_0x244 0x244 -#define FLAG_0x245 0x245 -#define FLAG_0x246 0x246 -#define FLAG_0x247 0x247 -#define FLAG_0x248 0x248 -#define FLAG_0x249 0x249 -#define FLAG_0x24A 0x24A -#define FLAG_0x24B 0x24B -#define FLAG_0x24C 0x24C -#define FLAG_0x24D 0x24D -#define FLAG_0x24E 0x24E -#define FLAG_0x24F 0x24F +#define FLAG_GOT_POTION_ON_ROUTE_1 0x230 +#define FLAG_GOT_TM34_FROM_SURGE 0x231 +#define FLAG_GOT_FOSSIL_FROM_MT_MOON 0x232 +#define FLAG_HELPED_BILL_IN_SEA_COTTAGE 0x233 +#define FLAG_GOT_SS_TICKET 0x234 +#define FLAG_GOT_SS_TICKET_DUP 0x235 +#define FLAG_GOT_TM42_AT_MEMORIAL_PILLAR 0x236 +#define FLAG_GOT_HM01 0x237 +#define FLAG_GOT_HM02 0x238 +#define FLAG_GOT_HM03 0x239 +#define FLAG_GOT_HM04 0x23A +#define FLAG_GOT_HM05 0x23B +#define FLAG_RESCUED_MR_FUJI 0x23C +#define FLAG_GOT_POKE_FLUTE 0x23D +#define FLAG_0x23E 0x23E +#define FLAG_GOT_TM28_FROM_ROCKET 0x23F +#define FLAG_GOT_OLD_ROD 0x240 +#define FLAG_GOT_BIKE_VOUCHER 0x241 +#define FLAG_0x242 0x242 +#define FLAG_GOT_COIN_CASE 0x243 +#define FLAG_GOT_GOOD_ROD 0x244 +#define FLAG_GOT_TM29_FROM_MR_PSYCHIC 0x245 +#define FLAG_GOT_LAPRAS_FROM_SILPH 0x246 +#define FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL 0x247 +#define FLAG_DID_MIMIEN_TRADE 0x248 +#define FLAG_BOUGHT_MAGIKARP 0x249 +#define FLAG_DID_ZYNX_TRADE 0x24A +#define FLAG_DID_MS_NIDO_TRADE 0x24B +#define FLAG_0x24C 0x24C +#define FLAG_DID_CH_DING_TRADE 0x24D +#define FLAG_GOT_TM38_FROM_BLAINE 0x24E +#define FLAG_OAK_SKIP_22_RIVAL_CHECK 0x24F #define FLAG_0x250 0x250 #define FLAG_0x251 0x251 #define FLAG_0x252 0x252 diff --git a/include/fame_checker.h b/include/fame_checker.h index 67b1e0e9c..782a8df18 100644 --- a/include/fame_checker.h +++ b/include/fame_checker.h @@ -5,12 +5,6 @@ #include "constants/fame_checker.h" enum { - FCPICKSTATE_NO_DRAW, - FCPICKSTATE_SILHOUETTE, - FCPICKSTATE_COLORED -}; - -enum { FCWINDOWID_LIST, FCWINDOWID_UIHELP, FCWINDOWID_MSGBOX, |