diff options
| author | Garak <thomastaps194@comcast.net> | 2018-06-24 13:45:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-24 13:45:15 -0400 |
| commit | b3dec86071ae7d2eb5c1258ea778f0e823a5f636 (patch) | |
| tree | 594590b12dc14049b9c17587d8b602686a4c57fa /src/party_menu.c | |
| parent | ac636ec14e896214b549025e671fc6ae7f6fd045 (diff) | |
| parent | 4313b2f49d22f4e5a6db3c45f9f3a434079a7c1f (diff) | |
Merge pull request #1 from pret/master
upstream merge
Diffstat (limited to 'src/party_menu.c')
| -rw-r--r-- | src/party_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index a4b7b0ffa..52c637879 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -4456,7 +4456,7 @@ bool8 IsBlueYellowRedFlute(u16 item) return FALSE; } -void sub_8070048(u8 taskId, u16 item, TaskFunc func) +void DoSacredAshItemEffect(u8 taskId, u16 item, TaskFunc func) { ewram1C000.unk10 = func; ewram1C000.unk4 = taskId; @@ -4473,7 +4473,7 @@ void sub_8070088(u8 taskId) u8 taskId2; gTasks[taskId].func = TaskDummy; - if (GetMonData(&gPlayerParty[ewram1C000.primarySelectedMonIndex], MON_DATA_SPECIES) == 0) + if (GetMonData(&gPlayerParty[ewram1C000.primarySelectedMonIndex], MON_DATA_SPECIES) == SPECIES_NONE) { gTasks[taskId].func = sub_80701DC; } |