Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed check for if cleanse tag is registered

voloved 2023-04-10 17:10:11 -04:00
parent 74a5adcabd
commit 56dc9951e6
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
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) - if (GetMonData(&gPlayerParty[0], MON_DATA_HELD_ITEM) == ITEM_CLEANSE_TAG)
- *encRate = *encRate * 2 / 3; - *encRate = *encRate * 2 / 3;
int i; + int i;
for (i = 0; i < PARTY_SIZE; i++){ + for (i = 0; i < PARTY_SIZE; i++){
if (GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) == ITEM_CLEANSE_TAG){ + if (GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM) == ITEM_CLEANSE_TAG){
*encRate = 0; + *encRate = 0;
break; + break;
} + }
} + }
} }
``` ```
@ -107,18 +107,12 @@ In `item_use.c`, define what happens when you select the cleanse tag:
+ { + {
+ FlagSet(FLAG_CLEANSE_TAG); + FlagSet(FLAG_CLEANSE_TAG);
+ PlaySE(SE_EXP_MAX); + 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 + else
+ { + {
+ FlagClear(FLAG_CLEANSE_TAG); + FlagClear(FLAG_CLEANSE_TAG);
+ PlaySE(SE_PC_OFF); + 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);
+ } + }
+} +}