begin decompiling item.s

6 files changed, 95 insertions, 152 deletions

diff --git a/asm/item.s b/asm/item.s
index 35d1839f3..4e5998573 100644
--- a/asm/item.s
+++ b/asm/item.s
@@ -5,146 +5,6 @@
 
 	.text
 
-	thumb_func_start GetBagItemQuantity
-GetBagItemQuantity: @ 80D6554
-	adds r1, r0, 0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	adds r0, 0xAC
-	ldr r0, [r0]
-	ldrh r1, [r1]
-	eors r0, r1
-	lsls r0, 16
-	lsrs r0, 16
-	bx lr
-	.pool
-	thumb_func_end GetBagItemQuantity
-
-	thumb_func_start SetBagItemQuantity
-SetBagItemQuantity: @ 80D656C
-	lsls r1, 16
-	lsrs r1, 16
-	ldr r2, =gSaveBlock2Ptr
-	ldr r2, [r2]
-	adds r2, 0xAC
-	ldr r2, [r2]
-	eors r1, r2
-	strh r1, [r0]
-	bx lr
-	.pool
-	thumb_func_end SetBagItemQuantity
-
-	thumb_func_start sub_80D6584
-sub_80D6584: @ 80D6584
-	ldrh r0, [r0]
-	bx lr
-	thumb_func_end sub_80D6584
-
-	thumb_func_start sub_80D6588
-sub_80D6588: @ 80D6588
-	strh r1, [r0]
-	bx lr
-	thumb_func_end sub_80D6588
-
-	thumb_func_start encrypt_decrypt_all_item_quantities
-encrypt_decrypt_all_item_quantities: @ 80D658C
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x4
-	mov r8, r0
-	movs r1, 0
-	ldr r0, =gBagItems
-	mov r9, r0
-_080D659E:
-	movs r6, 0
-	lsls r5, r1, 3
-	mov r2, r9
-	adds r0, r5, r2
-	adds r7, r1, 0x1
-	ldrb r0, [r0, 0x4]
-	cmp r6, r0
-	bcs _080D65CC
-	ldr r2, =gBagItems
-_080D65B0:
-	adds r4, r5, r2
-	lsls r1, r6, 2
-	ldr r0, [r4]
-	adds r0, r1
-	adds r0, 0x2
-	mov r1, r8
-	str r2, [sp]
-	bl apply_u16_xor_crypto
-	adds r6, 0x1
-	ldr r2, [sp]
-	ldrb r4, [r4, 0x4]
-	cmp r6, r4
-	bcc _080D65B0
-_080D65CC:
-	adds r1, r7, 0
-	cmp r1, 0x4
-	bls _080D659E
-	add sp, 0x4
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end encrypt_decrypt_all_item_quantities
-
-	thumb_func_start call_encrypt_decrypt_all_item_quantities
-call_encrypt_decrypt_all_item_quantities: @ 80D65E4
-	push {lr}
-	bl encrypt_decrypt_all_item_quantities
-	pop {r0}
-	bx r0
-	thumb_func_end call_encrypt_decrypt_all_item_quantities
-
-	thumb_func_start init_bag_pockets
-@ void init_bag_pockets()
-init_bag_pockets: @ 80D65F0
-	push {r4,lr}
-	ldr r1, =gBagItems
-	ldr r0, =gSaveBlock1Ptr
-	ldr r2, [r0]
-	movs r3, 0xAC
-	lsls r3, 3
-	adds r0, r2, r3
-	str r0, [r1]
-	movs r3, 0x1E
-	strb r3, [r1, 0x4]
-	movs r4, 0xBB
-	lsls r4, 3
-	adds r0, r2, r4
-	str r0, [r1, 0x20]
-	adds r0, r1, 0
-	adds r0, 0x24
-	strb r3, [r0]
-	movs r3, 0xCA
-	lsls r3, 3
-	adds r0, r2, r3
-	str r0, [r1, 0x8]
-	movs r0, 0x10
-	strb r0, [r1, 0xC]
-	adds r4, 0xB8
-	adds r0, r2, r4
-	str r0, [r1, 0x10]
-	movs r0, 0x40
-	strb r0, [r1, 0x14]
-	movs r0, 0xF2
-	lsls r0, 3
-	adds r2, r0
-	str r2, [r1, 0x18]
-	movs r0, 0x2E
-	strb r0, [r1, 0x1C]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end init_bag_pockets
 
 	thumb_func_start itemid_get_name
 @ void itemid_get_name(int item_id, char *dest)
