From 56dc9951e69afb5b0e376b83a3dd1b4872bd93e2 Mon Sep 17 00:00:00 2001
From: voloved <36523934+voloved@users.noreply.github.com>
Date: Mon, 10 Apr 2023 17:10:11 -0400
Subject: [PATCH] Removed check for if cleanse tag is registered

---
 ...oll-Do-the-Same-for-Trainers-Seeing-You.md | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/Make-Cleanse-Tag-Avoid-All-Wild-Encounters-and-Usable-If-Held-By-Anyone-in-Your-Party;-Make-PokeDoll-Do-the-Same-for-Trainers-Seeing-You.md b/Make-Cleanse-Tag-Avoid-All-Wild-Encounters-and-Usable-If-Held-By-Anyone-in-Your-Party;-Make-PokeDoll-Do-the-Same-for-Trainers-Seeing-You.md
index 4a37b36..24f7578 100644
--- a/Make-Cleanse-Tag-Avoid-All-Wild-Encounters-and-Usable-If-Held-By-Anyone-in-Your-Party;-Make-PokeDoll-Do-the-Same-for-Trainers-Seeing-You.md
+++ b/Make-Cleanse-Tag-Avoid-All-Wild-Encounters-and-Usable-If-Held-By-Anyone-in-Your-Party;-Make-PokeDoll-Do-the-Same-for-Trainers-Seeing-You.md
@@ -9,13 +9,13 @@ static void ApplyCleanseTagEncounterRateMod(u32 *encRate)
 {
 -    if (GetMonData(&gPlayerParty[0], MON_DATA_HELD_ITEM) == ITEM_CLEANSE_TAG)
 -        *encRate = *encRate * 2 / 3;
-    int i;
-    for (i = 0; i < PARTY_SIZE; i++){
-        if (GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) == ITEM_CLEANSE_TAG){
-            *encRate = 0;
-            break;
-        }
-    }
++    int i;
++    for (i = 0; i < PARTY_SIZE; i++){
++        if (GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) == ITEM_CLEANSE_TAG){
++            *encRate = 0;
++            break;
++        }
++    }
 }
 ```
 
@@ -107,19 +107,13 @@ In `item_use.c`, define what happens when you select the cleanse tag:
 +    {
 +        FlagSet(FLAG_CLEANSE_TAG);
 +        PlaySE(SE_EXP_MAX);
-+        if (gTasks[taskId].tUsingRegisteredKeyItem) // to account for pressing select in the overworld
-+            DisplayItemMessageOnField(taskId, gText_CleanseTagTurnOn, Task_CloseCantUseKeyItemMessage);
-+        else
-+            DisplayItemMessage(taskId, 1, gText_CleanseTagTurnOn, CloseItemMessage);
++        DisplayItemMessage(taskId, 1, gText_CleanseTagTurnOn, CloseItemMessage);
 +    }
 +    else
 +    {
 +        FlagClear(FLAG_CLEANSE_TAG);
 +        PlaySE(SE_PC_OFF);
-+        if (gTasks[taskId].tUsingRegisteredKeyItem) // to account for pressing select in the overworld
-+            DisplayItemMessageOnField(taskId, gText_CleanseTagTurnOff, Task_CloseCantUseKeyItemMessage);
-+        else
-+            DisplayItemMessage(taskId, 1, gText_CleanseTagTurnOff, CloseItemMessage);
++        DisplayItemMessage(taskId, 1, gText_CleanseTagTurnOff, CloseItemMessage);
 +    }
 +}