Some pokenav work

This commit is contained in:
DizzyEggg
2019-05-26 12:42:01 +02:00
committed by huderlem
parent 818e1909ff
commit f64c1dfabf
8 changed files with 519 additions and 1025 deletions

View File

@@ -1305,881 +1305,5 @@ _081D0E5A:
bx r1
thumb_func_end sub_81D0E00
thumb_func_start sub_81D0E60
sub_81D0E60: @ 81D0E60
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BB8
bl AddWindow
strh r0, [r4, 0xA]
lsls r0, 24
lsrs r0, 24
bl PutWindowTilemap
adds r0, r4, 0
bl sub_81D0E84
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0E60
thumb_func_start sub_81D0E84
sub_81D0E84: @ 81D0E84
push {r4,r5,lr}
sub sp, 0x10
adds r5, r0, 0
ldr r1, =gUnknown_08624BC0
add r0, sp, 0xC
movs r2, 0x3
bl memcpy
ldr r4, =gStringVar1
bl sub_81D07D8
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
movs r3, 0x2
bl ConvertIntToDecimalStringN
bl DynamicPlaceholderTextUtil_Reset
movs r0, 0
adds r1, r4, 0
bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
ldr r4, =gStringVar4
ldr r1, =gText_RibbonsF700
adds r0, r4, 0
bl DynamicPlaceholderTextUtil_ExpandPlaceholders
ldrb r0, [r5, 0xA]
movs r1, 0x44
bl FillWindowPixelBuffer
ldrb r0, [r5, 0xA]
add r1, sp, 0xC
str r1, [sp]
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
str r4, [sp, 0x8]
movs r1, 0x1
movs r2, 0
movs r3, 0x1
bl AddTextPrinterParameterized3
ldrb r0, [r5, 0xA]
movs r1, 0x2
bl CopyWindowToVram
add sp, 0x10
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0E84
thumb_func_start sub_81D0EFC
sub_81D0EFC: @ 81D0EFC
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x10
adds r7, r0, 0
bl sub_81D0954
adds r5, r0, 0
ldr r1, =gUnknown_08624BC0
add r0, sp, 0xC
movs r2, 0x3
bl memcpy
ldrb r0, [r7, 0xA]
movs r1, 0x44
bl FillWindowPixelBuffer
cmp r5, 0x18
bhi _081D0F60
lsls r1, r5, 3
ldr r0, =gRibbonDescriptionPointers
adds r6, r1, r0
movs r5, 0x80
lsls r5, 17
movs r4, 0x1
_081D0F2E:
ldrb r0, [r7, 0xA]
lsrs r3, r5, 24
add r1, sp, 0xC
str r1, [sp]
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
ldm r6!, {r1}
str r1, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl AddTextPrinterParameterized3
movs r0, 0x80
lsls r0, 21
adds r5, r0
subs r4, 0x1
cmp r4, 0
bge _081D0F2E
b _081D0FAA
.pool
_081D0F60:
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
adds r0, r5
ldr r1, =0x0000318f
adds r0, r1
ldrb r5, [r0]
cmp r5, 0
beq _081D0FB2
subs r5, 0x1
movs r4, 0
ldr r0, =gGiftRibbonDescriptionPointers
mov r8, r0
movs r6, 0x80
lsls r6, 17
_081D0F7C:
ldrb r0, [r7, 0xA]
lsrs r3, r6, 24
add r1, sp, 0xC
str r1, [sp]
movs r1, 0x1
negs r1, r1
str r1, [sp, 0x4]
lsls r1, r4, 2
lsls r2, r5, 3
adds r1, r2
add r1, r8
ldr r1, [r1]
str r1, [sp, 0x8]
movs r1, 0x1
movs r2, 0
bl AddTextPrinterParameterized3
movs r0, 0x80
lsls r0, 21
adds r6, r0
adds r4, 0x1
cmp r4, 0x1
ble _081D0F7C
_081D0FAA:
ldrb r0, [r7, 0xA]
movs r1, 0x2
bl CopyWindowToVram
_081D0FB2:
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0EFC
thumb_func_start sub_81D0FCC
sub_81D0FCC: @ 81D0FCC
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BC4
bl AddWindow
strh r0, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
bl PutWindowTilemap
adds r0, r4, 0
bl sub_81D0FF0
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0FCC
thumb_func_start sub_81D0FF0
sub_81D0FF0: @ 81D0FF0
push {r4-r7,lr}
sub sp, 0x10
ldrh r7, [r0, 0x8]
ldrb r5, [r0, 0x8]
adds r0, r5, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r4, =gStringVar3
mov r6, sp
adds r6, 0xD
adds r0, r4, 0
add r1, sp, 0xC
adds r2, r6, 0
bl sub_81D06E4
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
str r0, [sp, 0x4]
movs r0, 0
str r0, [sp, 0x8]
adds r0, r5, 0
movs r1, 0x1
adds r2, r4, 0
movs r3, 0
bl AddTextPrinterParameterized
ldrb r0, [r6]
cmp r0, 0
beq _081D1040
cmp r0, 0xFE
beq _081D1048
ldr r1, =gUnknown_08624BE4
b _081D104A
.pool
_081D1040:
ldr r1, =gUnknown_08624BCC
b _081D104A
.pool
_081D1048:
ldr r1, =gUnknown_08624BD8
_081D104A:
ldr r5, =gStringVar1
adds r0, r5, 0
bl StringCopy
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
movs r1, 0xF9
strb r1, [r0]
adds r0, 0x1
movs r1, 0x5
strb r1, [r0]
adds r0, 0x1
add r1, sp, 0xC
ldrb r1, [r1]
movs r2, 0
movs r3, 0x3
bl ConvertIntToDecimalStringN
lsls r4, r7, 24
lsrs r4, 24
movs r0, 0x1
str r0, [sp]
movs r0, 0xFF
str r0, [sp, 0x4]
movs r0, 0
str r0, [sp, 0x8]
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
movs r3, 0x3C
bl AddTextPrinterParameterized
adds r0, r4, 0
movs r1, 0x2
bl CopyWindowToVram
add sp, 0x10
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D0FF0
thumb_func_start sub_81D10A4
sub_81D10A4: @ 81D10A4
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624BE8
bl AddWindow
strh r0, [r4, 0xC]
lsls r0, 24
lsrs r0, 24
movs r1, 0x11
bl FillWindowPixelBuffer
ldrb r0, [r4, 0xC]
bl PutWindowTilemap
adds r0, r4, 0
bl sub_81D10D0
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D10A4
thumb_func_start sub_81D10D0
sub_81D10D0: @ 81D10D0
push {r4-r6,lr}
mov r6, r8
push {r6}
sub sp, 0xC
mov r8, r0
bl sub_81D06C4
adds r4, r0, 0
adds r4, 0x1
bl sub_81D06D4
adds r6, r0, 0
ldr r5, =gStringVar1
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
movs r1, 0xBA
strb r1, [r0]
adds r0, 0x1
adds r1, r6, 0
movs r2, 0x1
movs r3, 0x3
bl ConvertIntToDecimalStringN
movs r0, 0x1
adds r1, r5, 0
movs r2, 0x38
bl GetStringCenterAlignXOffset
adds r3, r0, 0
mov r1, r8
ldrb r0, [r1, 0xC]
lsls r3, 24
lsrs r3, 24
movs r1, 0x1
str r1, [sp]
movs r1, 0xFF
str r1, [sp, 0x4]
movs r1, 0
str r1, [sp, 0x8]
movs r1, 0x1
adds r2, r5, 0
bl AddTextPrinterParameterized
mov r1, r8
ldrb r0, [r1, 0xC]
movs r1, 0x2
bl CopyWindowToVram
add sp, 0xC
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D10D0
thumb_func_start sub_81D1148
sub_81D1148: @ 81D1148
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
add r1, sp, 0x4
add r2, sp, 0x8
mov r0, sp
bl sub_81D0760
bl ResetAllPicSprites
movs r0, 0x28
movs r1, 0x68
bl sub_81D1184
strh r0, [r4, 0x10]
movs r0, 0xF
movs r1, 0
bl sub_81C7990
add sp, 0xC
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_81D1148
thumb_func_start sub_81D1178
sub_81D1178: @ 81D1178
push {lr}
ldrh r0, [r0, 0x10]
bl FreeAndDestroyMonPicSprite
pop {r0}
bx r0
thumb_func_end sub_81D1178
thumb_func_start sub_81D1184
sub_81D1184: @ 81D1184
push {lr}
sub sp, 0x1C
add r1, sp, 0x14
add r2, sp, 0x18
add r0, sp, 0x10
bl sub_81D0760
add r0, sp, 0x10
ldrh r0, [r0]
ldr r1, [sp, 0x18]
ldr r2, [sp, 0x14]
movs r3, 0x28
str r3, [sp]
movs r3, 0x68
str r3, [sp, 0x4]
movs r3, 0xF
str r3, [sp, 0x8]
ldr r3, =0x0000ffff
str r3, [sp, 0xC]
movs r3, 0x1
bl CreateMonPicSprite_HandleDeoxys
lsls r0, 16
lsrs r0, 16
ldr r1, =gSprites
lsls r2, r0, 4
adds r2, r0
lsls r2, 2
adds r2, r1
ldrb r3, [r2, 0x5]
movs r1, 0xD
negs r1, r1
ands r1, r3
strb r1, [r2, 0x5]
add sp, 0x1C
pop {r1}
bx r1
.pool
thumb_func_end sub_81D1184
thumb_func_start sub_81D11D8
sub_81D11D8: @ 81D11D8
push {lr}
ldrh r1, [r0, 0x10]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
movs r2, 0x20
negs r2, r2
movs r1, 0x28
movs r3, 0x6
bl sub_81D1258
pop {r0}
bx r0
.pool
thumb_func_end sub_81D11D8
thumb_func_start sub_81D11FC
sub_81D11FC: @ 81D11FC
push {r4,r5,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x10]
bl FreeAndDestroyMonPicSprite
movs r5, 0x20
negs r5, r5
adds r0, r5, 0
movs r1, 0x68
bl sub_81D1184
strh r0, [r4, 0x10]
ldrh r1, [r4, 0x10]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
adds r1, r5, 0
movs r2, 0x28
movs r3, 0x6
bl sub_81D1258
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D11FC
thumb_func_start sub_81D1234
sub_81D1234: @ 81D1234
ldr r2, =gSprites
ldrh r1, [r0, 0x10]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r2, 0x1C
adds r0, r2
ldr r1, [r0]
ldr r0, =SpriteCallbackDummy
eors r1, r0
negs r0, r1
orrs r0, r1
lsrs r0, 31
bx lr
.pool
thumb_func_end sub_81D1234
thumb_func_start sub_81D1258
sub_81D1258: @ 81D1258
push {r4-r6,lr}
adds r4, r0, 0
adds r6, r2, 0
adds r5, r3, 0
subs r0, r6, r1
strh r1, [r4, 0x20]
lsls r1, 4
strh r1, [r4, 0x2E]
lsls r0, 4
adds r1, r5, 0
bl __udivsi3
strh r0, [r4, 0x30]
strh r5, [r4, 0x32]
strh r6, [r4, 0x34]
ldr r0, =sub_81D1284
str r0, [r4, 0x1C]
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1258
thumb_func_start sub_81D1284
sub_81D1284: @ 81D1284
push {lr}
adds r2, r0, 0
ldrh r1, [r2, 0x32]
movs r3, 0x32
ldrsh r0, [r2, r3]
cmp r0, 0
beq _081D12C8
subs r0, r1, 0x1
strh r0, [r2, 0x32]
ldrh r0, [r2, 0x30]
ldrh r1, [r2, 0x2E]
adds r0, r1
strh r0, [r2, 0x2E]
lsls r0, 16
asrs r0, 20
strh r0, [r2, 0x20]
movs r1, 0x20
negs r1, r1
cmp r0, r1
bgt _081D12BA
adds r0, r2, 0
adds r0, 0x3E
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
b _081D12D0
_081D12BA:
adds r2, 0x3E
ldrb r1, [r2]
movs r0, 0x5
negs r0, r0
ands r0, r1
strb r0, [r2]
b _081D12D0
_081D12C8:
ldrh r0, [r2, 0x34]
strh r0, [r2, 0x20]
ldr r0, =SpriteCallbackDummy
str r0, [r2, 0x1C]
_081D12D0:
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1284
thumb_func_start sub_81D12D8
sub_81D12D8: @ 81D12D8
push {r4-r6,lr}
bl sub_81D1350
ldr r5, =gUnknown_030012C0
adds r0, r5, 0
bl sub_81D0914
adds r6, r0, 0
ldr r2, =gUnknown_030012C4
movs r1, 0
str r1, [r2]
ldr r0, [r5]
cmp r1, r0
bcs _081D130A
adds r4, r2, 0
_081D12F6:
ldr r0, [r4]
ldm r6!, {r1}
bl sub_81D1370
ldr r1, [r4]
adds r1, 0x1
str r1, [r4]
ldr r0, [r5]
cmp r1, r0
bcc _081D12F6
_081D130A:
ldr r4, =gUnknown_030012C0
adds r0, r4, 0
bl sub_81D092C
adds r6, r0, 0
ldr r2, =gUnknown_030012C4
movs r1, 0
str r1, [r2]
ldr r0, [r4]
cmp r1, r0
bcs _081D133A
adds r4, r2, 0
_081D1322:
ldr r0, [r4]
adds r0, 0x1B
ldm r6!, {r1}
bl sub_81D1370
ldr r1, [r4]
adds r1, 0x1
str r1, [r4]
ldr r0, =gUnknown_030012C0
ldr r0, [r0]
cmp r1, r0
bcc _081D1322
_081D133A:
movs r0, 0x1
bl CopyBgTilemapBufferToVram
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D12D8
thumb_func_start sub_81D1350
sub_81D1350: @ 81D1350
push {lr}
sub sp, 0x8
movs r0, 0x20
str r0, [sp]
movs r0, 0x14
str r0, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
bl FillBgTilemapBufferRect_Palette0
add sp, 0x8
pop {r0}
bx r0
thumb_func_end sub_81D1350
thumb_func_start sub_81D1370
sub_81D1370: @ 81D1370
push {r4-r6,lr}
sub sp, 0x10
adds r4, r0, 0
adds r6, r1, 0
movs r1, 0x9
bl __umodsi3
adds r5, r0, 0
lsls r5, 1
adds r5, 0xB
adds r0, r4, 0
movs r1, 0x9
bl __udivsi3
adds r4, r0, 0
lsls r4, 1
adds r4, 0x4
add r0, sp, 0x8
adds r1, r6, 0
bl sub_81D13BC
lsls r5, 24
lsrs r5, 24
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
str r0, [sp]
str r0, [sp, 0x4]
movs r0, 0x1
add r1, sp, 0x8
adds r2, r5, 0
adds r3, r4, 0
bl CopyToBgTilemapBufferRect
add sp, 0x10
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_81D1370
thumb_func_start sub_81D13BC
sub_81D13BC: @ 81D13BC
push {r4,r5,lr}
ldr r2, =gUnknown_08624BF8
lsls r1, 2
adds r1, r2
ldrh r3, [r1, 0x2]
adds r3, 0x2
lsls r3, 16
ldrh r1, [r1]
lsls r1, 1
adds r1, 0x1
lsls r1, 16
lsrs r1, 16
lsrs r3, 4
adds r2, r1, 0
orrs r2, r3
strh r2, [r0]
movs r5, 0x80
lsls r5, 3
adds r4, r5, 0
orrs r2, r4
strh r2, [r0, 0x2]
adds r1, 0x1
orrs r1, r3
strh r1, [r0, 0x4]
orrs r1, r4
strh r1, [r0, 0x6]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D13BC
thumb_func_start sub_81D13FC
sub_81D13FC: @ 81D13FC
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_08624C78
bl LoadCompressedSpriteSheet
ldr r0, =gUnknown_08624C80
bl Pokenav_AllocAndLoadPalettes
ldr r0, =gUnknown_08624D04
movs r1, 0
movs r2, 0
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
ldr r0, =gSprites
adds r1, r0
str r1, [r4, 0x14]
adds r1, 0x3E
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D13FC
thumb_func_start sub_81D1448
sub_81D1448: @ 81D1448
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r6, r0, 0
bl sub_81D0944
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r4, 0
movs r1, 0x9
bl __modsi3
adds r5, r0, 0
lsls r5, 4
adds r5, 0x60
adds r0, r4, 0
movs r1, 0x9
bl __divsi3
lsls r0, 4
adds r0, 0x28
ldr r1, [r6, 0x14]
movs r2, 0
mov r8, r2
strh r5, [r1, 0x20]
ldr r1, [r6, 0x14]
strh r0, [r1, 0x22]
bl sub_81D0954
adds r4, r0, 0
movs r0, 0x9
bl GetSpriteTileStartByTag
ldr r3, [r6, 0x14]
ldr r1, =gUnknown_08624BF8
lsls r4, 2
adds r4, r1
ldrh r1, [r4]
lsls r1, 4
adds r0, r1
ldr r2, =0x000003ff
adds r1, r2, 0
ands r0, r1
ldrh r2, [r3, 0x4]
ldr r1, =0xfffffc00
ands r1, r2
orrs r1, r0
strh r1, [r3, 0x4]
ldrh r0, [r4, 0x2]
adds r0, 0xF
lsls r0, 16
lsrs r0, 16
bl IndexOfSpritePaletteTag
ldr r3, [r6, 0x14]
lsls r0, 4
ldrb r2, [r3, 0x5]
movs r1, 0xF
ands r1, r2
orrs r1, r0
strb r1, [r3, 0x5]
ldr r0, [r6, 0x14]
movs r1, 0x1
bl StartSpriteAffineAnim
ldr r1, [r6, 0x14]
adds r1, 0x3E
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
ldr r0, [r6, 0x14]
mov r1, r8
strh r1, [r0, 0x2E]
ldr r1, [r6, 0x14]
ldr r0, =sub_81D1538
str r0, [r1, 0x1C]
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1448
thumb_func_start sub_81D1500
sub_81D1500: @ 81D1500
push {r4,lr}
adds r4, r0, 0
ldr r1, [r4, 0x14]
movs r0, 0x1
strh r0, [r1, 0x2E]
ldr r0, [r4, 0x14]
movs r1, 0x2
bl StartSpriteAffineAnim
ldr r1, [r4, 0x14]
ldr r0, =sub_81D1538
str r0, [r1, 0x1C]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1500
thumb_func_start sub_81D1524
sub_81D1524: @ 81D1524
ldr r0, [r0, 0x14]
ldr r1, [r0, 0x1C]
ldr r0, =SpriteCallbackDummy
eors r1, r0
negs r0, r1
orrs r0, r1
lsrs r0, 31
bx lr
.pool
thumb_func_end sub_81D1524
thumb_func_start sub_81D1538
sub_81D1538: @ 81D1538
push {lr}
adds r3, r0, 0
adds r0, 0x3F
ldrb r1, [r0]
movs r0, 0x20
ands r0, r1
cmp r0, 0
beq _081D156A
movs r0, 0x3E
adds r0, r3
mov r12, r0
movs r0, 0x1
ldrh r1, [r3, 0x2E]
ands r1, r0
lsls r1, 2
mov r0, r12
ldrb r2, [r0]
movs r0, 0x5
negs r0, r0
ands r0, r2
orrs r0, r1
mov r1, r12
strb r0, [r1]
ldr r0, =SpriteCallbackDummy
str r0, [r3, 0x1C]
_081D156A:
pop {r0}
bx r0
.pool
thumb_func_end sub_81D1538
.align 2, 0 @ Don't pad with nop.

View File

@@ -5,44 +5,6 @@
@ File centered around AllocSubstruct(2)
thumb_func_start sub_81C98D4
sub_81C98D4: @ 81C98D4
push {r4,lr}
movs r4, 0
_081C98D8:
adds r0, r4, 0
bl sub_81CB0C8
ldr r1, =gMapHeader
lsls r0, 24
lsrs r0, 24
ldrb r1, [r1, 0x14]
cmp r0, r1
bne _081C9914
adds r0, r4, 0
bl sub_81CAE08
cmp r0, 0
beq _081C9914
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
ldr r1, =0x000009ca
adds r0, r1
adds r0, r4
ldrb r0, [r0]
cmp r0, 0
beq _081C9914
movs r0, 0x1
b _081C991C
.pool
_081C9914:
adds r4, 0x1
cmp r4, 0x4D
ble _081C98D8
movs r0, 0
_081C991C:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_81C98D4
thumb_func_start sub_81C9924
sub_81C9924: @ 81C9924