summaryrefslogtreecommitdiff
path: root/arm9/modules/06/asm/module_06.s
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules/06/asm/module_06.s')
-rw-r--r--arm9/modules/06/asm/module_06.s76
1 files changed, 38 insertions, 38 deletions
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 164e4d16..e2f76b59 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -4864,7 +4864,7 @@ _0223BA42:
cmp r0, #0
bne _0223BA8C
add r0, r7, #0
- bl FUN_0204A1D8
+ bl GetFirstAliveMonInParty_CrashIfNone
mov r1, #1
str r1, [sp, #0x34]
mov r1, #0xa0
@@ -5646,7 +5646,7 @@ _0223C0CE:
cmp r0, #0
bne _0223C118
add r0, r6, #0
- bl FUN_0204A1D8
+ bl GetFirstAliveMonInParty_CrashIfNone
mov r1, #1
str r1, [sp, #0x2c]
mov r1, #0xa0
@@ -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]
@@ -8427,7 +8427,7 @@ MOD06_0223D63C: ; 0x0223D63C
mov r4, #3
add r0, r4, #0
mov r1, #0xb
- bl FUN_02012838
+ bl ListMenu_ctor
add r1, r5, #0
add r1, #0x84
str r0, [r1]
@@ -8439,7 +8439,7 @@ MOD06_0223D63C: ; 0x0223D63C
ldr r1, [r1]
mov r2, #0xf
mov r3, #2
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
add r0, r5, #0
add r1, r5, #0
add r0, #0x84
@@ -8448,7 +8448,7 @@ MOD06_0223D63C: ; 0x0223D63C
ldr r1, [r1]
mov r2, #0x10
mov r3, #0xe
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
add r0, r5, #0
add r1, r5, #0
add r0, #0x84
@@ -8458,7 +8458,7 @@ MOD06_0223D63C: ; 0x0223D63C
ldr r0, [r0]
ldr r1, [r1]
sub r3, #0x13
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
mov r3, #1
str r3, [sp]
mov r1, #0xd
@@ -8478,7 +8478,7 @@ _0223D6B8:
mov r4, #2
add r0, r4, #0
mov r1, #0xb
- bl FUN_02012838
+ bl ListMenu_ctor
add r1, r5, #0
add r1, #0x84
str r0, [r1]
@@ -8490,7 +8490,7 @@ _0223D6B8:
ldr r1, [r1]
mov r2, #0xf
add r3, r4, #0
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
add r0, r5, #0
add r1, r5, #0
add r0, #0x84
@@ -8500,7 +8500,7 @@ _0223D6B8:
ldr r0, [r0]
ldr r1, [r1]
sub r3, #0x13
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
mov r3, #1
str r3, [sp]
mov r1, #0xd
@@ -8618,7 +8618,7 @@ MOD06_0223D7B8: ; 0x0223D7B8
add r0, r4, #0
add r0, #0x84
ldr r0, [r0]
- bl FUN_02012870
+ bl ListMenu_dtor
add r4, #8
add r0, r4, #0
bl FUN_02019178
@@ -9146,7 +9146,7 @@ _0223DC34:
ldrb r0, [r5, r0]
mov r1, #0xb
add r0, r0, #1
- bl FUN_02012838
+ bl ListMenu_ctor
str r0, [r5, #0x7c]
mov r0, #0x8b
lsl r0, r0, #2
@@ -9172,7 +9172,7 @@ _0223DC52:
ldr r0, [r5, #0x7c]
ldrh r2, [r2, r4]
add r1, r7, #0
- bl FUN_020128A0
+ bl ListMenu_AddItem
add r0, r7, #0
bl String_dtor
mov r0, #0x8b
@@ -9190,7 +9190,7 @@ _0223DC8E:
ldr r0, [r5, #0x7c]
ldr r1, [r1]
sub r3, #0xa
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
ldr r0, [sp]
bl DestroyMsgData
ldr r4, _0223DCEC ; =0x0224F38C
@@ -9597,7 +9597,7 @@ _0223E006:
add r2, r1, #0
bl FUN_02001300
ldr r0, [r5, #0x7c]
- bl FUN_02012870
+ bl ListMenu_dtor
add r0, r5, #0
bl MOD06_0223D9C0
add r0, r5, #0
@@ -9811,7 +9811,7 @@ MOD06_0223E1D8: ; 0x0223E1D8
ldrh r1, [r5, r1]
ldr r0, [r5, r0]
mov r2, #0xb
- bl FUN_0206EEF8
+ 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 FUN_0206ED24
+ 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 FUN_0206ED38
+ bl Bag_AddItem
b _0223E7F6
_0223E7D0:
cmp r0, #1
@@ -10622,7 +10622,7 @@ _0223E88A:
mov r1, #0xc
mov r2, #1
mov r3, #0xb
- bl FUN_0206ED38
+ bl Bag_AddItem
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
@@ -11977,7 +11977,7 @@ MOD06_0223F3B8: ; 0x0223F3B8
beq _0223F450
mov r0, #0x10
mov r1, #4
- bl FUN_02012838
+ bl ListMenu_ctor
ldr r4, _0223F454 ; =0x02252420
mov r5, #0
ldr r1, [r4]
@@ -12006,7 +12006,7 @@ _0223F3E0:
mov r2, #0
ldr r0, [r1, #0x64]
ldr r1, [r1]
- bl FUN_020128A0
+ bl ListMenu_AddItem
add r5, r5, #1
cmp r5, #0x10
blt _0223F3E0
@@ -12821,7 +12821,7 @@ MOD06_0223FAB8: ; 0x0223FAB8
beq _0223FB4C
mov r0, #5
mov r1, #4
- bl FUN_02012838
+ bl ListMenu_ctor
ldr r4, _0223FB50 ; =0x02252420
mov r5, #0
ldr r1, [r4]
@@ -12834,7 +12834,7 @@ _0223FAE6:
ldr r0, [r1, #0x64]
ldr r1, [r1, #0x74]
add r3, r7, #0
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
add r5, r5, #1
cmp r5, #5
blt _0223FAE6
@@ -13849,7 +13849,7 @@ MOD06_02240364: ; 0x02240364
mov r1, #0
bl FUN_0200CCF8
ldr r0, [r4, #0x64]
- bl FUN_02012870
+ bl ListMenu_dtor
mov r1, #0
ldr r0, [r4, #0x5c]
add r2, r1, #0
@@ -14577,7 +14577,7 @@ _02240940:
bne _022409D2
add r0, r6, #2
mov r1, #4
- bl FUN_02012838
+ bl ListMenu_ctor
str r0, [r5, #8]
mov r3, #1
str r3, [sp]
@@ -14605,7 +14605,7 @@ _02240940:
ldr r1, [r5, #0x68]
mov r2, #0x7b
mov r3, #0xc
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
mov r4, #0
cmp r6, #0
ble _022409C4
@@ -14625,7 +14625,7 @@ _02240998:
ldr r0, [r5, #8]
ldr r1, [r5, #0x20]
add r2, r4, #0
- bl FUN_020128A0
+ bl ListMenu_AddItem
add r4, r4, #1
cmp r4, r6
blt _02240998
@@ -14635,7 +14635,7 @@ _022409C4:
ldr r0, [r5, #8]
ldr r1, [r5, #0x68]
sub r3, #0x74
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
_022409D2:
ldr r4, _02240A24 ; =0x0224F704
add r3, sp, #0x14
@@ -14700,7 +14700,7 @@ MOD06_02240A28: ; 0x02240A28
add r0, #0x34
bl FUN_02019178
ldr r0, [r4, #8]
- bl FUN_02012870
+ bl ListMenu_dtor
mov r0, #0
str r0, [r4]
_02240A62:
@@ -14792,7 +14792,7 @@ MOD06_02240B04: ; 0x02240B04
mov r0, #3
mov r1, #4
ldr r4, _02240BA8 ; =MOD6_022522E4
- bl FUN_02012838
+ bl ListMenu_ctor
str r0, [r5, #0xc]
mov r0, #0xa
str r0, [sp]
@@ -14823,7 +14823,7 @@ _02240B4A:
ldr r1, [r5, #0x68]
ldr r2, [r4]
ldr r3, [r4, #4]
- bl FUN_02012880
+ bl ListMenu_ItemFromMsgData
add r6, r6, #1
add r4, #8
cmp r6, #3
@@ -14935,7 +14935,7 @@ _02240C1A:
add r0, #0x44
bl FUN_02019178
ldr r0, [r5, #0xc]
- bl FUN_02012870
+ bl ListMenu_dtor
mov r0, #0
str r0, [r5, #4]
_02240C50:
@@ -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 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 FUN_0206EEF8
+ 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 FUN_0206EDD4
+ bl Bag_TakeItem
cmp r0, #1
beq _0224E550
bl ErrorHandling
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 07:48:15 +0000