From 1af603cdb91928dcdc3a703f4c66f78a3ac2bf93 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 21 Jun 2020 17:39:00 -0400 Subject: Name itemtool methods and data --- arm9/asm/scrcmd_18.s | 2 +- arm9/asm/scrcmd_22.s | 2 +- arm9/asm/scrcmd_4.s | 2 +- arm9/asm/unk_02035068.s | 10 ++-- arm9/asm/unk_0205CE48.s | 6 +- arm9/asm/unk_020653EC.s | 2 +- arm9/asm/unk_0206E5B4.s | 4 +- arm9/asm/unk_0206EB80.s | 2 +- arm9/asm/unk_0206F3FC.s | 22 +++---- arm9/asm/unk_02073710.s | 2 +- arm9/asm/unk_0207550C.s | 68 +++++++++++----------- arm9/asm/unk_02079C70.s | 2 +- arm9/asm/unk_020842DC.s | 150 ++++++++++++++++++++++++------------------------ arm9/asm/unk_020854E0.s | 2 +- arm9/asm/unk_02088AAC.s | 2 +- 15 files changed, 139 insertions(+), 139 deletions(-) (limited to 'arm9/asm') diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index bcd4dc70..468cd321 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -761,7 +761,7 @@ FUN_020448D4: ; 0x020448D4 lsr r0, r0, #0x10 mov r1, #0x1 mov r2, #0xb - bl FUN_0206E7B8 + bl GetItemAttr cmp r0, #0x34 bne _0204495A mov r0, #0x96 diff --git a/arm9/asm/scrcmd_22.s b/arm9/asm/scrcmd_22.s index 4d6295d1..de61ca49 100644 --- a/arm9/asm/scrcmd_22.s +++ b/arm9/asm/scrcmd_22.s @@ -204,7 +204,7 @@ FUN_02045918: ; 0x02045918 add r0, r4, #0x0 mov r1, #0x5 mov r2, #0xb - bl FUN_0206E7B8 + bl GetItemAttr strh r0, [r5, #0x0] mov r0, #0x0 pop {r3-r5, pc} diff --git a/arm9/asm/scrcmd_4.s b/arm9/asm/scrcmd_4.s index 4dc36e74..cb148e1a 100644 --- a/arm9/asm/scrcmd_4.s +++ b/arm9/asm/scrcmd_4.s @@ -174,7 +174,7 @@ FUN_02040800: ; 0x02040800 add r1, r0, #0x0 ldr r0, [r5, #0x0] bl FUN_020394F0 - bl FUN_0206EA30 + bl TMHMGetMove add r2, r0, #0x0 ldr r0, [r6, #0x0] add r1, r4, #0x0 diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 6fedcc3c..252405dd 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -2005,7 +2005,7 @@ _02035FD0: b _0203625E _02036056: ldrh r0, [r6, #0x24] - bl FUN_0206EAB8 + bl ItemToMailId add r3, r0, #0x0 mov r0, #0xb add r2, r6, #0x0 @@ -2365,7 +2365,7 @@ _02036340: ldrh r0, [r1, #0x4] mov r1, #0x6 mov r2, #0xb - bl FUN_0206E7B8 + bl GetItemAttr add r1, r0, #0x0 lsl r1, r1, #0x10 mov r0, #0x0 @@ -2451,7 +2451,7 @@ _020363F6: ldr r0, [r4, r0] bl FreeToHeap add r0, r5, #0x0 - bl FUN_0206EA98 + bl ItemIdIsMail cmp r0, #0x1 bne _02036474 ldr r0, [sp, #0xc] @@ -2461,7 +2461,7 @@ _020363F6: cmp r0, #0x0 bne _02036474 add r0, r5, #0x0 - bl FUN_0206EAB8 + bl ItemToMailId add r3, r0, #0x0 mov r0, #0xb lsl r2, r7, #0x18 @@ -3104,7 +3104,7 @@ FUN_0203695C: ; 0x0203695C add r4, r5, #0x0 _0203699A: add r0, r4, #0x0 - bl FUN_0206EB1C + bl BerryToItemId add r7, r0, #0x0 ldr r0, [sp, #0x0] add r1, r7, #0x0 diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index ae71023f..21fb0c6d 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -802,7 +802,7 @@ FUN_0205D400: ; 0x0205D400 add r0, #0x22 strb r1, [r0, #0x0] ldrh r0, [r6, #0x4] - bl FUN_0206EA30 + bl TMHMGetMove strh r0, [r4, #0x26] ldr r1, _0205D490 ; =UNK_020F96DC add r0, r5, #0x0 @@ -830,7 +830,7 @@ FUN_0205D498: ; 0x0205D498 bl FUN_0204652C add r4, r0, #0x0 ldrh r0, [r5, #0x4] - bl FUN_0206EAB8 + bl ItemToMailId add r2, r0, #0x0 add r0, r6, #0x0 mov r1, #0x3 @@ -1711,7 +1711,7 @@ _0205DB66: mov r1, #0x6 mov r2, #0xb str r0, [sp, #0x0] - bl FUN_0206E7B8 + bl GetItemAttr lsl r0, r0, #0x10 lsr r4, r0, #0x10 mov r0, #0x2 diff --git a/arm9/asm/unk_020653EC.s b/arm9/asm/unk_020653EC.s index ba17b570..f463a96a 100644 --- a/arm9/asm/unk_020653EC.s +++ b/arm9/asm/unk_020653EC.s @@ -1665,7 +1665,7 @@ _020660AE: bl FUN_020257CC strb r0, [r5, #0x5] ldrb r0, [r5, #0x5] - bl FUN_0206EAD8 + bl MailToItemId strh r0, [r5, #0x6] add r0, r7, #0x0 bl FUN_020257C4 diff --git a/arm9/asm/unk_0206E5B4.s b/arm9/asm/unk_0206E5B4.s index 5fdd814c..a40749bc 100644 --- a/arm9/asm/unk_0206E5B4.s +++ b/arm9/asm/unk_0206E5B4.s @@ -3,8 +3,8 @@ .text - thumb_func_start FUN_0206E5B4 -FUN_0206E5B4: ; 0x0206E5B4 + thumb_func_start MoveItemSlotInList +MoveItemSlotInList: ; 0x0206E5B4 push {r3-r6} add r3, r0, #0x0 add r0, r2, #0x0 diff --git a/arm9/asm/unk_0206EB80.s b/arm9/asm/unk_0206EB80.s index f65f8b86..26e15f21 100644 --- a/arm9/asm/unk_0206EB80.s +++ b/arm9/asm/unk_0206EB80.s @@ -65,7 +65,7 @@ FUN_0206EBD4: ; 0x0206EBD4 ldr r2, [sp, #0x10] mov r1, #0x5 add r6, r3, #0x0 - bl FUN_0206E7B8 + bl GetItemAttr cmp r0, #0x7 bhi _0206EC64 add r1, r0, r0 diff --git a/arm9/asm/unk_0206F3FC.s b/arm9/asm/unk_0206F3FC.s index 45c546c9..23b8fdb0 100644 --- a/arm9/asm/unk_0206F3FC.s +++ b/arm9/asm/unk_0206F3FC.s @@ -3833,7 +3833,7 @@ _02071210: add r1, r0, r2 ldr r0, _02071270 ; =0x0000070C ldrh r0, [r1, r0] - bl FUN_0206EA98 + bl ItemIdIsMail cmp r0, #0x1 bne _0207123E mov r1, #0x5 @@ -5357,15 +5357,15 @@ FUN_02071DF4: ; 0x02071DF4 ldr r0, [r5, r0] mov r2, #0xc ldrh r0, [r0, #0x24] - bl FUN_0206E710 + bl LoadItemDataOrGfx mov r1, #0x22 add r4, r0, #0x0 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _02071E1E add r0, r4, #0x0 mov r1, #0x23 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02071E30 _02071E1E: @@ -5379,12 +5379,12 @@ _02071E1E: _02071E30: add r0, r4, #0x0 mov r1, #0x24 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02071E5A add r0, r4, #0x0 mov r1, #0x25 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _02071E5A add r0, r4, #0x0 @@ -5418,7 +5418,7 @@ _02071E5A: bl FUN_0206EDD4 add r0, r4, #0x0 mov r1, #0x1a - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ldr r0, _02071F1C ; =0x000005A4 beq _02071ECC @@ -5449,7 +5449,7 @@ _02071E5A: _02071ECC: ldr r0, [r5, r0] ldrh r0, [r0, #0x24] - bl FUN_0206EB34 + bl ItemIsBitter cmp r0, #0x1 bne _02071EFA ldr r0, _02071F1C ; =0x000005A4 @@ -5505,7 +5505,7 @@ FUN_02071F28: ; 0x02071F28 mov r0, #0x0 pop {r3, pc} _02071F40: - bl FUN_0206EA98 + bl ItemIdIsMail cmp r0, #0x1 bne _02071F4C mov r0, #0x2 @@ -5543,7 +5543,7 @@ _02071F84: ldr r0, _02072074 ; =0x000005A4 ldr r0, [r5, r0] ldrh r0, [r0, #0x24] - bl FUN_0206EA98 + bl ItemIdIsMail cmp r0, #0x1 bne _02071FA0 ldr r0, _02072074 ; =0x000005A4 @@ -5844,7 +5844,7 @@ _0207220C: ldr r0, _020722A8 ; =0x000005A4 ldr r0, [r5, r0] ldrh r0, [r0, #0x24] - bl FUN_0206EA98 + bl ItemIdIsMail cmp r0, #0x1 bne _02072246 ldr r0, _020722A8 ; =0x000005A4 diff --git a/arm9/asm/unk_02073710.s b/arm9/asm/unk_02073710.s index 16631f9e..93309503 100644 --- a/arm9/asm/unk_02073710.s +++ b/arm9/asm/unk_02073710.s @@ -536,7 +536,7 @@ FUN_02073A78: ; 0x02073A78 pop {r3-r5, pc} _02073A92: add r0, r2, #0x0 - bl FUN_0206EA98 + bl ItemIdIsMail cmp r0, #0x1 ldr r0, [r5, r4] bne _02073AA6 diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index 08f186df..1dd536b9 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -10,10 +10,10 @@ FUN_0207550C: ; 0x0207550C push {r3-r5, lr} mov r1, #0x0 mov r2, #0xc - bl FUN_0206E710 + bl LoadItemDataOrGfx mov r1, #0xe add r4, r0, #0x0 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x1 beq _0207552C add r0, r4, #0x0 @@ -23,37 +23,37 @@ FUN_0207550C: ; 0x0207550C _0207552C: add r0, r4, #0x0 mov r1, #0x1b - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _02075580 add r0, r4, #0x0 mov r1, #0x1c - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _02075580 add r0, r4, #0x0 mov r1, #0x1d - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _02075580 add r0, r4, #0x0 mov r1, #0x1e - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _02075580 add r0, r4, #0x0 mov r1, #0x1f - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _02075580 add r0, r4, #0x0 mov r1, #0x20 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _02075580 add r0, r4, #0x0 mov r1, #0x21 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _0207558A _02075580: @@ -64,7 +64,7 @@ _02075580: _0207558A: add r0, r4, #0x0 mov r1, #0x18 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020755A0 add r0, r4, #0x0 @@ -74,7 +74,7 @@ _0207558A: _020755A0: add r0, r4, #0x0 mov r1, #0x19 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020755B6 add r0, r4, #0x0 @@ -84,31 +84,31 @@ _020755A0: _020755B6: add r0, r4, #0x0 mov r1, #0xf - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x10 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData lsl r0, r0, #0x1 add r5, r5, r0 add r0, r4, #0x0 mov r1, #0x11 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData lsl r0, r0, #0x2 add r5, r5, r0 add r0, r4, #0x0 mov r1, #0x12 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData lsl r0, r0, #0x3 add r5, r5, r0 add r0, r4, #0x0 mov r1, #0x13 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData lsl r0, r0, #0x4 add r5, r5, r0 add r0, r4, #0x0 mov r1, #0x14 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData lsl r0, r0, #0x5 add r5, r5, r0 cmp r5, #0x10 @@ -174,7 +174,7 @@ _02075664: _0207566E: add r0, r4, #0x0 mov r1, #0x26 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02075684 add r0, r4, #0x0 @@ -189,7 +189,7 @@ _02075684: _0207568E: add r0, r4, #0x0 mov r1, #0x15 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020756A4 add r0, r4, #0x0 @@ -199,7 +199,7 @@ _0207568E: _020756A4: add r0, r4, #0x0 mov r1, #0x26 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020756BA add r0, r4, #0x0 @@ -209,7 +209,7 @@ _020756A4: _020756BA: add r0, r4, #0x0 mov r1, #0x30 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _020756D0 add r0, r4, #0x0 @@ -225,7 +225,7 @@ _020756D0: _020756DC: add r0, r4, #0x0 mov r1, #0x31 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _020756F2 add r0, r4, #0x0 @@ -241,7 +241,7 @@ _020756F2: _020756FE: add r0, r4, #0x0 mov r1, #0x32 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _02075714 add r0, r4, #0x0 @@ -257,7 +257,7 @@ _02075714: _02075720: add r0, r4, #0x0 mov r1, #0x33 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _02075736 add r0, r4, #0x0 @@ -273,7 +273,7 @@ _02075736: _02075742: add r0, r4, #0x0 mov r1, #0x34 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _02075758 add r0, r4, #0x0 @@ -289,7 +289,7 @@ _02075758: _02075764: add r0, r4, #0x0 mov r1, #0x35 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _0207577A add r0, r4, #0x0 @@ -305,7 +305,7 @@ _0207577A: _02075786: add r0, r4, #0x0 mov r1, #0x1a - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _0207579C add r0, r4, #0x0 @@ -315,7 +315,7 @@ _02075786: _0207579C: add r0, r4, #0x0 mov r1, #0x22 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020757B2 add r0, r4, #0x0 @@ -325,7 +325,7 @@ _0207579C: _020757B2: add r0, r4, #0x0 mov r1, #0x23 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020757C8 add r0, r4, #0x0 @@ -335,12 +335,12 @@ _020757B2: _020757C8: add r0, r4, #0x0 mov r1, #0x24 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _020757E0 add r0, r4, #0x0 mov r1, #0x25 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020757EA _020757E0: @@ -1444,7 +1444,7 @@ FUN_02076144: ; 0x02076144 push {r3, lr} mov r1, #0x18 mov r2, #0xc - bl FUN_0206E7B8 + bl GetItemAttr cmp r0, #0x0 beq _02076156 mov r0, #0x1 @@ -2559,7 +2559,7 @@ _02076AC6: blo _02076AAA _02076AD4: ldrh r0, [r0, #0x24] - bl FUN_0206EA7C + bl ItemToTMHMId add r1, r0, #0x0 add r0, r6, #0x0 bl FUN_0206A13C @@ -3105,7 +3105,7 @@ FUN_02076F2C: ; 0x02076F2C cmp r0, #0x0 beq _02076FA8 ldrh r0, [r1, #0x26] - bl FUN_0206EA54 + bl MoveIsHM cmp r0, #0x0 bne _02076F98 ldr r0, _02076FAC ; =0x000005A4 diff --git a/arm9/asm/unk_02079C70.s b/arm9/asm/unk_02079C70.s index d9fbf726..644dbb64 100644 --- a/arm9/asm/unk_02079C70.s +++ b/arm9/asm/unk_02079C70.s @@ -1294,7 +1294,7 @@ _0207A6C0: mov r0, #0xa1 lsl r0, r0, #0x2 ldrh r0, [r1, r0] - bl FUN_0206EA54 + bl MoveIsHM cmp r0, #0x1 bne _0207A712 mov r0, #0x93 diff --git a/arm9/asm/unk_020842DC.s b/arm9/asm/unk_020842DC.s index 91504fe7..b016ceb3 100644 --- a/arm9/asm/unk_020842DC.s +++ b/arm9/asm/unk_020842DC.s @@ -13,10 +13,10 @@ FUN_020842DC: ; 0x020842DC ldr r0, [sp, #0x4] mov r1, #0x0 add r2, r3, #0x0 - bl FUN_0206E710 + bl LoadItemDataOrGfx mov r1, #0xe add r4, r0, #0x0 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x1 beq _02084308 add r0, r4, #0x0 @@ -32,7 +32,7 @@ _02084308: add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0xf - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084332 mov r0, #0x7 @@ -46,7 +46,7 @@ _02084308: _02084332: add r0, r4, #0x0 mov r1, #0x10 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084350 mov r0, #0x88 @@ -60,7 +60,7 @@ _02084332: _02084350: add r0, r4, #0x0 mov r1, #0x11 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _0208436E mov r0, #0x10 @@ -74,7 +74,7 @@ _02084350: _0208436E: add r0, r4, #0x0 mov r1, #0x12 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _0208438C mov r0, #0x20 @@ -88,7 +88,7 @@ _0208436E: _0208438C: add r0, r4, #0x0 mov r1, #0x13 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020843AA mov r0, #0x40 @@ -107,18 +107,18 @@ _020843AA: add r5, r0, #0x0 add r0, r4, #0x0 mov r1, #0x17 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _020843CE add r0, r4, #0x0 mov r1, #0x18 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020843EA _020843CE: add r0, r4, #0x0 mov r1, #0x19 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _020843EA cmp r5, #0x0 @@ -131,7 +131,7 @@ _020843CE: _020843EA: add r0, r4, #0x0 mov r1, #0x26 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084414 cmp r5, #0x0 @@ -150,7 +150,7 @@ _020843EA: _02084414: add r0, r4, #0x0 mov r1, #0x19 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _0208443A add r0, r6, #0x0 @@ -167,7 +167,7 @@ _02084414: _0208443A: add r0, r4, #0x0 mov r1, #0x1a - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084464 mov r0, #0x0 @@ -186,12 +186,12 @@ _0208443A: _02084464: add r0, r4, #0x0 mov r1, #0x22 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _0208447C add r0, r4, #0x0 mov r1, #0x23 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020844B2 _0208447C: @@ -221,7 +221,7 @@ _0208447C: _020844B2: add r0, r4, #0x0 mov r1, #0x24 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020844D6 add r0, r6, #0x0 @@ -237,7 +237,7 @@ _020844B2: _020844D6: add r0, r4, #0x0 mov r1, #0x25 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084502 mov r5, #0x0 @@ -297,12 +297,12 @@ _02084502: beq _020845C6 add r0, r4, #0x0 mov r1, #0x27 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020845C6 add r0, r4, #0x0 mov r1, #0x30 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _0208459C cmp r5, #0x64 @@ -347,12 +347,12 @@ _020845AE: _020845C6: add r0, r4, #0x0 mov r1, #0x28 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084632 add r0, r4, #0x0 mov r1, #0x31 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _02084606 ldr r0, [sp, #0x14] @@ -398,12 +398,12 @@ _0208461A: _02084632: add r0, r4, #0x0 mov r1, #0x29 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020846A0 add r0, r4, #0x0 mov r1, #0x32 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _02084674 ldr r0, [sp, #0x10] @@ -450,12 +450,12 @@ _02084688: _020846A0: add r0, r4, #0x0 mov r1, #0x2a - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _0208470E add r0, r4, #0x0 mov r1, #0x33 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _020846E2 ldr r0, [sp, #0xc] @@ -502,12 +502,12 @@ _020846F6: _0208470E: add r0, r4, #0x0 mov r1, #0x2b - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _0208477C add r0, r4, #0x0 mov r1, #0x34 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _02084750 ldr r0, [sp, #0x8] @@ -554,12 +554,12 @@ _02084764: _0208477C: add r0, r4, #0x0 mov r1, #0x2c - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020847E6 add r0, r4, #0x0 mov r1, #0x35 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _020847BC cmp r7, #0x64 @@ -635,10 +635,10 @@ FUN_02084810: ; 0x02084810 ldr r2, [sp, #0x88] mov r1, #0x0 str r3, [sp, #0x8] - bl FUN_0206E710 + bl LoadItemDataOrGfx mov r1, #0xe add r4, r0, #0x0 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x1 beq _02084840 add r0, r4, #0x0 @@ -657,7 +657,7 @@ _02084840: str r0, [sp, #0x54] add r0, r4, #0x0 mov r1, #0xf - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084868 ldr r1, [sp, #0x54] @@ -668,7 +668,7 @@ _02084840: _02084868: add r0, r4, #0x0 mov r1, #0x10 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _0208487E ldr r1, [sp, #0x54] @@ -679,7 +679,7 @@ _02084868: _0208487E: add r0, r4, #0x0 mov r1, #0x11 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084894 ldr r1, [sp, #0x54] @@ -690,7 +690,7 @@ _0208487E: _02084894: add r0, r4, #0x0 mov r1, #0x12 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020848AA ldr r1, [sp, #0x54] @@ -701,7 +701,7 @@ _02084894: _020848AA: add r0, r4, #0x0 mov r1, #0x13 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020848C0 ldr r1, [sp, #0x54] @@ -732,18 +732,18 @@ _020848D4: str r0, [sp, #0x54] add r0, r4, #0x0 mov r1, #0x17 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 bne _02084904 add r0, r4, #0x0 mov r1, #0x18 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084930 _02084904: add r0, r4, #0x0 mov r1, #0x19 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084930 ldr r0, [sp, #0x50] @@ -751,7 +751,7 @@ _02084904: bne _0208492C add r0, r4, #0x0 mov r1, #0x36 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData add r3, r0, #0x0 ldr r1, [sp, #0x50] ldr r2, [sp, #0x54] @@ -764,7 +764,7 @@ _0208492C: _02084930: add r0, r4, #0x0 mov r1, #0x26 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _0208495C ldr r1, [sp, #0x50] @@ -773,7 +773,7 @@ _02084930: bge _0208495A add r0, r4, #0x0 mov r1, #0x36 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData add r3, r0, #0x0 ldr r1, [sp, #0x50] ldr r2, [sp, #0x54] @@ -790,7 +790,7 @@ _0208495C: str r0, [sp, #0x58] add r0, r4, #0x0 mov r1, #0x19 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020849B4 ldr r0, [sp, #0x58] @@ -825,14 +825,14 @@ _020849B2: _020849B4: add r0, r4, #0x0 mov r1, #0x1a - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020849C2 mov r7, #0x1 _020849C2: add r0, r4, #0x0 mov r1, #0x22 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _020849E2 ldr r1, [sp, #0x4] @@ -848,7 +848,7 @@ _020849DE: _020849E2: add r0, r4, #0x0 mov r1, #0x23 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084A00 ldr r1, [sp, #0x4] @@ -863,12 +863,12 @@ _020849FE: _02084A00: add r0, r4, #0x0 mov r1, #0x24 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084A2C add r0, r4, #0x0 mov r1, #0x37 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData add r2, r0, #0x0 ldr r1, [sp, #0x4] add r0, r5, #0x0 @@ -884,7 +884,7 @@ _02084A28: .word 0xFFFFF077 _02084A2C: add r0, r4, #0x0 mov r1, #0x25 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084A66 mov r0, #0x0 @@ -895,7 +895,7 @@ _02084A2C: _02084A42: add r0, r4, #0x0 add r1, r7, #0x0 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData add r2, r0, #0x0 ldr r1, [sp, #0x50] add r0, r5, #0x0 @@ -952,12 +952,12 @@ _02084A66: beq _02084B20 add r0, r4, #0x0 mov r1, #0x27 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084B20 add r0, r4, #0x0 mov r1, #0x30 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData ldr r1, [sp, #0x60] ldr r2, [sp, #0x54] str r1, [sp, #0x10] @@ -997,12 +997,12 @@ _02084B18: _02084B20: add r0, r4, #0x0 mov r1, #0x28 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084B80 add r0, r4, #0x0 mov r1, #0x31 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData ldr r1, [sp, #0x60] ldr r2, [sp, #0x50] str r1, [sp, #0x1c] @@ -1042,12 +1042,12 @@ _02084B78: _02084B80: add r0, r4, #0x0 mov r1, #0x29 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084BE0 add r0, r4, #0x0 mov r1, #0x32 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData ldr r1, [sp, #0x60] ldr r2, [sp, #0x50] str r1, [sp, #0x28] @@ -1087,12 +1087,12 @@ _02084BD8: _02084BE0: add r0, r4, #0x0 mov r1, #0x2a - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084C40 add r0, r4, #0x0 mov r1, #0x33 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData ldr r1, [sp, #0x60] ldr r2, [sp, #0x50] str r1, [sp, #0x34] @@ -1132,12 +1132,12 @@ _02084C38: _02084C40: add r0, r4, #0x0 mov r1, #0x2b - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084CA0 add r0, r4, #0x0 mov r1, #0x34 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData ldr r1, [sp, #0x5c] ldr r2, [sp, #0x50] str r1, [sp, #0x40] @@ -1177,12 +1177,12 @@ _02084C98: _02084CA0: add r0, r4, #0x0 mov r1, #0x2c - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084D00 add r0, r4, #0x0 mov r1, #0x35 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData ldr r1, [sp, #0x5c] ldr r2, [sp, #0x50] str r1, [sp, #0x4c] @@ -1239,12 +1239,12 @@ _02084D14: bge _02084D54 add r0, r4, #0x0 mov r1, #0x2d - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084DC2 add r0, r4, #0x0 mov r1, #0x38 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData add r2, r0, #0x0 ldr r0, [sp, #0x88] str r0, [sp, #0x0] @@ -1263,12 +1263,12 @@ _02084D54: bge _02084D8A add r0, r4, #0x0 mov r1, #0x2e - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084DC2 add r0, r4, #0x0 mov r1, #0x39 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData add r2, r0, #0x0 ldr r0, [sp, #0x88] str r0, [sp, #0x0] @@ -1288,12 +1288,12 @@ _02084D8A: bgt _02084DC2 add r0, r4, #0x0 mov r1, #0x2f - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02084DC2 add r0, r4, #0x0 mov r1, #0x3a - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData add r2, r0, #0x0 ldr r0, [sp, #0x88] str r0, [sp, #0x0] @@ -1631,12 +1631,12 @@ _02085014: bge _02085038 add r0, r4, #0x0 mov r1, #0x2d - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02085034 add r0, r4, #0x0 mov r1, #0x38 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _02085034 mov r0, #0x1 @@ -1650,12 +1650,12 @@ _02085038: bge _0208505E add r0, r4, #0x0 mov r1, #0x2e - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _0208505A add r0, r4, #0x0 mov r1, #0x39 - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _0208505A mov r0, #0x1 @@ -1670,12 +1670,12 @@ _0208505E: bge _02085086 add r0, r4, #0x0 mov r1, #0x2f - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 beq _02085082 add r0, r4, #0x0 mov r1, #0x3a - bl FUN_0206E7DC + bl GetItemAttr_PreloadedItemData cmp r0, #0x0 ble _02085082 mov r0, #0x1 @@ -1728,7 +1728,7 @@ _020850BE: ldr r2, [sp, #0x20] lsr r0, r0, #0x10 mov r1, #0x1 - bl FUN_0206E7B8 + bl GetItemAttr cmp r0, #0x34 bne _020850EC ldr r1, [sp, #0x18] diff --git a/arm9/asm/unk_020854E0.s b/arm9/asm/unk_020854E0.s index bb8ca455..cf2ec66b 100644 --- a/arm9/asm/unk_020854E0.s +++ b/arm9/asm/unk_020854E0.s @@ -257,7 +257,7 @@ FUN_020856A0: ; 0x020856A0 pop {r3-r7, pc} _020856BC: bl FUN_020257CC - bl FUN_0206EAD8 + bl MailToItemId str r0, [sp, #0x0] add r0, r4, #0x0 mov r1, #0xa9 diff --git a/arm9/asm/unk_02088AAC.s b/arm9/asm/unk_02088AAC.s index fd0718de..b8a83eab 100644 --- a/arm9/asm/unk_02088AAC.s +++ b/arm9/asm/unk_02088AAC.s @@ -264,7 +264,7 @@ FUN_02088C3C: ; 0x02088C3C add r4, r6, #0x0 _02088C70: add r0, r4, #0x0 - bl FUN_0206EB1C + bl BerryToItemId lsl r0, r0, #0x18 lsr r7, r0, #0x18 ldr r0, [sp, #0x0] -- cgit v1.2.3