Merge branch 'master' into doc-trickhouse

This commit is contained in:
GriffinR
2019-11-06 19:49:14 -05:00
committed by GitHub
77 changed files with 1302 additions and 1179 deletions

View File

@@ -353,8 +353,8 @@
#define FLAG_UNUSED_MYSTERY_GIFT_0x14D 0x14D
#define FLAG_MIRAGE_TOWER_VISIBLE 0x14E
#define FLAG_CHOSE_CLAW_FOSSIL 0x14F
#define FLAG_CHOSE_ROOT_FOSSIL 0x150
#define FLAG_CHOSE_ROOT_FOSSIL 0x14F
#define FLAG_CHOSE_CLAW_FOSSIL 0x150
#define FLAG_RECEIVED_POWDER_JAR 0x151
#define FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER 0x152