More pokemon storage

This commit is contained in:
DizzyEggg
2018-12-11 23:09:12 +01:00
parent c5b5f4bd77
commit 74746603ad
3 changed files with 200 additions and 569 deletions
-554
View File
@@ -8,560 +8,6 @@
thumb_func_start sub_80CA230
sub_80CA230: @ 80CA230
push {lr}
ldr r0, =gUnknown_02039D08
ldr r1, [r0]
ldr r2, =0x00000ce4
adds r0, r1, r2
ldrh r0, [r0]
subs r2, 0x4
adds r1, r2
ldr r1, [r1]
bl sub_80CA44C
bl sub_80CA4FC
bl sub_80CA65C
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
pop {r0}
bx r0
.pool
thumb_func_end sub_80CA230
thumb_func_start BoxSetMosaic
BoxSetMosaic: @ 80CA260
push {lr}
bl sub_80CA230
ldr r3, =gUnknown_02039D08
ldr r0, [r3]
movs r1, 0x89
lsls r1, 6
adds r0, r1
ldr r2, [r0]
cmp r2, 0
beq _080CA2AC
ldrb r0, [r2, 0x1]
movs r1, 0x10
orrs r0, r1
strb r0, [r2, 0x1]
ldr r1, [r3]
movs r0, 0x89
lsls r0, 6
adds r1, r0
ldr r2, [r1]
movs r0, 0xA
strh r0, [r2, 0x2E]
ldr r2, [r1]
movs r0, 0x1
strh r0, [r2, 0x30]
ldr r2, [r1]
ldr r0, =BoxSetMosaic2
str r0, [r2, 0x1C]
ldr r0, [r1]
ldrh r0, [r0, 0x2E]
lsls r1, r0, 12
lsls r0, 8
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x4C
bl SetGpuReg
_080CA2AC:
pop {r0}
bx r0
.pool
thumb_func_end BoxSetMosaic
thumb_func_start sub_80CA2B8
sub_80CA2B8: @ 80CA2B8
ldr r0, =gUnknown_02039D08
ldr r0, [r0]
movs r1, 0x89
lsls r1, 6
adds r0, r1
ldr r0, [r0]
ldrb r0, [r0, 0x1]
lsls r0, 27
lsrs r0, 31
bx lr
.pool
thumb_func_end sub_80CA2B8
thumb_func_start BoxSetMosaic2
BoxSetMosaic2: @ 80CA2D0
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x2E]
ldrh r1, [r4, 0x30]
subs r0, r1
strh r0, [r4, 0x2E]
lsls r0, 16
cmp r0, 0
bge _080CA2E6
movs r0, 0
strh r0, [r4, 0x2E]
_080CA2E6:
ldrh r0, [r4, 0x2E]
lsls r1, r0, 12
lsls r0, 8
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0x4C
bl SetGpuReg
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080CA30E
ldrb r0, [r4, 0x1]
movs r1, 0x11
negs r1, r1
ands r1, r0
strb r1, [r4, 0x1]
ldr r0, =SpriteCallbackDummy
str r0, [r4, 0x1C]
_080CA30E:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end BoxSetMosaic2
thumb_func_start sub_80CA318
sub_80CA318: @ 80CA318
push {r4-r7,lr}
sub sp, 0x28
ldr r0, =gUnknown_02039D08
mov r12, r0
ldr r1, [r0]
ldr r4, =0x000022c4
adds r0, r1, r4
str r0, [sp, 0x18]
add r3, sp, 0x18
movs r0, 0x82
lsls r0, 10
str r0, [r3, 0x4]
ldr r5, =0x00002244
adds r1, r5
str r1, [sp, 0x20]
ldr r0, =0x0000dac6
add r2, sp, 0x20
str r0, [r2, 0x4]
mov r1, sp
ldr r0, =gUnknown_08572754
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
ldm r0!, {r5-r7}
stm r1!, {r5-r7}
movs r6, 0
adds r7, r2, 0
mov r5, r12
movs r2, 0
ldr r1, =0x000007ff
_080CA352:
ldr r0, [r5]
adds r0, r4
adds r0, r6
strb r2, [r0]
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
cmp r6, r1
bls _080CA352
movs r6, 0
ldr r5, =gUnknown_02039D08
ldr r4, =0x00002244
movs r2, 0
_080CA36C:
ldr r0, [r5]
lsls r1, r6, 1
adds r0, r4
adds r0, r1
strh r2, [r0]
adds r0, r6, 0x1
lsls r0, 16
lsrs r6, r0, 16
cmp r6, 0xF
bls _080CA36C
ldr r0, =gUnknown_02039D08
ldr r0, [r0]
movs r6, 0x89
lsls r6, 6
adds r0, r6
movs r1, 0
str r1, [r0]
adds r0, r3, 0
bl LoadSpriteSheet
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq _080CA420
adds r0, r7, 0
bl LoadSpritePalette
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xFF
beq _080CA420
b _080CA40C
.pool
_080CA3C4:
ldr r0, =gUnknown_02039D08
ldr r2, [r0]
movs r7, 0x89
lsls r7, 6
adds r3, r2, r7
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, =gSprites
adds r0, r1
str r0, [r3]
lsls r0, r4, 4
movs r1, 0x80
lsls r1, 1
adds r0, r1
ldr r3, =0x0000223a
adds r1, r2, r3
strh r0, [r1]
ldr r6, =0x0000223c
adds r2, r6
lsls r0, r5, 5
ldr r7, =0x06010000
adds r0, r7
str r0, [r2]
b _080CA420
.pool
_080CA40C:
mov r0, sp
movs r1, 0x28
movs r2, 0x30
movs r3, 0
bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
bne _080CA3C4
_080CA420:
ldr r0, =gUnknown_02039D08
ldr r0, [r0]
movs r1, 0x89
lsls r1, 6
adds r0, r1
ldr r0, [r0]
cmp r0, 0
bne _080CA43C
movs r0, 0x2
bl FreeSpriteTilesByTag
ldr r0, =0x0000dac6
bl FreeSpritePaletteByTag
_080CA43C:
add sp, 0x28
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_80CA318
thumb_func_start sub_80CA44C
sub_80CA44C: @ 80CA44C
push {r4-r7,lr}
sub sp, 0x4
adds r3, r1, 0
lsls r0, 16
lsrs r4, r0, 16
ldr r6, =gUnknown_02039D08
ldr r2, [r6]
movs r7, 0x89
lsls r7, 6
adds r0, r2, r7
ldr r0, [r0]
cmp r0, 0
beq _080CA4F2
cmp r4, 0
beq _080CA4E8
lsls r0, r4, 3
ldr r1, =gMonFrontPicTable
adds r0, r1
ldr r5, =0x000022c4
adds r1, r2, r5
movs r2, 0x1
str r2, [sp]
adds r2, r4, 0
bl LoadSpecialPokePic
ldr r1, [r6]
ldr r2, =0x00000cdc
adds r0, r1, r2
ldr r0, [r0]
ldr r4, =0x00002244
adds r1, r4
bl LZ77UnCompWram
ldr r0, [r6]
adds r5, r0, r5
ldr r1, =0x0000223c
adds r0, r1
ldr r1, [r0]
ldr r2, =0x04000200
adds r0, r5, 0
bl CpuSet
ldr r0, [r6]
adds r4, r0, r4
ldr r2, =0x0000223a
adds r0, r2
ldrh r1, [r0]
adds r0, r4, 0
movs r2, 0x20
bl LoadPalette
ldr r0, [r6]
adds r0, r7
ldr r1, [r0]
adds r1, 0x3E
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
strb r0, [r1]
b _080CA4F2
.pool
_080CA4E8:
adds r0, 0x3E
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
_080CA4F2:
add sp, 0x4
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80CA44C
thumb_func_start sub_80CA4FC
sub_80CA4FC: @ 80CA4FC
push {r4-r6,lr}
sub sp, 0xC
movs r0, 0
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r6, =gUnknown_02039D08
ldr r2, [r6]
ldrb r0, [r2, 0x1]
cmp r0, 0x3
beq _080CA588
ldr r0, =0x00000cf9
adds r2, r0
movs r4, 0
str r4, [sp]
movs r5, 0xFF
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0
movs r1, 0x1
movs r3, 0x6
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000d1d
adds r2, r1
movs r0, 0xF
str r0, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0
movs r1, 0x2
movs r3, 0x6
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r0, =0x00000d41
adds r2, r0
movs r0, 0x1D
str r0, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0
movs r1, 0x2
movs r3, 0xA
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000d65
adds r2, r1
movs r0, 0x2B
str r0, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0
movs r1, 0
movs r3, 0x6
bl AddTextPrinterParameterized
b _080CA5E8
.pool
_080CA588:
ldr r0, =0x00000d65
adds r2, r0
movs r4, 0
str r4, [sp]
movs r5, 0xFF
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0
movs r1, 0
movs r3, 0x6
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000cf9
adds r2, r1
movs r0, 0xD
str r0, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0
movs r1, 0x1
movs r3, 0x6
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r0, =0x00000d1d
adds r2, r0
movs r0, 0x1C
str r0, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0
movs r1, 0x2
movs r3, 0x6
bl AddTextPrinterParameterized
ldr r2, [r6]
ldr r1, =0x00000d41
adds r2, r1
movs r0, 0x2A
str r0, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r0, 0
movs r1, 0x2
movs r3, 0xA
bl AddTextPrinterParameterized
_080CA5E8:
movs r0, 0
movs r1, 0x2
bl CopyWindowToVram
ldr r4, =gUnknown_02039D08
ldr r1, [r4]
ldr r2, =0x00000ce4
adds r0, r1, r2
ldrh r0, [r0]
cmp r0, 0
beq _080CA640
adds r2, 0x7
adds r0, r1, r2
ldrb r0, [r0]
adds r2, 0xB5
adds r1, r2
ldr r1, [r1]
bl sub_8120084
ldr r0, [r4]
ldr r1, =0x00000d94
adds r0, r1
ldr r1, [r0]
adds r1, 0x3E
ldrb r2, [r1]
movs r0, 0x5
negs r0, r0
ands r0, r2
b _080CA64E
.pool
_080CA640:
ldr r2, =0x00000d94
adds r0, r1, r2
ldr r1, [r0]
adds r1, 0x3E
ldrb r0, [r1]
movs r2, 0x4
orrs r0, r2
_080CA64E:
strb r0, [r1]
add sp, 0xC
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_80CA4FC
thumb_func_start sub_80CA65C
sub_80CA65C: @ 80CA65C
push {r4,lr}
sub sp, 0x4
ldr r0, =gUnknown_02039D08
ldr r0, [r0]
ldr r1, =0x00000ce4
adds r0, r1
ldrh r0, [r0]
cmp r0, 0
beq _080CA6B4
movs r0, 0x2
str r0, [sp]
movs r0, 0
movs r1, 0
movs r2, 0
movs r3, 0x8
bl sub_80D27AC
movs r4, 0
_080CA680:
ldr r0, =gUnknown_02039D08
ldr r0, [r0]
lsls r1, r4, 2
ldr r2, =0x00000d98
adds r0, r2
adds r0, r1
ldr r0, [r0]
lsls r1, r4, 1
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
bl StartSpriteAnimIfDifferent
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0x1
bls _080CA680
b _080CA6E6
.pool
_080CA6B4:
movs r0, 0x2
str r0, [sp]
movs r0, 0
movs r1, 0
movs r2, 0x2
movs r3, 0x8
bl sub_80D27AC
movs r4, 0
_080CA6C6:
ldr r0, =gUnknown_02039D08
ldr r0, [r0]
lsls r1, r4, 2
ldr r2, =0x00000d98
adds r0, r2
adds r0, r1
ldr r0, [r0]
lsls r1, r4, 25
lsrs r1, 24
bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0x1
bls _080CA6C6
_080CA6E6:
movs r0, 0
bl sub_80D2918
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x4
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_80CA65C
thumb_func_start sub_80CA704
sub_80CA704: @ 80CA704
push {r4,lr}