@@ -1076,7 +936,7 @@ _080D6D28:
 	adds r0, r1, r2
 	ldr r1, =0x0000049a
 	adds r0, r1
-	bl sub_80D6584
+	bl GetBagItemId
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, r5
@@ -1127,7 +987,7 @@ _080D6D9C:
 	bne _080D6DD0
 	adds r4, r1, 0x2
 	adds r0, r4, 0
-	bl sub_80D6584
+	bl GetBagItemId
 	lsls r0, 16
 	lsrs r2, r0, 16
 	adds r1, r2, r5
@@ -1141,7 +1001,7 @@ _080D6D9C:
 	lsrs r5, r0, 16
 	adds r0, r4, 0
 	adds r1, r3, 0
-	bl sub_80D6588
+	bl SetBagItemId
 	cmp r5, 0
 	beq _080D6E20
 _080D6DD0:
@@ -1168,7 +1028,7 @@ _080D6E04:
 	lsls r1, 16
 	lsrs r1, 16
 	adds r0, r4, 0
-	bl sub_80D6588
+	bl SetBagItemId
 	b _080D6E20
 _080D6E10:
 	lsls r0, r1, 2
@@ -1177,7 +1037,7 @@ _080D6E10:
 	strh r1, [r0]
 	adds r0, 0x2
 	adds r1, r5, 0
-	bl sub_80D6588
+	bl SetBagItemId
 _080D6E20:
 	ldr r0, =gSaveBlock1Ptr
 	ldr r0, [r0]
diff --git a/asm/load_save.s b/asm/load_save.s
index 6cbb2bdb2..8cb8ee993 100644
--- a/asm/load_save.s
+++ b/asm/load_save.s
@@ -86,7 +86,7 @@ InitSaveBlockPointersWithRandomOffset: @ 8076BDC
 	ldr r0, =gUnknown_02029808
 	adds r4, r0
 	str r4, [r1]
-	bl init_bag_pockets
+	bl SetBagItemsPointers
 	bl sub_81617F4
 	pop {r4,r5}
 	pop {r0}
@@ -685,7 +685,7 @@ _080770A0:
 	ldr r1, [r2]
 	str r1, [r0]
 	adds r0, r4, 0
-	bl encrypt_decrypt_all_item_quantities
+	bl ApplyNewEncyprtionKeyToBagItems
 	ldr r0, [r7]
 	adds r0, 0xAC
 	str r4, [r0]
@@ -699,8 +699,8 @@ _080770A0:
 	.pool
 	thumb_func_end copy_bags_and_unk_data_to_save_blocks
 
-	thumb_func_start apply_u16_xor_crypto
-apply_u16_xor_crypto: @ 8077100
+	thumb_func_start ApplyNewEncyprtionKeyToHword
+ApplyNewEncyprtionKeyToHword: @ 8077100
 	ldr r2, =gSaveBlock2Ptr
 	ldr r2, [r2]
 	adds r2, 0xAC
@@ -711,7 +711,7 @@ apply_u16_xor_crypto: @ 8077100
 	strh r2, [r0]
 	bx lr
 	.pool
-	thumb_func_end apply_u16_xor_crypto
+	thumb_func_end ApplyNewEncyprtionKeyToHword
 
 	thumb_func_start apply_u32_xor_crypto
 apply_u32_xor_crypto: @ 8077118
@@ -733,7 +733,7 @@ saveblock_apply_crypto: @ 8077130
 	adds r4, r0, 0
 	bl sub_8084864
 	adds r0, r4, 0
-	bl call_encrypt_decrypt_all_item_quantities
+	bl ApplyNewEncyprtionKeyToBagItems_
 	adds r0, r4, 0
 	bl sub_8024690
 	ldr r5, =gSaveBlock1Ptr
@@ -747,7 +747,7 @@ saveblock_apply_crypto: @ 8077130
 	ldr r1, =0x00000494
 	adds r0, r1
 	adds r1, r4, 0
-	bl apply_u16_xor_crypto
+	bl ApplyNewEncyprtionKeyToHword
 	pop {r4,r5}
 	pop {r0}
 	bx r0
