summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/module_05.s4
-rw-r--r--arm9/modules/06/asm/module_06.s10
-rw-r--r--arm9/modules/07/asm/module_07.s2
-rw-r--r--arm9/modules/09/asm/module_09.s52
-rw-r--r--arm9/modules/11/asm/module_11.s100
-rw-r--r--arm9/modules/14/asm/module_14.s30
-rw-r--r--arm9/modules/27/asm/module_27.s2
-rw-r--r--arm9/modules/71/asm/module_71.s4
-rw-r--r--arm9/modules/75/asm/module_75.s44
-rw-r--r--arm9/modules/80/asm/module_80.s6
-rw-r--r--arm9/modules/83/asm/module_83.s10
11 files changed, 132 insertions, 132 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 602dd5eb..e2e84f0d 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -43106,7 +43106,7 @@ MOD05_021EC4DC: ; 0x021EC4DC
bl GetBoxMonData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA98
+ bl ItemIdIsMail
pop {r3, pc}
thumb_func_start MOD05_021EC4F0
@@ -44043,7 +44043,7 @@ _021ECC60:
add r0, r5, r0
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA30
+ bl TMHMGetMove
ldr r1, [r4, r6]
cmp r1, r0
bne _021ECCA2
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 43fd9cac..727c21ca 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -9197,7 +9197,7 @@ _0223DD0C:
lsr r1, r1, #0x10
mov r2, #0xb
add r6, r0, #0
- bl FUN_0206E790
+ bl GetItemDescIntoString
b _0223DD86
_0223DD3C:
cmp r0, #1
@@ -10291,7 +10291,7 @@ _0223E67C:
mov r1, #5
ldrh r0, [r5, r0]
mov r2, #0xb
- bl FUN_0206E7B8
+ bl GetItemAttr
add r2, r0, #0
add r0, r5, #0
add r0, #0x8c
@@ -10728,7 +10728,7 @@ MOD06_0223EA08: ; 0x0223EA08
add r0, r1, #0
mov r1, #0
mov r2, #0xb
- bl FUN_0206E7B8
+ bl GetItemAttr
pop {r3, pc}
_0223EA1E:
cmp r0, #1
@@ -11016,7 +11016,7 @@ _0223EC5A:
add r5, r0, #0
add r0, r6, #0
mov r1, #1
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r3, r0, #0
mov r0, #0
str r0, [sp]
@@ -11038,7 +11038,7 @@ _0223EC5A:
add r5, r0, #0
add r0, r6, #0
mov r1, #2
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r3, r0, #0
mov r0, #0
str r0, [sp]
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 5723ce56..c64596d3 100644
--- a/arm9/modules/07/asm/module_07.s
+++ b/arm9/modules/07/asm/module_07.s
@@ -3975,7 +3975,7 @@ _02213E50:
bl FUN_0200C644
b _02213EC0
_02213E9A:
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #1
bne _02213EB2
mov r0, #0x67
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 174cdc6a..7c8fdd02 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -493,13 +493,13 @@ _02212254:
ldrh r0, [r4, #0x22]
ldr r2, [r4, #0xc]
mov r1, #0x24
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _0221228A
ldrh r0, [r4, #0x22]
ldr r2, [r4, #0xc]
mov r1, #0x25
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
bne _0221228A
ldrb r1, [r4, #0x11]
@@ -531,7 +531,7 @@ _0221228A:
ldrh r0, [r4, #0x22]
ldr r2, [r4, #0xc]
mov r1, #0x25
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _022122BA
ldr r0, _02212360 ; =0x00002079
@@ -547,7 +547,7 @@ _022122BA:
ldrh r0, [r4, #0x22]
ldr r2, [r4, #0xc]
mov r1, #0x17
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
bne _0221232A
add r2, r4, #0
@@ -1458,7 +1458,7 @@ MOD09_022129F8: ; 0x022129F8
mov r1, #0x25
ldrh r0, [r2, #0x22]
ldr r2, [r2, #0xc]
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02212A16
mov r0, #0x18
@@ -3742,10 +3742,10 @@ _02213C1C:
add r0, r1, r0
ldrh r0, [r0, #0x34]
_02213C2A:
- ldr r3, _02213C30 ; =FUN_0206EA54
+ ldr r3, _02213C30 ; =MoveIsHM
bx r3
nop
-_02213C30: .word FUN_0206EA54
+_02213C30: .word MoveIsHM
thumb_func_start MOD09_02213C34
MOD09_02213C34: ; 0x02213C34
@@ -8056,7 +8056,7 @@ _02216134:
mov r1, #0x25
ldrh r0, [r2, #0x22]
ldr r2, [r2, #0xc]
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
bne _02216156
add r0, r5, #0
@@ -8321,7 +8321,7 @@ MOD09_02216378: ; 0x02216378
ldr r2, [sp, #0xc]
ldrh r0, [r0, #0x22]
ldr r2, [r2, #0xc]
- bl FUN_0206E710
+ bl LoadItemDataOrGfx
ldr r2, [sp, #0xc]
add r6, r0, #0
ldrb r3, [r2, #0x11]
@@ -8343,7 +8343,7 @@ MOD09_02216378: ; 0x02216378
add r0, r6, #0
mov r1, #0xf
mov r4, #0
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
beq _022163CC
mov r0, #1
@@ -8353,7 +8353,7 @@ MOD09_02216378: ; 0x02216378
_022163CC:
add r0, r6, #0
mov r1, #0x10
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
beq _022163E0
mov r0, #2
@@ -8363,7 +8363,7 @@ _022163CC:
_022163E0:
add r0, r6, #0
mov r1, #0x11
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
beq _022163F4
mov r0, #4
@@ -8373,7 +8373,7 @@ _022163E0:
_022163F4:
add r0, r6, #0
mov r1, #0x12
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
beq _02216408
mov r0, #8
@@ -8383,7 +8383,7 @@ _022163F4:
_02216408:
add r0, r6, #0
mov r1, #0x13
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
beq _0221641C
mov r0, #0x10
@@ -8393,7 +8393,7 @@ _02216408:
_0221641C:
add r0, r6, #0
mov r1, #0x14
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
beq _02216430
mov r0, #0x20
@@ -8403,7 +8403,7 @@ _0221641C:
_02216430:
add r0, r6, #0
mov r1, #0x15
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
beq _02216444
mov r0, #0x40
@@ -8487,12 +8487,12 @@ _0221648E:
_022164EA:
add r0, r6, #0
mov r1, #0x24
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
bne _02216502
add r0, r6, #0
mov r1, #0x25
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
beq _02216512
_02216502:
@@ -9457,7 +9457,7 @@ MOD09_02216D2C: ; 0x02216D2C
add r6, r3, #0
cmp r0, #0
beq _02216D5C
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #1
bne _02216D4A
add r0, r5, #0
@@ -13327,7 +13327,7 @@ _02218C68:
ldrh r0, [r4, #0x1c]
ldr r2, [r4, #0xc]
mov r1, #7
- bl FUN_0206E7B8
+ bl GetItemAttr
add r6, r0, #0
ldr r0, [r4, #0x18]
cmp r0, #0
@@ -15136,7 +15136,7 @@ MOD09_02219AFC: ; 0x02219AFC
ldr r2, [r2, #0xc]
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_0206E790
+ bl GetItemDescIntoString
mov r1, #0
str r1, [sp]
mov r0, #0xff
@@ -15363,7 +15363,7 @@ _02219CCA:
ldr r2, [r4]
mov r1, #0xd
ldr r2, [r2, #0xc]
- bl FUN_0206E7B8
+ bl GetItemAttr
add r7, r0, #0
ldr r1, _02219D88 ; =0x0221BD7C
mov r0, #0
@@ -15550,7 +15550,7 @@ _02219E52:
add r5, r4, r0
mov r0, #1
add r1, r0, #0
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r3, r0, #0
mov r0, #0
str r0, [sp]
@@ -15565,7 +15565,7 @@ _02219E52:
bl FUN_0200C00C
mov r0, #1
mov r1, #2
- bl FUN_0206E640
+ bl GetItemIndexMapping
mov r1, #0x10
str r1, [sp]
str r0, [sp, #4]
@@ -15628,7 +15628,7 @@ MOD09_02219EEC: ; 0x02219EEC
add r7, r0, #0
add r0, r6, #0
mov r1, #1
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r3, r0, #0
mov r0, #0
str r0, [sp]
@@ -15651,7 +15651,7 @@ MOD09_02219F24: ; 0x02219F24
add r0, r1, #0
mov r1, #2
add r4, r2, #0
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r2, r0, #0
mov r0, #3
str r0, [sp]
diff --git a/arm9/modules/11/asm/module_11.s b/arm9/modules/11/asm/module_11.s
index 9fdabf6b..bd0da753 100644
--- a/arm9/modules/11/asm/module_11.s
+++ b/arm9/modules/11/asm/module_11.s
@@ -5697,7 +5697,7 @@ _022303E4:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230478
ldr r0, [sp, #0x18]
@@ -5759,7 +5759,7 @@ _02230478:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _022304DC
ldr r0, [sp, #0x18]
@@ -5807,7 +5807,7 @@ _022304DC:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230540
ldr r0, [sp, #0x18]
@@ -5855,7 +5855,7 @@ _02230540:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _022305A4
ldr r0, [sp, #0x18]
@@ -5903,7 +5903,7 @@ _022305A4:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230608
ldr r0, [sp, #0x18]
@@ -5951,7 +5951,7 @@ _02230608:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230650
ldr r0, [sp, #0x10]
@@ -5986,7 +5986,7 @@ _02230650:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _022306AC
ldr r0, [sp, #0x10]
@@ -6029,7 +6029,7 @@ _022306AC:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230706
ldr r0, [sp, #4]
@@ -6070,7 +6070,7 @@ _02230706:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230744
ldr r0, [sp, #0x10]
@@ -6100,7 +6100,7 @@ _02230744:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230782
ldr r0, [sp, #0x10]
@@ -6130,7 +6130,7 @@ _02230782:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _022307C0
ldr r0, [sp, #0x10]
@@ -6160,7 +6160,7 @@ _022307C0:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _022307FE
ldr r0, [sp, #0x10]
@@ -6190,7 +6190,7 @@ _022307FE:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _0223083C
ldr r0, [sp, #0x10]
@@ -6220,7 +6220,7 @@ _0223083C:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _0223087A
ldr r0, [sp, #0x10]
@@ -6250,7 +6250,7 @@ _0223087A:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _022308C4
ldr r0, [sp, #0x10]
@@ -6286,7 +6286,7 @@ _022308C4:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _0223095A
ldr r0, [sp, #0x38]
@@ -6294,7 +6294,7 @@ _022308C4:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
str r0, [sp, #0x20]
add r1, r4, #0
ldr r0, [sp, #0x18]
@@ -6355,7 +6355,7 @@ _0223095A:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _022309F8
ldr r0, [sp, #0x38]
@@ -6363,7 +6363,7 @@ _0223095A:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
str r0, [sp, #0x20]
mov r4, #0
_0223097E:
@@ -6430,7 +6430,7 @@ _022309F8:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
bne _02230A0C
b _02230B14
@@ -6442,7 +6442,7 @@ _02230A0C:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230A36
ldr r0, [sp, #0x18]
@@ -6480,7 +6480,7 @@ _02230A42:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
str r0, [sp, #0x20]
cmp r0, #0xfd
beq _02230AA2
@@ -6530,7 +6530,7 @@ _02230AC2:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
bne _02230B10
ldr r0, [sp, #4]
@@ -6566,7 +6566,7 @@ _02230B14:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230B4A
ldr r0, [sp, #0x18]
@@ -6583,7 +6583,7 @@ _02230B14:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
str r0, [sp, #8]
_02230B4A:
ldr r0, [sp, #0x38]
@@ -6591,7 +6591,7 @@ _02230B4A:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230B8E
ldr r0, [sp, #0x18]
@@ -6614,7 +6614,7 @@ _02230B4A:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
str r0, [sp, #8]
_02230B8E:
ldr r0, [sp, #0x38]
@@ -6622,7 +6622,7 @@ _02230B8E:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02230BC4
ldr r0, [sp, #0x18]
@@ -6639,7 +6639,7 @@ _02230B8E:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
str r0, [sp, #8]
_02230BC4:
ldr r0, [sp, #8]
@@ -6679,7 +6679,7 @@ _02230BFC:
lsl r0, r0, #0x10
lsr r0, r0, #0x10
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0x34
bne _02230C28
ldr r1, [sp, #8]
@@ -26647,7 +26647,7 @@ _0223A7D6:
lsr r0, r0, #0x10
mov r1, #1
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0x32
beq _0223A81E
add r0, r5, #0
@@ -26751,7 +26751,7 @@ _0223A8B0:
lsr r0, r0, #0x10
mov r1, #1
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
str r0, [sp, #0x18]
ldr r0, [sp, #0x38]
mov r1, #1
@@ -27998,12 +27998,12 @@ MOD11_0223B2DC: ; 0x0223B2DC
add r0, r6, #0
mov r1, #1
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
add r5, r0, #0
add r0, r6, #0
mov r1, #2
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
add r6, r0, #0
add r0, r4, #0
str r0, [sp, #0x18]
@@ -31772,7 +31772,7 @@ _0223D216:
add r0, r4, r0
bl LoadAllWazaTbl
mov r0, #5
- bl FUN_0206EB50
+ bl LoadAllItemData
ldr r1, _0223D234 ; =0x00002120
str r0, [r4, r1]
add r0, r4, #0
@@ -51873,7 +51873,7 @@ MOD11_02246C50: ; 0x02246C50
bne _02246C9E
ldr r0, [sp, #4]
ldrh r0, [r4, r0]
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
bne _02246C9E
mov r7, #1
@@ -51893,7 +51893,7 @@ MOD11_02246CAC: ; 0x02246CAC
add r1, r0, r2
ldr r0, _02246CC8 ; =0x00002DB8
ldrh r0, [r1, r0]
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
bne _02246CC4
mov r0, #1
@@ -59246,7 +59246,7 @@ _0224A444:
ldr r0, _0224A4DC ; =0x00002DB8
add r1, r4, r1
ldrh r0, [r1, r0]
- bl FUN_0206EAEC
+ bl ItemIdIsBerry
cmp r0, #1
bne _0224A45A
mov r6, #1
@@ -61028,7 +61028,7 @@ _0224B1D8:
mov r2, #5
ldrh r0, [r0, r1]
mov r1, #1
- bl FUN_0206E7B8
+ bl GetItemAttr
lsl r0, r0, #0x10
lsr r0, r0, #0x10
bl GetArceusTypeByHeldItemEffect
@@ -62999,13 +62999,13 @@ MOD11_0224C12C: ; 0x0224C12C
add r0, r1, #0
mov r1, #0
add r4, r2, #0
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r1, r0, #0
ldr r0, _0224C14C ; =0x00002120
ldr r0, [r5, r0]
- bl FUN_0206EB78
+ bl GetItemDataPtrFromArray
add r1, r4, #0
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
pop {r3, r4, r5, pc}
.align 2, 0
_0224C14C: .word 0x00002120
@@ -74093,7 +74093,7 @@ _0225191C:
mov r1, #0x26
ldrh r0, [r0, #0x1c]
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02251954
ldr r0, [r4]
@@ -74762,7 +74762,7 @@ _02251E6A:
str r0, [sp, #0x24]
ldr r0, [r4, #4]
ldrh r0, [r0, #0x1c]
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02251E9E
mov r6, #0
@@ -74772,7 +74772,7 @@ _02251E9E:
mov r1, #0x10
ldrh r0, [r0, #0x1c]
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02251EB2
mov r6, #1
@@ -74782,7 +74782,7 @@ _02251EB2:
mov r1, #0x11
ldrh r0, [r0, #0x1c]
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02251EC6
mov r6, #2
@@ -74792,7 +74792,7 @@ _02251EC6:
mov r1, #0x12
ldrh r0, [r0, #0x1c]
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02251EDA
mov r6, #3
@@ -74802,7 +74802,7 @@ _02251EDA:
mov r1, #0x13
ldrh r0, [r0, #0x1c]
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02251EEE
mov r6, #4
@@ -74812,7 +74812,7 @@ _02251EEE:
mov r1, #0x14
ldrh r0, [r0, #0x1c]
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02251F02
mov r6, #5
@@ -74822,7 +74822,7 @@ _02251F02:
mov r1, #0x15
ldrh r0, [r0, #0x1c]
mov r2, #5
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _02251F16
mov r6, #6
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index a471bab6..e5de54cd 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -605,7 +605,7 @@ MOD14_021D7998: ; 0x021D7998
bl MOD14_021DC430
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
beq _021D79B6
mov r0, #0x1e
@@ -2823,7 +2823,7 @@ _021D8C12:
bl MOD14_021DC430
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
beq _021D8C42
ldr r0, _021D8D58 ; =0x000005F3
@@ -2868,7 +2868,7 @@ _021D8C7C:
bl MOD14_021DC430
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
beq _021D8CAC
ldr r0, _021D8D58 ; =0x000005F3
@@ -4789,7 +4789,7 @@ _021D9C36:
bl MOD14_021DC430
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
beq _021D9C56
mov r0, #0x1e
@@ -6025,7 +6025,7 @@ _021DA614:
str r0, [r1, #4]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
beq _021DA648
ldr r0, _021DA7B8 ; =0x000005F3
@@ -6247,7 +6247,7 @@ _021DA7EA:
str r0, [r1]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
beq _021DA81E
ldr r0, _021DA9C4 ; =0x000005F3
@@ -9291,7 +9291,7 @@ _021DBF9A:
beq _021DBFAA
ldr r0, [r4, #0x1c]
mov r2, #9
- bl FUN_0206E768
+ bl GetItemNameIntoString
b _021DBFB8
_021DBFAA:
mov r0, #0x63
@@ -9588,7 +9588,7 @@ MOD14_021DC1E8: ; 0x021DC1E8
beq _021DC20A
ldr r0, [r4, #0x1c]
mov r2, #9
- bl FUN_0206E768
+ bl GetItemNameIntoString
b _021DC218
_021DC20A:
mov r0, #0x63
@@ -22991,7 +22991,7 @@ MOD14_021E2940: ; 0x021E2940
lsl r0, r4, #0x10
lsr r0, r0, #0x10
mov r1, #1
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r1, r0, #0
mov r0, #0xa
str r0, [sp]
@@ -23016,7 +23016,7 @@ MOD14_021E2940: ; 0x021E2940
lsl r0, r4, #0x10
lsr r0, r0, #0x10
mov r1, #2
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r1, r0, #0
mov r0, #0x20
str r0, [sp]
@@ -27175,7 +27175,7 @@ MOD14_021E4890: ; 0x021E4890
bl MOD14_021DDDB4
mov r0, #1
add r1, r0, #0
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r1, r0, #0
mov r0, #0xa
str r0, [sp]
@@ -27396,7 +27396,7 @@ _021E4A54:
lsr r0, r0, #0x10
mov r1, #1
lsl r4, r6, #3
- bl FUN_0206E640
+ bl GetItemIndexMapping
mov r2, #0
ldr r3, _021E4ACC ; =0x021E68E8
str r2, [sp]
@@ -27410,7 +27410,7 @@ _021E4A54:
lsl r0, r7, #0x10
lsr r0, r0, #0x10
mov r1, #2
- bl FUN_0206E640
+ bl GetItemIndexMapping
ldr r3, _021E4AD0 ; =0x021E68EC
add r1, r0, #0
mov r0, #0x20
@@ -27527,7 +27527,7 @@ MOD14_021E4B58: ; 0x021E4B58
lsr r0, r0, #0x10
mov r1, #1
lsl r6, r4, #3
- bl FUN_0206E640
+ bl GetItemIndexMapping
mov r2, #0
ldr r3, _021E4BD8 ; =0x021E68E8
str r2, [sp]
@@ -27541,7 +27541,7 @@ MOD14_021E4B58: ; 0x021E4B58
lsl r0, r7, #0x10
lsr r0, r0, #0x10
mov r1, #2
- bl FUN_0206E640
+ bl GetItemIndexMapping
ldr r3, _021E4BDC ; =0x021E68EC
add r1, r0, #0
mov r0, #0x20
diff --git a/arm9/modules/27/asm/module_27.s b/arm9/modules/27/asm/module_27.s
index 7bd6fc00..2445df1b 100644
--- a/arm9/modules/27/asm/module_27.s
+++ b/arm9/modules/27/asm/module_27.s
@@ -933,7 +933,7 @@ _02254F58:
ldrh r0, [r6, #0xe]
cmp r0, #0
beq _02254F92
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
beq _02254F6A
mov r1, #1
diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s
index fae14c7d..00a2d2ed 100644
--- a/arm9/modules/71/asm/module_71.s
+++ b/arm9/modules/71/asm/module_71.s
@@ -1394,7 +1394,7 @@ _0222E18E:
beq _0222E19E
lsl r0, r6, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA98
+ bl ItemIdIsMail
add r0, r0, #1
strh r0, [r4, #2]
_0222E19E:
@@ -2992,7 +2992,7 @@ _0222EEA6:
add r1, r7, #0
mov r2, #0x1a
add r5, r0, #0
- bl FUN_0206E768
+ bl GetItemNameIntoString
mov r0, #3
str r0, [sp]
mov r3, #0
diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s
index ba070e07..73240a5e 100644
--- a/arm9/modules/75/asm/module_75.s
+++ b/arm9/modules/75/asm/module_75.s
@@ -1057,7 +1057,7 @@ MOD75_021E7458: ; 0x021E7458
add r5, r0, #0
add r4, r1, #0
add r0, r2, #0
- bl FUN_0206EA30
+ bl TMHMGetMove
add r1, r0, #0
add r0, r5, #0
add r2, r4, #0
@@ -3896,7 +3896,7 @@ MOD75_021E89F0: ; 0x021E89F0
ldr r0, [r0]
lsr r1, r1, #0x10
lsr r2, r2, #0x10
- bl FUN_0206E5B4
+ bl MoveItemSlotInList
mov r0, #0x16
lsl r0, r0, #4
ldr r0, [r4, r0]
@@ -4066,7 +4066,7 @@ MOD75_021E8B70: ; 0x021E8B70
add r0, #0x66
ldrh r0, [r0]
mov r2, #6
- bl FUN_0206E710
+ bl LoadItemDataOrGfx
add r7, r0, #0
add r0, r5, #0
add r0, #0xc4
@@ -4123,7 +4123,7 @@ _021E8BB4:
_021E8BEC:
add r0, r7, #0
mov r1, #6
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
beq _021E8C66
add r0, r5, #0
@@ -4188,7 +4188,7 @@ _021E8C64:
_021E8C66:
add r0, r7, #0
mov r1, #3
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
bne _021E8C84
mov r0, #8
@@ -4203,7 +4203,7 @@ _021E8C66:
_021E8C84:
add r0, r7, #0
mov r1, #4
- bl FUN_0206E7DC
+ bl GetItemAttr_PreloadedItemData
cmp r0, #0
beq _021E8CCC
add r0, r5, #0
@@ -4423,7 +4423,7 @@ MOD75_021E8E1C: ; 0x021E8E1C
add r0, #0x66
ldrh r0, [r0]
add r2, r1, #0
- bl FUN_0206E7B8
+ bl GetItemAttr
add r1, r0, #0
lsl r1, r1, #0x10
mov r0, #2
@@ -4652,7 +4652,7 @@ _021E8FFA:
ldr r0, [r0]
add r0, #0x66
ldrh r0, [r0]
- bl FUN_0206EA30
+ bl TMHMGetMove
add r5, r0, #0
mov r0, #0x46
lsl r0, r0, #2
@@ -4661,7 +4661,7 @@ _021E8FFA:
add r2, r5, #0
bl FUN_0200AD5C
add r0, r5, #0
- bl FUN_0206EA54
+ bl MoveIsHM
cmp r0, #1
bne _021E9034
mov r0, #0x45
@@ -4959,7 +4959,7 @@ _021E9286:
add r0, r5, #0
mov r1, #2
mov r2, #6
- bl FUN_0206E7B8
+ bl GetItemAttr
add r1, r0, #0
lsl r1, r1, #0x18
add r0, r4, #0
@@ -5705,7 +5705,7 @@ _021E9872:
add r0, #0x66
ldrh r0, [r0]
mov r2, #6
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
beq _021E98FC
add r0, r5, #0
@@ -5891,7 +5891,7 @@ _021E99C6:
add r0, #0x66
ldrh r0, [r0]
mov r2, #6
- bl FUN_0206E7B8
+ bl GetItemAttr
ldr r1, _021E9B40 ; =0x0000048C
mov r2, #6
str r0, [r5, r1]
@@ -5901,7 +5901,7 @@ _021E99C6:
mov r1, #3
add r0, #0x66
ldrh r0, [r0]
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0
bne _021E9A38
ldr r1, _021E9B40 ; =0x0000048C
@@ -6633,7 +6633,7 @@ _021EA016:
ldrh r0, [r0]
mov r1, #6
add r2, r1, #0
- bl FUN_0206E7B8
+ bl GetItemAttr
cmp r0, #0xd
beq _021EA090
mov r3, #6
@@ -8052,7 +8052,7 @@ MOD75_021EAAE8: ; 0x021EAAE8
add r1, r6, #0
mov r2, #6
add r4, r0, #0
- bl FUN_0206E790
+ bl GetItemDescIntoString
b _021EAB18
_021EAB0A:
mov r0, #0x45
@@ -8091,7 +8091,7 @@ MOD75_021EAB44: ; 0x021EAB44
add r4, r5, #0
add r0, r1, #0
add r4, #0x14
- bl FUN_0206EA30
+ bl TMHMGetMove
str r0, [sp, #0x10]
mov r0, #0x45
lsl r0, r0, #2
@@ -8548,7 +8548,7 @@ MOD75_021EAF0C: ; 0x021EAF0C
add r5, r0, #0
ldrh r0, [r4]
add r6, r2, #0
- bl FUN_0206EB0C
+ bl ItemToBerryId
mov r1, #2
add r2, r0, #0
str r1, [sp]
@@ -10057,7 +10057,7 @@ _021EBA98:
bl FUN_0200C00C
mov r0, #0
mov r1, #1
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r3, r0, #0
mov r0, #0
str r0, [sp]
@@ -10130,7 +10130,7 @@ _021EBA98:
bl FUN_0200C06C
mov r0, #0
mov r1, #2
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r3, r0, #0
mov r0, #0
str r0, [sp]
@@ -10629,7 +10629,7 @@ MOD75_021EC034: ; 0x021EC034
add r5, r0, #0
add r0, r4, #0
mov r1, #1
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r3, r0, #0
mov r0, #0
str r0, [sp]
@@ -10645,7 +10645,7 @@ MOD75_021EC034: ; 0x021EC034
bl FUN_0200C9D8
add r0, r4, #0
mov r1, #2
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r3, r0, #0
mov r0, #0
str r0, [sp]
@@ -10983,7 +10983,7 @@ MOD75_021EC2B8: ; 0x021EC2B8
cmp r4, #0
beq _021EC374
add r0, r6, #0
- bl FUN_0206EA30
+ bl TMHMGetMove
mov r1, #3
add r4, r0, #0
bl GetWazaAttr
diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s
index 088090b7..d7122a78 100644
--- a/arm9/modules/80/asm/module_80.s
+++ b/arm9/modules/80/asm/module_80.s
@@ -4905,7 +4905,7 @@ MOD80_0222FBC0: ; 0x0222FBC0
ldr r0, [sp, #0x18]
lsr r1, r1, #0x10
mov r2, #0x3e
- bl FUN_0206E768
+ bl GetItemNameIntoString
mov r4, #0
add r5, r6, #0
add r7, r4, #0
@@ -10901,7 +10901,7 @@ _02232CF2:
ldr r0, [sp, #0x18]
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
beq _02232D48
add r0, r7, #0
@@ -11527,7 +11527,7 @@ MOD80_022331F8: ; 0x022331F8
bl GetMonData
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206EA98
+ bl ItemIdIsMail
cmp r0, #0
beq _02233212
mov r0, #1
diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s
index cf34dfb1..b43f0953 100644
--- a/arm9/modules/83/asm/module_83.s
+++ b/arm9/modules/83/asm/module_83.s
@@ -17289,7 +17289,7 @@ _02235CCA:
beq _02235DAC
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206E6D8
+ bl UpConvertItemId_Gen3to4
add r7, r0, #0
mov r0, #0x40
mov r1, #0x4e
@@ -17298,7 +17298,7 @@ _02235CCA:
lsr r1, r1, #0x10
mov r2, #0x4e
add r6, r0, #0
- bl FUN_0206E768
+ bl GetItemNameIntoString
mov r0, #0
mvn r0, r0
str r0, [sp, #0x60]
@@ -21897,7 +21897,7 @@ MOD83_02237F6C: ; 0x02237F6C
beq _02237FCE
lsl r0, r0, #0x10
lsr r0, r0, #0x10
- bl FUN_0206E6D8
+ bl UpConvertItemId_Gen3to4
str r0, [sp, #8]
_02237FCE:
add r0, r4, #0
@@ -24117,12 +24117,12 @@ _02239168:
lsl r0, r4, #0x10
lsr r0, r0, #0x10
mov r1, #1
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r7, r0, #0
lsl r0, r4, #0x10
lsr r0, r0, #0x10
mov r1, #2
- bl FUN_0206E640
+ bl GetItemIndexMapping
add r4, r0, #0
bl FUN_0206E708
add r6, r0, #0
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-17 19:35:38 +0000