diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-31 09:31:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 09:31:33 -0400 |
| commit | c6cd74fed25cbb6e2fa0296960fbcda795311b06 (patch) | |
| tree | 05ae3de2bc0130040d48e800fe4e962f2a818aef /include/constants/flags.h | |
| parent | 922411abebd56d0f5d6072bad4924c909c8e2c27 (diff) | |
| parent | 2b0bcdcad9336defc82f50a329b12e631b1f33ce (diff) | |
Merge pull request #120 from PikalaxALT/trade
Trade
Diffstat (limited to 'include/constants/flags.h')
| -rw-r--r-- | include/constants/flags.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 082e12f87..bd356064c 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1,7 +1,7 @@ #ifndef GUARD_CONSTANTS_FLAGS_H #define GUARD_CONSTANTS_FLAGS_H -// TODO: Get correct names and numbers +#include "constants/trainers.h" #define FLAG_TEMP_1 0x001 #define FLAG_TEMP_2 0x002 @@ -1309,10 +1309,8 @@ #define FLAG_TRAINER_FLAG_START 0x500 -#define TRAINERS_FLAG_NO 0x2E7 // 743 -#define TRAINER_FLAGS_WORDS 0x300 - -#define SYS_FLAGS (FLAG_TRAINER_FLAG_START + TRAINER_FLAGS_WORDS) // 0x800 +// Vanilla: SYS_FLAGS = 0x800 +#define SYS_FLAGS (FLAG_TRAINER_FLAG_START + ((NUM_TRAINERS) + 31) / 32 * 32) // SYSTEM FLAGS |