Merge master into ObjEvent rename

2019-11-25 20:00:04 -05:00
parent 4c52cf9ed1 6efa51f8ad
commit f559fa3fe2
144 changed files with 8322 additions and 8521 deletions
@@ -30,6 +30,7 @@
 #include "wild_encounter.h"
 #include "constants/event_bg.h"
 #include "constants/event_objects.h"
+#include "constants/field_poison.h"
 #include "constants/map_types.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
@@ -647,11 +648,11 @@ static bool8 UpdatePoisonStepCounter(void)
        {
            switch (DoPoisonFieldEffect())
            {
-            case 0:
+            case FLDPSN_NONE:
                return FALSE;
-            case 1:
+            case FLDPSN_PSN:
                return FALSE;
-            case 2:
+            case FLDPSN_FNT:
                return TRUE;
            }
        }