diff --git a/include/global.h b/include/global.h
index c201b554f..85ac787ec 100644
--- a/include/global.h
+++ b/include/global.h
@@ -129,6 +129,8 @@ struct SaveBlock2
     /*0x90*/ u8 filler_90[0x8];
     /*0x98*/ struct Time localTimeOffset;
     /*0xA0*/ struct Time lastBerryTreeUpdate;
+    /*0xA8*/ u8 filler_A8[0x4];
+    /*0xAC*/ u32 encryptionKey;
 };
 
 extern struct SaveBlock2 *gSaveBlock2Ptr;
diff --git a/include/item.h b/include/item.h
new file mode 100644
index 000000000..adcbfb01d
--- /dev/null
+++ b/include/item.h
@@ -0,0 +1,4 @@
+#ifndef ITEM_H
+#define ITEM_H
+
+#endif // ITEM_H
diff --git a/ld_script.txt b/ld_script.txt
index 3825dde6f..d71092981 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -121,6 +121,7 @@ SECTIONS {
         asm/pokedex.o(.text);
         asm/trainer_card.o(.text);
         asm/rom_80C6FA0.o(.text);
+        src/item.o(.text);
         asm/item.o(.text);
         asm/contest.o(.text);
         asm/shop.o(.text);
diff --git a/src/item.c b/src/item.c
new file mode 100644
index 000000000..c68922c0e
--- /dev/null
+++ b/src/item.c
@@ -0,0 +1,76 @@
+#include "global.h"
+#include "item.h"
+
+extern void ApplyNewEncyprtionKeyToHword(u16* hword, u32 newKey);
+
+enum
+{
+    ITEMS_POCKET,
+    BALLS_POCKET,
+    TMHM_POCKET,
+    BERRIES_POCKET,
+    KEYITEMS_POCKET
+};
+
+struct BagItem
+{
+    struct ItemSlot (*items)[];
+    u8 maxPerPocket;
+};
+
+extern struct BagItem gBagItems[];
+
+u16 GetBagItemQuantity(u16* quantity)
+{
+    return gSaveBlock2Ptr->encryptionKey ^ *quantity;
+}
+
+void SetBagItemQuantity(u16* quantity, u16 newValue)
+{
+    *quantity =  newValue ^ gSaveBlock2Ptr->encryptionKey;
+}
+
+u16 GetBagItemId(u16* slot)
+{
+    return *slot;
+}
+
+void SetBagItemId(u16* slot, u16 newItemId)
+{
+    *slot = newItemId;
+}
+
+void ApplyNewEncyprtionKeyToBagItems(u32 newKey)
+{
+    u32 pocket, item;
+    for (pocket = 0; pocket < 5; pocket++)
+    {
+        for (item = 0; item < gBagItems[pocket].maxPerPocket; item++)
+            ApplyNewEncyprtionKeyToHword(&((*gBagItems[pocket].items)[item].quantity), newKey);
+    }
+}
+
+void ApplyNewEncyprtionKeyToBagItems_(u32 newKey) // really GF?
+{
+    ApplyNewEncyprtionKeyToBagItems(newKey);
+}
+
+// TODO: move those max values to defines
+
+void SetBagItemsPointers(void)
+{
+    gBagItems[ITEMS_POCKET].items = &gSaveBlock1Ptr->bagPocket_Items;
+    gBagItems[ITEMS_POCKET].maxPerPocket = 30;
+
+    gBagItems[KEYITEMS_POCKET].items = &gSaveBlock1Ptr->bagPocket_KeyItems;
+    gBagItems[KEYITEMS_POCKET].maxPerPocket = 30;
+
+    gBagItems[BALLS_POCKET].items = &gSaveBlock1Ptr->bagPocket_PokeBalls;
+    gBagItems[BALLS_POCKET].maxPerPocket = 16;
+
+    gBagItems[TMHM_POCKET].items = &gSaveBlock1Ptr->bagPocket_TMHM;
+    gBagItems[TMHM_POCKET].maxPerPocket = 64;
+
+    gBagItems[BERRIES_POCKET].items = &gSaveBlock1Ptr->bagPocket_Berries;
+    gBagItems[BERRIES_POCKET].maxPerPocket = 46;
+}