diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-13 15:17:06 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-13 15:17:06 -0400 |
| commit | cbf5ca94718075c645f4c34d7b6ab0e6e95a3995 (patch) | |
| tree | 6f09e314e18974a4ff5b9bb15434a77dff6c6c97 /arm9/modules/06/asm/module_06.s | |
| parent | ddd20f2c76a34b4fc46503c8bf88d53a755453a8 (diff) | |
Name routines in unk_0206EB80.s --> bag.s
Diffstat (limited to 'arm9/modules/06/asm/module_06.s')
| -rw-r--r-- | arm9/modules/06/asm/module_06.s | 22 |
1 files changed, 11 insertions, 11 deletions
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 |