dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve review suggestions.

Browse Source
This commit is contained in:
ultima-soul
2019-10-06 14:47:08 -07:00
parent 0873084a5d
commit 52d40061ec
10 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/berry_powder.c
+7 -7
View File
@@ -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)