From 562ad709151bf103a3e9ebdab9535f960f78f852 Mon Sep 17 00:00:00 2001 From: Fontbane Date: Mon, 1 Apr 2019 23:07:21 -0400 Subject: [PATCH] Removed Gen 4 Ability field effects --- src/battle_script_commands.c | 12 +----------- src/wild_encounter.c | 6 ------ 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a3d724c0ae..4563e587ba 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -10540,7 +10540,7 @@ static void atkE5_pickup(void) species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL); - lvlDivBy10 = (level - 1) / 10; + lvlDivBy10 = (level - 1) / 10; //Moving this here makes it easier to add in abilities like Honey Gather if (lvlDivBy10 > 9) lvlDivBy10 = 9; @@ -10572,16 +10572,6 @@ static void atkE5_pickup(void) } } } - else if (ability == ABILITY_HONEY_GATHER - && species != 0 - && species != SPECIES_EGG - && heldItem == ITEM_NONE - && (Random()%100 <= lvlDivBy10*5+5)) - { - u16 honey = ITEM_HONEY; - SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &honey); - break; - } } } diff --git a/src/wild_encounter.c b/src/wild_encounter.c index be97c73ac1..b860da13ec 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -487,12 +487,6 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility) encounterRate *= 2; else if (ability == ABILITY_SAND_VEIL && gSaveBlock1Ptr->weather == 8) encounterRate /= 2; - else if (ability == ABILITY_SNOW_CLOAK && gSaveBlock1Ptr->weather == 4) - encounterRate /= 2; - else if (ability == ABILITY_QUICK_FEET && gSaveBlock1Ptr->weather == 8) - encounterRate /= 2; - else if (ability == ABILITY_NO_GUARD) - encounterRate = encounterRate * 150 / 100; } if (encounterRate > 2880) encounterRate = 2880;