diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-19 11:00:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 11:00:32 -0400 |
| commit | 33b65b547000387fcdce9fe497da9b217544ece6 (patch) | |
| tree | 0c1754c67d188776ee1942fcca503ad8e1e19f05 /include/constants | |
| parent | 715c2ff3ad3a7842a97a2b221f4c02135a813139 (diff) | |
| parent | a8403c07790b1031c96ff35a1701e1684919ed95 (diff) | |
Merge pull request #307 from PikalaxALT/field_control_avatar
Field control avatar
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/event_bg.h | 2 | ||||
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/quest_log.h | 12 | ||||
| -rw-r--r-- | include/constants/vars.h | 15 |
4 files changed, 25 insertions, 6 deletions
diff --git a/include/constants/event_bg.h b/include/constants/event_bg.h index b106a74ef..37fedf25b 100644 --- a/include/constants/event_bg.h +++ b/include/constants/event_bg.h @@ -7,4 +7,6 @@ #define BG_EVENT_PLAYER_FACING_EAST 3 #define BG_EVENT_PLAYER_FACING_WEST 4 +#define BG_EVENT_HIDDEN_ITEM 7 + #endif // GUARD_CONSTANTS_EVENT_BG_H diff --git a/include/constants/flags.h b/include/constants/flags.h index 0bc96eb35..ccac1da3b 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1360,7 +1360,7 @@ #define FLAG_SYS_RIBBON_GET (SYS_FLAGS + 0x3B) #define FLAG_SYS_SAW_HELP_SYSTEM_INTRO (SYS_FLAGS + 0x3C) #define FLAG_0x83D (SYS_FLAGS + 0x3D) -#define FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN (SYS_FLAGS + 0x3E) +#define FLAG_OPENED_START_MENU (SYS_FLAGS + 0x3E) #define FLAG_0x83F (SYS_FLAGS + 0x3F) #define FLAG_SYS_NATIONAL_DEX (SYS_FLAGS + 0x40) #define FLAG_SYS_PC_STORAGE_DISABLED (SYS_FLAGS + 0x41) diff --git a/include/constants/quest_log.h b/include/constants/quest_log.h index c1eaf3f07..b5494e7b9 100644 --- a/include/constants/quest_log.h +++ b/include/constants/quest_log.h @@ -118,6 +118,18 @@ #define QL_DEPARTED_MISC_BUILDING_1 8 #define QL_DEPARTED_MISC_BUILDING_2 9 +#define QL_INPUT_OFF 0 +#define QL_INPUT_UP 1 +#define QL_INPUT_DOWN 2 +#define QL_INPUT_LEFT 3 +#define QL_INPUT_RIGHT 4 +#define QL_INPUT_L 5 +#define QL_INPUT_R 6 +#define QL_INPUT_START 7 +#define QL_INPUT_SELECT 8 +#define QL_INPUT_A 9 +#define QL_INPUT_B 10 + #define FANCLUB_MEMBER1 0 #define FANCLUB_MEMBER2 1 diff --git a/include/constants/vars.h b/include/constants/vars.h index 640bf41fd..4a64eb095 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -49,10 +49,15 @@ // Counts up every step. Wraps around at 128. // When wraparound occurs, the friendship of // every party poke gets a slight boost. -#define VAR_FRIENDSHIP_STEP_COUNT 0x4021 +#define VAR_HAPPINESS_STEP_COUNTER 0x4021 -// Maybe unused? -#define VAR_0x4022 0x4022 +// Counts up every step while a party Pokemon is +// poisoned. Wraps around at 5. When wraparound +// occurs, every party Pokemon with the PSN status +// takes 1 point of damage. +// This is a deviation from the typical rate in +// the series, which is 1 damage every 4 steps. +#define VAR_POISON_STEP_COUNTER 0x4022 // Step counter. Caps at 1500. If you enter a map with // renewable hidden items and this counter is capped, @@ -81,8 +86,8 @@ #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_0x402A 0x402A +#define VAR_0x402B 0x402B #define VAR_RESET_RTC_ENABLE 0x402C #define VAR_0x402D 0x402D #define VAR_0x402E 0x402E |