diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-21 17:39:00 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-06-21 17:39:00 -0400 |
| commit | 1af603cdb91928dcdc3a703f4c66f78a3ac2bf93 (patch) | |
| tree | 5610b61970a8a05948caa0774f89768e8cd32f9b | |
| parent | b207354025c33f3084981224e7727d4540c550d3 (diff) | |
Name itemtool methods and data
32 files changed, 522 insertions, 523 deletions
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] diff --git a/arm9/global.inc b/arm9/global.inc index 80a7aa6a..a59192fd 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -4966,28 +4966,28 @@ .extern FUN_0206E394 .extern FUN_0206E3F8 .extern FUN_0206E51C -.extern FUN_0206E5B4 -.extern FUN_0206E640 -.extern FUN_0206E6D8 +.extern MoveItemSlotInList +.extern GetItemIndexMapping +.extern UpConvertItemId_Gen3to4 .extern FUN_0206E708 .extern FUN_0206E70C -.extern FUN_0206E710 -.extern FUN_0206E768 -.extern FUN_0206E790 -.extern FUN_0206E7B8 -.extern FUN_0206E7DC -.extern FUN_0206EA30 -.extern FUN_0206EA54 -.extern FUN_0206EA7C -.extern FUN_0206EA98 -.extern FUN_0206EAB8 -.extern FUN_0206EAD8 -.extern FUN_0206EAEC -.extern FUN_0206EB0C -.extern FUN_0206EB1C -.extern FUN_0206EB34 -.extern FUN_0206EB50 -.extern FUN_0206EB78 +.extern LoadItemDataOrGfx +.extern GetItemNameIntoString +.extern GetItemDescIntoString +.extern GetItemAttr +.extern GetItemAttr_PreloadedItemData +.extern TMHMGetMove +.extern MoveIsHM +.extern ItemToTMHMId +.extern ItemIdIsMail +.extern ItemToMailId +.extern MailToItemId +.extern ItemIdIsBerry +.extern ItemToBerryId +.extern BerryToItemId +.extern ItemIsBitter +.extern LoadAllItemData +.extern GetItemDataPtrFromArray .extern FUN_0206EB80 .extern FUN_0206EB88 .extern FUN_0206EBA0 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 diff --git a/arm9/src/itemtool.c b/arm9/src/itemtool.c index fb4097a3..2c389512 100644 --- a/arm9/src/itemtool.c +++ b/arm9/src/itemtool.c @@ -6,7 +6,7 @@ #pragma thumb on -const u16 UNK_020F8454[] = { +static const u16 sMailIdxs[] = { ITEM_GRASS_MAIL, ITEM_FLAME_MAIL, ITEM_BUBBLE_MAIL, @@ -21,7 +21,7 @@ const u16 UNK_020F8454[] = { ITEM_BRICK_MAIL, }; -const u16 UNK_020F846C[] = { +static const u16 sBerryIdxs[] = { ITEM_CHERI_BERRY, ITEM_CHESTO_BERRY, ITEM_PECHA_BERRY, @@ -88,7 +88,7 @@ const u16 UNK_020F846C[] = { ITEM_ROWAP_BERRY, }; -const u16 UNK_020F84EC[] = { +static const u16 sTMHMMoves[] = { MOVE_FOCUS_PUNCH, MOVE_DRAGON_CLAW, MOVE_WATER_PULSE, @@ -191,7 +191,12 @@ const u16 UNK_020F84EC[] = { MOVE_ROCK_CLIMB, }; -const u16 UNK_020F85B4[][4] = { +static const u16 sItemIndexMappings[][4] = { + /* Col 1: Offset in item_data.narc + * Col 2: Gfx offset in item_icon.narc + * Col 3: Pal offset in item_icon.narc + * Col 4: Gen 3 item index (for Pal Park conversion) + */ { 0, 699, 700, 0 }, { 1, 2, 3, 1 }, { 2, 4, 5, 2 }, @@ -658,7 +663,7 @@ const u16 UNK_020F85B4[][4] = { { 440, 598, 599, 285 }, { 441, 600, 601, 0 }, }; -// + //static inline void ShiftItemSlots(struct ItemSlot * itemSlots, s16 from, s16 to, s32 direction) //{ // for (; direction > 0 ? from < to : from > to; from += direction) @@ -667,7 +672,7 @@ const u16 UNK_020F85B4[][4] = { // } //} // -//void FUN_0206E5B4(struct ItemSlot * itemSlots, u16 from, u16 to) +//void MoveItemSlotInList(struct ItemSlot * itemSlots, u16 from, u16 to) //{ // if (from != to) // { @@ -685,7 +690,7 @@ const u16 UNK_020F85B4[][4] = { // } //} -u16 FUN_0206E640(u16 a0, u16 a1) +u16 GetItemIndexMapping(u16 a0, u16 a1) { switch (a1) { @@ -694,35 +699,35 @@ u16 FUN_0206E640(u16 a0, u16 a1) break; if (a0 == 0xFFFF) break; - return UNK_020F85B4[a0][0]; + return sItemIndexMappings[a0][0]; case 1: if (a0 == 0) return 699; if (a0 == 0xFFFF) return 701; - return UNK_020F85B4[a0][1]; + return sItemIndexMappings[a0][1]; case 2: if (a0 == 0) return 700; if (a0 == 0xFFFF) return 702; - return UNK_020F85B4[a0][2]; + return sItemIndexMappings[a0][2]; case 3: if (a0 == 0) break; if (a0 == 0xFFFF) break; - return UNK_020F85B4[a0][3]; + return sItemIndexMappings[a0][3]; } return 0; } -u16 FUN_0206E6D8(u16 a0) +u16 UpConvertItemId_Gen3to4(u16 a0) { u16 i; - for (i = 1; i <= NELEMS(UNK_020F85B4) - 1; i++) + for (i = 1; i <= NELEMS(sItemIndexMappings) - 1; i++) { - if (a0 == UNK_020F85B4[i][3]) + if (a0 == sItemIndexMappings[i][3]) return i; } return 0; @@ -738,53 +743,47 @@ int FUN_0206E70C() return 0; } -void * FUN_0206E710(u16 a0, u16 a1, u32 heap_id) +void * LoadItemDataOrGfx(u16 a0, u16 a1, u32 heap_id) { - if (a0 > NELEMS(UNK_020F85B4) - 1) + if (a0 > NELEMS(sItemIndexMappings) - 1) a0 = 0; switch (a1) { case 0: - return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, UNK_020F85B4[a0][0], heap_id); + return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, sItemIndexMappings[a0][0], heap_id); case 1: - return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, UNK_020F85B4[a0][1], heap_id); + return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, sItemIndexMappings[a0][1], heap_id); case 2: - return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, UNK_020F85B4[a0][2], heap_id); + return AllocAndReadWholeNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, sItemIndexMappings[a0][2], heap_id); default: return NULL; } } -void FUN_0206E768(struct String * dest, u16 item_id, u32 heap_no) +void GetItemNameIntoString(struct String * dest, u16 item_id, u32 heap_no) { struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 344, heap_no); ReadMsgDataIntoString(msgData, item_id, dest); DestroyMsgData(msgData); } -void FUN_0206E790(struct String * dest, u16 item_id, u32 heap_no) +void GetItemDescIntoString(struct String * dest, u16 item_id, u32 heap_no) { struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 343, heap_no); ReadMsgDataIntoString(msgData, item_id, dest); DestroyMsgData(msgData); } -struct ItemData; - -u32 FUN_0206E7DC(struct ItemData * itemData, u32 attr); - -u32 FUN_0206E7B8(u16 item, u32 attr, u32 heap_id) +u32 GetItemAttr(u16 item, u32 attr, u32 heap_id) { u32 ret; - struct ItemData * itemData = (struct ItemData *)FUN_0206E710(item, 0, heap_id); - ret = FUN_0206E7DC(itemData, attr); + struct ItemData * itemData = (struct ItemData *)LoadItemDataOrGfx(item, 0, heap_id); + ret = GetItemAttr_PreloadedItemData(itemData, attr); FUN_02016A8C(heap_id, itemData); return ret; } -u32 FUN_0206E878(struct ItemDataSub * a0, u32 attr); - -u32 FUN_0206E7DC(struct ItemData * itemData, u32 attr) +u32 GetItemAttr_PreloadedItemData(struct ItemData * itemData, u32 attr) { switch (attr) { @@ -824,14 +823,14 @@ u32 FUN_0206E7DC(struct ItemData * itemData, u32 attr) case 0: return itemData->unkE.flat; case 1: - return FUN_0206E878(&itemData->unkE.sub, attr); + return GetItemAttrSub(&itemData->unkE.sub, attr); default: return 0; } } } -u32 FUN_0206E878(struct ItemDataSub * sub, u32 attr) +u32 GetItemAttrSub(struct ItemDataSub * sub, u32 attr) { switch (attr) { @@ -928,101 +927,101 @@ u32 FUN_0206E878(struct ItemDataSub * sub, u32 attr) } } -u16 FUN_0206EA30(u16 a0) +u16 TMHMGetMove(u16 a0) { if (a0 < ITEM_TM01 || a0 > ITEM_HM08) return MOVE_NONE; a0 -= ITEM_TM01; - return UNK_020F84EC[a0]; + return sTMHMMoves[a0]; } -BOOL FUN_0206EA54(u16 a0) +BOOL MoveIsHM(u16 a0) { u8 i; for (i = 0; i < 8; i++) { - if (a0 == UNK_020F84EC[i + NUM_TMS]) + if (a0 == sTMHMMoves[i + NUM_TMS]) return TRUE; } return FALSE; } -u8 FUN_0206EA7C(u16 a0) +u8 ItemToTMHMId(u16 a0) { if (a0 < ITEM_TM01 || a0 > ITEM_HM08) return 0; return (u8)(a0 - ITEM_TM01); } -BOOL FUN_0206EA98(u16 a0) +BOOL ItemIdIsMail(u16 a0) { u32 i; for (i = 0; i < 12; i++) { - if (a0 == UNK_020F8454[i]) + if (a0 == sMailIdxs[i]) return TRUE; } return FALSE; } -u8 FUN_0206EAB8(u16 a0) +u8 ItemToMailId(u16 a0) { u32 i; for (i = 0; i < 12; i++) { - if (a0 == UNK_020F8454[i]) + if (a0 == sMailIdxs[i]) return (u8)i; } return 0; } -u16 FUN_0206EAD8(u8 i) +u16 MailToItemId(u8 i) { if (i >= 12) return 0; - return UNK_020F8454[i]; + return sMailIdxs[i]; } -BOOL FUN_0206EAEC(u16 a0) +BOOL ItemIdIsBerry(u16 a0) { u32 i; for (i = 0; i < 64; i++) { - if (a0 == UNK_020F846C[i]) + if (a0 == sBerryIdxs[i]) return TRUE; } return FALSE; } -u8 FUN_0206EB0C(u16 a0) +u8 ItemToBerryId(u16 item_id) { - if (a0 < FIRST_BERRY_IDX) + if (item_id < FIRST_BERRY_IDX) return 0xFF; - return (u8)(a0 - FIRST_BERRY_IDX); + return (u8)(item_id - FIRST_BERRY_IDX); } -u16 FUN_0206EB1C(u8 a0) +u16 BerryToItemId(u8 a0) { if (a0 >= NUM_BERRIES) return 0xFFFF; - return UNK_020F846C[a0]; + return sBerryIdxs[a0]; } -u8 FUN_0206EB34(u16 a0) +u8 ItemIsBitter(u16 item_id) { - return a0 == ITEM_ENERGYPOWDER || - a0 == ITEM_ENERGY_ROOT || - a0 == ITEM_HEAL_POWDER || - a0 == ITEM_REVIVAL_HERB; + return item_id == ITEM_ENERGYPOWDER || + item_id == ITEM_ENERGY_ROOT || + item_id == ITEM_HEAL_POWDER || + item_id == ITEM_REVIVAL_HERB; } -struct ItemData * FUN_0206EB50(u16 a0) +struct ItemData * LoadAllItemData(u32 heap_id) { - return AllocAndReadFromNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, 0, a0, 0, sizeof(struct ItemData) * FUN_0206E640(ITEM_SECRETPOTION, 0)); + return AllocAndReadFromNarcMemberByIdPair(NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, 0, heap_id, 0, sizeof(struct ItemData) * GetItemIndexMapping(ITEM_SECRETPOTION, 0)); } -struct ItemData * FUN_0206EB78(struct ItemData * a0, u16 a1) +struct ItemData * GetItemDataPtrFromArray(struct ItemData * a0, u16 item_id) { - return a0 + a1; + return a0 + item_id; } diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c index a15d20c1..8be66329 100644 --- a/arm9/src/pokemon.c +++ b/arm9/src/pokemon.c @@ -972,7 +972,7 @@ u32 GetBoxMonDataInternal(struct BoxPokemon * boxmon, int attr, void * dest) case MON_DATA_TYPE_1: case MON_DATA_TYPE_2: if (blockA->species == SPECIES_ARCEUS && blockA->ability == ABILITY_MULTITYPE) - ret = (u32)GetArceusTypeByHeldItemEffect((u16)FUN_0206E7B8(blockA->heldItem, 1, 0)); + ret = (u32)GetArceusTypeByHeldItemEffect((u16)GetItemAttr(blockA->heldItem, 1, 0)); else { ret = (u32)GetMonBaseStat_HandleFormeConversion(blockA->species, blockB->alternateForm, (enum BaseStat)(attr - MON_DATA_TYPE_1 + BASE_TYPE1)); @@ -2060,7 +2060,7 @@ void MonApplyFriendshipMod(struct Pokemon * pokemon, u32 kind, u32 location) if (species == SPECIES_NONE || species == SPECIES_EGG) return; - effect = (u8)FUN_0206E7B8((u16)GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), 1, 0); + effect = (u8)GetItemAttr((u16)GetMonData(pokemon, MON_DATA_HELD_ITEM, NULL), 1, 0); r4 = 0; friendship = (s16)GetMonData(pokemon, MON_DATA_FRIENDSHIP, NULL); if (friendship >= 100) @@ -2514,7 +2514,7 @@ u16 GetMonEvolution(struct PlayerParty * party, struct Pokemon * pokemon, u32 co personality = GetMonData(pokemon, MON_DATA_PERSONALITY, NULL); beauty = (u8)GetMonData(pokemon, MON_DATA_BEAUTY, NULL); pid_hi = (u16)((personality & 0xFFFF0000) >> 16); - r1 = (u8)FUN_0206E7B8(heldItem, 1, 0); + r1 = (u8)GetItemAttr(heldItem, 1, 0); if (species != SPECIES_KADABRA && r1 == 0x3F && context != 3) return SPECIES_NONE; if (method_ret == NULL) @@ -3248,7 +3248,7 @@ void FUN_02069ECC(struct BoxPokemon * boxmon) u32 forme; if (species == SPECIES_ARCEUS && ability == ABILITY_MULTITYPE) { - forme = GetArceusTypeByHeldItemEffect((u16)FUN_0206E7B8((u16)heldItem, 1, 0)); + forme = GetArceusTypeByHeldItemEffect((u16)GetItemAttr((u16)heldItem, 1, 0)); SetBoxMonData(boxmon, MON_DATA_FORME, &forme); } } diff --git a/include/filesystem.h b/include/filesystem.h index 6b5a16d6..35fc6fe6 100644 --- a/include/filesystem.h +++ b/include/filesystem.h @@ -14,152 +14,152 @@ typedef struct NARC typedef enum NarcId { - NARC_BATTLE_SKILL_WAZA_SEQ = 0, - NARC_BATTLE_SKILL_SUB_SEQ, - NARC_POKETOOL_PERSONAL_PERSONAL, - NARC_POKETOOL_PERSONAL_GROWTBL, - NARC_POKETOOL_POKEGRA_POKEGRA, - NARC_POKETOOL_POKEGRA_HEIGHT, - NARC_POKETOOL_TRGRA_TRBGRA, - NARC_BATTLE_GRAPHIC_BATT_BG, - NARC_WAZAEFFECT_WE, - NARC_POKETOOL_WAZA_WAZA_TBL, - NARC_FIELDDATA_SCRIPT_SCR_SEQ_RELEASE, - NARC_MSGDATA_SCENARIO_SCR_MSG, - NARC_GRAPHIC_POKETCH, - NARC_GRAPHIC_BAG_GRA, - NARC_GRAPHIC_FONT, - NARC_ITEMTOOL_ITEMDATA_ITEM_DATA, - NARC_ITEMTOOL_ITEMDATA_ITEM_ICON, - NARC_GRAPHIC_TMAP_GRA, - NARC_GRAPHIC_BOX, - NARC_POKETOOL_ICONGRA_POKE_ICON, - NARC_GRAPHIC_PLIST_GRA, - NARC_WAZAEFFECT_EFFECTCLACT_WECHAR, - NARC_WAZAEFFECT_EFFECTCLACT_WEPLTT, - NARC_WAZAEFFECT_EFFECTCLACT_WECELL, - NARC_WAZAEFFECT_EFFECTCLACT_WECELLANM, - NARC_GRAPHIC_IMAGECLIP, - NARC_MSGDATA_MSG, - NARC_BATTLE_GRAPHIC_BATT_OBJ, - NARC_DATA_UNDERG_RADAR, - NARC_WAZAEFFECT_EFFECTDATA_WAZA_PARTICLE, - NARC_BATTLE_SKILL_BE_SEQ, - NARC_DATA_NAMEIN, - NARC_FIELDDATA_EVENTDATA_ZONE_EVENT_RELEASE, - NARC_POKETOOL_PERSONAL_WOTBL, - NARC_POKETOOL_PERSONAL_EVO, - NARC_GRAPHIC_FONTOAM, - NARC_GRAPHIC_FIELD_BOARD, - NARC_FIELDDATA_ENCOUNTDATA_D_ENC_DATA, - NARC_GRAPHIC_WINFRAME, - NARC_GRAPHIC_PST_GRA, - NARC_FIELDDATA_BUILD_MODEL_BUILD_MODEL, - NARC_FIELDDATA_MAPMATRIX_MAP_MATRIX, - NARC_FIELDDATA_AREADATA_AREA_DATA, - NARC_FIELDDATA_AREADATA_AREA_BUILD_MODEL_AREA_BUILD, - NARC_FIELDDATA_AREADATA_AREA_MAP_TEX_MAP_TEX_SET, - NARC_CONTEST_GRAPHIC_CONTEST_BG, - NARC_CONTEST_GRAPHIC_CONTEST_OBJ, - NARC_DATA_UGEFFECT_OBJ_GRAPHIC, - NARC_DEMO_TITLE_TITLEDEMO, - NARC_FIELDDATA_AREADATA_AREA_MOVE_MODEL_MOVE_MODEL_LIST, - NARC_DATA_UG_TRAP, - NARC_GRAPHIC_TRAINER_CASE, - NARC_DATA_UG_FOSSIL, - NARC_GRAPHIC_NTAG_GRA, - NARC_DATA_TRADELIST, - NARC_DATA_UG_PARTS, - NARC_GRAPHIC_OPENING, - NARC_POKETOOL_TRAINER_TRDATA, - NARC_POKETOOL_TRAINER_TRPOKE, - NARC_POKETOOL_TRMSG_TRTBL, - NARC_POKETOOL_TRGRA_TRFGRA, - NARC_PARTICLEDATA_PARTICLEDATA, - NARC_GRAPHIC_SHOP_GRA, - NARC_WAZAEFFECT_WE_SUB, - NARC_DATA_UG_ANIM, - NARC_DATA_WEATHER_SYS, - NARC_GRAPHIC_MENU_GRA, - NARC_FIELDDATA_LAND_DATA_LAND_DATA_RELEASE, - NARC_ITEMTOOL_ITEMDATA_NUTS_DATA, - NARC_RESOURCE_ENG_ZUKAN_ZUKAN, - NARC_POKETOOL_POKEFOOT_POKEFOOT, - NARC_FIELDDATA_AREADATA_AREA_BUILD_MODEL_AREABM_TEXSET, - NARC_BATTLE_GRAPHIC_B_PLIST_GRA, - NARC_GRAPHIC_CONFIG_GRA, - NARC_GRAPHIC_UNIONROOM, - NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_DATA, - NARC_GRAPHIC_PMSI, - NARC_BATTLE_GRAPHIC_B_BAG_GRA, - NARC_GRAPHIC_OEKAKI, - NARC_GRAPHIC_MAIL_GRA, - NARC_GRAPHIC_F_NOTE_GRA, - NARC_DATA_MMODEL_MMODEL, - NARC_GRAPHIC_EV_POKESELECT, - NARC_GRAPHIC_PORU_GRA, - NARC_GRAPHIC_TOUCH_SUBWINDOW, - NARC_GRAPHIC_FLD_COMACT, - NARC_GRAPHIC_RECORD, - NARC_GRAPHIC_PORUDEMO, - NARC_GRAPHIC_PORUACT, - NARC_DATA_WIFINOTE, - NARC_CONTEST_DATA_CONTEST_DATA, - NARC_APPLICATION_CUSTOM_BALL_DATA_CB_DATA, - NARC_DATA_WIFIP2PMATCH, - NARC_GRAPHIC_DEMO_TRADE, - NARC_POKEANIME_POKE_ANM, - NARC_GRAPHIC_MYSIGN, - NARC_FIELDDATA_MM_LIST_MOVE_MODEL_LIST, - NARC_DATA_FIELD_CUTIN, - NARC_DATA_DEMO_CLIMAX, - NARC_WAZAEFFECT_EFFECTDATA_BALL_PARTICLE, - NARC_WAZAEFFECT_PT_DEBUG_DEBUG_PARTICLE, - NARC_GRAPHIC_DENDOU_PC, - NARC_APPLICATION_WIFI_EARTH_WIFI_EARTH_PLACE, - NARC_BATTLE_TR_AI_TR_AI_SEQ, - NARC_GRAPHIC_WORLDTRADE, - NARC_GRAPHIC_DENDOU_DEMO, - NARC_ARC_ENCDATA_EX, - NARC_DATA_MMODEL_FLDEFF, - NARC_BATTLE_GRAPHIC_VS_DEMO_GRA, - NARC_POKETOOL_POKEZUKAN, - NARC_ARC_BM_ANIME, - NARC_ARC_BM_ANIME_LIST, - NARC_GRAPHIC_FIELD_ENCOUNTEFFECT, - NARC_GRAPHIC_WAZA_OSHIE_GRA, - NARC_POKETOOL_POKEANM_POKEANM, - NARC_FIELDDATA_POKEMON_TRADE_FLD_TRADE, - NARC_GRAPHIC_MYSTERY, - NARC_POKETOOL_POKEGRA_OTHERPOKE, - NARC_DEMO_EGG_DATA_EGG_DATA, - NARC_DEMO_EGG_DATA_PARTICLE_EGG_DEMO_PARTICLE, - NARC_ARC_SHIP_DEMO, - NARC_POKETOOL_POKEGRA_HEIGHT_O, - NARC_GRAPHIC_NUTMIXER, - NARC_GRAPHIC_BTOWER, - NARC_DEMO_SHINKA_DATA_PARTICLE_SHINKA_DEMO_PARTICLE, - NARC_DEMO_INTRO_INTRO, - NARC_ARC_TV, - NARC_GRAPHIC_ENDING, - NARC_DEMO_TITLE_OP_DEMO, - NARC_APPLICATION_WIFI_EARTH_WIFI_EARTH, - NARC_GRAPHIC_RANKING, - NARC_ARC_PPARK, - NARC_DEMO_SYOUJYOU_SYOUJYOU, - NARC_DATA_SLOT, - NARC_BATTLE_B_TOWER_BTDTR, - NARC_BATTLE_B_TOWER_BTDPM, - NARC_DEMO_INTRO_INTRO_TV, - NARC_POKETOOL_TRMSG_TRTBLOFS, - NARC_POKETOOL_POKEGRA_POKE_YOFS, - NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND, - NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL, - NARC_GRAPHIC_HIDEN_EFFECT, - NARC_POKETOOL_POKEGRA_POKE_SHADOW, - NARC_FIELDDATA_ENCOUNTDATA_P_ENC_DATA, - NARC_POKETOOL_POKEGRA_POKE_SHADOW_OFX, - NARC_POKETOOL_SHINZUKAN, + NARC_BATTLE_SKILL_WAZA_SEQ = 0, + NARC_BATTLE_SKILL_SUB_SEQ = 1, + NARC_POKETOOL_PERSONAL_PERSONAL = 2, + NARC_POKETOOL_PERSONAL_GROWTBL = 3, + NARC_POKETOOL_POKEGRA_POKEGRA = 4, + NARC_POKETOOL_POKEGRA_HEIGHT = 5, + NARC_POKETOOL_TRGRA_TRBGRA = 6, + NARC_BATTLE_GRAPHIC_BATT_BG = 7, + NARC_WAZAEFFECT_WE = 8, + NARC_POKETOOL_WAZA_WAZA_TBL = 9, + NARC_FIELDDATA_SCRIPT_SCR_SEQ_RELEASE = 10, + NARC_MSGDATA_SCENARIO_SCR_MSG = 11, + NARC_GRAPHIC_POKETCH = 12, + NARC_GRAPHIC_BAG_GRA = 13, + NARC_GRAPHIC_FONT = 14, + NARC_ITEMTOOL_ITEMDATA_ITEM_DATA = 15, + NARC_ITEMTOOL_ITEMDATA_ITEM_ICON = 16, + NARC_GRAPHIC_TMAP_GRA = 17, + NARC_GRAPHIC_BOX = 18, + NARC_POKETOOL_ICONGRA_POKE_ICON = 19, + NARC_GRAPHIC_PLIST_GRA = 20, + NARC_WAZAEFFECT_EFFECTCLACT_WECHAR = 21, + NARC_WAZAEFFECT_EFFECTCLACT_WEPLTT = 22, + NARC_WAZAEFFECT_EFFECTCLACT_WECELL = 23, + NARC_WAZAEFFECT_EFFECTCLACT_WECELLANM = 24, + NARC_GRAPHIC_IMAGECLIP = 25, + NARC_MSGDATA_MSG = 26, + NARC_BATTLE_GRAPHIC_BATT_OBJ = 27, + NARC_DATA_UNDERG_RADAR = 28, + NARC_WAZAEFFECT_EFFECTDATA_WAZA_PARTICLE = 29, + NARC_BATTLE_SKILL_BE_SEQ = 30, + NARC_DATA_NAMEIN = 31, + NARC_FIELDDATA_EVENTDATA_ZONE_EVENT_RELEASE = 32, + NARC_POKETOOL_PERSONAL_WOTBL = 33, + NARC_POKETOOL_PERSONAL_EVO = 34, + NARC_GRAPHIC_FONTOAM = 35, + NARC_GRAPHIC_FIELD_BOARD = 36, + NARC_FIELDDATA_ENCOUNTDATA_D_ENC_DATA = 37, + NARC_GRAPHIC_WINFRAME = 38, + NARC_GRAPHIC_PST_GRA = 39, + NARC_FIELDDATA_BUILD_MODEL_BUILD_MODEL = 40, + NARC_FIELDDATA_MAPMATRIX_MAP_MATRIX = 41, + NARC_FIELDDATA_AREADATA_AREA_DATA = 42, + NARC_FIELDDATA_AREADATA_AREA_BUILD_MODEL_AREA_BUILD = 43, + NARC_FIELDDATA_AREADATA_AREA_MAP_TEX_MAP_TEX_SET = 44, + NARC_CONTEST_GRAPHIC_CONTEST_BG = 45, + NARC_CONTEST_GRAPHIC_CONTEST_OBJ = 46, + NARC_DATA_UGEFFECT_OBJ_GRAPHIC = 47, + NARC_DEMO_TITLE_TITLEDEMO = 48, + NARC_FIELDDATA_AREADATA_AREA_MOVE_MODEL_MOVE_MODEL_LIST = 49, + NARC_DATA_UG_TRAP = 50, + NARC_GRAPHIC_TRAINER_CASE = 51, + NARC_DATA_UG_FOSSIL = 52, + NARC_GRAPHIC_NTAG_GRA = 53, + NARC_DATA_TRADELIST = 54, + NARC_DATA_UG_PARTS = 55, + NARC_GRAPHIC_OPENING = 56, + NARC_POKETOOL_TRAINER_TRDATA = 57, + NARC_POKETOOL_TRAINER_TRPOKE = 58, + NARC_POKETOOL_TRMSG_TRTBL = 59, + NARC_POKETOOL_TRGRA_TRFGRA = 60, + NARC_PARTICLEDATA_PARTICLEDATA = 61, + NARC_GRAPHIC_SHOP_GRA = 62, + NARC_WAZAEFFECT_WE_SUB = 63, + NARC_DATA_UG_ANIM = 64, + NARC_DATA_WEATHER_SYS = 65, + NARC_GRAPHIC_MENU_GRA = 66, + NARC_FIELDDATA_LAND_DATA_LAND_DATA_RELEASE = 67, + NARC_ITEMTOOL_ITEMDATA_NUTS_DATA = 68, + NARC_RESOURCE_ENG_ZUKAN_ZUKAN = 69, + NARC_POKETOOL_POKEFOOT_POKEFOOT = 70, + NARC_FIELDDATA_AREADATA_AREA_BUILD_MODEL_AREABM_TEXSET = 71, + NARC_BATTLE_GRAPHIC_B_PLIST_GRA = 72, + NARC_GRAPHIC_CONFIG_GRA = 73, + NARC_GRAPHIC_UNIONROOM = 74, + NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_DATA = 75, + NARC_GRAPHIC_PMSI = 76, + NARC_BATTLE_GRAPHIC_B_BAG_GRA = 77, + NARC_GRAPHIC_OEKAKI = 78, + NARC_GRAPHIC_MAIL_GRA = 79, + NARC_GRAPHIC_F_NOTE_GRA = 80, + NARC_DATA_MMODEL_MMODEL = 81, + NARC_GRAPHIC_EV_POKESELECT = 82, + NARC_GRAPHIC_PORU_GRA = 83, + NARC_GRAPHIC_TOUCH_SUBWINDOW = 84, + NARC_GRAPHIC_FLD_COMACT = 85, + NARC_GRAPHIC_RECORD = 86, + NARC_GRAPHIC_PORUDEMO = 87, + NARC_GRAPHIC_PORUACT = 88, + NARC_DATA_WIFINOTE = 89, + NARC_CONTEST_DATA_CONTEST_DATA = 90, + NARC_APPLICATION_CUSTOM_BALL_DATA_CB_DATA = 91, + NARC_DATA_WIFIP2PMATCH = 92, + NARC_GRAPHIC_DEMO_TRADE = 93, + NARC_POKEANIME_POKE_ANM = 94, + NARC_GRAPHIC_MYSIGN = 95, + NARC_FIELDDATA_MM_LIST_MOVE_MODEL_LIST = 96, + NARC_DATA_FIELD_CUTIN = 97, + NARC_DATA_DEMO_CLIMAX = 98, + NARC_WAZAEFFECT_EFFECTDATA_BALL_PARTICLE = 99, + NARC_WAZAEFFECT_PT_DEBUG_DEBUG_PARTICLE = 100, + NARC_GRAPHIC_DENDOU_PC = 101, + NARC_APPLICATION_WIFI_EARTH_WIFI_EARTH_PLACE = 102, + NARC_BATTLE_TR_AI_TR_AI_SEQ = 103, + NARC_GRAPHIC_WORLDTRADE = 104, + NARC_GRAPHIC_DENDOU_DEMO = 105, + NARC_ARC_ENCDATA_EX = 106, + NARC_DATA_MMODEL_FLDEFF = 107, + NARC_BATTLE_GRAPHIC_VS_DEMO_GRA = 108, + NARC_POKETOOL_POKEZUKAN = 109, + NARC_ARC_BM_ANIME = 110, + NARC_ARC_BM_ANIME_LIST = 111, + NARC_GRAPHIC_FIELD_ENCOUNTEFFECT = 112, + NARC_GRAPHIC_WAZA_OSHIE_GRA = 113, + NARC_POKETOOL_POKEANM_POKEANM = 114, + NARC_FIELDDATA_POKEMON_TRADE_FLD_TRADE = 115, + NARC_GRAPHIC_MYSTERY = 116, + NARC_POKETOOL_POKEGRA_OTHERPOKE = 117, + NARC_DEMO_EGG_DATA_EGG_DATA = 118, + NARC_DEMO_EGG_DATA_PARTICLE_EGG_DEMO_PARTICLE = 119, + NARC_ARC_SHIP_DEMO = 120, + NARC_POKETOOL_POKEGRA_HEIGHT_O = 121, + NARC_GRAPHIC_NUTMIXER = 122, + NARC_GRAPHIC_BTOWER = 123, + NARC_DEMO_SHINKA_DATA_PARTICLE_SHINKA_DEMO_PARTICLE = 124, + NARC_DEMO_INTRO_INTRO = 125, + NARC_ARC_TV = 126, + NARC_GRAPHIC_ENDING = 127, + NARC_DEMO_TITLE_OP_DEMO = 128, + NARC_APPLICATION_WIFI_EARTH_WIFI_EARTH = 129, + NARC_GRAPHIC_RANKING = 130, + NARC_ARC_PPARK = 131, + NARC_DEMO_SYOUJYOU_SYOUJYOU = 132, + NARC_DATA_SLOT = 133, + NARC_BATTLE_B_TOWER_BTDTR = 134, + NARC_BATTLE_B_TOWER_BTDPM = 135, + NARC_DEMO_INTRO_INTRO_TV = 136, + NARC_POKETOOL_TRMSG_TRTBLOFS = 137, + NARC_POKETOOL_POKEGRA_POKE_YOFS = 138, + NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND = 139, + NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL = 140, + NARC_GRAPHIC_HIDEN_EFFECT = 141, + NARC_POKETOOL_POKEGRA_POKE_SHADOW = 142, + NARC_FIELDDATA_ENCOUNTDATA_P_ENC_DATA = 143, + NARC_POKETOOL_POKEGRA_POKE_SHADOW_OFX = 144, + NARC_POKETOOL_SHINZUKAN = 145, } NarcId; void ReadFromNarcMemberByPathAndId(void * dest, const char * path, s32 file_idx, u32 offset, u32 size); diff --git a/include/itemtool.h b/include/itemtool.h index 84046a4a..97077744 100644 --- a/include/itemtool.h +++ b/include/itemtool.h @@ -110,28 +110,28 @@ u32 GetNutAttr(struct NutData * nut, u32 attr); struct String * GetNutName(u32 berry_idx, u32 heap_id); struct String * GetNutDesc(u32 berry_idx, u32 heap_id); -void FUN_0206E5B4(struct ItemSlot * itemSlots, u16 from, u16 to); -u16 FUN_0206E640(u16 a0, u16 a1); -u16 FUN_0206E6D8(u16 a0); +void MoveItemSlotInList(struct ItemSlot * itemSlots, u16 from, u16 to); +u16 GetItemIndexMapping(u16 a0, u16 a1); +u16 UpConvertItemId_Gen3to4(u16 a0); int FUN_0206E708(); int FUN_0206E70C(); -void * FUN_0206E710(u16 a0, u16 a1, u32 heap_id); -void FUN_0206E768(struct String * dest, u16 item_id, u32 heap_no); -void FUN_0206E790(struct String * dest, u16 item_id, u32 heap_no); -u32 FUN_0206E7B8(u16 item, u32 attr, u32 heap_id); -u32 FUN_0206E7DC(struct ItemData * itemData, u32 attr); -u32 FUN_0206E878(struct ItemDataSub * sub, u32 attr); -u16 FUN_0206EA30(u16 a0); -BOOL FUN_0206EA54(u16 a0); -u8 FUN_0206EA7C(u16 a0); -BOOL FUN_0206EA98(u16 a0); -u8 FUN_0206EAB8(u16 a0); -u16 FUN_0206EAD8(u8 i); -BOOL FUN_0206EAEC(u16 a0); -u8 FUN_0206EB0C(u16 a0); -u16 FUN_0206EB1C(u8 a0); -u8 FUN_0206EB34(u16 a0); -struct ItemData * FUN_0206EB50(u16 a0); -struct ItemData * FUN_0206EB78(struct ItemData * a0, u16 a1); +void * LoadItemDataOrGfx(u16 a0, u16 a1, u32 heap_id); +void GetItemNameIntoString(struct String * dest, u16 item_id, u32 heap_no); +void GetItemDescIntoString(struct String * dest, u16 item_id, u32 heap_no); +u32 GetItemAttr(u16 item, u32 attr, u32 heap_id); +u32 GetItemAttr_PreloadedItemData(struct ItemData * itemData, u32 attr); +u32 GetItemAttrSub(struct ItemDataSub * sub, u32 attr); +u16 TMHMGetMove(u16 a0); +BOOL MoveIsHM(u16 a0); +u8 ItemToTMHMId(u16 a0); +BOOL ItemIdIsMail(u16 a0); +u8 ItemToMailId(u16 item_id); +u16 MailToItemId(u8 i); +BOOL ItemIdIsBerry(u16 item_id); +u8 ItemToBerryId(u16 item_id); +u16 BerryToItemId(u8 a0); +u8 ItemIsBitter(u16 item_id); +struct ItemData * LoadAllItemData(u32 heap_id); +struct ItemData * GetItemDataPtrFromArray(struct ItemData * a0, u16 item_id); #endif //POKEDIAMOND_ITEMTOOL_H diff --git a/include/proto.h b/include/proto.h index 4a0012d3..bcb95ee0 100644 --- a/include/proto.h +++ b/include/proto.h @@ -10,7 +10,7 @@ void StringCopy(u16 * dest, struct String * src); void String_dtor(void * ptr); void FUN_02021E28(u16 * dest, u16 * src); void FUN_02021EF0(const struct String * src, u16 * dest, u32 count); -u32 FUN_0206E7B8(u16 item, u32 a1, u32 a2); +u32 GetItemAttr(u16 item, u32 a1, u32 a2); int FUN_02014C3C(u8); void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8); u32 IsNighttime(void); // is day or night |