through sub_811A15C (two nonmatching)

1 files changed, 0 insertions, 464 deletions

diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s
index cc9ed7dc3..67b8dc5b1 100644
--- a/asm/pokedex_cry_screen.s
+++ b/asm/pokedex_cry_screen.s
@@ -5,470 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8119E3C
-sub_8119E3C: @ 8119E3C
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	adds r5, r0, 0
-	lsls r1, 24
-	lsrs r2, r1, 24
-	movs r0, 0
-	mov r9, r0
-	ldr r6, _08119E60 @ =gUnknown_03005E98
-	ldrb r0, [r6]
-	cmp r0, 0x1
-	beq _08119EE0
-	cmp r0, 0x1
-	bgt _08119E64
-	cmp r0, 0
-	beq _08119E6A
-	b _08119F74
-	.align 2, 0
-_08119E60: .4byte gUnknown_03005E98
-_08119E64:
-	cmp r0, 0x2
-	beq _08119F60
-	b _08119F74
-_08119E6A:
-	ldr r4, _08119ECC @ =gSharedMem + 0x1C000
-	ldrh r0, [r5]
-	movs r1, 0
-	strh r0, [r4, 0x14]
-	ldrb r0, [r5, 0x5]
-	strb r0, [r4, 0x16]
-	strb r1, [r4, 0x1A]
-	strb r1, [r4, 0x1B]
-	strb r1, [r4, 0x10]
-	movs r0, 0x1C
-	strb r0, [r4, 0x12]
-	strb r1, [r4, 0x11]
-	ldrb r1, [r5, 0x4]
-	lsls r1, 19
-	negs r1, r1
-	asrs r1, 16
-	adds r0, r2, 0
-	movs r2, 0x1
-	bl sub_811A350
-	movs r0, 0
-	mov r12, r6
-	ldr r1, _08119ED0 @ =0x040000d4
-	ldr r7, _08119ED4 @ =gUnknown_083FB718
-	ldr r2, _08119ED8 @ =0xfffe4000
-	adds r6, r4, r2
-	ldr r5, _08119EDC @ =0x80000010
-_08119EA0:
-	movs r3, 0
-	adds r4, r0, 0x1
-	lsls r2, r0, 5
-_08119EA6:
-	str r7, [r1]
-	adds r0, r2, r3
-	lsls r0, 5
-	adds r0, r6
-	str r0, [r1, 0x4]
-	str r5, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x1F
-	bls _08119EA6
-	lsls r0, r4, 24
-	lsrs r0, 24
-	cmp r0, 0x6
-	bls _08119EA0
-	mov r1, r12
-	b _08119F50
-	.align 2, 0
-_08119ECC: .4byte gSharedMem + 0x1C000
-_08119ED0: .4byte 0x040000d4
-_08119ED4: .4byte gUnknown_083FB718
-_08119ED8: .4byte 0xfffe4000
-_08119EDC: .4byte 0x80000010
-_08119EE0:
-	ldrb r0, [r5, 0x2]
-	lsls r0, 27
-	lsrs r7, r0, 16
-	ldrb r1, [r5, 0x3]
-	lsls r1, 12
-	ldrh r0, [r5]
-	lsls r0, 18
-	lsrs r0, 23
-	adds r1, r0
-	lsls r1, 16
-	lsrs r6, r1, 16
-	movs r0, 0
-	ldr r2, _08119F58 @ =gSharedMem + 0x1C000
-	mov r8, r2
-	movs r1, 0xC0
-	lsls r1, 19
-	mov r12, r1
-_08119F02:
-	movs r3, 0
-	adds r4, r0, 0x1
-	lsls r5, r0, 6
-_08119F08:
-	lsls r1, r3, 1
-	adds r1, r5
-	adds r1, r7
-	add r1, r12
-	adds r2, r6, 0
-	adds r0, r2, 0x1
-	lsls r0, 16
-	lsrs r6, r0, 16
-	strh r2, [r1]
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, 0x1F
-	bls _08119F08
-	lsls r0, r4, 24
-	lsrs r0, 24
-	cmp r0, 0x6
-	bls _08119F02
-	mov r2, r8
-	ldrb r0, [r2, 0x16]
-	movs r4, 0
-	cmp r0, 0
-	beq _08119F4E
-	mov r5, r8
-_08119F38:
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_811A1C8
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldrb r0, [r5, 0x16]
-	lsls r0, 3
-	cmp r4, r0
-	blt _08119F38
-_08119F4E:
-	ldr r1, _08119F5C @ =gUnknown_03005E98
-_08119F50:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _08119F74
-	.align 2, 0
-_08119F58: .4byte gSharedMem + 0x1C000
-_08119F5C: .4byte gUnknown_03005E98
-_08119F60:
-	bl sub_811A324
-	ldr r0, _08119F84 @ =gUnknown_083FB6F8
-	ldrb r1, [r5, 0x3]
-	lsls r1, 4
-	movs r2, 0x20
-	bl LoadPalette
-	movs r0, 0x1
-	mov r9, r0
-_08119F74:
-	mov r0, r9
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08119F84: .4byte gUnknown_083FB6F8
-	thumb_func_end sub_8119E3C
-
-	thumb_func_start sub_8119F88
-sub_8119F88: @ 8119F88
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	bl sub_811A324
-	adds r0, r4, 0
-	bl sub_811A15C
-	ldr r1, _08119FC4 @ =gSharedMem + 0x1C000
-	ldrb r0, [r1, 0x1B]
-	cmp r0, 0
-	beq _08119FA6
-	subs r0, 0x1
-	strb r0, [r1, 0x1B]
-_08119FA6:
-	ldrb r0, [r1, 0x1A]
-	cmp r0, 0
-	beq _08119FC8
-	subs r0, 0x1
-	strb r0, [r1, 0x1A]
-	lsls r0, 24
-	cmp r0, 0
-	bne _08119FC8
-	ldrh r0, [r1, 0x18]
-	bl sub_811A0A0
-	bl sub_811A124
-	b _0811A044
-	.align 2, 0
-_08119FC4: .4byte gSharedMem + 0x1C000
-_08119FC8:
-	ldr r5, _08119FD8 @ =gSharedMem + 0x1C000
-	ldrb r0, [r5, 0x10]
-	cmp r0, 0
-	bne _08119FDC
-	bl sub_811A124
-	b _0811A044
-	.align 2, 0
-_08119FD8: .4byte gSharedMem + 0x1C000
-_08119FDC:
-	cmp r0, 0x1
-	bne _08119FE6
-	bl sub_811A0C0
-	b _0811A006
-_08119FE6:
-	cmp r0, 0x8
-	bls _0811A006
-	bl IsCryPlaying
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _08119FFE
-	bl sub_811A124
-	strb r4, [r5, 0x10]
-	b _0811A044
-_08119FFE:
-	bl sub_811A0C0
-	movs r0, 0x1
-	strb r0, [r5, 0x10]
-_0811A006:
-	ldr r5, _0811A04C @ =gSharedMem + 0x1C000
-	ldrb r4, [r5, 0x10]
-	subs r4, 0x1
-	lsls r4, 25
-	lsrs r4, 24
-	ldrb r0, [r5, 0x16]
-	lsls r0, 3
-	ldrb r1, [r5, 0x11]
-	adds r0, r1
-	subs r0, 0x2
-	lsls r0, 24
-	lsrs r0, 24
-	adds r1, r4, r5
-	ldrb r1, [r1]
-	bl sub_811A1C8
-	ldrb r0, [r5, 0x16]
-	lsls r0, 3
-	ldrb r1, [r5, 0x11]
-	adds r0, r1
-	subs r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	adds r4, 0x1
-	adds r4, r5
-	ldrb r1, [r4]
-	bl sub_811A1C8
-	ldrb r0, [r5, 0x10]
-	adds r0, 0x1
-	strb r0, [r5, 0x10]
-_0811A044:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811A04C: .4byte gSharedMem + 0x1C000
-	thumb_func_end sub_8119F88
-
-	thumb_func_start sub_811A050
-sub_811A050: @ 811A050
-	push {r4-r6,lr}
-	lsls r0, 16
-	lsrs r5, r0, 16
-	adds r6, r5, 0
-	ldr r0, _0811A08C @ =gMPlay_BGM
-	ldr r0, [r0, 0x4]
-	cmp r0, 0
-	bge _0811A09A
-	ldr r4, _0811A090 @ =gSharedMem + 0x1C000
-	ldrb r0, [r4, 0x1A]
-	cmp r0, 0
-	bne _0811A09A
-	ldrb r0, [r4, 0x1B]
-	cmp r0, 0
-	bne _0811A09A
-	movs r0, 0x4
-	strb r0, [r4, 0x1B]
-	bl IsCryPlaying
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0811A094
-	bl StopCry
-	strh r5, [r4, 0x18]
-	movs r0, 0x2
-	strb r0, [r4, 0x1A]
-	b _0811A09A
-	.align 2, 0
-_0811A08C: .4byte gMPlay_BGM
-_0811A090: .4byte gSharedMem + 0x1C000
-_0811A094:
-	adds r0, r6, 0
-	bl sub_811A0A0
-_0811A09A:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_811A050
-
-	thumb_func_start sub_811A0A0
-sub_811A0A0: @ 811A0A0
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	movs r1, 0
-	movs r2, 0x7D
-	movs r3, 0xA
-	bl PlayCry2
-	ldr r1, _0811A0BC @ =gSharedMem + 0x1C000
-	movs r0, 0x1
-	strb r0, [r1, 0x10]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811A0BC: .4byte gSharedMem + 0x1C000
-	thumb_func_end sub_811A0A0
-
-	thumb_func_start sub_811A0C0
-sub_811A0C0: @ 811A0C0
-	push {r4,lr}
-	ldr r3, _0811A0D0 @ =gPcmDmaCounter
-	movs r0, 0
-	ldrsb r0, [r3, r0]
-	cmp r0, 0x1
-	bgt _0811A0D8
-	ldr r0, _0811A0D4 @ =gSoundInfo + 0x350
-	b _0811A0F0
-	.align 2, 0
-_0811A0D0: .4byte gPcmDmaCounter
-_0811A0D4: .4byte gSoundInfo + 0x350
-_0811A0D8:
-	ldr r2, _0811A11C @ =gSoundInfo
-	ldrb r1, [r2, 0xB]
-	movs r0, 0
-	ldrsb r0, [r3, r0]
-	subs r0, 0x1
-	subs r1, r0
-	ldr r0, [r2, 0x10]
-	muls r0, r1
-	movs r1, 0xD4
-	lsls r1, 2
-	adds r2, r1
-	adds r0, r2
-_0811A0F0:
-	movs r1, 0xC6
-	lsls r1, 3
-	adds r3, r0, r1
-	movs r2, 0
-	ldr r4, _0811A120 @ =gSharedMem + 0x1C000
-_0811A0FA:
-	adds r1, r2, r4
-	lsls r0, r2, 1
-	adds r0, r3
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	lsls r0, 1
-	strb r0, [r1]
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0xF
-	bls _0811A0FA
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811A11C: .4byte gSoundInfo
-_0811A120: .4byte gSharedMem + 0x1C000
-	thumb_func_end sub_811A0C0
-
-	thumb_func_start sub_811A124
-sub_811A124: @ 811A124
-	push {r4,lr}
-	ldr r4, _0811A158 @ =gSharedMem + 0x1C000
-	ldrb r0, [r4, 0x16]
-	lsls r0, 3
-	ldrb r1, [r4, 0x11]
-	adds r0, r1
-	subs r0, 0x2
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0
-	bl sub_811A1C8
-	ldrb r0, [r4, 0x16]
-	lsls r0, 3
-	ldrb r4, [r4, 0x11]
-	adds r0, r4
-	subs r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0
-	bl sub_811A1C8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811A158: .4byte gSharedMem + 0x1C000
-	thumb_func_end sub_811A124
-
-	thumb_func_start sub_811A15C
-sub_811A15C: @ 811A15C
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r4, _0811A1B4 @ =gSharedMem + 0x1C000
-	ldrb r1, [r4, 0x11]
-	movs r2, 0
-	bl sub_811A350
-	ldrb r0, [r4, 0x11]
-	adds r0, 0x2
-	strb r0, [r4, 0x11]
-	ldrb r0, [r4, 0x11]
-	lsrs r0, 3
-	ldrb r2, [r4, 0x16]
-	adds r1, r0, r2
-	adds r2, r1, 0x1
-	adds r0, r2, 0
-	asrs r0, 5
-	lsls r0, 5
-	subs r0, r2, r0
-	lsls r0, 16
-	lsrs r3, r0, 16
-	movs r1, 0
-	ldr r2, _0811A1B8 @ =0x040000d4
-	ldr r6, _0811A1BC @ =gUnknown_083FB718
-	ldr r0, _0811A1C0 @ =0xfffe4000
-	adds r5, r4, r0
-	ldr r4, _0811A1C4 @ =0x80000010
-_0811A194:
-	str r6, [r2]
-	lsls r0, r1, 5
-	adds r0, r3
-	lsls r0, 5
-	adds r0, r5
-	str r0, [r2, 0x4]
-	str r4, [r2, 0x8]
-	ldr r0, [r2, 0x8]
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0x6
-	bls _0811A194
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0811A1B4: .4byte gSharedMem + 0x1C000
-_0811A1B8: .4byte 0x040000d4
-_0811A1BC: .4byte gUnknown_083FB718
-_0811A1C0: .4byte 0xfffe4000
-_0811A1C4: .4byte 0x80000010
-	thumb_func_end sub_811A15C
-
 	thumb_func_start sub_811A1C8
 sub_811A1C8: @ 811A1C8
 	push {r4-r7,lr}