diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-12-01 16:33:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 14:33:06 -0800 |
| commit | 4fc272fea6bc7332fae031ebeb12362cff1c35de (patch) | |
| tree | 88092c6da3a6bb741caceab54f5372aee4ad5bae /src/code_80958E8.c | |
| parent | fd8720b75c56ef3f641e6c5abf6c446929c824b9 (diff) | |
No wifi + 2 days on train = more decomp (#80)
* No wifi + 2 days on train = more decomp
* layin some more
* one func, one file
Diffstat (limited to 'src/code_80958E8.c')
| -rw-r--r-- | src/code_80958E8.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/code_80958E8.c b/src/code_80958E8.c index 7674ed4..cae46bc 100644 --- a/src/code_80958E8.c +++ b/src/code_80958E8.c @@ -34,7 +34,7 @@ extern bool8 sub_809095C(u8); extern s32 sub_8090298(u8); extern bool8 sub_809017C(u8 *); extern s16 GetBaseSpecies(s16); -extern bool8 sub_8092040(u8); +extern bool8 IsInvalidItemReward(u8); extern u8 sub_803C1D0(u8 *, u8); extern bool8 IsNotMoneyOrUsedTMItem(u8); extern u8 xxx_bit_lut_lookup_8091E50(u8 ,u8 ); @@ -107,11 +107,11 @@ bool8 IsValidWonderMail(struct WonderMail *WonderMailData) bool8 ValidateWonderMail(struct WonderMail *data) { - if(data->missionType > DELIVER_ITEM) + if(data->missionType > WONDER_MAIL_MISSION_TYPE_DELIVER_ITEM) return FALSE; else { - if(data->missionType == DELIVER_ITEM && GetMaxItemCount(data->dungeon) == 0) + if(data->missionType == WONDER_MAIL_MISSION_TYPE_DELIVER_ITEM && GetMaxItemCount(data->dungeon) == 0) return FALSE; if(data->unk2 > 9) @@ -141,11 +141,11 @@ bool8 ValidateWonderMail(struct WonderMail *data) return FALSE; // Item Delivery/Finding - if((u8)(data->missionType - 1) > FIND_POKE) + if((u8)(data->missionType - 1) > WONDER_MAIL_MISSION_TYPE_RESCUE_TARGET) if(data->targetSpecies != data->clientSpecies) return FALSE; - if(sub_8092040(data->targetItem)) + if(IsInvalidItemReward(data->targetItem)) return FALSE; if(IsThrowableItem(data->targetItem)) return FALSE; @@ -153,13 +153,13 @@ bool8 ValidateWonderMail(struct WonderMail *data) return FALSE; // Item finding - if(data->missionType == FIND_ITEM && xxx_bit_lut_lookup_8091E50(data->dungeon, data->targetItem) == 0) + if(data->missionType == WONDER_MAIL_MISSION_TYPE_FIND_ITEM && xxx_bit_lut_lookup_8091E50(data->dungeon, data->targetItem) == 0) return FALSE; if(data->rewardType == BLANK_4 || data->rewardType == END_REWARDS || data->rewardType > END_REWARDS) return FALSE; - if(sub_8092040(data->itemReward)) + if(IsInvalidItemReward(data->itemReward)) return FALSE; // Friend Area Reward |