Use SYSTEM_FLAGS offset for upper flags

1 files changed, 114 insertions, 113 deletions

diff --git a/include/constants/flags.h b/include/constants/flags.h
index 55eeab526..eff147fb8 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -671,129 +671,130 @@
 
 #define TRAINER_FLAG_START 0x500
 
-#define TRAINERS_FLAG_NO    0x356
-#define SYSTEM_FLAGS        (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x800
 
 // SYSTEM FLAGS
 
-#define FLAG_SYS_POKEMON_GET  0x800
-#define FLAG_SYS_POKEDEX_GET  0x801
-#define FLAG_SYS_POKENAV_GET  0x802
-#define FLAG_SYS_GAME_CLEAR   0x804
-#define FLAG_SYS_CHAT_USED    0x805
-#define FLAG_SYS_HIPSTER_MEET 0x806
+#define NUMBER_OF_TRAINERS  693
+#define SYSTEM_FLAGS        (TRAINER_FLAG_START + NUMBER_OF_TRAINERS + 0x4B) // 0x800
+
+#define FLAG_SYS_POKEMON_GET  (SYSTEM_FLAGS + 0x00)
+#define FLAG_SYS_POKEDEX_GET  (SYSTEM_FLAGS + 0x01)
+#define FLAG_SYS_POKENAV_GET  (SYSTEM_FLAGS + 0x02)
+#define FLAG_SYS_GAME_CLEAR   (SYSTEM_FLAGS + 0x04)
+#define FLAG_SYS_CHAT_USED    (SYSTEM_FLAGS + 0x05)
+#define FLAG_SYS_HIPSTER_MEET (SYSTEM_FLAGS + 0x06)
 
 // badges
-#define FLAG_BADGE01_GET 0x807
-#define FLAG_BADGE02_GET 0x808
-#define FLAG_BADGE03_GET 0x809
-#define FLAG_BADGE04_GET 0x80A
-#define FLAG_BADGE05_GET 0x80B
-#define FLAG_BADGE06_GET 0x80C
-#define FLAG_BADGE07_GET 0x80D
-#define FLAG_BADGE08_GET 0x80E
+#define FLAG_BADGE01_GET (SYSTEM_FLAGS + 0x07)
+#define FLAG_BADGE02_GET (SYSTEM_FLAGS + 0x08)
+#define FLAG_BADGE03_GET (SYSTEM_FLAGS + 0x09)
+#define FLAG_BADGE04_GET (SYSTEM_FLAGS + 0x0A)
+#define FLAG_BADGE05_GET (SYSTEM_FLAGS + 0x0B)
+#define FLAG_BADGE06_GET (SYSTEM_FLAGS + 0x0C)
+#define FLAG_BADGE07_GET (SYSTEM_FLAGS + 0x0D)
+#define FLAG_BADGE08_GET (SYSTEM_FLAGS + 0x0E)
 
 // cities and towns 
