diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2019-10-06 14:47:08 -0700 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2019-10-06 14:47:08 -0700 |
| commit | 52d40061ecdb2b47da10083c0359e06df5470eb1 (patch) | |
| tree | 7ad8e6736a9c43cc7b87b97c4953f8a215359b68 /src/berry_powder.c | |
| parent | 0873084a5d143c4e7eab682f7d27a3255ed281b7 (diff) | |
Resolve review suggestions.
Diffstat (limited to 'src/berry_powder.c')
| -rw-r--r-- | src/berry_powder.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/berry_powder.c b/src/berry_powder.c index ad824b24b..992e82522 100644 --- a/src/berry_powder.c +++ b/src/berry_powder.c @@ -11,7 +11,7 @@ EWRAM_DATA u8 gUnknown_203F464 = 0; -u32 sub_815EE3C(u32 * a0) +u32 DecryptBerryPowder(u32 * a0) { return *a0 ^ gSaveBlock2Ptr->encryptionKey; } @@ -28,7 +28,7 @@ void sub_815EE6C(u32 a0) bool8 sub_815EE88(u32 a0) { - if (sub_815EE3C(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < a0) + if (DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < a0) return FALSE; else return TRUE; @@ -36,7 +36,7 @@ bool8 sub_815EE88(u32 a0) bool8 sub_815EEB0(void) { - if (sub_815EE3C(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < gSpecialVar_0x8004) + if (DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount) < gSpecialVar_0x8004) return FALSE; else return TRUE; @@ -45,7 +45,7 @@ bool8 sub_815EEB0(void) bool8 sub_815EEE0(u32 a0) { u32 * ptr = &gSaveBlock2Ptr->berryCrush.berryPowderAmount; - u32 amount = sub_815EE3C(ptr) + a0; + u32 amount = DecryptBerryPowder(ptr) + a0; if (amount > 99999) { SetBerryPowder(ptr, 99999); @@ -65,7 +65,7 @@ bool8 sub_815EF20(u32 a0) return FALSE; else { - u32 amount = sub_815EE3C(ptr); + u32 amount = DecryptBerryPowder(ptr); SetBerryPowder(ptr, amount - a0); return TRUE; } @@ -78,7 +78,7 @@ bool8 sub_815EF5C(void) return FALSE; else { - u32 amount = sub_815EE3C(ptr); + u32 amount = DecryptBerryPowder(ptr); SetBerryPowder(ptr, amount - gSpecialVar_0x8004); return TRUE; } @@ -86,7 +86,7 @@ bool8 sub_815EF5C(void) u32 GetBerryPowder(void) { - return sub_815EE3C(&gSaveBlock2Ptr->berryCrush.berryPowderAmount); + return DecryptBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount); } void sub_815EFBC(u8 windowId, u32 powder, u8 x, u8 y, u8 speed) |