10 files changed, 23 insertions, 23 deletions
diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s
index f4fc02fe..75c42499 100644
--- a/arm9/modules/05/asm/mod05_021E1374.s
+++ b/arm9/modules/05/asm/mod05_021E1374.s
@@ -400,7 +400,7 @@ MOD05_021E1654: ; 0x021E1654
 	ldr r1, _021E16C4 ; =0x000001BB
 	mov r2, #1
 	mov r3, #4
-	bl BagHasItem
+	bl Bag_HasItem
 	cmp r0, #1
 	bne _021E1692
 	cmp r6, #0x64
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index a6ee875d..a0965880 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -26811,7 +26811,7 @@ _021EFCC4:
 	ldr r1, _021EFD3C ; =0x000001B5
 	mov r2, #1
 	mov r3, #4
-	bl BagHasItem
+	bl Bag_HasItem
 	cmp r0, #1
 	bne _021EFCFE
 	add r0, r6, #0
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 0e2dd1b6..a19163b0 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -9811,7 +9811,7 @@ MOD06_0223E1D8: ; 0x0223E1D8
 	ldrh r1, [r5, r1]
 	ldr r0, [r5, r0]
 	mov r2, #0xb
-	bl BagGetQuantity
+	bl Bag_GetQuantity
 	add r4, r0, #0
 	b _0223E214
 _0223E1FA:
@@ -10005,7 +10005,7 @@ MOD06_0223E384: ; 0x0223E384
 	ldrh r2, [r4, r2]
 	ldr r0, [r4, r0]
 	mov r3, #0xb
-	bl BagHasSpaceForItem
+	bl Bag_HasSpaceForItem
 	b _0223E3D2
 _0223E3A8:
 	cmp r0, #1
@@ -10507,7 +10507,7 @@ _0223E7B2:
 	ldrh r2, [r4, r2]
 	ldr r0, [r4, r0]
 	mov r3, #0xb
-	bl BagAddItem
+	bl Bag_AddItem
 	b _0223E7F6
 _0223E7D0:
 	cmp r0, #1
@@ -10622,7 +10622,7 @@ _0223E88A:
 	mov r1, #0xc
 	mov r2, #1
 	mov r3, #0xb
-	bl BagAddItem
+	bl Bag_AddItem
 	cmp r0, #1
 	bne _0223E902
 	add r0, r5, #0
@@ -42756,7 +42756,7 @@ MOD06_0224E410: ; 0x0224E410
 	add r1, #0x95
 	lsl r1, r1, #0x10
 	lsr r1, r1, #0x10
