Merge branch 'master' into secret_base

1 files changed, 24 insertions, 0 deletions

diff --git a/include/flags.h b/include/flags.h
index 0e408a833..a60de6ea0 100644
--- a/include/flags.h
+++ b/include/flags.h
@@ -22,6 +22,24 @@
 #define BADGE07_GET 0x80D
 #define BADGE08_GET 0x80E
 
+// 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 SYS_USE_FLASH        0x828
 #define SYS_USE_STRENGTH     0x829
 #define SYS_WEATHER_CTRL     0x82A
@@ -42,6 +60,9 @@
 #define SYS_SHOAL_TIDE       0x83A
 #define SYS_RIBBON_GET       0x83B
 
+#define FLAG_UNLOCK_BATTLE_TOWER    0x848
+#define FLAG_UNLOCK_SOUTHERN_ISLAND 0x849
+
 #define SYS_PC_LANETTE       0x84B
 #define SYS_EXDATA_ENABLE    0x84C
 #define SYS_ENC_UP_ITEM      0x84D
@@ -50,6 +71,9 @@
 #define SYS_BRAILLE_STRENGTH 0x850
 #define SYS_BRAILLE_WAIT     0x851
 #define SYS_BRAILLE_FLY      0x852
+#define SYS_HAS_EON_TICKET   0x853
+
+#define SYS_POKEMON_LEAGUE_FLY 0x854
 
 #define SYS_TV_LATI          0x85D