lab: fix intang colanim

UnclePunch · Dec 2, 2020 · 61fa1f2 · 61fa1f2
1 parent 7f2fcfa
commit 61fa1f2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/patch/events/lab/output/EvLab.dat b/patch/events/lab/output/EvLab.dat
diff --git a/patch/events/lab/source/lab.c b/patch/events/lab/source/lab.c
@@ -1592,12 +1592,17 @@ void Lab_ChangeCPUPercent(GOBJ *menu_gobj, int value)
 }
 void Lab_ChangeCPUIntang(GOBJ *menu_gobj, int value)
 {
-    // remove blink GFX if toggling off
+
+    GOBJ *fighter = Fighter_GetGObj(1);
+    FighterData *fighter_data = fighter->userdata;
+
+    // remove colanim if toggling off
     if (value == 0)
-    {
-        GOBJ *fighter = Fighter_GetGObj(1);
-        Fighter_GFXRemoveAll(fighter);
-    }
+        Fighter_ColorRemove(fighter_data, INTANG_COLANIM);
+    // apply colanim
+    else
+        Fighter_ApplyOverlay(fighter_data, INTANG_COLANIM, 0);
+
     return;
 }
 void Lab_ChangeModelDisplay(GOBJ *menu_gobj, int value)
@@ -6164,10 +6169,14 @@ void Event_Think(GOBJ *event)
     {
         cpu_data->flags.no_reaction_always = 1;
         cpu_data->flags.nudge_disable = 1;
-        Fighter_ApplyOverlay(cpu_data, 9, 0);
-        Fighter_UpdateOverlay(cpu);
         cpu_data->dmg.percent = 0;
         Fighter_SetHUDDamage(cpu_data->ply, 0);
+
+        // if new state, apply colanim
+        if (cpu_data->TM.state_frame <= 1)
+        {
+            Fighter_ApplyOverlay(cpu_data, INTANG_COLANIM, 0);
+        }
     }
     else
     {

diff --git a/patch/events/lab/source/lab.h b/patch/events/lab/source/lab.h
@@ -528,6 +528,8 @@ enum cpu_mash
     CPUMASH_PERFECT,
 };
 
+#define INTANG_COLANIM 10
+
 // Grab Escape RNG Def
 #define CPUMASHRNG_MED 35
 #define CPUMASHRNG_HIGH 55

diff --git a/patch/tmdata/assets/evMenu.dat b/patch/tmdata/assets/evMenu.dat
diff --git a/patch/tmdata/output/TmDt.dat b/patch/tmdata/output/TmDt.dat