From 61fa1f227a0de31d54c90ea93c207241a0243a62 Mon Sep 17 00:00:00 2001 From: UnclePunch Date: Wed, 2 Dec 2020 05:05:43 -0500 Subject: [PATCH] lab: fix intang colanim --- patch/events/lab/output/EvLab.dat | Bin 61979 -> 62019 bytes patch/events/lab/source/lab.c | 23 ++++++++++++++++------- patch/events/lab/source/lab.h | 2 ++ patch/tmdata/assets/evMenu.dat | Bin 14003 -> 14051 bytes patch/tmdata/output/TmDt.dat | Bin 42982 -> 43030 bytes 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/patch/events/lab/output/EvLab.dat b/patch/events/lab/output/EvLab.dat index a3058a2f9c42da93b6ab46183eca5e7aec31e21b..56d670f10c7d72eb9308a553f0cc3e46b697fa5b 100644 GIT binary patch delta 14699 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 delta 14717 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 + + // 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 index bef3b029..b6b2f89a 100644 --- 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 index 94baf18609062d80ec6e1ab736adafa99167393e..8b779ba7db4cdb23646bd5b78cc76f6e51d84df9 100644 GIT binary patch delta 96 zcmdm-`#6_}fx+xC1A}1z0|R5^MjkCyCPSUc7OKaX3@s+9&0;ci**r&W1J`5+Lmm*` q>|nT@SyqIBLDd9^ZGboeh*tpd8X&#`#CInDF_C7h*eqf?pAi7bav0VC delta 78 zcmaEyyE&JKfx&Du1B0Os0|R5&MjkCyCI*Jd7OKa9)Fic8KyvdOwGCXG3k+v7Pv$q3 a5dFizpvD5k3P9`v#2!Fgu-V0QJ|h6}p%MQ8 diff --git a/patch/tmdata/output/TmDt.dat b/patch/tmdata/output/TmDt.dat index 086374ba6d7afe2ff6750e15788d500909ff564c..2ee88d2bb54b99d8eba5dc3d74fc788bc7de88d9 100644 GIT binary patch delta 145 zcmaEMo@v?zCLRWc6=Dnwi&7XE7-Kf_D9iI3DHs_T87LT-S{WEy8JTRhlmAi1v`A;N z#k6Bgi!3HhpT)GuW%Hcr8@MJrEaCy-%?^upGs}uFFibN6VjCci0OA!uyatG`0P&s4 j0?VWsD>iE^o6IO00JJRxh+`NSY8x29U{S#23(Lg-!oMt) delta 108 zcmbPsf$7R6