Merge branch 'master' into quest_log

2018-11-21 09:00:41 -05:00
parent 6bcabeab1e 2ed26ab8fc
commit 77d7434df2
44 changed files with 5266 additions and 6718 deletions
@@ -68,7 +68,9 @@ enum FieldEffectScriptIdx
    FLDEFF_USE_FLY_ANCIENT_TOMB,
    FLDEFF_PCTURN_ON,
    FLDEFF_HALL_OF_FAME_RECORD,
-    FLDEFF_USE_TELEPORT
+    FLDEFF_USE_TELEPORT,
+    FLDEFF_UNK_40,
+    FLDEFF_UNK_41  // TODO: related to vs_seeker
 };

 extern u32 gFieldEffectArguments[8];