summaryrefslogtreecommitdiff
path: root/src/item.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/item.c')
-rw-r--r--src/item.c281
1 files changed, 143 insertions, 138 deletions
diff --git a/src/item.c b/src/item.c
index b2c009be6..71c2dc0f7 100644
--- a/src/item.c
+++ b/src/item.c
@@ -1,20 +1,21 @@
#include "global.h"
#include "item.h"
#include "berry.h"
-#include "constants/items.h"
#include "string_util.h"
#include "text.h"
#include "event_data.h"
-#include "malloc.h"
+#include "alloc.h"
#include "secret_base.h"
#include "item_menu.h"
#include "strings.h"
#include "load_save.h"
+#include "item_use.h"
#include "battle_pyramid.h"
#include "battle_pyramid_bag.h"
+#include "constants/items.h"
+#include "constants/hold_effects.h"
extern u16 gUnknown_0203CF30[];
-extern const struct Item gItems[];
// this file's functions
static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count);
@@ -23,6 +24,10 @@ static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count);
// EWRAM variables
EWRAM_DATA struct BagPocket gBagPockets[POCKETS_COUNT] = {0};
+// rodata
+#include "data/text/item_descriptions.h"
+#include "data/items.h"
+
// code
static u16 GetBagItemQuantity(u16 *quantity)
{
@@ -239,152 +244,152 @@ NAKED
bool8 CheckBagHasSpace(u16 itemId, u16 count)
{
asm_unified("push {r4-r7,lr}\n\
- mov r7, r10\n\
- mov r6, r9\n\
- mov r5, r8\n\
- push {r5-r7}\n\
- sub sp, 0x4\n\
- lsls r0, 16\n\
- lsrs r0, 16\n\
- mov r8, r0\n\
- lsls r1, 16\n\
- lsrs r5, r1, 16\n\
- bl ItemId_GetPocket\n\
- lsls r0, 24\n\
- cmp r0, 0\n\
- beq _080D6906\n\
- bl InBattlePyramid\n\
- lsls r0, 24\n\
- cmp r0, 0\n\
- bne _080D6838\n\
- ldr r0, =0x00004004\n\
- bl FlagGet\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- cmp r0, 0x1\n\
- bne _080D684C\n\
+ mov r7, r10\n\
+ mov r6, r9\n\
+ mov r5, r8\n\
+ push {r5-r7}\n\
+ sub sp, 0x4\n\
+ lsls r0, 16\n\
+ lsrs r0, 16\n\
+ mov r8, r0\n\
+ lsls r1, 16\n\
+ lsrs r5, r1, 16\n\
+ bl ItemId_GetPocket\n\
+ lsls r0, 24\n\
+ cmp r0, 0\n\
+ beq _080D6906\n\
+ bl InBattlePyramid\n\
+ lsls r0, 24\n\
+ cmp r0, 0\n\
+ bne _080D6838\n\
+ ldr r0, =0x00004004\n\
+ bl FlagGet\n\
+ lsls r0, 24\n\
+ lsrs r0, 24\n\
+ cmp r0, 0x1\n\
+ bne _080D684C\n\
_080D6838:\n\
- mov r0, r8\n\
- adds r1, r5, 0\n\
- bl CheckPyramidBagHasSpace\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- b _080D6916\n\
- .pool\n\
+ mov r0, r8\n\
+ adds r1, r5, 0\n\
+ bl CheckPyramidBagHasSpace\n\
+ lsls r0, 24\n\
+ lsrs r0, 24\n\
+ b _080D6916\n\
+ .pool\n\
_080D684C:\n\
- mov r0, r8\n\
- bl ItemId_GetPocket\n\
- subs r0, 0x1\n\
- lsls r0, 24\n\
- lsrs r2, r0, 24\n\
- ldr r7, =0x000003e7\n\
- cmp r2, 0x3\n\
- beq _080D6860\n\
- movs r7, 0x63\n\
+ mov r0, r8\n\
+ bl ItemId_GetPocket\n\
+ subs r0, 0x1\n\
+ lsls r0, 24\n\
+ lsrs r2, r0, 24\n\
+ ldr r7, =0x000003e7\n\
+ cmp r2, 0x3\n\
+ beq _080D6860\n\
+ movs r7, 0x63\n\
_080D6860:\n\
- movs r6, 0\n\
- ldr r1, =gBagPockets\n\
- lsls r4, r2, 3\n\
- adds r0, r4, r1\n\
- mov r9, r4\n\
- ldrb r0, [r0, 0x4]\n\
- cmp r6, r0\n\
- bcs _080D68BC\n\
- subs r0, r2, 0x2\n\
- lsls r0, 24\n\
- lsrs r0, 24\n\
- mov r10, r0\n\
+ movs r6, 0\n\
+ ldr r1, =gBagPockets\n\
+ lsls r4, r2, 3\n\
+ adds r0, r4, r1\n\
+ mov r9, r4\n\
+ ldrb r0, [r0, 0x4]\n\
+ cmp r6, r0\n\
+ bcs _080D68BC\n\
+ subs r0, r2, 0x2\n\
+ lsls r0, 24\n\
+ lsrs r0, 24\n\
+ mov r10, r0\n\
_080D6878:\n\
- adds r0, r4, r1\n\
- ldr r1, [r0]\n\
- lsls r0, r6, 2\n\
- adds r1, r0, r1\n\
- ldrh r0, [r1]\n\
- cmp r0, r8\n\
- bne _080D68AC\n\
- adds r0, r1, 0x2\n\
- str r2, [sp]\n\
- bl GetBagItemQuantity\n\
- lsls r0, 16\n\
- lsrs r1, r0, 16\n\
- adds r0, r1, r5\n\
- ldr r2, [sp]\n\
- cmp r0, r7\n\
- ble _080D6914\n\
- mov r0, r10\n\
- cmp r0, 0x1\n\
- bls _080D6906\n\
- subs r0, r7, r1\n\
- subs r0, r5, r0\n\
- lsls r0, 16\n\
- lsrs r5, r0, 16\n\
- cmp r5, 0\n\
- beq _080D6914\n\
+ adds r0, r4, r1\n\
+ ldr r1, [r0]\n\
+ lsls r0, r6, 2\n\
+ adds r1, r0, r1\n\
+ ldrh r0, [r1]\n\
+ cmp r0, r8\n\
+ bne _080D68AC\n\
+ adds r0, r1, 0x2\n\
+ str r2, [sp]\n\
+ bl GetBagItemQuantity\n\
+ lsls r0, 16\n\
+ lsrs r1, r0, 16\n\
+ adds r0, r1, r5\n\
+ ldr r2, [sp]\n\
+ cmp r0, r7\n\
+ ble _080D6914\n\
+ mov r0, r10\n\
+ cmp r0, 0x1\n\
+ bls _080D6906\n\
+ subs r0, r7, r1\n\
+ subs r0, r5, r0\n\
+ lsls r0, 16\n\
+ lsrs r5, r0, 16\n\
+ cmp r5, 0\n\
+ beq _080D6914\n\
_080D68AC:\n\
- adds r0, r6, 0x1\n\
- lsls r0, 24\n\
- lsrs r6, r0, 24\n\
- ldr r1, =gBagPockets\n\
- adds r0, r4, r1\n\
- ldrb r0, [r0, 0x4]\n\
- cmp r6, r0\n\
- bcc _080D6878\n\
+ adds r0, r6, 0x1\n\
+ lsls r0, 24\n\
+ lsrs r6, r0, 24\n\
+ ldr r1, =gBagPockets\n\
+ adds r0, r4, r1\n\
+ ldrb r0, [r0, 0x4]\n\
+ cmp r6, r0\n\
+ bcc _080D6878\n\
_080D68BC:\n\
- cmp r5, 0\n\
- beq _080D6914\n\
- movs r6, 0\n\
- ldr r3, =gBagPockets\n\
- mov r1, r9\n\
- adds r0, r1, r3\n\
- ldrb r0, [r0, 0x4]\n\
- cmp r6, r0\n\
- bcs _080D6902\n\
- adds r4, r3, 0\n\
- subs r0, r2, 0x2\n\
- lsls r0, 24\n\
- lsrs r2, r0, 24\n\
+ cmp r5, 0\n\
+ beq _080D6914\n\
+ movs r6, 0\n\
+ ldr r3, =gBagPockets\n\
+ mov r1, r9\n\
+ adds r0, r1, r3\n\
+ ldrb r0, [r0, 0x4]\n\
+ cmp r6, r0\n\
+ bcs _080D6902\n\
+ adds r4, r3, 0\n\
+ subs r0, r2, 0x2\n\
+ lsls r0, 24\n\
+ lsrs r2, r0, 24\n\
_080D68D6:\n\
- adds r0, r1, r4\n\
- ldr r1, [r0]\n\
- lsls r0, r6, 2\n\
- adds r0, r1\n\
- ldrh r0, [r0]\n\
- cmp r0, 0\n\
- bne _080D68F2\n\
- cmp r5, r7\n\
- bls _080D6914\n\
- cmp r2, 0x1\n\
- bls _080D6906\n\
- subs r0, r5, r7\n\
- lsls r0, 16\n\
- lsrs r5, r0, 16\n\
+ adds r0, r1, r4\n\
+ ldr r1, [r0]\n\
+ lsls r0, r6, 2\n\
+ adds r0, r1\n\
+ ldrh r0, [r0]\n\
+ cmp r0, 0\n\
+ bne _080D68F2\n\
+ cmp r5, r7\n\
+ bls _080D6914\n\
+ cmp r2, 0x1\n\
+ bls _080D6906\n\
+ subs r0, r5, r7\n\
+ lsls r0, 16\n\
+ lsrs r5, r0, 16\n\
_080D68F2:\n\
- adds r0, r6, 0x1\n\
- lsls r0, 24\n\
- lsrs r6, r0, 24\n\
- mov r1, r9\n\
- adds r0, r1, r3\n\
- ldrb r0, [r0, 0x4]\n\
- cmp r6, r0\n\
- bcc _080D68D6\n\
+ adds r0, r6, 0x1\n\
+ lsls r0, 24\n\
+ lsrs r6, r0, 24\n\
+ mov r1, r9\n\
+ adds r0, r1, r3\n\
+ ldrb r0, [r0, 0x4]\n\
+ cmp r6, r0\n\
+ bcc _080D68D6\n\
_080D6902:\n\
- cmp r5, 0\n\
- beq _080D6914\n\
+ cmp r5, 0\n\
+ beq _080D6914\n\
_080D6906:\n\
- movs r0, 0\n\
- b _080D6916\n\
- .pool\n\
+ movs r0, 0\n\
+ b _080D6916\n\
+ .pool\n\
_080D6914:\n\
- movs r0, 0x1\n\
+ movs r0, 0x1\n\
_080D6916:\n\
- add sp, 0x4\n\
- pop {r3-r5}\n\
- mov r8, r3\n\
- mov r9, r4\n\
- mov r10, r5\n\
- pop {r4-r7}\n\
- pop {r1}\n\
- bx r1");
+ add sp, 0x4\n\
+ pop {r3-r5}\n\
+ mov r8, r3\n\
+ mov r9, r4\n\
+ mov r10, r5\n\
+ pop {r4-r7}\n\
+ pop {r1}\n\
+ bx r1");
}
#endif // NONMATCHING
@@ -538,7 +543,7 @@ bool8 RemoveBagItem(u16 itemId, u16 count)
VarSet(VAR_0x40ED, itemId);
}
- var = sub_81ABB2C(pocket);
+ var = GetItemListPosition(pocket);
if (itemPocket->capacity > var
&& itemPocket->itemSlots[var].itemId == itemId)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 01:39:08 +0000