Merge branch 'master' into event-flags

2018-10-17 12:30:45 -04:00
parent ff97873c30 f67bbbdaaa
commit 7d88b9647f
56 changed files with 1280 additions and 2679 deletions
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -508,7 +508,7 @@
 #define FLAG_0x1F1               0x1F1
 #define FLAG_0x1F2               0x1F2
 #define FLAG_0x1F3               0x1F3
-#define FLAG_0x1F4               0x1F4
+#define FLAG_HIDDEN_ITEMS_START               0x1F4
 #define FLAG_0x1F5               0x1F5 // trick house end room?
 #define FLAG_0x1F6               0x1F6
 #define FLAG_0x1F7               0x1F7