diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 1 | ||||
| -rw-r--r-- | include/constants/vars.h | 82 | ||||
| -rw-r--r-- | include/field_specials.h | 3 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 3 |
4 files changed, 46 insertions, 43 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 0719371d8..50619c941 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1325,6 +1325,7 @@ #define FLAG_SYS_STRENGTH_ACTIVE (SYS_FLAGS + 0x5) #define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6) #define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7) +#define FLAG_0x808 (SYS_FLAGS + 0x8) #define PERMA_SYS_FLAGS_START 0x820 #define FLAG_BADGE01_GET (SYS_FLAGS + 0x20) diff --git a/include/constants/vars.h b/include/constants/vars.h index 9e34127f9..715cde5a7 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -78,50 +78,50 @@ // with the species sanity bit set. // Bits 12-15 are the same for the player's party. // Used by Quest Log. -#define VAR_QUEST_LOG_MON_COUNTS 0x4027 -#define VAR_MENEWS_JISAN_STEP_COUNTER 0x4028 -#define VAR_0x4029 0x4029 -#define VAR_HAPPINESS_STEP_COUNTER 0x402A -#define VAR_POISON_STEP_COUNTER 0x402B -#define VAR_RESET_RTC_ENABLE 0x402C -#define VAR_0x402D 0x402D -#define VAR_0x402E 0x402E +#define VAR_QUEST_LOG_MON_COUNTS 0x4027 +#define VAR_MENEWS_JISAN_STEP_COUNTER 0x4028 +#define VAR_0x4029 0x4029 +#define VAR_HAPPINESS_STEP_COUNTER 0x402A +#define VAR_POISON_STEP_COUNTER 0x402B +#define VAR_RESET_RTC_ENABLE 0x402C +#define VAR_0x402D 0x402D +#define VAR_0x402E 0x402E -#define VAR_0x402F 0x402F +#define VAR_0x402F 0x402F -#define VAR_0x4030 0x4030 -#define VAR_STARTER_MON 0x4031 -#define VAR_0x4032 0x4032 -#define VAR_ENIGMA_BERRY_AVAILABLE 0x4033 +#define VAR_0x4030 0x4030 +#define VAR_STARTER_MON 0x4031 +#define VAR_0x4032 0x4032 +#define VAR_ENIGMA_BERRY_AVAILABLE 0x4033 -#define VAR_0x4034 0x4034 -#define VAR_RESORT_GOREGEOUS_STEP_COUNTER 0x4035 -#define VAR_RESORT_GOREGOUS_REQUESTED_MON 0x4036 -#define VAR_0x4037 0x4037 -#define VAR_0x4038 0x4038 -#define VAR_0x4039 0x4039 -#define VAR_ELEVATOR_FLOOR 0x403A -#define VAR_RESORT_GOREGOUS_REWARD 0x403B -#define VAR_0x403C 0x403C -#define VAR_0x403D 0x403D -#define VAR_DEOXYS_INTERACTION_NUM 0x403E -#define VAR_0x403F 0x403F -#define VAR_DAYS 0x4040 -#define VAR_0x4041 0x4041 -#define VAR_0x4042 0x4042 -#define VAR_DEPT_STORE_FLOOR 0x4043 -#define VAR_0x4044 0x4044 -#define VAR_POKELOT_PRIZE 0x4045 -#define VAR_NATIONAL_DEX 0x4046 -#define VAR_SEEDOT_SIZE_RECORD 0x4047 -#define VAR_ASH_GATHER_COUNT 0x4048 -#define VAR_HOF_BRAG_STATE 0x4049 -#define VAR_EGG_BRAG_STATE 0x404A -#define VAR_LINK_WIN_BRAG_STATE 0x404B -#define VAR_POKELOT_RND2 0x404C -#define VAR_0x404D 0x404D -#define VAR_0x404E 0x404E -#define VAR_LOTAD_SIZE_RECORD 0x404F +#define VAR_0x4034 0x4034 +#define VAR_RESORT_GOREGEOUS_STEP_COUNTER 0x4035 +#define VAR_RESORT_GOREGOUS_REQUESTED_MON 0x4036 +#define VAR_0x4037 0x4037 +#define VAR_0x4038 0x4038 +#define VAR_0x4039 0x4039 +#define VAR_ELEVATOR_FLOOR 0x403A +#define VAR_RESORT_GOREGOUS_REWARD 0x403B +#define VAR_0x403C 0x403C +#define VAR_0x403D 0x403D +#define VAR_DEOXYS_INTERACTION_NUM 0x403E +#define VAR_0x403F 0x403F +#define VAR_DAYS 0x4040 +#define VAR_0x4041 0x4041 +#define VAR_TRAINER_CARD_MON_ICON_TINT_IDX 0x4042 +#define VAR_TRAINER_CARD_MON_ICON_1 0x4043 +#define VAR_TRAINER_CARD_MON_ICON_2 0x4044 +#define VAR_TRAINER_CARD_MON_ICON_3 0x4045 +#define VAR_TRAINER_CARD_MON_ICON_4 0x4046 +#define VAR_TRAINER_CARD_MON_ICON_5 0x4047 +#define VAR_TRAINER_CARD_MON_ICON_6 0x4048 +#define VAR_0x4049 0x4049 +#define VAR_EGG_BRAG_STATE 0x404A +#define VAR_LINK_WIN_BRAG_STATE 0x404B +#define VAR_POKELOT_RND2 0x404C +#define VAR_0x404D 0x404D +#define VAR_0x404E 0x404E +#define VAR_LOTAD_SIZE_RECORD 0x404F // Map Scene #define VAR_MAP_SCENE_PALLET_TOWN_OAK 0x4050 diff --git a/include/field_specials.h b/include/field_specials.h index 24ef0d00b..e82439fe7 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -22,7 +22,8 @@ u8 ContextNpcGetTextColor(void); void set_unknown_box_id(u8); u16 get_unknown_box_id(void); bool8 sub_80CC7B4(void); -u16 GetHiddenItemAttr(struct HiddenItemStruct hiddenItem, u8 attr); +u16 GetHiddenItemAttr(u32 hiddenItem, u8 attr); u8 GetUnlockedSeviiAreas(void); +u32 GetPlayerTrainerId(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index bf142d265..a4358081d 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -134,7 +134,8 @@ union BgUnion u8 *script; // hidden item type probably - struct HiddenItemStruct hiddenItem; + struct HiddenItemStruct hiddenItemStr; + u32 hiddenItem; // secret base type u32 secretBaseId; |