Merge pull request #279 from PikalaxALT/field_effect

Field effect
2020-03-02 12:11:22 -05:00
parent 5198a05272 2d820809d7
commit ae08a40290
51 changed files with 4132 additions and 10303 deletions
@@ -2389,13 +2389,13 @@ static void MoveDeoxysObject(u8 num)
        gFieldEffectArguments[5] = 60;
    else
        gFieldEffectArguments[5] = 5;
-    FieldEffectStart(FLDEFF_UNK_43);
+    FieldEffectStart(FLDEFF_MOVE_DEOXYS_ROCK);
    Overworld_SetMapObjTemplateCoords(1, sDeoxysCoords[num][0], sDeoxysCoords[num][1]);
 }

 static void Task_WaitDeoxysFieldEffect(u8 taskId)
 {
-    if (!FieldEffectActiveListContains(FLDEFF_UNK_43))
+    if (!FieldEffectActiveListContains(FLDEFF_MOVE_DEOXYS_ROCK))
    {
        EnableBothScriptContexts();
        DestroyTask(taskId);