summaryrefslogtreecommitdiff
path: root/src/decoration_inventory.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-06-13 22:01:30 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-06-13 22:01:30 -0400
commit212bb0566f12c44685e39e3285d4332a88a8feb1 (patch)
tree169d21413d481de3f18e5509df0b0addc3882dd1 /src/decoration_inventory.c
parent355498d85b71536580025364ccaa5ceb94c4194d (diff)
parent134cb1c9ec1d1a3a82a88d5065bf0758f9d906a6 (diff)
Merge branch 'decoration' into decoration_inventory
Diffstat (limited to 'src/decoration_inventory.c')
-rwxr-xr-xsrc/decoration_inventory.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c
index c3dfdb2a8..6463f50dc 100755
--- a/src/decoration_inventory.c
+++ b/src/decoration_inventory.c
@@ -56,7 +56,7 @@ bool8 sub_8133FE4(u8 decorIdx)
{
u8 invIdx;
u8 i;
- invIdx = gDecorations[decorIdx].decor_field_13;
+ invIdx = gDecorations[decorIdx].category;
for (i=0; i<gDecorationInventories[invIdx].size; i++)
{
if (gDecorationInventories[invIdx].items[i] == decorIdx)
@@ -75,7 +75,7 @@ bool8 IsThereStorageSpaceForDecoration(u8 decorIdx)
{
return FALSE;
}
- invIdx = gDecorations[decorIdx].decor_field_13;
+ invIdx = gDecorations[decorIdx].category;
invSlot = sub_8133F9C(invIdx);
if (invSlot == -1)
{
@@ -92,7 +92,7 @@ bool8 sub_8134074(u8 decorIdx)
{
return FALSE;
}
- invIdx = gDecorations[decorIdx].decor_field_13;
+ invIdx = gDecorations[decorIdx].category;
if (sub_8133F9C(invIdx) == -1)
{
return FALSE;
@@ -109,9 +109,9 @@ bool8 sub_81340A8(u8 decorIdx)
{
return FALSE;
}
- for (i=0; i<gDecorationInventories[gDecorations[decorIdx].decor_field_13].size; i++)
+ for (i=0; i<gDecorationInventories[gDecorations[decorIdx].category].size; i++)
{
- invIdx = gDecorations[decorIdx].decor_field_13;
+ invIdx = gDecorations[decorIdx].category;
if (gDecorationInventories[invIdx].items[i] == decorIdx)
{
gDecorationInventories[invIdx].items[i] = DECOR_NONE;