summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2019-07-25 18:56:08 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2019-07-25 18:56:08 +0200
commitfd07c608fc1c08294914c22833aeba2f077e6cf0 (patch)
tree0560218b31fff5d63bc8d33e4b398725bffd93df
parent2bd5833833fbd9a10fb14adc586eca3114248e20 (diff)
Decompile pokemon unk 6
-rw-r--r--asm/pokenav_unk_6.s1752
-rw-r--r--include/pokemon.h2
-rw-r--r--include/pokenav.h9
-rw-r--r--ld_script.txt2
-rw-r--r--src/battle_anim_mons.c4
-rw-r--r--src/battle_gfx_sfx_util.c6
-rw-r--r--src/contest.c2
-rw-r--r--src/contest_painting.c2
-rw-r--r--src/menu_specialized.c2
-rw-r--r--src/pokedex.c2
-rw-r--r--src/pokemon.c4
-rwxr-xr-xsrc/pokemon_jump.c2
-rw-r--r--src/pokemon_storage_system.c2
-rw-r--r--src/pokenav_unk_6.c637
-rw-r--r--src/pokenav_unk_7.c2
-rw-r--r--src/trainer_pokemon_sprites.c4
16 files changed, 660 insertions, 1774 deletions
diff --git a/asm/pokenav_unk_6.s b/asm/pokenav_unk_6.s
deleted file mode 100644
index f5e017816..000000000
--- a/asm/pokenav_unk_6.s
+++ /dev/null
@@ -1,1752 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .syntax unified
-
-@ File centered around AllocSubstruct(0xB)
-
- thumb_func_start sub_81CCFD8
-sub_81CCFD8: @ 81CCFD8
- push {r4,lr}
- ldr r1, =0x0000678c
- movs r0, 0xB
- bl AllocSubstruct
- adds r4, r0, 0
- cmp r4, 0
- beq _081CD01C
- ldr r1, =0x00006428
- adds r0, r4, r1
- bl sub_81D1ED4
- bl sub_81CD970
- ldr r1, =gKeyRepeatStartDelay
- movs r0, 0x14
- strh r0, [r1]
- ldr r0, =0x00006304
- adds r1, r4, r0
- ldr r0, =sub_81CD08C
- str r0, [r1]
- movs r0, 0x1
- b _081CD01E
- .pool
-_081CD01C:
- movs r0, 0
-_081CD01E:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_81CCFD8
-
- thumb_func_start sub_81CD024
-sub_81CD024: @ 81CD024
- push {r4,lr}
- ldr r1, =0x0000678c
- movs r0, 0xB
- bl AllocSubstruct
- adds r4, r0, 0
- cmp r4, 0
- beq _081CD068
- ldr r1, =0x00006428
- adds r0, r4, r1
- bl sub_81D1ED4
- bl sub_81CD9F8
- ldr r1, =gKeyRepeatStartDelay
- movs r0, 0x14
- strh r0, [r1]
- ldr r0, =0x00006304
- adds r1, r4, r0
- ldr r0, =sub_81CD08C
- str r0, [r1]
- movs r0, 0x1
- b _081CD06A
- .pool
-_081CD068:
- movs r0, 0
-_081CD06A:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_81CD024
-
- thumb_func_start sub_81CD070
-sub_81CD070: @ 81CD070
- push {lr}
- movs r0, 0xB
- bl GetSubstructPtr
- ldr r2, =0x00006304
- adds r1, r0, r2
- ldr r1, [r1]
- bl _call_via_r1
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CD070
-
- thumb_func_start sub_81CD08C
-sub_81CD08C: @ 81CD08C
- push {r4,r5,lr}
- adds r4, r0, 0
- movs r0, 0x12
- bl GetSubstructPtr
- adds r5, r0, 0
- adds r0, r4, 0
- bl sub_81CD1E4
- lsls r0, 24
- lsrs r2, r0, 24
- cmp r2, 0
- bne _081CD100
- ldr r0, =gMain
- ldrh r1, [r0, 0x2E]
- movs r0, 0x2
- ands r0, r1
- cmp r0, 0
- bne _081CD0D0
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _081CD100
- movs r1, 0xC6
- lsls r1, 7
- adds r0, r4, r1
- ldrb r0, [r0]
- cmp r0, 0
- bne _081CD0F0
- ldrh r1, [r5, 0x2]
- ldrh r0, [r5]
- subs r0, 0x1
- cmp r1, r0
- bne _081CD100
-_081CD0D0:
- movs r0, 0x5
- bl PlaySE
- ldr r0, =0x00006304
- adds r1, r4, r0
- ldr r0, =sub_81CD19C
- str r0, [r1]
- movs r2, 0x2
- b _081CD100
- .pool
-_081CD0F0:
- movs r0, 0x5
- bl PlaySE
- movs r2, 0x5
- ldr r0, =0x00006304
- adds r1, r4, r0
- ldr r0, =sub_81CD110
- str r0, [r1]
-_081CD100:
- adds r0, r2, 0
- pop {r4,r5}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CD08C
-
- thumb_func_start sub_81CD110
-sub_81CD110: @ 81CD110
- push {r4-r6,lr}
- sub sp, 0x4
- adds r6, r0, 0
- movs r4, 0
- bl sub_811FBA4
- lsls r0, 24
- cmp r0, 0
- bne _081CD18A
- bl sub_81CEF14
- ldr r1, =0x00006786
- adds r5, r6, r1
- movs r1, 0
- ldrsb r1, [r5, r1]
- ldr r2, =0x00006783
- adds r4, r6, r2
- adds r1, r4, r1
- strb r0, [r1]
- movs r0, 0x12
- bl GetSubstructPtr
- ldrh r1, [r0, 0x2]
- lsls r1, 2
- adds r0, r1
- ldrb r2, [r0, 0x4]
- ldrb r3, [r0, 0x5]
- movs r0, 0
- ldrsb r0, [r5, r0]
- adds r4, r0
- ldrb r1, [r4]
- mov r0, sp
- strb r1, [r0]
- cmp r2, 0xE
- bne _081CD174
- movs r0, 0x64
- muls r0, r3
- ldr r1, =gPlayerParty
- adds r0, r1
- movs r1, 0x8
- mov r2, sp
- bl SetMonData
- b _081CD180
- .pool
-_081CD174:
- adds r0, r2, 0
- adds r1, r3, 0
- movs r2, 0x8
- mov r3, sp
- bl SetBoxMonDataAt
-_081CD180:
- ldr r0, =0x00006304
- adds r1, r6, r0
- ldr r0, =sub_81CD08C
- str r0, [r1]
- movs r4, 0x6
-_081CD18A:
- adds r0, r4, 0
- add sp, 0x4
- pop {r4-r6}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CD110
-
- thumb_func_start sub_81CD19C
-sub_81CD19C: @ 81CD19C
- push {lr}
- movs r1, 0xC6
- lsls r1, 7
- adds r0, r1
- ldrb r0, [r0]
- cmp r0, 0
- beq _081CD1B4
- ldr r0, =0x000186aa
- b _081CD1B6
- .pool
-_081CD1B4:
- ldr r0, =0x000186a2
-_081CD1B6:
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CD19C
-
- thumb_func_start sub_81CD1C0
-sub_81CD1C0: @ 81CD1C0
- push {lr}
- movs r0, 0xB
- bl GetSubstructPtr
- movs r1, 0xC6
- lsls r1, 7
- adds r0, r1
- ldrb r0, [r0]
- cmp r0, 0
- bne _081CD1DA
- movs r0, 0x12
- bl FreePokenavSubstruct
-_081CD1DA:
- movs r0, 0xB
- bl FreePokenavSubstruct
- pop {r0}
- bx r0
- thumb_func_end sub_81CD1C0
-
- thumb_func_start sub_81CD1E4
-sub_81CD1E4: @ 81CD1E4
- push {r4,lr}
- adds r4, r0, 0
- movs r0, 0x12
- bl GetSubstructPtr
- adds r2, r0, 0
- movs r3, 0
- ldr r0, =gMain
- ldrh r1, [r0, 0x2C]
- movs r0, 0x40
- ands r0, r1
- cmp r0, 0
- beq _081CD220
- movs r1, 0xC6
- lsls r1, 7
- adds r0, r4, r1
- ldrb r0, [r0]
- cmp r0, 0
- beq _081CD210
- ldrh r0, [r2, 0x2]
- cmp r0, 0
- beq _081CD24E
-_081CD210:
- movs r0, 0x5
- bl PlaySE
- movs r0, 0x1
- b _081CD246
- .pool
-_081CD220:
- movs r0, 0x80
- ands r0, r1
- cmp r0, 0
- beq _081CD24E
- movs r1, 0xC6
- lsls r1, 7
- adds r0, r4, r1
- ldrb r0, [r0]
- cmp r0, 0
- beq _081CD23E
- ldrh r1, [r2, 0x2]
- ldrh r0, [r2]
- subs r0, 0x1
- cmp r1, r0
- bge _081CD24E
-_081CD23E:
- movs r0, 0x5
- bl PlaySE
- movs r0, 0
-_081CD246:
- bl sub_81CD258
- lsls r0, 24
- lsrs r3, r0, 24
-_081CD24E:
- adds r0, r3, 0
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_81CD1E4
-
- thumb_func_start sub_81CD258
-sub_81CD258: @ 81CD258
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- lsls r0, 24
- lsrs r0, 24
- mov r8, r0
- movs r0, 0xB
- bl GetSubstructPtr
- adds r4, r0, 0
- movs r0, 0x12
- bl GetSubstructPtr
- adds r5, r0, 0
- mov r0, r8
- cmp r0, 0
- beq _081CD284
- ldr r1, =0x00006788
- adds r0, r4, r1
- b _081CD288
- .pool
-_081CD284:
- ldr r2, =0x00006787
- adds r0, r4, r2
-_081CD288:
- ldrb r0, [r0]
- lsls r0, 24
- asrs r0, 24
- lsls r0, 16
- lsrs r0, 16
- adds r7, r0, 0
- ldr r1, =0x00006428
- adds r0, r4, r1
- ldr r2, =0x00006786
- adds r1, r4, r2
- movs r2, 0
- ldrsb r2, [r1, r2]
- lsls r1, r2, 2
- adds r1, r2
- lsls r1, 2
- ldr r3, =0x0000643c
- adds r1, r3
- adds r1, r4, r1
- lsls r2, r7, 2
- adds r2, r7
- lsls r2, 2
- adds r2, r3
- adds r2, r4, r2
- bl sub_81D1F84
- ldrh r6, [r5, 0x2]
- bl sub_81CDD5C
- cmp r0, 0
- beq _081CD2D8
- ldrh r1, [r5]
- b _081CD2DC
- .pool
-_081CD2D8:
- ldrh r1, [r5]
- subs r1, 0x1
-_081CD2DC:
- eors r1, r6
- negs r0, r1
- orrs r0, r1
- lsrs r0, 31
- adds r6, r0, 0
- mov r0, r8
- cmp r0, 0
- beq _081CD332
- ldr r1, =0x00006787
- adds r2, r4, r1
- ldrb r0, [r2]
- adds r1, 0x1
- adds r3, r4, r1
- strb r0, [r3]
- ldr r0, =0x00006786
- adds r1, r4, r0
- ldrb r0, [r1]
- strb r0, [r2]
- strb r7, [r1]
- ldrb r1, [r3]
- ldr r2, =0x00006789
- adds r0, r4, r2
- strb r1, [r0]
- ldrh r0, [r5, 0x2]
- cmp r0, 0
- bne _081CD312
- ldrh r0, [r5]
-_081CD312:
- subs r1, r0, 0x1
- strh r1, [r5, 0x2]
- lsls r0, r1, 16
- cmp r0, 0
- beq _081CD32C
- subs r1, 0x1
- b _081CD384
- .pool
-_081CD32C:
- ldrh r0, [r5]
- subs r1, r0, 0x1
- b _081CD384
-_081CD332:
- ldr r0, =0x00006788
- adds r2, r4, r0
- ldrb r0, [r2]
- ldr r1, =0x00006787
- adds r3, r4, r1
- strb r0, [r3]
- ldr r0, =0x00006786
- adds r1, r4, r0
- ldrb r0, [r1]
- strb r0, [r2]
- strb r7, [r1]
- ldrb r1, [r3]
- ldr r2, =0x00006789
- adds r0, r4, r2
- strb r1, [r0]
- ldrh r1, [r5, 0x2]
- ldrh r0, [r5]
- subs r0, 0x1
- cmp r1, r0
- bge _081CD370
- adds r0, r1, 0x1
- b _081CD372
- .pool
-_081CD370:
- movs r0, 0
-_081CD372:
- strh r0, [r5, 0x2]
- ldrh r1, [r5, 0x2]
- ldrh r0, [r5]
- subs r0, 0x1
- cmp r1, r0
- bge _081CD382
- adds r1, 0x1
- b _081CD384
-_081CD382:
- movs r1, 0
-_081CD384:
- ldr r2, =0x00006302
- adds r0, r4, r2
- strh r1, [r0]
- ldrh r4, [r5, 0x2]
- bl sub_81CDD5C
- cmp r0, 0
- beq _081CD39C
- ldrh r1, [r5]
- b _081CD3A0
- .pool
-_081CD39C:
- ldrh r1, [r5]
- subs r1, 0x1
-_081CD3A0:
- eors r1, r4
- negs r0, r1
- orrs r0, r1
- lsrs r0, 31
- cmp r6, 0
- bne _081CD3B0
- movs r0, 0x3
- b _081CD3BA
-_081CD3B0:
- cmp r0, 0
- beq _081CD3B8
- movs r0, 0x1
- b _081CD3BA
-_081CD3B8:
- movs r0, 0x4
-_081CD3BA:
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_81CD258
-
- thumb_func_start sub_81CD3C4
-sub_81CD3C4: @ 81CD3C4
- push {r4,lr}
- movs r0, 0xB
- bl GetSubstructPtr
- adds r4, r0, 0
- movs r0, 0x12
- bl GetSubstructPtr
- adds r2, r0, 0
- ldr r1, =0x0000678a
- adds r0, r4, r1
- ldrb r0, [r0]
- cmp r0, 0x9
- bls _081CD3E2
- b _081CD530
-_081CD3E2:
- lsls r0, 2
- ldr r1, =_081CD3F4
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .pool
- .align 2, 0
-_081CD3F4:
- .4byte _081CD41C
- .4byte _081CD428
- .4byte _081CD434
- .4byte _081CD440
- .4byte _081CD490
- .4byte _081CD4A8
- .4byte _081CD4C0
- .4byte _081CD4D8
- .4byte _081CD4F0
- .4byte _081CD508
-_081CD41C:
- movs r1, 0x2
- ldrsh r0, [r2, r1]
- movs r1, 0
- bl sub_81CD824
- b _081CD530
-_081CD428:
- movs r1, 0x2
- ldrsh r0, [r2, r1]
- movs r1, 0
- bl sub_81CDA1C
- b _081CD530
-_081CD434:
- movs r1, 0x2
- ldrsh r0, [r2, r1]
- movs r1, 0
- bl sub_81CDB98
- b _081CD530
-_081CD440:
- ldrh r0, [r2]
- cmp r0, 0x1
- bne _081CD468
- ldr r2, =0x00006786
- adds r0, r4, r2
- movs r1, 0
- strb r1, [r0]
- adds r2, 0x1
- adds r0, r4, r2
- strb r1, [r0]
- adds r2, 0x1
- adds r0, r4, r2
- strb r1, [r0]
- adds r2, 0x2
- adds r0, r4, r2
- strb r1, [r0]
- movs r0, 0x1
- b _081CD53C
- .pool
-_081CD468:
- ldr r0, =0x00006786
- adds r1, r4, r0
- movs r0, 0
- strb r0, [r1]
- ldr r2, =0x00006787
- adds r1, r4, r2
- movs r0, 0x1
- strb r0, [r1]
- ldr r0, =0x00006788
- adds r1, r4, r0
- movs r0, 0x2
- strb r0, [r1]
- b _081CD530
- .pool
-_081CD490:
- ldrh r0, [r2, 0x2]
- adds r0, 0x1
- ldrh r2, [r2]
- cmp r0, r2
- blt _081CD49C
- movs r0, 0
-_081CD49C:
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x1
- bl sub_81CD824
- b _081CD530
-_081CD4A8:
- ldrh r0, [r2, 0x2]
- adds r0, 0x1
- ldrh r2, [r2]
- cmp r0, r2
- blt _081CD4B4
- movs r0, 0
-_081CD4B4:
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x1
- bl sub_81CDA1C
- b _081CD530
-_081CD4C0:
- ldrh r0, [r2, 0x2]
- adds r0, 0x1
- ldrh r2, [r2]
- cmp r0, r2
- blt _081CD4CC
- movs r0, 0
-_081CD4CC:
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x1
- bl sub_81CDB98
- b _081CD530
-_081CD4D8:
- ldrh r0, [r2, 0x2]
- subs r0, 0x1
- cmp r0, 0
- bge _081CD4E4
- ldrh r0, [r2]
- subs r0, 0x1
-_081CD4E4:
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x2
- bl sub_81CD824
- b _081CD530
-_081CD4F0:
- ldrh r0, [r2, 0x2]
- subs r0, 0x1
- cmp r0, 0
- bge _081CD4FC
- ldrh r0, [r2]
- subs r0, 0x1
-_081CD4FC:
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x2
- bl sub_81CDA1C
- b _081CD530
-_081CD508:
- ldrh r0, [r2, 0x2]
- subs r0, 0x1
- cmp r0, 0
- bge _081CD514
- ldrh r0, [r2]
- subs r0, 0x1
-_081CD514:
- lsls r0, 16
- asrs r0, 16
- movs r1, 0x2
- bl sub_81CDB98
- ldr r2, =0x0000678a
- adds r1, r4, r2
- movs r0, 0
- strb r0, [r1]
- movs r0, 0x1
- b _081CD53C
- .pool
-_081CD530:
- ldr r0, =0x0000678a
- adds r1, r4, r0
- ldrb r0, [r1]
- adds r0, 0x1
- strb r0, [r1]
- movs r0, 0
-_081CD53C:
- pop {r4}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CD3C4
-
- thumb_func_start sub_81CD548
-sub_81CD548: @ 81CD548
- push {r4,r5,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- adds r5, r4, 0
- movs r0, 0xB
- bl GetSubstructPtr
- adds r1, r0, 0
- cmp r4, 0x1
- beq _081CD588
- cmp r4, 0x1
- bgt _081CD566
- cmp r4, 0
- beq _081CD56C
- b _081CD5C4
-_081CD566:
- cmp r5, 0x2
- beq _081CD5A4
- b _081CD5C4
-_081CD56C:
- ldr r2, =0x00006302
- adds r0, r1, r2
- movs r2, 0
- ldrsh r0, [r0, r2]
- ldr r2, =0x00006789
- adds r1, r2
- ldrb r1, [r1]
- bl sub_81CD824
- b _081CD5C4
- .pool
-_081CD588:
- ldr r2, =0x00006302
- adds r0, r1, r2
- movs r2, 0
- ldrsh r0, [r0, r2]
- ldr r2, =0x00006789
- adds r1, r2
- ldrb r1, [r1]
- bl sub_81CDA1C
- b _081CD5C4
- .pool
-_081CD5A4:
- ldr r2, =0x00006302
- adds r0, r1, r2
- movs r2, 0
- ldrsh r0, [r0, r2]
- ldr r2, =0x00006789
- adds r1, r2
- ldrb r1, [r1]
- bl sub_81CDB98
- movs r0, 0x1
- b _081CD5C6
- .pool
-_081CD5C4:
- movs r0, 0
-_081CD5C6:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_81CD548
-
- thumb_func_start sub_81CD5CC
-sub_81CD5CC: @ 81CD5CC
- push {r4,lr}
- adds r4, r0, 0
- lsls r2, 16
- lsrs r2, 16
- b _081CD5E4
-_081CD5D6:
- strb r3, [r4]
- adds r1, 0x1
- adds r4, 0x1
- lsls r0, r2, 16
- ldr r2, =0xffff0000
- adds r0, r2
- lsrs r2, r0, 16
-_081CD5E4:
- ldrb r3, [r1]
- adds r0, r3, 0
- cmp r0, 0xFF
- bne _081CD5D6
- adds r1, r2, 0
- lsls r0, r1, 16
- ldr r2, =0xffff0000
- adds r0, r2
- lsrs r2, r0, 16
- lsls r1, 16
- cmp r1, 0
- ble _081CD612
- movs r3, 0
-_081CD5FE:
- strb r3, [r4]
- adds r4, 0x1
- adds r1, r2, 0
- lsls r0, r1, 16
- ldr r2, =0xffff0000
- adds r0, r2
- lsrs r2, r0, 16
- lsls r1, 16
- cmp r1, 0
- bgt _081CD5FE
-_081CD612:
- movs r0, 0xFF
- strb r0, [r4]
- adds r0, r4, 0
- pop {r4}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CD5CC
-
- thumb_func_start sub_81CD624
-sub_81CD624: @ 81CD624
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- adds r5, r0, 0
- adds r4, r1, 0
- lsls r4, 16
- lsrs r4, 16
- lsls r2, 24
- lsrs r2, 24
- mov r10, r2
- movs r0, 0x12
- bl GetSubstructPtr
- lsls r4, 2
- adds r0, r4
- ldrb r4, [r0, 0x4]
- mov r8, r4
- ldrb r6, [r0, 0x5]
- mov r9, r6
- movs r0, 0xFC
- strb r0, [r5]
- adds r5, 0x1
- movs r0, 0x4
- strb r0, [r5]
- adds r5, 0x1
- movs r0, 0x8
- strb r0, [r5]
- adds r5, 0x1
- movs r0, 0
- strb r0, [r5]
- adds r5, 0x1
- movs r0, 0x9
- strb r0, [r5]
- adds r5, 0x1
- adds r0, r4, 0
- adds r1, r6, 0
- movs r2, 0x2D
- movs r3, 0
- bl GetBoxOrPartyMonData
- cmp r0, 0
- beq _081CD690
- ldr r1, =gText_EggNickname
- adds r0, r5, 0
- movs r2, 0
- movs r3, 0xC
- bl StringCopyPadded
- b _081CD80E
- .pool
-_081CD690:
- adds r0, r4, 0
- adds r1, r6, 0
- movs r2, 0x2
- adds r3, r5, 0
- bl GetBoxOrPartyMonData
- adds r0, r5, 0
- bl StringGetEnd10
- adds r0, r4, 0
- adds r1, r6, 0
- movs r2, 0xB
- movs r3, 0
- bl GetBoxOrPartyMonData
- lsls r0, 16
- lsrs r7, r0, 16
- cmp r4, 0xE
- bne _081CD6E0
- movs r0, 0x64
- adds r4, r6, 0
- muls r4, r0
- ldr r0, =gPlayerParty
- adds r4, r0
- adds r0, r4, 0
- movs r1, 0x38
- bl GetMonData
- lsls r0, 16
- lsrs r0, 16
- mov r8, r0
- adds r0, r4, 0
- bl GetMonGender
- lsls r0, 24
- lsrs r6, r0, 24
- b _081CD6FE
- .pool
-_081CD6E0:
- mov r0, r8
- mov r1, r9
- bl GetBoxedMonPtr
- adds r4, r0, 0
- bl GetBoxMonGender
- lsls r0, 24
- lsrs r6, r0, 24
- adds r0, r4, 0
- bl GetLevelFromBoxMonExp
- lsls r0, 24
- lsrs r0, 24
- mov r8, r0
-_081CD6FE:
- cmp r7, 0x1D
- beq _081CD706
- cmp r7, 0x20
- bne _081CD71C
-_081CD706:
- movs r0, 0xB
- adds r1, r7, 0
- muls r1, r0
- ldr r0, =gSpeciesNames
- adds r1, r0
- adds r0, r5, 0
- bl StringCompare
- cmp r0, 0
- bne _081CD71C
- movs r6, 0xFF
-_081CD71C:
- adds r3, r5, 0
- b _081CD726
- .pool
-_081CD724:
- adds r3, 0x1
-_081CD726:
- ldrb r0, [r3]
- cmp r0, 0xFF
- bne _081CD724
- movs r1, 0xFC
- strb r1, [r3]
- adds r3, 0x1
- movs r0, 0x12
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0x3C
- strb r0, [r3]
- adds r3, 0x1
- cmp r6, 0
- beq _081CD74A
- cmp r6, 0xFE
- beq _081CD76E
- movs r0, 0x77
- b _081CD790
-_081CD74A:
- strb r1, [r3]
- adds r3, 0x1
- movs r0, 0x1
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0x4
- strb r0, [r3]
- adds r3, 0x1
- strb r1, [r3]
- adds r3, 0x1
- movs r0, 0x3
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0x5
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0xB5
- b _081CD790
-_081CD76E:
- strb r1, [r3]
- adds r3, 0x1
- movs r0, 0x1
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0x6
- strb r0, [r3]
- adds r3, 0x1
- strb r1, [r3]
- adds r3, 0x1
- movs r0, 0x3
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0x7
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0xB6
-_081CD790:
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0xFC
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0x4
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0x8
- strb r0, [r3]
- adds r3, 0x1
- movs r5, 0
- strb r5, [r3]
- adds r3, 0x1
- movs r0, 0x9
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0xBA
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0xF9
- strb r0, [r3]
- adds r3, 0x1
- movs r0, 0x5
- strb r0, [r3]
- adds r3, 0x1
- adds r4, r3, 0
- adds r0, r4, 0
- mov r1, r8
- movs r2, 0
- movs r3, 0x3
- bl ConvertIntToDecimalStringN
- adds r3, r0, 0
- subs r4, r3, r4
- lsls r4, 16
- lsrs r4, 16
- strb r5, [r3]
- adds r3, 0x1
- mov r0, r10
- cmp r0, 0
- bne _081CD808
- movs r0, 0x3
- subs r0, r4
- lsls r0, 16
- ldr r1, =0xffff0000
- adds r0, r1
- lsrs r4, r0, 16
- ldr r0, =0x0000ffff
- cmp r4, r0
- beq _081CD808
- movs r2, 0
- adds r1, r0, 0
-_081CD7FA:
- strb r2, [r3]
- adds r3, 0x1
- subs r0, r4, 0x1
- lsls r0, 16
- lsrs r4, r0, 16
- cmp r4, r1
- bne _081CD7FA
-_081CD808:
- movs r0, 0xFF
- strb r0, [r3]
- adds r0, r3, 0
-_081CD80E:
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CD624
-
- thumb_func_start sub_81CD824
-sub_81CD824: @ 81CD824
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- lsls r0, 16
- lsrs r0, 16
- mov r8, r0
- lsls r1, 24
- lsrs r6, r1, 24
- movs r0, 0xB
- bl GetSubstructPtr
- adds r5, r0, 0
- movs r0, 0x12
- bl GetSubstructPtr
- adds r7, r0, 0
- mov r1, r8
- lsls r0, r1, 16
- asrs r4, r0, 16
- bl sub_81CDD5C
- cmp r0, 0
- beq _081CD85A
- ldrh r2, [r7]
- cmp r4, r2
- bne _081CD862
- b _081CD900
-_081CD85A:
- ldrh r0, [r7]
- subs r0, 0x1
- cmp r4, r0
- beq _081CD900
-_081CD862:
- lsls r0, r6, 6
- ldr r1, =0x00006368
- adds r0, r1
- adds r0, r5, r0
- mov r2, r8
- lsls r4, r2, 16
- lsrs r1, r4, 16
- movs r2, 0
- bl sub_81CD624
- asrs r4, 14
- adds r4, r7, r4
- ldrb r3, [r4, 0x4]
- lsls r0, r6, 1
- adds r0, r6
- lsls r4, r0, 3
- ldr r1, =0x00006320
- adds r0, r5, r1
- adds r0, r4
- movs r2, 0
- movs r1, 0xFC
- strb r1, [r0]
- ldr r1, =0x00006321
- adds r0, r5, r1
- adds r0, r4
- movs r1, 0x4
- strb r1, [r0]
- ldr r1, =0x00006322
- adds r0, r5, r1
- adds r0, r4
- movs r1, 0x8
- strb r1, [r0]
- ldr r1, =0x00006323
- adds r0, r5, r1
- adds r0, r4
- strb r2, [r0]
- ldr r2, =0x00006324
- adds r0, r5, r2
- adds r0, r4
- movs r1, 0x9
- strb r1, [r0]
- cmp r3, 0xE
- bne _081CD8E4
- adds r0, r4, r5
- ldr r1, =0x00006325
- adds r0, r1
- ldr r1, =gText_InParty
- b _081CD8F4
- .pool
-_081CD8E4:
- adds r4, r5
- ldr r2, =0x00006325
- adds r4, r2
- adds r0, r3, 0
- bl GetBoxNamePtr
- adds r1, r0, 0
- adds r0, r4, 0
-_081CD8F4:
- movs r2, 0x8
- bl sub_81CD5CC
- b _081CD95C
- .pool
-_081CD900:
- movs r1, 0
- lsls r4, r6, 6
- lsls r0, r6, 1
- mov r8, r0
- adds r3, r4, 0
- ldr r0, =0x00006368
- adds r2, r5, r0
- movs r7, 0
-_081CD910:
- adds r0, r1, r3
- adds r0, r2, r0
- strb r7, [r0]
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, 0xB
- bls _081CD910
- adds r1, r4
- ldr r2, =0x00006368
- adds r0, r5, r2
- adds r0, r1
- movs r1, 0xFF
- strb r1, [r0]
- movs r1, 0
- mov r2, r8
- adds r0, r2, r6
- lsls r3, r0, 3
- ldr r0, =0x00006320
- adds r2, r5, r0
- movs r4, 0
-_081CD93A:
- adds r0, r1, r3
- adds r0, r2, r0
- strb r4, [r0]
- adds r0, r1, 0x1
- lsls r0, 16
- lsrs r1, r0, 16
- cmp r1, 0x7
- bls _081CD93A
- mov r2, r8
- adds r0, r2, r6
- lsls r0, 3
- adds r0, r1, r0
- ldr r2, =0x00006320
- adds r1, r5, r2
- adds r1, r0
- movs r0, 0xFF
- strb r0, [r1]
-_081CD95C:
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81CD824
-
- thumb_func_start sub_81CD970
-sub_81CD970: @ 81CD970
- push {r4-r7,lr}
- movs r0, 0xB
- bl GetSubstructPtr
- adds r7, r0, 0
- ldr r1, =0x000006ac
- movs r0, 0x12
- bl AllocSubstruct
- adds r6, r0, 0
- movs r0, 0xC6
- lsls r0, 7
- adds r1, r7, r0
- movs r0, 0
- strb r0, [r1]
- movs r4, 0
- movs r5, 0
- b _081CD9C4
- .pool
-_081CD998:
- movs r0, 0x64
- muls r0, r4
- ldr r1, =gPlayerParty
- adds r0, r1
- movs r1, 0x2D
- bl GetMonData
- adds r2, r0, 0
- cmp r2, 0
- bne _081CD9BE
- lsls r1, r5, 2
- adds r1, r6, r1
- movs r0, 0xE
- strb r0, [r1, 0x4]
- strb r4, [r1, 0x5]
- strh r2, [r1, 0x6]
- adds r0, r5, 0x1
- lsls r0, 16
- lsrs r5, r0, 16
-_081CD9BE:
- adds r0, r4, 0x1
- lsls r0, 16
- lsrs r4, r0, 16
-_081CD9C4:
- bl CalculatePlayerPartyCount
- lsls r0, 24
- lsrs r0, 24
- cmp r4, r0
- bcc _081CD998
- lsls r0, r5, 2
- adds r0, r6, r0
- movs r1, 0
- strb r1, [r0, 0x4]
- strb r1, [r0, 0x5]
- movs r2, 0
- strh r1, [r0, 0x6]
- strh r1, [r6, 0x2]
- adds r0, r5, 0x1
- strh r0, [r6]
- ldr r1, =0x0000678a
- adds r0, r7, r1
- strb r2, [r0]
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81CD970
-
- thumb_func_start sub_81CD9F8
-sub_81CD9F8: @ 81CD9F8
- push {lr}
- movs r0, 0xB
- bl GetSubstructPtr
- movs r1, 0xC6
- lsls r1, 7
- adds r2, r0, r1
- movs r3, 0
- movs r1, 0x1
- strb r1, [r2]
- ldr r1, =0x0000678a
- adds r0, r1
- strb r3, [r0]
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81CD9F8
-
- thumb_func_start sub_81CDA1C
-sub_81CDA1C: @ 81CDA1C
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- lsls r0, 16
- lsrs r6, r0, 16
- lsls r1, 24
- lsrs r1, 24
- mov r9, r1
- movs r0, 0xB
- bl GetSubstructPtr
- mov r8, r0
- movs r0, 0x12
- bl GetSubstructPtr
- adds r4, r0, 0
- lsls r0, r6, 16
- asrs r5, r0, 16
- bl sub_81CDD5C
- cmp r0, 0
- beq _081CDA52
- ldrh r0, [r4]
- cmp r5, r0
- bne _081CDA5A
- b _081CDB48
-_081CDA52:
- ldrh r0, [r4]
- subs r0, 0x1
- cmp r5, r0
- beq _081CDB48
-_081CDA5A:
- lsls r0, r6, 16
- asrs r0, 14
- adds r0, r4, r0
- ldrb r6, [r0, 0x4]
- ldrb r7, [r0, 0x5]
- adds r0, r6, 0
- adds r1, r7, 0
- movs r2, 0x16
- movs r3, 0
- bl GetBoxOrPartyMonData
- mov r1, r9
- lsls r5, r1, 2
- adds r4, r5, r1
- ldr r1, =0x00006428
- add r1, r8
- adds r1, r4
- strb r0, [r1]
- adds r0, r6, 0
- adds r1, r7, 0
- movs r2, 0x2F
- movs r3, 0
- bl GetBoxOrPartyMonData
- ldr r1, =0x00006429
- add r1, r8
- adds r1, r4
- strb r0, [r1]
- adds r0, r6, 0
- adds r1, r7, 0
- movs r2, 0x21
- movs r3, 0
- bl GetBoxOrPartyMonData
- ldr r1, =0x0000642a
- add r1, r8
- adds r1, r4
- strb r0, [r1]
- adds r0, r6, 0
- adds r1, r7, 0
- movs r2, 0x18
- movs r3, 0
- bl GetBoxOrPartyMonData
- ldr r1, =0x0000642b
- add r1, r8
- adds r1, r4
- strb r0, [r1]
- adds r0, r6, 0
- adds r1, r7, 0
- movs r2, 0x17
- movs r3, 0
- bl GetBoxOrPartyMonData
- ldr r1, =0x0000642c
- add r1, r8
- adds r1, r4
- strb r0, [r1]
- movs r0, 0xCF
- lsls r0, 7
- add r0, r8
- mov r2, r9
- adds r4, r0, r2
- adds r0, r6, 0
- adds r1, r7, 0
- movs r2, 0x30
- movs r3, 0
- bl GetBoxOrPartyMonData
- cmp r0, 0xFF
- beq _081CDB10
- adds r0, r6, 0
- adds r1, r7, 0
- movs r2, 0x30
- movs r3, 0
- bl GetBoxOrPartyMonData
- movs r1, 0x1D
- bl __udivsi3
- b _081CDB12
- .pool
-_081CDB10:
- movs r0, 0x9
-_081CDB12:
- strb r0, [r4]
- adds r0, r6, 0
- adds r1, r7, 0
- movs r2, 0x8
- movs r3, 0
- bl GetBoxOrPartyMonData
- ldr r1, =0x00006783
- add r1, r8
- add r1, r9
- strb r0, [r1]
- mov r0, r9
- adds r1, r5, r0
- ldr r2, =0x00006428
- adds r0, r1, r2
- add r0, r8
- lsls r1, 2
- adds r2, 0x14
- adds r1, r2
- add r1, r8
- bl sub_81D2754
- b _081CDB80
- .pool
-_081CDB48:
- movs r2, 0
- mov r0, r9
- lsls r5, r0, 2
- add r5, r9
- ldr r4, =0x00006428
- add r4, r8
- lsls r3, r5, 2
- mov r9, r2
- ldr r7, =0x0000643c
- movs r6, 0x9B
-_081CDB5C:
- adds r0, r2, r5
- adds r0, r4, r0
- mov r1, r9
- strb r1, [r0]
- lsls r0, r2, 2
- adds r0, r3
- add r0, r8
- adds r1, r0, r7
- strh r6, [r1]
- ldr r1, =0x0000643e
- adds r0, r1
- movs r1, 0x5B
- strh r1, [r0]
- adds r0, r2, 0x1
- lsls r0, 16
- lsrs r2, r0, 16
- cmp r2, 0x4
- bls _081CDB5C
-_081CDB80:
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81CDA1C
-
- thumb_func_start sub_81CDB98
-sub_81CDB98: @ 81CDB98
- push {r4-r7,lr}
- mov r7, r9
- mov r6, r8
- push {r6,r7}
- sub sp, 0x4
- lsls r0, 16
- lsrs r6, r0, 16
- lsls r1, 24
- lsrs r1, 24
- mov r9, r1
- movs r0, 0xB
- bl GetSubstructPtr
- adds r7, r0, 0
- movs r0, 0x12
- bl GetSubstructPtr
- adds r4, r0, 0
- lsls r0, r6, 16
- asrs r5, r0, 16
- bl sub_81CDD5C
- cmp r0, 0
- beq _081CDBCC
- ldrh r0, [r4]
- b _081CDBD0
-_081CDBCC:
- ldrh r0, [r4]
- subs r0, 0x1
-_081CDBD0:
- cmp r5, r0
- beq _081CDC3E
- lsls r0, r6, 16
- asrs r0, 14
- adds r0, r4, r0
- ldrb r5, [r0, 0x4]
- ldrb r6, [r0, 0x5]
- adds r0, r5, 0
- adds r1, r6, 0
- movs r2, 0x41
- movs r3, 0
- bl GetBoxOrPartyMonData
- adds r4, r0, 0
- lsls r4, 16
- lsrs r4, 16
- adds r0, r5, 0
- adds r1, r6, 0
- movs r2, 0x1
- movs r3, 0
- bl GetBoxOrPartyMonData
- mov r8, r0
- adds r0, r5, 0
- adds r1, r6, 0
- movs r2, 0
- movs r3, 0
- bl GetBoxOrPartyMonData
- adds r5, r0, 0
- lsls r0, r4, 3
- ldr r1, =gMonFrontPicTable
- adds r0, r1
- mov r2, r9
- lsls r1, r2, 13
- movs r2, 0xC0
- lsls r2, 2
- adds r1, r2
- adds r1, r7, r1
- movs r2, 0x1
- str r2, [sp]
- adds r2, r4, 0
- adds r3, r5, 0
- bl LoadSpecialPokePic
- adds r0, r4, 0
- mov r1, r8
- adds r2, r5, 0
- bl GetFrontSpritePalFromSpeciesAndPersonality
- mov r2, r9
- lsls r1, r2, 7
- adds r1, r7, r1
- bl LZ77UnCompWram
-_081CDC3E:
- add sp, 0x4
- pop {r3,r4}
- mov r8, r3
- mov r9, r4
- pop {r4-r7}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_81CDB98
-
- thumb_func_start sub_81CDC50
-sub_81CDC50: @ 81CDC50
- push {lr}
- movs r0, 0x12
- bl GetSubstructPtr
- ldrh r0, [r0]
- pop {r1}
- bx r1
- thumb_func_end sub_81CDC50
-
- thumb_func_start sub_81CDC60
-sub_81CDC60: @ 81CDC60
- push {lr}
- movs r0, 0x12
- bl GetSubstructPtr
- ldrh r0, [r0, 0x2]
- pop {r1}
- bx r1
- thumb_func_end sub_81CDC60
-
- thumb_func_start sub_81CDC70
-sub_81CDC70: @ 81CDC70
- push {lr}
- movs r0, 0xB
- bl GetSubstructPtr
- ldr r1, =0x00006428
- adds r0, r1
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CDC70
-
- thumb_func_start sub_81CDC84
-sub_81CDC84: @ 81CDC84
- push {lr}
- movs r0, 0xB
- bl GetSubstructPtr
- ldr r1, =0x00006786
- adds r0, r1
- ldrb r0, [r0]
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CDC84
-
- thumb_func_start sub_81CDC9C
-sub_81CDC9C: @ 81CDC9C
- push {lr}
- movs r0, 0xB
- bl GetSubstructPtr
- ldr r1, =0x00006302
- adds r0, r1
- ldrb r0, [r0]
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CDC9C
-
- thumb_func_start sub_81CDCB4
-sub_81CDCB4: @ 81CDCB4
- push {r4,lr}
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- movs r0, 0xB
- bl GetSubstructPtr
- lsls r4, 13
- movs r1, 0xC0
- lsls r1, 2
- adds r4, r1
- adds r0, r4
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_81CDCB4
-
- thumb_func_start sub_81CDCD4
-sub_81CDCD4: @ 81CDCD4
- push {r4,lr}
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- movs r0, 0xB
- bl GetSubstructPtr
- lsls r4, 7
- adds r0, r4
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_81CDCD4
-
- thumb_func_start sub_81CDCEC
-sub_81CDCEC: @ 81CDCEC
- push {lr}
- movs r0, 0xB
- bl GetSubstructPtr
- ldr r1, =0x00006789
- adds r0, r1
- ldrb r0, [r0]
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CDCEC
-
- thumb_func_start sub_81CDD04
-sub_81CDD04: @ 81CDD04
- push {r4,lr}
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- movs r0, 0xB
- bl GetSubstructPtr
- lsls r4, 6
- ldr r1, =0x00006368
- adds r4, r1
- adds r0, r4
- pop {r4}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CDD04
-
- thumb_func_start sub_81CDD24
-sub_81CDD24: @ 81CDD24
- push {r4,lr}
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- movs r0, 0xB
- bl GetSubstructPtr
- lsls r1, r4, 1
- adds r1, r4
- lsls r1, 3
- ldr r2, =0x00006320
- adds r1, r2
- adds r0, r1
- pop {r4}
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CDD24
-
- thumb_func_start sub_81CDD48
-sub_81CDD48: @ 81CDD48
- push {lr}
- movs r0, 0x12
- bl GetSubstructPtr
- ldrh r1, [r0, 0x2]
- lsls r1, 2
- adds r0, r1
- ldrh r0, [r0, 0x6]
- pop {r1}
- bx r1
- thumb_func_end sub_81CDD48
-
- thumb_func_start sub_81CDD5C
-sub_81CDD5C: @ 81CDD5C
- push {lr}
- movs r0, 0xB
- bl GetSubstructPtr
- movs r1, 0xC6
- lsls r1, 7
- adds r0, r1
- ldrb r0, [r0]
- cmp r0, 0x1
- beq _081CDD74
- movs r0, 0
- b _081CDD76
-_081CDD74:
- movs r0, 0x1
-_081CDD76:
- pop {r1}
- bx r1
- thumb_func_end sub_81CDD5C
-
- thumb_func_start sub_81CDD7C
-sub_81CDD7C: @ 81CDD7C
- push {lr}
- movs r0, 0xB
- bl GetSubstructPtr
- adds r2, r0, 0
- movs r1, 0xC6
- lsls r1, 7
- adds r0, r2, r1
- ldrb r0, [r0]
- cmp r0, 0x1
- beq _081CDD96
- movs r0, 0
- b _081CDDA6
-_081CDD96:
- ldr r3, =0x00006786
- adds r0, r2, r3
- movs r1, 0
- ldrsb r1, [r0, r1]
- subs r3, 0x3
- adds r0, r2, r3
- adds r0, r1
- ldrb r0, [r0]
-_081CDDA6:
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CDD7C
-
- thumb_func_start sub_81CDDB0
-sub_81CDDB0: @ 81CDDB0
- push {lr}
- movs r0, 0xB
- bl GetSubstructPtr
- ldr r2, =0x00006786
- adds r1, r0, r2
- ldrb r1, [r1]
- lsls r1, 24
- asrs r1, 24
- subs r2, 0x6
- adds r0, r2
- adds r0, r1
- ldrb r0, [r0]
- pop {r1}
- bx r1
- .pool
- thumb_func_end sub_81CDDB0
-
- .align 2, 0 @ Don't pad with nop.
diff --git a/include/pokemon.h b/include/pokemon.h
index 090a21f18..07bcff2e3 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -563,7 +563,7 @@ void PlayBattleBGM(void);
void PlayMapChosenOrBattleBGM(u16 songId);
void sub_806E694(u16 songId);
const u32 *GetMonFrontSpritePal(struct Pokemon *mon);
-const u32 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality);
+const u32 *GetMonSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality);
const struct CompressedSpritePalette *GetMonSpritePalStruct(struct Pokemon *mon);
const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u16 species, u32 otId , u32 personality);
bool32 IsHMMove2(u16 move);
diff --git a/include/pokenav.h b/include/pokenav.h
index 42591ab10..b6d3fff86 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -187,18 +187,17 @@ void sub_81CC670(void);
// pokenav_unk_6.c
bool32 sub_81CD3C4(void);
bool32 sub_81CDD5C(void);
-s8 sub_81CDC84(void);
struct UnknownStruct_81D1ED4 *sub_81CDC70(void);
u16 sub_81CDC60(void);
u16 sub_81CDC50(void);
u8 sub_81CDDB0(void);
bool32 sub_81CD548(u8 arg0);
u8 sub_81CDD7C(void);
-const u8 *sub_81CDD04(u8 id);
-const u8 *sub_81CDD24(u8 id);
+u8 *sub_81CDD04(u8 id);
+u8 *sub_81CDD24(u8 id);
u16 sub_81CDD48(void);
-const void *sub_81CDCB4(u8 id);
-const u16 *sub_81CDCD4(u8 id);
+void *sub_81CDCB4(u8 id);
+void *sub_81CDCD4(u8 id);
// pokenav_unk_7.c
u8 sub_81CEF14(void);
diff --git a/ld_script.txt b/ld_script.txt
index e9e42606c..f2eb6b88f 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -316,7 +316,7 @@ SECTIONS {
src/pokenav_unk_3.o(.text*);
src/pokenav_unk_4.o(.text*);
src/pokenav_unk_5.o(.text*);
- asm/pokenav_unk_6.o(.text*);
+ src/pokenav_unk_6.o(.text*);
src/pokenav_unk_7.o(.text*);
asm/pokenav_unk_8.o(.text*);
asm/pokenav_unk_9.o(.text*);
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index c6058204d..a667daecf 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -2037,7 +2037,7 @@ u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority
gMonSpritesGfxPtr->field_17C = AllocZeroed(0x2000);
if (!isBackpic)
{
- LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20);
+ LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20);
if (a10 == 1 || sub_80688F8(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0)
LoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
gMonSpritesGfxPtr->field_17C,
@@ -2053,7 +2053,7 @@ u8 sub_80A8394(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority
}
else
{
- LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20);
+ LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20);
if (a10 == 1 || sub_80688F8(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0)
LoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species],
gMonSpritesGfxPtr->field_17C,
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index d6b1b6dee..c98713fc3 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -534,7 +534,7 @@ void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId)
if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies == SPECIES_NONE)
lzPaletteData = GetMonFrontSpritePal(mon);
else
- lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
+ lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
LZDecompressWram(lzPaletteData, gDecompressionBuffer);
LoadPalette(gDecompressionBuffer, paletteOffset, 0x20);
@@ -597,7 +597,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId)
if (gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies == SPECIES_NONE)
lzPaletteData = GetMonFrontSpritePal(mon);
else
- lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
+ lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(species, otId, monsPersonality);
LZDecompressWram(lzPaletteData, gDecompressionBuffer);
LoadPalette(gDecompressionBuffer, paletteOffset, 0x20);
@@ -918,7 +918,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform
dst = (void *)(VRAM + 0x10000 + gSprites[gBattlerSpriteIds[battlerAtk]].oam.tileNum * 32);
DmaCopy32(3, src, dst, 0x800);
paletteOffset = 0x100 + battlerAtk * 16;
- lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue);
+ lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(targetSpecies, otId, personalityValue);
LZDecompressWram(lzPaletteData, gDecompressionBuffer);
LoadPalette(gDecompressionBuffer, paletteOffset, 32);
diff --git a/src/contest.c b/src/contest.c
index 869300a92..662a27060 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -2973,7 +2973,7 @@ static u8 sub_80DB174(u16 species, u32 otId, u32 personality, u32 index)
else
HandleLoadSpecialPokePic_DontHandleDeoxys(gMonBackPicTable + species, gMonSpritesGfxPtr->sprites[0], species, personality);
- LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x120, 0x20);
+ LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x120, 0x20);
SetMultiuseSpriteTemplateToPokemon(species, 0);
spriteId = CreateSprite(&gMultiuseSpriteTemplate, 0x70, GetBattlerSpriteFinal_Y(2, species, FALSE), 30);
diff --git a/src/contest_painting.c b/src/contest_painting.c
index b7fd3cce7..820505b6e 100644
--- a/src/contest_painting.c
+++ b/src/contest_painting.c
@@ -362,7 +362,7 @@ static void VBlankCB_ContestPainting(void)
void sub_81302E8(u16 species, u8 arg1)
{
- const void *pal = GetFrontSpritePalFromSpeciesAndPersonality(species, gUnknown_030061C0->trainerId, gUnknown_030061C0->personality);
+ const void *pal = GetMonSpritePalFromSpeciesAndPersonality(species, gUnknown_030061C0->trainerId, gUnknown_030061C0->personality);
LZDecompressVram(pal, gContestPaintingMonPalette);
if (!arg1)
{
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index 34dd1fe2b..d33d53707 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -1290,7 +1290,7 @@ void sub_81D3094(void *tilesDst, void *palDst, u16 boxId, u16 monId, u16 arg5, u
u32 personality = GetBoxOrPartyMonData(boxId, monId, MON_DATA_PERSONALITY, NULL);
LoadSpecialPokePic(&gMonFrontPicTable[species], tilesDst, species, personality, TRUE);
- LZ77UnCompWram(GetFrontSpritePalFromSpeciesAndPersonality(species, trainerId, personality), palDst);
+ LZ77UnCompWram(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), palDst);
}
}
diff --git a/src/pokedex.c b/src/pokedex.c
index 2588e2b73..da3f06bf1 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -3855,7 +3855,7 @@ void blockset_load_palette_to_gpu(u8 taskId)
otId = ((u16)gTasks[taskId].data[13] << 16) | (u16)gTasks[taskId].data[12];
personality = ((u16)gTasks[taskId].data[15] << 16) | (u16)gTasks[taskId].data[14];
paletteNum = gSprites[gTasks[taskId].data[3]].oam.paletteNum;
- lzPaletteData = GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality);
+ lzPaletteData = GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality);
LoadCompressedPalette(lzPaletteData, 0x100 | paletteNum * 16, 32);
DestroyTask(taskId);
}
diff --git a/src/pokemon.c b/src/pokemon.c
index 6ad47d346..2485caa50 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -6321,10 +6321,10 @@ const u32 *GetMonFrontSpritePal(struct Pokemon *mon)
u16 species = GetMonData(mon, MON_DATA_SPECIES2, 0);
u32 otId = GetMonData(mon, MON_DATA_OT_ID, 0);
u32 personality = GetMonData(mon, MON_DATA_PERSONALITY, 0);
- return GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality);
+ return GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality);
}
-const u32 *GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality)
+const u32 *GetMonSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality)
{
u32 shinyValue;
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index 61f899801..5272b3292 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -2248,7 +2248,7 @@ void sub_802C9D4(struct PokemonJump2 *arg0, struct PokemonJump1_MonInfo *jumpMon
spriteSheet.size = 0x800;
LoadSpriteSheet(&spriteSheet);
- spritePalette.data = GetFrontSpritePalFromSpeciesAndPersonality(jumpMon->species, jumpMon->otId, jumpMon->personality);
+ spritePalette.data = GetMonSpritePalFromSpeciesAndPersonality(jumpMon->species, jumpMon->otId, jumpMon->personality);
spritePalette.tag = multiplayerId;
LoadCompressedSpritePalette(&spritePalette);
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index c5cd71d15..59ec8f4f1 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -6827,7 +6827,7 @@ static void SetCursorMonData(void *pokemon, u8 mode)
sPSSData->cursorMonLevel = GetLevelFromBoxMonExp(boxMon);
sPSSData->cursorMonMarkings = GetBoxMonData(boxMon, MON_DATA_MARKINGS);
sPSSData->cursorMonPersonality = GetBoxMonData(boxMon, MON_DATA_PERSONALITY);
- sPSSData->cursorMonPalette = GetFrontSpritePalFromSpeciesAndPersonality(sPSSData->cursorMonSpecies, otId, sPSSData->cursorMonPersonality);
+ sPSSData->cursorMonPalette = GetMonSpritePalFromSpeciesAndPersonality(sPSSData->cursorMonSpecies, otId, sPSSData->cursorMonPersonality);
gender = GetGenderFromSpeciesAndPersonality(sPSSData->cursorMonSpecies, sPSSData->cursorMonPersonality);
sPSSData->cursorMonItem = GetBoxMonData(boxMon, MON_DATA_HELD_ITEM);
}
diff --git a/src/pokenav_unk_6.c b/src/pokenav_unk_6.c
new file mode 100644
index 000000000..0fe5f7a8f
--- /dev/null
+++ b/src/pokenav_unk_6.c
@@ -0,0 +1,637 @@
+#include "global.h"
+#include "data.h"
+#include "decompress.h"
+#include "main.h"
+#include "menu_specialized.h"
+#include "mon_markings.h"
+#include "pokenav.h"
+#include "pokemon.h"
+#include "pokemon_storage_system.h"
+#include "sound.h"
+#include "string_util.h"
+#include "strings.h"
+#include "text.h"
+#include "constants/songs.h"
+#include "constants/species.h"
+
+struct PokenavSub11
+{
+ u32 monPal[3][0x20];
+ u8 fill[0x180];
+ u32 monPicGfx[3][0x800];
+ u8 unk6300;
+ s16 unk6302;
+ u32 (*unk6304)(struct PokenavSub11 *);
+ u8 fill2[0x6320 - 0x6308];
+ u8 unk6320[3][24];
+ u8 unk6368[3][64];
+ struct UnknownStruct_81D1ED4 unk6428;
+ u8 unk6780[3];
+ u8 unk6783[3];
+ s8 unk6786;
+ s8 unk6787;
+ s8 unk6788;
+ s8 unk6789;
+ u8 unk678A;
+};
+
+struct PokenavSub18
+{
+ u16 unk0;
+ u16 unk2;
+ struct
+ {
+ u8 boxId;
+ u8 monId;
+ u16 unk6;
+ } unk4[TOTAL_BOXES_COUNT * IN_BOX_COUNT + PARTY_SIZE];
+};
+
+void sub_81CD970(void);
+void sub_81CD9F8(void);
+u32 sub_81CD08C(struct PokenavSub11 *structPtr);
+u32 sub_81CD19C(struct PokenavSub11 *structPtr);
+u32 sub_81CD110(struct PokenavSub11 *structPtr);
+u8 sub_81CD1E4(struct PokenavSub11 *structPtr);
+u8 sub_81CD258(u8 arg0);
+void sub_81CD824(s16 arg0, u8 arg1);
+void sub_81CDA1C(s16 arg0, u8 arg1);
+void sub_81CDB98(s16 arg0, u8 arg1);
+
+// code
+bool32 sub_81CCFD8(void)
+{
+ struct PokenavSub11 *structPtr = AllocSubstruct(11, sizeof(struct PokenavSub11));
+
+ if (structPtr == NULL)
+ return FALSE;
+
+ sub_81D1ED4(&structPtr->unk6428);
+ sub_81CD970();
+ gKeyRepeatStartDelay = 20;
+ structPtr->unk6304 = sub_81CD08C;
+ return TRUE;
+}
+
+bool32 sub_81CD024(void)
+{
+ struct PokenavSub11 *structPtr = AllocSubstruct(11, sizeof(struct PokenavSub11));
+
+ if (structPtr == NULL)
+ return FALSE;
+
+ sub_81D1ED4(&structPtr->unk6428);
+ sub_81CD9F8();
+ gKeyRepeatStartDelay = 20;
+ structPtr->unk6304 = sub_81CD08C;
+ return TRUE;
+}
+
+u32 sub_81CD070(void)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+
+ return structPtr->unk6304(structPtr);
+}
+
+u32 sub_81CD08C(struct PokenavSub11 *structPtr)
+{
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+ u32 ret = sub_81CD1E4(structPtr);
+
+ if (ret == 0)
+ {
+ if (gMain.newKeys & B_BUTTON)
+ {
+ PlaySE(SE_SELECT);
+ structPtr->unk6304 = sub_81CD19C;
+ ret = 2;
+ }
+ else if (gMain.newKeys & A_BUTTON)
+ {
+ if (structPtr->unk6300 == 0)
+ {
+ if (unkPtr->unk2 == unkPtr->unk0 - 1)
+ {
+ PlaySE(SE_SELECT);
+ structPtr->unk6304 = sub_81CD19C;
+ ret = 2;
+ }
+ }
+ else
+ {
+ PlaySE(SE_SELECT);
+ ret = 5;
+ structPtr->unk6304 = sub_81CD110;
+ }
+ }
+ }
+
+ return ret;
+}
+
+u32 sub_81CD110(struct PokenavSub11 *structPtr)
+{
+ struct PokenavSub18 *unkPtr;
+ u8 markings;
+ u32 ret = 0, boxId, monId;
+
+ if (!sub_811FBA4())
+ {
+ structPtr->unk6783[structPtr->unk6786] = sub_81CEF14();
+ unkPtr = GetSubstructPtr(18);
+ boxId = unkPtr->unk4[unkPtr->unk2].boxId;
+ monId = unkPtr->unk4[unkPtr->unk2].monId;
+ markings = structPtr->unk6783[structPtr->unk6786];
+
+ if (boxId == TOTAL_BOXES_COUNT)
+ SetMonData(&gPlayerParty[monId], MON_DATA_MARKINGS, &markings);
+ else
+ SetBoxMonDataAt(boxId, monId, MON_DATA_MARKINGS, &markings);
+
+ structPtr->unk6304 = sub_81CD08C;
+ ret = 6;
+ }
+
+ return ret;
+}
+
+u32 sub_81CD19C(struct PokenavSub11 *structPtr)
+{
+ if (structPtr->unk6300 == 0)
+ return 0x186A2;
+ else
+ return 0x186AA;
+}
+
+void sub_81CD1C0(void)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ if (structPtr->unk6300 == 0)
+ FreePokenavSubstruct(18);
+
+ FreePokenavSubstruct(11);
+}
+
+u8 sub_81CD1E4(struct PokenavSub11 *structPtr)
+{
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+ u8 ret = 0;
+
+ if (gMain.heldKeys & DPAD_UP)
+ {
+ if (structPtr->unk6300 == 0 || unkPtr->unk2 != 0)
+ {
+ PlaySE(SE_SELECT);
+ ret = sub_81CD258(1);
+ }
+ }
+ else if (gMain.heldKeys & DPAD_DOWN)
+ {
+ if (structPtr->unk6300 == 0 || unkPtr->unk2 < unkPtr->unk0 - 1)
+ {
+ PlaySE(SE_SELECT);
+ ret = sub_81CD258(0);
+ }
+ }
+
+ return ret;
+}
+
+u8 sub_81CD258(u8 arg0)
+{
+ u16 r7;
+ bool8 r6, r0;
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+
+ r7 = (arg0) ? structPtr->unk6788 : structPtr->unk6787;
+ sub_81D1F84(&structPtr->unk6428, structPtr->unk6428.unk14[structPtr->unk6786], structPtr->unk6428.unk14[r7]);
+ r6 = (unkPtr->unk2 != ((sub_81CDD5C() != 0) ? unkPtr->unk0 : unkPtr->unk0 - 1));
+ if (arg0)
+ {
+ structPtr->unk6788 = structPtr->unk6787;
+ structPtr->unk6787 = structPtr->unk6786;
+ structPtr->unk6786 = r7;
+ structPtr->unk6789 = structPtr->unk6788;
+
+ unkPtr->unk2 = (unkPtr->unk2 == 0) ? unkPtr->unk0 - 1 : unkPtr->unk2 - 1;
+ structPtr->unk6302 = (unkPtr->unk2 != 0) ? unkPtr->unk2 - 1 : unkPtr->unk0 - 1;
+ }
+ else
+ {
+ structPtr->unk6787 = structPtr->unk6788;
+ structPtr->unk6788 = structPtr->unk6786;
+ structPtr->unk6786 = r7;
+ structPtr->unk6789 = structPtr->unk6787;
+
+ unkPtr->unk2 = (unkPtr->unk2 < unkPtr->unk0 - 1) ? unkPtr->unk2 + 1 : 0;
+ structPtr->unk6302 = (unkPtr->unk2 < unkPtr->unk0 - 1) ? unkPtr->unk2 + 1 : 0;
+ }
+
+ r0 = (unkPtr->unk2 != ((sub_81CDD5C() != 0) ? unkPtr->unk0 : unkPtr->unk0 - 1));
+
+ if (!r6)
+ return 3;
+ else if (!r0)
+ return 4;
+ else
+ return 1;
+}
+
+bool32 sub_81CD3C4(void)
+{
+ s32 var;
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+
+ switch (structPtr->unk678A)
+ {
+ case 0:
+ sub_81CD824(unkPtr->unk2, 0);
+ break;
+ case 1:
+ sub_81CDA1C(unkPtr->unk2, 0);
+ break;
+ case 2:
+ sub_81CDB98(unkPtr->unk2, 0);
+ break;
+ case 3:
+ if (unkPtr->unk0 == 1)
+ {
+ structPtr->unk6786 = 0;
+ structPtr->unk6787 = 0;
+ structPtr->unk6788 = 0;
+ structPtr->unk678A = 0;
+ return TRUE;
+ }
+ else
+ {
+ structPtr->unk6786 = 0;
+ structPtr->unk6787 = 1;
+ structPtr->unk6788 = 2;
+ }
+ break;
+ // These were probably ternaries just like cases 7-9, but couldn't match it any other way.
+ case 4:
+ var = unkPtr->unk2 + 1;
+ if (var >= unkPtr->unk0)
+ var = 0;
+ sub_81CD824(var, 1);
+ break;
+ case 5:
+ var = unkPtr->unk2 + 1;
+ if (var >= unkPtr->unk0)
+ var = 0;
+ sub_81CDA1C(var, 1);
+ break;
+ case 6:
+ var = unkPtr->unk2 + 1;
+ if (var >= unkPtr->unk0)
+ var = 0;
+ sub_81CDB98(var, 1);
+ break;
+ case 7:
+ sub_81CD824((unkPtr->unk2 - 1 >= 0) ? unkPtr->unk2 - 1 : unkPtr->unk0 - 1, 2);
+ break;
+ case 8:
+ sub_81CDA1C((unkPtr->unk2 - 1 >= 0) ? unkPtr->unk2 - 1 : unkPtr->unk0 - 1, 2);
+ break;
+ case 9:
+ sub_81CDB98((unkPtr->unk2 - 1 >= 0) ? unkPtr->unk2 - 1 : unkPtr->unk0 - 1, 2);
+ structPtr->unk678A = 0;
+ return TRUE;
+ }
+
+ structPtr->unk678A++;
+ return FALSE;
+}
+
+bool32 sub_81CD548(u8 arg0)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+
+ switch (arg0)
+ {
+ case 0:
+ sub_81CD824(structPtr->unk6302, structPtr->unk6789);
+ break;
+ case 1:
+ sub_81CDA1C(structPtr->unk6302, structPtr->unk6789);
+ break;
+ case 2:
+ sub_81CDB98(structPtr->unk6302, structPtr->unk6789);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+u8 *sub_81CD5CC(u8 *dst, const u8 *src, s16 n)
+{
+ while (*src != EOS)
+ *dst++ = *src++, n--;
+
+ while (n-- > 0)
+ *dst++ = CHAR_SPACE;
+
+ *dst = EOS;
+ return dst;
+}
+
+u8 *sub_81CD624(u8 *str, u16 id, bool8 arg3)
+{
+ u16 boxId, monId, gender, species, level, lvlDigits;
+ struct BoxPokemon *boxMon;
+ u8 *txtPtr, *str_;
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+
+ boxId = unkPtr->unk4[id].boxId;
+ monId = unkPtr->unk4[id].monId;
+ *(str++) = EXT_CTRL_CODE_BEGIN;
+ *(str++) = 4;
+ *(str++) = 8;
+ *(str++) = 0;
+ *(str++) = 9;
+
+ if (GetBoxOrPartyMonData(boxId, monId, MON_DATA_IS_EGG, NULL))
+ return StringCopyPadded(str, gText_EggNickname, CHAR_SPACE, 12);
+
+ GetBoxOrPartyMonData(boxId, monId, MON_DATA_NICKNAME, str);
+ StringGetEnd10(str);
+ species = GetBoxOrPartyMonData(boxId, monId, MON_DATA_SPECIES, NULL);
+ if (boxId == TOTAL_BOXES_COUNT)
+ {
+ level = GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL);
+ gender = GetMonGender(&gPlayerParty[monId]);
+ }
+ else
+ {
+ boxMon = GetBoxedMonPtr(boxId, monId);
+ gender = GetBoxMonGender(boxMon);
+ level = GetLevelFromBoxMonExp(boxMon);
+ }
+
+ if ((species == SPECIES_NIDORAN_F || species == SPECIES_NIDORAN_M) && !StringCompare(str, gSpeciesNames[species]))
+ gender = MON_GENDERLESS;
+
+ str_ = str; // For some reason, a variable is needed to match.
+ while (*str_ != EOS)
+ *(str_++);
+
+ *(str_++) = EXT_CTRL_CODE_BEGIN;
+ *(str_++) = 0x12;
+ *(str_++) = 0x3C;
+ switch (gender)
+ {
+ default:
+ *(str_++) = 0x77;
+ break;
+ case MON_MALE:
+ *(str_++) = EXT_CTRL_CODE_BEGIN;
+ *(str_++) = EXT_CTRL_CODE_COLOR;
+ *(str_++) = 4;
+ *(str_++) = EXT_CTRL_CODE_BEGIN;
+ *(str_++) = 3;
+ *(str_++) = 5;
+ *(str_++) = CHAR_MALE;
+ break;
+ case MON_FEMALE:
+ *(str_++) = EXT_CTRL_CODE_BEGIN;
+ *(str_++) = EXT_CTRL_CODE_COLOR;
+ *(str_++) = 6;
+ *(str_++) = EXT_CTRL_CODE_BEGIN;
+ *(str_++) = 3;
+ *(str_++) = 7;
+ *(str_++) = CHAR_FEMALE;
+ break;
+ }
+
+ *(str_++) = EXT_CTRL_CODE_BEGIN;
+ *(str_++) = 4;
+ *(str_++) = 8;
+ *(str_++) = 0;
+ *(str_++) = 9;
+ *(str_++) = CHAR_SLASH;
+ *(str_++) = CHAR_SPECIAL_F9;
+ *(str_++) = 5;
+ txtPtr = str_;
+ str_ = ConvertIntToDecimalStringN(str_, level, STR_CONV_MODE_LEFT_ALIGN, 3);
+ lvlDigits = str_ - txtPtr;
+ *(str_++) = CHAR_SPACE;
+ if (!arg3)
+ {
+ lvlDigits = 3 - lvlDigits;
+ while (lvlDigits-- != 0)
+ *(str_++) = CHAR_SPACE;
+ }
+
+ *str_ = EOS;
+ return str_;
+}
+
+void sub_81CD824(s16 arg0, u8 arg1)
+{
+ u16 boxId, i;
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+
+ if (arg0 != (sub_81CDD5C() != 0 ? unkPtr->unk0 : unkPtr->unk0 - 1))
+ {
+ sub_81CD624(structPtr->unk6368[arg1], arg0, FALSE);
+ boxId = unkPtr->unk4[arg0].boxId;
+ structPtr->unk6320[arg1][0] = EXT_CTRL_CODE_BEGIN;
+ structPtr->unk6320[arg1][1] = 4;
+ structPtr->unk6320[arg1][2] = 8;
+ structPtr->unk6320[arg1][3] = 0;
+ structPtr->unk6320[arg1][4] = 9;
+ if (boxId == TOTAL_BOXES_COUNT)
+ sub_81CD5CC(&structPtr->unk6320[arg1][5], gText_InParty, 8);
+ else
+ sub_81CD5CC(&structPtr->unk6320[arg1][5], GetBoxNamePtr(boxId), 8);
+ }
+ else
+ {
+ for (i = 0; i < 12; i++)
+ structPtr->unk6368[arg1][i] = CHAR_SPACE;
+ structPtr->unk6368[arg1][i] = EOS;
+
+ for (i = 0; i < 8; i++)
+ structPtr->unk6320[arg1][i] = CHAR_SPACE;
+ structPtr->unk6320[arg1][i] = EOS;
+ }
+}
+
+void sub_81CD970(void)
+{
+ u16 i, count;
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ struct PokenavSub18 *unkPtr = AllocSubstruct(18, sizeof(struct PokenavSub18));
+
+ structPtr->unk6300 = 0;
+ for (i = 0, count = 0; i < CalculatePlayerPartyCount(); i++)
+ {
+ if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
+ {
+ unkPtr->unk4[count].boxId = TOTAL_BOXES_COUNT;
+ unkPtr->unk4[count].monId = i;
+ unkPtr->unk4[count].unk6 = 0;
+ count++;
+ }
+ }
+
+ unkPtr->unk4[count].boxId = 0;
+ unkPtr->unk4[count].monId = 0;
+ unkPtr->unk4[count].unk6 = 0;
+ unkPtr->unk2 = 0;
+ unkPtr->unk0 = count + 1;
+ structPtr->unk678A = 0;
+}
+
+void sub_81CD9F8(void)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ structPtr->unk6300 = 1;
+ structPtr->unk678A = 0;
+}
+
+void sub_81CDA1C(s16 arg0, u8 arg1)
+{
+ u16 boxId, monId, i;
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+
+ if (arg0 != (sub_81CDD5C() != 0 ? unkPtr->unk0 : unkPtr->unk0 - 1))
+ {
+ boxId = unkPtr->unk4[arg0].boxId;
+ monId = unkPtr->unk4[arg0].monId;
+ structPtr->unk6428.unk0[arg1][0] = GetBoxOrPartyMonData(boxId, monId, MON_DATA_COOL, NULL);
+ structPtr->unk6428.unk0[arg1][1] = GetBoxOrPartyMonData(boxId, monId, MON_DATA_TOUGH, NULL);
+ structPtr->unk6428.unk0[arg1][2] = GetBoxOrPartyMonData(boxId, monId, MON_DATA_SMART, NULL);
+ structPtr->unk6428.unk0[arg1][3] = GetBoxOrPartyMonData(boxId, monId, MON_DATA_CUTE, NULL);
+ structPtr->unk6428.unk0[arg1][4] = GetBoxOrPartyMonData(boxId, monId, MON_DATA_BEAUTY, NULL);
+ structPtr->unk6780[arg1] = (GetBoxOrPartyMonData(boxId, monId, MON_DATA_SHEEN, NULL) != 255)
+ ? GetBoxOrPartyMonData(boxId, monId, MON_DATA_SHEEN, NULL) / 29u
+ : 9;
+ structPtr->unk6783[arg1] = GetBoxOrPartyMonData(boxId, monId, MON_DATA_MARKINGS, NULL);
+ sub_81D2754(structPtr->unk6428.unk0[arg1], structPtr->unk6428.unk14[arg1]);
+ }
+ else
+ {
+ for (i = 0; i < 5; i++)
+ {
+ structPtr->unk6428.unk0[arg1][i] = 0;
+ structPtr->unk6428.unk14[arg1][i].unk0 = 155;
+ structPtr->unk6428.unk14[arg1][i].unk2 = 91;
+ }
+ }
+}
+
+void sub_81CDB98(s16 arg0, u8 arg1)
+{
+ u16 boxId, monId, species;
+ u32 personality, tid;
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+
+ if (arg0 == (sub_81CDD5C() != 0 ? unkPtr->unk0 : unkPtr->unk0 - 1))
+ return;
+
+ boxId = unkPtr->unk4[arg0].boxId;
+ monId = unkPtr->unk4[arg0].monId;
+ species = GetBoxOrPartyMonData(boxId, monId, MON_DATA_SPECIES2, NULL);
+ tid = GetBoxOrPartyMonData(boxId, monId, MON_DATA_OT_ID, NULL);
+ personality = GetBoxOrPartyMonData(boxId, monId, MON_DATA_PERSONALITY, NULL);
+ LoadSpecialPokePic(&gMonFrontPicTable[species], structPtr->monPicGfx[arg1], species, personality, TRUE);
+ LZ77UnCompWram(GetMonSpritePalFromSpeciesAndPersonality(species, tid, personality), structPtr->monPal[arg1]);
+}
+
+u16 sub_81CDC50(void)
+{
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+ return unkPtr->unk0;
+}
+
+u16 sub_81CDC60(void)
+{
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+ return unkPtr->unk2;
+}
+
+struct UnknownStruct_81D1ED4 *sub_81CDC70(void)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ return &structPtr->unk6428;
+}
+
+u8 sub_81CDC84(void)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ return structPtr->unk6786;
+}
+
+u8 sub_81CDC9C(void)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ return structPtr->unk6302;
+}
+
+void *sub_81CDCB4(u8 id)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ return structPtr->monPicGfx[id];
+}
+
+void *sub_81CDCD4(u8 id)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ return structPtr->monPal[id];
+}
+
+u8 sub_81CDCEC(void)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ return structPtr->unk6789;
+}
+
+u8 *sub_81CDD04(u8 id)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ return structPtr->unk6368[id];
+}
+
+u8 *sub_81CDD24(u8 id)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ return structPtr->unk6320[id];
+}
+
+u16 sub_81CDD48(void)
+{
+ struct PokenavSub18 *unkPtr = GetSubstructPtr(18);
+ return unkPtr->unk4[unkPtr->unk2].unk6;
+}
+
+bool32 sub_81CDD5C(void)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ if (structPtr->unk6300 == 1)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+u8 sub_81CDD7C(void)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ if (structPtr->unk6300 == 1)
+ return structPtr->unk6783[structPtr->unk6786];
+ else
+ return 0;
+}
+
+u8 sub_81CDDB0(void)
+{
+ struct PokenavSub11 *structPtr = GetSubstructPtr(11);
+ return structPtr->unk6780[structPtr->unk6786];
+}
diff --git a/src/pokenav_unk_7.c b/src/pokenav_unk_7.c
index 414d91036..ada71b851 100644
--- a/src/pokenav_unk_7.c
+++ b/src/pokenav_unk_7.c
@@ -38,6 +38,8 @@ struct Pokenav7Struct
u8 filler2[0x38ac - 0x2909];
};
+extern s8 sub_81CDC84(void); // This function's declaration here is different than its definition in pokenav_unk_6. u8/s8
+
u32 sub_81CDE94(s32 state);
u32 sub_81CDE80(void);
void sub_81CED30(u8 var);
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index 6824e8747..047783a85 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -104,7 +104,7 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8
if (paletteTag == 0xFFFF)
{
sCreatingSpriteTemplate.paletteTag = 0xFFFF;
- LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20);
+ LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20);
}
else
{
@@ -130,7 +130,7 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8
static void LoadPicPaletteBySlot(u16 species, u32 otId, u32 personality, u8 paletteSlot, bool8 isTrainer)
{
if (!isTrainer)
- LoadCompressedPalette(GetFrontSpritePalFromSpeciesAndPersonality(species, otId, personality), paletteSlot * 0x10, 0x20);
+ LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), paletteSlot * 0x10, 0x20);
else
LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, paletteSlot * 0x10, 0x20);
}