ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-19 12:08:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2284 from StephenLynx/master

Browse Source 
Fixed pickup running when it shouldn't in some cases.
This commit is contained in:
Eduardo Quezada D'Ottone 2022-09-01 14:55:36 -04:00 committed by GitHub
commit 875f656045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/battle_script_commands.c
View File

@ -13313,10 +13313,7 @@ static void Cmd_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);
if (GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM)) ability = gBaseStats[species].abilities[GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM)];
ability = gBaseStats[species].abilities[1];
else
ability = gBaseStats[species].abilities[0];
if (ability == ABILITY_PICKUP if (ability == ABILITY_PICKUP
&& species != SPECIES_NONE && species != SPECIES_NONE
@ -13352,10 +13349,7 @@ static void Cmd_pickup(void)
if (lvlDivBy10 > 9) if (lvlDivBy10 > 9)
lvlDivBy10 = 9; lvlDivBy10 = 9;
if (GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM)) ability = gBaseStats[species].abilities[GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM)];
ability = gBaseStats[species].abilities[1];
else
ability = gBaseStats[species].abilities[0];
if (ability == ABILITY_PICKUP if (ability == ABILITY_PICKUP
&& species != SPECIES_NONE && species != SPECIES_NONE