summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-08-13 15:17:06 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-08-13 15:17:06 -0400
commitcbf5ca94718075c645f4c34d7b6ab0e6e95a3995 (patch)
tree6f09e314e18974a4ff5b9bb15434a77dff6c6c97 /arm9/modules
parentddd20f2c76a34b4fc46503c8bf88d53a755453a8 (diff)
Name routines in unk_0206EB80.s --> bag.s
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/mod05_021E1374.s4
-rw-r--r--arm9/modules/05/asm/module_05.s4
-rw-r--r--arm9/modules/06/asm/module_06.s22
-rw-r--r--arm9/modules/09/asm/module_09.s8
-rw-r--r--arm9/modules/11/asm/module_11_thumb1.s6
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s2
-rw-r--r--arm9/modules/14/asm/module_14.s16
-rw-r--r--arm9/modules/18/asm/module_18.s4
-rw-r--r--arm9/modules/71/asm/module_71.s4
-rw-r--r--arm9/modules/73/asm/module_73.s2
-rw-r--r--arm9/modules/75/asm/module_75.s8
11 files changed, 40 insertions, 40 deletions
diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s
index 018f4d8c..f4fc02fe 100644
--- a/arm9/modules/05/asm/mod05_021E1374.s
+++ b/arm9/modules/05/asm/mod05_021E1374.s
@@ -396,11 +396,11 @@ MOD05_021E1654: ; 0x021E1654
bl FUN_0205F43C
add r5, r0, #0
ldr r0, [r7, #0xc]
- bl FUN_0206F158
+ bl Sav2_Bag_get
ldr r1, _021E16C4 ; =0x000001BB
mov r2, #1
mov r3, #4
- bl FUN_0206EE50
+ bl BagHasItem
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 bcebfd49..cb2a013d 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -26807,11 +26807,11 @@ _021EFCB0:
pop {r3, r4, r5, r6, pc}
_021EFCC4:
ldr r0, [r6, #0x34]
- bl FUN_0206F158
+ bl Sav2_Bag_get
ldr r1, _021EFD3C ; =0x000001B5
mov r2, #1
mov r3, #4
- bl FUN_0206EE50
+ bl BagHasItem
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 164e4d16..5ba98611 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -8162,7 +8162,7 @@ MOD06_0223D3D0: ; 0x0223D3D0
cmp r0, #0
bne _0223D456
ldr r0, [r5, #0xc]
- bl FUN_0206F158
+ bl Sav2_Bag_get
mov r1, #0x21
lsl r1, r1, #4
str r0, [r4, r1]
@@ -9811,7 +9811,7 @@ MOD06_0223E1D8: ; 0x0223E1D8
ldrh r1, [r5, r1]
ldr r0, [r5, r0]
mov r2, #0xb
- bl FUN_0206EEF8
+ bl BagGetQuantity
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 FUN_0206ED24
+ bl BagHasSpaceForItem
b _0223E3D2
_0223E3A8:
cmp r0, #1
@@ -10507,7 +10507,7 @@ _0223E7B2:
ldrh r2, [r4, r2]
ldr r0, [r4, r0]
mov r3, #0xb
- bl FUN_0206ED38
+ bl BagAddItem
b _0223E7F6
_0223E7D0:
cmp r0, #1
@@ -10622,7 +10622,7 @@ _0223E88A:
mov r1, #0xc
mov r2, #1
mov r3, #0xb
- bl FUN_0206ED38
+ bl BagAddItem
cmp r0, #1
bne _0223E902
add r0, r5, #0
@@ -11160,10 +11160,10 @@ MOD06_0223ECF0: ; 0x0223ECF0
add r4, r0, #0
bl MOD06_0223D7B8
ldr r0, [r5, #0xc]
- bl FUN_0206F158
+ bl Sav2_Bag_get
ldr r1, _0223ED48 ; =0x0224F47C
mov r2, #0xb
- bl FUN_0206EFEC
+ bl CreateBagView
add r3, r5, #0
str r0, [r4, #4]
add r3, #0x94
@@ -41161,7 +41161,7 @@ MOD06_0224D70C: ; 0x0224D70C
bl FUN_0202708C
str r0, [r4, #0xc]
add r0, r6, #0
- bl FUN_0206F158
+ bl Sav2_Bag_get
str r0, [r4, #0x10]
mov r2, #0x81
ldr r3, [r4, #0x18]
@@ -42756,7 +42756,7 @@ MOD06_0224E410: ; 0x0224E410
add r1, #0x95
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_0206EEF8
+ bl BagGetQuantity
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 FUN_0206EEF8
+ bl BagGetQuantity
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 FUN_0206EDD4
+ bl BagTakeItem
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 115ee3cb..97479bc1 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 FUN_0206EDD4
+ bl BagTakeItem
_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 FUN_0206EDD4
+ bl BagTakeItem
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 FUN_0206EE50
+ bl BagHasItem
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 FUN_0206F0D8
+ bl BagGetPocketSlotN
add r5, r0, #0
beq _02219D3C
ldrh r0, [r5]
diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s
index 235b01d0..a5298ae9 100644
--- a/arm9/modules/11/asm/module_11_thumb1.s
+++ b/arm9/modules/11/asm/module_11_thumb1.s
@@ -1178,7 +1178,7 @@ _0222DFEC:
lsl r1, r1, #2
ldr r0, [r4, #0x58]
ldr r1, [r7, r1]
- bl FUN_0206EBB4
+ bl Sav2_Bag_copy
ldr r0, [r4, #0x58]
bl FreeToHeap
mov r1, #0x11
@@ -1758,14 +1758,14 @@ _0222E532:
cmp r7, #4
blt _0222E532
mov r0, #5
- bl FUN_0206EB88
+ bl Sav2_Bag_new
str r0, [r4, #0x58]
mov r1, #0x42
ldr r0, [sp, #4]
lsl r1, r1, #2
ldr r0, [r0, r1]
ldr r1, [r4, #0x58]
- bl FUN_0206EBB4
+ bl Sav2_Bag_copy
mov r0, #5
bl FUN_02023D6C
str r0, [r4, #0x60]
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index b3f10c3b..06169afb 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 FUN_0206EDD4
+ bl BagTakeItem
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 738bf429..9f0f7265 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -5807,10 +5807,10 @@ _021DA41E:
mov r0, #0x47
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0206F158
+ bl Sav2_Bag_get
ldr r1, _021DA5D8 ; =MOD14_021E6264
mov r2, #9
- bl FUN_0206EFEC
+ bl CreateBagView
mov r1, #0x85
lsl r1, r1, #2
str r0, [r4, r1]
@@ -5869,12 +5869,12 @@ _021DA498:
mov r0, #0x47
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0206F158
+ bl Sav2_Bag_get
lsl r1, r6, #0x10
lsr r1, r1, #0x10
mov r2, #1
mov r3, #9
- bl FUN_0206EDD4
+ bl BagTakeItem
ldr r1, _021DA5E4 ; =MOD14_021E6A00
add r0, r4, #0
ldr r1, [r1, #8]
@@ -6122,14 +6122,14 @@ _021DA6E4:
mov r0, #0x47
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0206F158
+ bl Sav2_Bag_get
ldr r1, _021DA7B4 ; =MOD14_021E6A00
mov r2, #1
ldr r1, [r1, #4]
mov r3, #9
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_0206ED38
+ bl BagAddItem
cmp r0, #0
beq _021DA72A
add r0, r4, #0
@@ -6344,14 +6344,14 @@ _021DA8BA:
mov r0, #0x47
lsl r0, r0, #2
ldr r0, [r4, r0]
- bl FUN_0206F158
+ bl Sav2_Bag_get
ldr r1, _021DA9C0 ; =MOD14_021E6A00
mov r2, #1
ldr r1, [r1]
mov r3, #9
lsl r1, r1, #0x10
lsr r1, r1, #0x10
- bl FUN_0206ED38
+ bl BagAddItem
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 3fbc762e..92b27707 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -34906,7 +34906,7 @@ _0224A5A6:
add r4, r0, #0
ldr r0, [r5, #0xc]
ldr r0, [r0, #0xc]
- bl FUN_0206F158
+ bl Sav2_Bag_get
add r6, r0, #0
ldr r0, _0224A694 ; =0x000005DC
bl FUN_020054C8
@@ -34915,7 +34915,7 @@ _0224A5A6:
lsr r1, r1, #0x10
mov r2, #1
mov r3, #4
- bl FUN_0206ED38
+ bl BagAddItem
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 9c4c00c9..91abbba9 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -4681,11 +4681,11 @@ _0222FC2C:
pop {r3, r4, r5, r6, r7, pc}
_0222FC70:
ldr r0, [r6, #4]
- bl FUN_0206F158
+ bl Sav2_Bag_get
ldr r1, _0222FCFC ; =0x000001B5
mov r2, #1
mov r3, #0x1a
- bl FUN_0206EE50
+ bl BagHasItem
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 b9d19767..800b7543 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 FUN_0206EE64
+ bl BagPocketNotEmpty
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 59d25787..22f2d1a4 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -473,7 +473,7 @@ MOD75_021E6FA4: ; 0x021E6FA4
add r0, #0xc4
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_0206F158
+ bl Sav2_Bag_get
add r1, r4, #0
add r1, #0xc8
str r0, [r1]
@@ -5004,7 +5004,7 @@ MOD75_021E92BC: ; 0x021E92BC
ldrh r2, [r2]
ldrh r3, [r4, r3]
sub r1, r1, #3
- bl FUN_0206EE20
+ bl BagTakeItem2
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 FUN_0206EF10
+ bl PocketGetQuantity
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 FUN_0206EF10
+ bl PocketGetQuantity
cmp r0, #1
bne _021E9AF4
mov r0, #0x45
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-25 23:52:05 +0000