ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-31 16:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed Gen 4 Ability field effects

Browse Source
This commit is contained in:
Fontbane 2019-04-01 23:07:21 -04:00
parent 2cfa5ea326
commit 562ad70915
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/battle_script_commands.c
View File

@ -10540,7 +10540,7 @@ static void atkE5_pickup(void)
species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL); 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) if (lvlDivBy10 > 9)
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;
}
} }
} }

6
src/wild_encounter.c
View File

@ -487,12 +487,6 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
encounterRate *= 2; encounterRate *= 2;
else if (ability == ABILITY_SAND_VEIL && gSaveBlock1Ptr->weather == 8) else if (ability == ABILITY_SAND_VEIL && gSaveBlock1Ptr->weather == 8)
encounterRate /= 2; 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) if (encounterRate > 2880)
encounterRate = 2880; encounterRate = 2880;