-	bl BagGetQuantity
+	bl Bag_GetQuantity
 	ldr r1, [r5, #0xc]
 	add r3, r0, #0
 	add r2, r1, r4
@@ -42870,7 +42870,7 @@ MOD06_0224E4E4: ; 0x0224E4E4
 	add r1, #0x95
 	lsl r1, r1, #0x10
 	lsr r1, r1, #0x10
-	bl BagGetQuantity
+	bl Bag_GetQuantity
 	add r1, r5, r4
 	ldr r1, [r1, #8]
 	cmp r0, r1
@@ -42912,7 +42912,7 @@ MOD06_0224E520: ; 0x0224E520
 	add r0, r6, #0
 	lsr r1, r1, #0x10
 	lsr r2, r2, #0x10
-	bl BagTakeItem
+	bl Bag_TakeItem
 	cmp r0, #1
 	beq _0224E550
 	bl ErrorHandling
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 97479bc1..571d34b6 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -3802,7 +3802,7 @@ MOD09_02213C84: ; 0x02213C84
 	add r1, r4, #0
 	mov r2, #1
 	add r3, r7, #0
-	bl BagTakeItem
+	bl Bag_TakeItem
 _02213CA8:
 	add r0, r5, #0
 	bl MOD11_02230218
@@ -14295,7 +14295,7 @@ MOD09_0221944C: ; 0x0221944C
 	add r1, r4, #0
 	mov r2, #1
 	add r3, r7, #0
-	bl BagTakeItem
+	bl Bag_TakeItem
 	add r0, r5, #0
 	bl MOD11_02230218
 	add r1, r4, #0
@@ -15275,7 +15275,7 @@ _02219C48:
 	ldr r0, [r3, #8]
 	ldr r3, [r3, #0xc]
 	mov r2, #1
-	bl BagHasItem
+	bl Bag_HasItem
 	cmp r0, #0
 	bne _02219C62
 	ldr r1, [r4]
@@ -15351,7 +15351,7 @@ _02219CCA:
 	lsl r2, r2, #0x10
 	ldr r1, [sp, #8]
 	lsr r2, r2, #0x10
-	bl BagGetPocketSlotN
+	bl Bag_GetPocketSlotN
 	add r5, r0, #0
 	beq _02219D3C
 	ldrh r0, [r5]
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index b33bacf9..ab70294a 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -33053,7 +33053,7 @@ _0223F598:
 	ldrh r1, [r6]
 	mov r2, #1
 	mov r3, #5
-	bl BagTakeItem
+	bl Bag_TakeItem
 	add r0, r7, #0
 	bl MOD11_02230218
 	ldrh r1, [r6]
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 9f0f7265..e1232e0b 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -5874,7 +5874,7 @@ _021DA498:
 	lsr r1, r1, #0x10
 	mov r2, #1
 	mov r3, #9
-	bl BagTakeItem
+	bl Bag_TakeItem
 	ldr r1, _021DA5E4 ; =MOD14_021E6A00
 	add r0, r4, #0
 	ldr r1, [r1, #8]
@@ -6129,7 +6129,7 @@ _021DA6E4:
 	mov r3, #9
 	lsl r1, r1, #0x10
 	lsr r1, r1, #0x10
-	bl BagAddItem
+	bl Bag_AddItem
 	cmp r0, #0
 	beq _021DA72A
 	add r0, r4, #0
@@ -6351,7 +6351,7 @@ _021DA8BA:
 	mov r3, #9
 	lsl r1, r1, #0x10
 	lsr r1, r1, #0x10
-	bl BagAddItem
+	bl Bag_AddItem
 	cmp r0, #0
 	beq _021DA908
 	add r0, r4, #0
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index 92b27707..b1cef2e5 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -34915,7 +34915,7 @@ _0224A5A6:
 	lsr r1, r1, #0x10
 	mov r2, #1
 	mov r3, #4
-	bl BagAddItem
+	bl Bag_AddItem
 	cmp r0, #0
 	beq _0224A62A
 	ldr r0, _0224A69C ; =0x022513F8
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index 91abbba9..3868e8f9 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -4685,7 +4685,7 @@ _0222FC70:
 	ldr r1, _0222FCFC ; =0x000001B5
 	mov r2, #1
 	mov r3, #0x1a
-	bl BagHasItem
+	bl Bag_HasItem
 	cmp r0, #1
 	bne _0222FCAA
 	ldr r0, _0222FCE4 ; =0x0000366C
diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s
index 800b7543..4a1e86bf 100644
--- a/arm9/modules/73/asm/module_73.s
+++ b/arm9/modules/73/asm/module_73.s
@@ -1159,7 +1159,7 @@ _021D7E68:
 	ldr r0, [r6, #0x10]
 	mov r1, #4
 	ldr r0, [r0, #0x14]
-	bl BagPocketNotEmpty
+	bl Bag_PocketNotEmpty
 	cmp r0, #0
 	bne _021D7E8A
 	ldr r0, _021D7F44 ; =0x0000063C
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index 7cd217ef..e5623487 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -5004,7 +5004,7 @@ MOD75_021E92BC: ; 0x021E92BC
 	ldrh r2, [r2]
 	ldrh r3, [r4, r3]
 	sub r1, r1, #3
-	bl PocketTakeItem
+	bl Pocket_TakeItem
 	add r0, r4, #0
 	add r0, #0xc4
 	ldr r3, [r0]
@@ -5226,7 +5226,7 @@ MOD75_021E947C: ; 0x021E947C
 	add r2, #0x66
 	ldrh r2, [r2]
 	sub r1, r1, #3
-	bl PocketGetQuantity
+	bl Pocket_GetQuantity
 	cmp r0, #1
 	bne _021E94BA
 	add r0, r4, #0
@@ -5954,7 +5954,7 @@ _021E9A6E:
 	add r2, #0x66
 	ldrh r2, [r2]
 	sub r1, r1, #3
-	bl PocketGetQuantity
+	bl Pocket_GetQuantity
 	cmp r0, #1
 	bne _021E9AF4
 	mov r0, #0x45