-#define FLAG_VISITED_LITTLEROOT_TOWN  0x80F
-#define FLAG_VISITED_OLDALE_TOWN      0x810
-#define FLAG_VISITED_DEWFORD_TOWN     0x811
-#define FLAG_VISITED_LAVARIDGE_TOWN   0x812
-#define FLAG_VISITED_FALLARBOR_TOWN   0x813
-#define FLAG_VISITED_VERDANTURF_TOWN  0x814
-#define FLAG_VISITED_PACIFIDLOG_TOWN  0x815
-#define FLAG_VISITED_PETALBURG_CITY   0x816
-#define FLAG_VISITED_SLATEPORT_CITY   0x817
-#define FLAG_VISITED_MAUVILLE_CITY    0x818
-#define FLAG_VISITED_RUSTBORO_CITY    0x819
-#define FLAG_VISITED_FORTREE_CITY     0x81A
-#define FLAG_VISITED_LILYCOVE_CITY    0x81B
-#define FLAG_VISITED_MOSSDEEP_CITY    0x81C
-#define FLAG_VISITED_SOOTOPOLIS_CITY  0x81D
-#define FLAG_VISITED_EVER_GRANDE_CITY 0x81E
-
-#define FLAG_SYS_USE_FLASH        0x828
-#define FLAG_SYS_USE_STRENGTH     0x829
-#define FLAG_SYS_WEATHER_CTRL     0x82A
-#define FLAG_SYS_CYCLING_ROAD     0x82B
-#define FLAG_SYS_SAFARI_MODE      0x82C
-#define FLAG_SYS_CRUISE_MODE      0x82D
-
-#define FLAG_SYS_TV_HOME          0x830
-#define FLAG_SYS_TV_WATCH         0x831
-#define FLAG_SYS_TV_START         0x832
-#define FLAG_SYS_POPWORD_INPUT    0x833
-#define FLAG_SYS_MIX_RECORD       0x834
-#define FLAG_SYS_CLOCK_SET        0x835
-#define FLAG_SYS_NATIONAL_DEX     0x836
-#define FLAG_SYS_CAVE_SHIP        0x837
-#define FLAG_SYS_CAVE_WONDER      0x838
-#define FLAG_SYS_CAVE_BATTLE      0x839
-#define FLAG_SYS_SHOAL_TIDE       0x83A
-#define FLAG_SYS_RIBBON_GET       0x83B
-
-#define FLAG_LANDMARK_FLOWER_SHOP        0x83C
-#define FLAG_LANDMARK_MR_BRINEY_HOUSE    0x83D
-#define FLAG_LANDMARK_ABANDONED_SHIP     0x83E
-#define FLAG_LANDMARK_SEASHORE_HOUSE     0x83F
-#define FLAG_LANDMARK_NEW_MAUVILLE       0x840
-#define FLAG_LANDMARK_OLD_LADY_REST_SHOP 0x841
-#define FLAG_LANDMARK_TRICK_HOUSE        0x842
-#define FLAG_LANDMARK_WINSTRATE_FAMILY   0x843
-#define FLAG_LANDMARK_GLASS_WORKSHOP     0x844
-#define FLAG_LANDMARK_LANETTES_HOUSE     0x845
-#define FLAG_LANDMARK_POKEMON_DAYCARE    0x846
-#define FLAG_LANDMARK_SEAFLOOR_CAVERN    0x847
-#define FLAG_LANDMARK_BATTLE_TOWER       0x848
-#define FLAG_LANDMARK_SOUTHERN_ISLAND    0x849
-#define FLAG_LANDMARK_FIERY_PATH         0x84A
-
-#define FLAG_SYS_PC_LANETTE       0x84B
-#define FLAG_SYS_EXDATA_ENABLE    0x84C
-#define FLAG_SYS_ENC_UP_ITEM      0x84D
-#define FLAG_SYS_ENC_DOWN_ITEM    0x84E
-#define FLAG_SYS_BRAILLE_DIG      0x84F
-#define FLAG_SYS_BRAILLE_STRENGTH 0x850
-#define FLAG_SYS_BRAILLE_WAIT     0x851
-#define FLAG_SYS_BRAILLE_FLY      0x852
-#define FLAG_SYS_HAS_EON_TICKET   0x853
-#define FLAG_SYS_POKEMON_LEAGUE_FLY 0x854
-
-#define FLAG_LANDMARK_ISLAND_CAVE          0x855
-#define FLAG_LANDMARK_DESERT_RUINS         0x856
-#define FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE 0x857
-#define FLAG_LANDMARK_SCORCHED_SLAB        0x858
-#define FLAG_LANDMARK_ANCIENT_TOMB         0x859
-#define FLAG_LANDMARK_TUNNELERS_REST_HOUSE 0x85A
-#define FLAG_LANDMARK_HUNTERS_HOUSE        0x85B
-#define FLAG_LANDMARK_SEALED_CHAMBER       0x85C
-
-#define FLAG_SYS_TV_LATI          0x85D
-
-#define FLAG_LANDMARK_SKY_PILLAR 0x85E
-
-#define FLAG_SYS_SHOAL_ITEM       0x85F
-#define FLAG_SYS_B_DASH           0x860 // got Running Shoes
-#define FLAG_SYS_CTRL_OBJ_DELETE  0x861
-#define FLAG_SYS_RESET_RTC_ENABLE 0x862
-
-#define FLAG_LANDMARK_BERRY_MASTERS_HOUSE 0x863
+#define FLAG_VISITED_LITTLEROOT_TOWN  (SYSTEM_FLAGS + 0x0F)
+#define FLAG_VISITED_OLDALE_TOWN      (SYSTEM_FLAGS + 0x10)
+#define FLAG_VISITED_DEWFORD_TOWN     (SYSTEM_FLAGS + 0x11)
+#define FLAG_VISITED_LAVARIDGE_TOWN   (SYSTEM_FLAGS + 0x12)
+#define FLAG_VISITED_FALLARBOR_TOWN   (SYSTEM_FLAGS + 0x13)
+#define FLAG_VISITED_VERDANTURF_TOWN  (SYSTEM_FLAGS + 0x14)
+#define FLAG_VISITED_PACIFIDLOG_TOWN  (SYSTEM_FLAGS + 0x15)
+#define FLAG_VISITED_PETALBURG_CITY   (SYSTEM_FLAGS + 0x16)
+#define FLAG_VISITED_SLATEPORT_CITY   (SYSTEM_FLAGS + 0x17)
+#define FLAG_VISITED_MAUVILLE_CITY    (SYSTEM_FLAGS + 0x18)
+#define FLAG_VISITED_RUSTBORO_CITY    (SYSTEM_FLAGS + 0x19)
+#define FLAG_VISITED_FORTREE_CITY     (SYSTEM_FLAGS + 0x1A)
+#define FLAG_VISITED_LILYCOVE_CITY    (SYSTEM_FLAGS + 0x1B)
+#define FLAG_VISITED_MOSSDEEP_CITY    (SYSTEM_FLAGS + 0x1C)
+#define FLAG_VISITED_SOOTOPOLIS_CITY  (SYSTEM_FLAGS + 0x1D)
+#define FLAG_VISITED_EVER_GRANDE_CITY (SYSTEM_FLAGS + 0x1E)
+
+#define FLAG_SYS_USE_FLASH        (SYSTEM_FLAGS + 0x28)
+#define FLAG_SYS_USE_STRENGTH     (SYSTEM_FLAGS + 0x29)
+#define FLAG_SYS_WEATHER_CTRL     (SYSTEM_FLAGS + 0x2A)
+#define FLAG_SYS_CYCLING_ROAD     (SYSTEM_FLAGS + 0x2B)
+#define FLAG_SYS_SAFARI_MODE      (SYSTEM_FLAGS + 0x2C)
+#define FLAG_SYS_CRUISE_MODE      (SYSTEM_FLAGS + 0x2D)
+
+#define FLAG_SYS_TV_HOME          (SYSTEM_FLAGS + 0x30)
+#define FLAG_SYS_TV_WATCH         (SYSTEM_FLAGS + 0x31)
+#define FLAG_SYS_TV_START         (SYSTEM_FLAGS + 0x32)
+#define FLAG_SYS_POPWORD_INPUT    (SYSTEM_FLAGS + 0x33)
+#define FLAG_SYS_MIX_RECORD       (SYSTEM_FLAGS + 0x34)
+#define FLAG_SYS_CLOCK_SET        (SYSTEM_FLAGS + 0x35)
+#define FLAG_SYS_NATIONAL_DEX     (SYSTEM_FLAGS + 0x36)
+#define FLAG_SYS_CAVE_SHIP        (SYSTEM_FLAGS + 0x37)
+#define FLAG_SYS_CAVE_WONDER      (SYSTEM_FLAGS + 0x38)
+#define FLAG_SYS_CAVE_BATTLE      (SYSTEM_FLAGS + 0x39)
+#define FLAG_SYS_SHOAL_TIDE       (SYSTEM_FLAGS + 0x3A)
+#define FLAG_SYS_RIBBON_GET       (SYSTEM_FLAGS + 0x3B)
+
+#define FLAG_LANDMARK_FLOWER_SHOP        (SYSTEM_FLAGS + 0x3C)
+#define FLAG_LANDMARK_MR_BRINEY_HOUSE    (SYSTEM_FLAGS + 0x3D)
+#define FLAG_LANDMARK_ABANDONED_SHIP     (SYSTEM_FLAGS + 0x3E)
+#define FLAG_LANDMARK_SEASHORE_HOUSE     (SYSTEM_FLAGS + 0x3F)
+#define FLAG_LANDMARK_NEW_MAUVILLE       (SYSTEM_FLAGS + 0x40)
+#define FLAG_LANDMARK_OLD_LADY_REST_SHOP (SYSTEM_FLAGS + 0x41)
+#define FLAG_LANDMARK_TRICK_HOUSE        (SYSTEM_FLAGS + 0x42)
+#define FLAG_LANDMARK_WINSTRATE_FAMILY   (SYSTEM_FLAGS + 0x43)
+#define FLAG_LANDMARK_GLASS_WORKSHOP     (SYSTEM_FLAGS + 0x44)
+#define FLAG_LANDMARK_LANETTES_HOUSE     (SYSTEM_FLAGS + 0x45)
+#define FLAG_LANDMARK_POKEMON_DAYCARE    (SYSTEM_FLAGS + 0x46)
+#define FLAG_LANDMARK_SEAFLOOR_CAVERN    (SYSTEM_FLAGS + 0x47)
+#define FLAG_LANDMARK_BATTLE_TOWER       (SYSTEM_FLAGS + 0x48)
+#define FLAG_LANDMARK_SOUTHERN_ISLAND    (SYSTEM_FLAGS + 0x49)
+#define FLAG_LANDMARK_FIERY_PATH         (SYSTEM_FLAGS + 0x4A)
+
+#define FLAG_SYS_PC_LANETTE       (SYSTEM_FLAGS + 0x4B)
+#define FLAG_SYS_EXDATA_ENABLE    (SYSTEM_FLAGS + 0x4C)
+#define FLAG_SYS_ENC_UP_ITEM      (SYSTEM_FLAGS + 0x4D)
+#define FLAG_SYS_ENC_DOWN_ITEM    (SYSTEM_FLAGS + 0x4E)
+#define FLAG_SYS_BRAILLE_DIG      (SYSTEM_FLAGS + 0x4F)
+#define FLAG_SYS_BRAILLE_STRENGTH (SYSTEM_FLAGS + 0x50)
+#define FLAG_SYS_BRAILLE_WAIT     (SYSTEM_FLAGS + 0x51)
+#define FLAG_SYS_BRAILLE_FLY      (SYSTEM_FLAGS + 0x52)
+#define FLAG_SYS_HAS_EON_TICKET   (SYSTEM_FLAGS + 0x53)
+#define FLAG_SYS_POKEMON_LEAGUE_FLY (SYSTEM_FLAGS + 0x54)
+
+#define FLAG_LANDMARK_ISLAND_CAVE          (SYSTEM_FLAGS + 0x55)
+#define FLAG_LANDMARK_DESERT_RUINS         (SYSTEM_FLAGS + 0x56)
+#define FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE (SYSTEM_FLAGS + 0x57)
+#define FLAG_LANDMARK_SCORCHED_SLAB        (SYSTEM_FLAGS + 0x58)
+#define FLAG_LANDMARK_ANCIENT_TOMB         (SYSTEM_FLAGS + 0x59)
+#define FLAG_LANDMARK_TUNNELERS_REST_HOUSE (SYSTEM_FLAGS + 0x5A)
+#define FLAG_LANDMARK_HUNTERS_HOUSE        (SYSTEM_FLAGS + 0x5B)
+#define FLAG_LANDMARK_SEALED_CHAMBER       (SYSTEM_FLAGS + 0x5C)
+
+#define FLAG_SYS_TV_LATI          (SYSTEM_FLAGS + 0x5D)
+
+#define FLAG_LANDMARK_SKY_PILLAR (SYSTEM_FLAGS + 0x5E)
+
+#define FLAG_SYS_SHOAL_ITEM       (SYSTEM_FLAGS + 0x5F)
+#define FLAG_SYS_B_DASH           (SYSTEM_FLAGS + 0x60) // got Running Shoes
+#define FLAG_SYS_CTRL_OBJ_DELETE  (SYSTEM_FLAGS + 0x61)
+#define FLAG_SYS_RESET_RTC_ENABLE (SYSTEM_FLAGS + 0x62)
+
+#define FLAG_LANDMARK_BERRY_MASTERS_HOUSE (SYSTEM_FLAGS + 0x63)
 
 
 // Daily Flags. These 64 flags are cleared once per day.
-#define DAILY_FLAGS_START 0x8C0
-
-#define FLAG_DAILY_RECEIVED_BERRY_FALLARBOR   0x8C1
-#define FLAG_DAILY_UNKNOWN_8C2                0x8C2
-
-#define FLAG_DAILY_PICKED_LOTTO_TICKET        0x8CA
-#define FLAG_DAILY_RECEIVED_BERRY_ROUTE114    0x8CB
-#define FLAG_DAILY_RECEIVED_BERRY_ROUTE111    0x8CC
-#define FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER 0x8CD
-#define FLAG_DAILY_RECEIVED_BERRY_ROUTE120    0x8CE
-#define FLAG_DAILY_RECEIVED_BERRY_LILYCOVE    0x8CF
-#define FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP 0x8D0
-#define FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE 0x8D1
-#define FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS  0x8D2
+#define DAILY_FLAGS_START (SYSTEM_FLAGS + 0xC0)
+
+#define FLAG_DAILY_RECEIVED_BERRY_FALLARBOR   (SYSTEM_FLAGS + 0xC1)
+#define FLAG_DAILY_UNKNOWN_8C2                (SYSTEM_FLAGS + 0xC2)
+
+#define FLAG_DAILY_PICKED_LOTTO_TICKET        (SYSTEM_FLAGS + 0xCA)
+#define FLAG_DAILY_RECEIVED_BERRY_ROUTE114    (SYSTEM_FLAGS + 0xCB)
+#define FLAG_DAILY_RECEIVED_BERRY_ROUTE111    (SYSTEM_FLAGS + 0xCC)
+#define FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER (SYSTEM_FLAGS + 0xCD)
+#define FLAG_DAILY_RECEIVED_BERRY_ROUTE120    (SYSTEM_FLAGS + 0xCE)
+#define FLAG_DAILY_RECEIVED_BERRY_LILYCOVE    (SYSTEM_FLAGS + 0xCF)
+#define FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP (SYSTEM_FLAGS + 0xD0)
+#define FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE (SYSTEM_FLAGS + 0xD1)
+#define FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS  (SYSTEM_FLAGS + 0xD2)
 // Daily flags end at 0x8FF
 
 // SPECIAL FLAGS (unknown purpose)