through sub_8097BA0; fix calls to pc_screen_effect from scene/hall_of_fame

1 files changed, 0 insertions, 284 deletions

diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index c282ebecd..85e29b183 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -5,290 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8097A64
-sub_8097A64: @ 8097A64
-	push {r4,r5,lr}
-	ldr r5, _08097A78 @ =gSharedMem
-	ldrb r0, [r5, 0x4]
-	cmp r0, 0x1
-	beq _08097AB0
-	cmp r0, 0x1
-	bgt _08097A7C
-	cmp r0, 0
-	beq _08097A86
-	b _08097B32
-	.align 2, 0
-_08097A78: .4byte gSharedMem
-_08097A7C:
-	cmp r0, 0x2
-	beq _08097B00
-	cmp r0, 0x3
-	beq _08097B18
-	b _08097B32
-_08097A86:
-	movs r0, 0x5
-	bl PrintStorageActionText
-	ldr r1, _08097AA4 @ =0x00002370
-	adds r0, r5, r1
-	ldr r2, _08097AA8 @ =0x0000daca
-	movs r1, 0x7
-	movs r3, 0x3
-	bl sub_8096264
-	ldr r0, _08097AAC @ =gPokemonStorage
-	ldrb r0, [r0]
-	bl sub_809634C
-	b _08097B0A
-	.align 2, 0
-_08097AA4: .4byte 0x00002370
-_08097AA8: .4byte 0x0000daca
-_08097AAC: .4byte gPokemonStorage
-_08097AB0:
-	bl sub_8096368
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08097AF4 @ =0x000008b2
-	adds r4, r5, r2
-	strh r0, [r4]
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	cmp r0, 0xC8
-	beq _08097B32
-	bl sub_8098A5C
-	bl sub_809635C
-	bl sub_8096310
-	movs r2, 0
-	ldrsh r0, [r4, r2]
-	cmp r0, 0xC9
-	beq _08097AE4
-	adds r1, r0, 0
-	ldr r0, _08097AF8 @ =gPokemonStorage
-	ldrb r0, [r0]
-	cmp r1, r0
-	bne _08097B0A
-_08097AE4:
-	movs r0, 0x1
-	bl sub_809A860
-	ldr r0, _08097AFC @ =sub_8096C84
-	bl SetPSSCallback
-	b _08097B32
-	.align 2, 0
-_08097AF4: .4byte 0x000008b2
-_08097AF8: .4byte gPokemonStorage
-_08097AFC: .4byte sub_8096C84
-_08097B00:
-	ldr r1, _08097B14 @ =0x000008b2
-	adds r0, r5, r1
-	ldrb r0, [r0]
-	bl sub_8099C70
-_08097B0A:
-	ldrb r0, [r5, 0x4]
-	adds r0, 0x1
-	strb r0, [r5, 0x4]
-	b _08097B32
-	.align 2, 0
-_08097B14: .4byte 0x000008b2
-_08097B18:
-	bl sub_8099D34
-	lsls r0, 24
-	cmp r0, 0
-	bne _08097B32
-	ldr r1, _08097B38 @ =gPokemonStorage
-	ldr r2, _08097B3C @ =0x000008b2
-	adds r0, r5, r2
-	ldrh r0, [r0]
-	strb r0, [r1]
-	ldr r0, _08097B40 @ =sub_8096C84
-	bl SetPSSCallback
-_08097B32:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097B38: .4byte gPokemonStorage
-_08097B3C: .4byte 0x000008b2
-_08097B40: .4byte sub_8096C84
-	thumb_func_end sub_8097A64
-
-	thumb_func_start sub_8097B44
-sub_8097B44: @ 8097B44
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r5, _08097B58 @ =gSharedMem
-	ldrb r4, [r5, 0x4]
-	cmp r4, 0
-	beq _08097B5C
-	cmp r4, 0x1
-	beq _08097B78
-	b _08097B8E
-	.align 2, 0
-_08097B58: .4byte gSharedMem
-_08097B5C:
-	bl sub_809BB90
-	movs r0, 0x1
-	negs r0, r0
-	str r4, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldrb r0, [r5, 0x4]
-	adds r0, 0x1
-	strb r0, [r5, 0x4]
-	b _08097B8E
-_08097B78:
-	bl UpdatePaletteFade
-	lsls r0, 24
-	cmp r0, 0
-	bne _08097B8E
-	ldr r0, _08097B98 @ =gUnknown_0203847F
-	strb r4, [r0]
-	strb r4, [r5, 0x6]
-	ldr r0, _08097B9C @ =sub_8096B5C
-	bl SetMainCallback2
-_08097B8E:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097B98: .4byte gUnknown_0203847F
-_08097B9C: .4byte sub_8096B5C
-	thumb_func_end sub_8097B44
-
-	thumb_func_start sub_8097BA0
-sub_8097BA0: @ 8097BA0
-	push {r4,lr}
-	ldr r0, _08097BB8 @ =gSharedMem
-	ldrb r1, [r0, 0x4]
-	adds r4, r0, 0
-	cmp r1, 0x4
-	bls _08097BAE
-	b _08097CB0
-_08097BAE:
-	lsls r0, r1, 2
-	ldr r1, _08097BBC @ =_08097BC0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08097BB8: .4byte gSharedMem
-_08097BBC: .4byte _08097BC0
-	.align 2, 0
-_08097BC0:
-	.4byte _08097BD4
-	.4byte _08097C18
-	.4byte _08097C2C
-	.4byte _08097C74
-	.4byte _08097C98
-_08097BD4:
-	bl sub_809BF20
-	lsls r0, 24
-	cmp r0, 0
-	beq _08097BF8
-	movs r0, 0x20
-	bl PlaySE
-	movs r0, 0xF
-	bl PrintStorageActionText
-	ldr r1, _08097BF4 @ =gSharedMem
-	movs r0, 0x1
-	strb r0, [r1, 0x4]
-	b _08097CB0
-	.align 2, 0
-_08097BF4: .4byte gSharedMem
-_08097BF8:
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0
-	bl PrintStorageActionText
-	movs r0, 0
-	bl sub_8098A38
-	ldr r1, _08097C14 @ =gSharedMem
-	movs r0, 0x2
-	strb r0, [r1, 0x4]
-	b _08097CB0
-	.align 2, 0
-_08097C14: .4byte gSharedMem
-_08097C18:
-	ldr r0, _08097C28 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0xF3
-	ands r0, r1
-	cmp r0, 0
-	beq _08097CB0
-	b _08097C4A
-	.align 2, 0
-_08097C28: .4byte gMain
-_08097C2C:
-	bl ProcessMenuInputNoWrap
-	lsls r0, 24
-	asrs r1, r0, 24
-	cmp r1, 0
-	beq _08097C5C
-	cmp r1, 0
-	bgt _08097C46
-	movs r0, 0x1
-	negs r0, r0
-	cmp r1, r0
-	beq _08097C4A
-	b _08097CB0
-_08097C46:
-	cmp r1, 0x1
-	bne _08097CB0
-_08097C4A:
-	bl sub_8098A5C
-	ldr r0, _08097C58 @ =sub_8096C84
-	bl SetPSSCallback
-	b _08097CB0
-	.align 2, 0
-_08097C58: .4byte sub_8096C84
-_08097C5C:
-	movs r0, 0x3
-	bl PlaySE
-	bl sub_8098A5C
-	ldr r1, _08097C70 @ =gSharedMem
-	ldrb r0, [r1, 0x4]
-	adds r0, 0x1
-	strb r0, [r1, 0x4]
-	b _08097CB0
-	.align 2, 0
-_08097C70: .4byte gSharedMem
-_08097C74:
-	movs r1, 0
-	movs r0, 0xE
-	strh r0, [r4, 0xC]
-	ldr r0, _08097C94 @ =0x0000dad0
-	strh r0, [r4, 0xE]
-	movs r0, 0x14
-	strh r0, [r4, 0x10]
-	strh r1, [r4, 0x12]
-	adds r0, r4, 0
-	adds r0, 0xC
-	bl sub_80C5E38
-	ldrb r0, [r4, 0x4]
-	adds r0, 0x1
-	strb r0, [r4, 0x4]
-	b _08097CB0
-	.align 2, 0
-_08097C94: .4byte 0x0000dad0
-_08097C98:
-	bl sub_80C5F98
-	lsls r0, 24
-	cmp r0, 0
-	beq _08097CB0
-	bl CalculatePlayerPartyCount
-	ldr r1, _08097CB8 @ =gPlayerPartyCount
-	strb r0, [r1]
-	ldr r0, _08097CBC @ =sub_80961A8
-	bl SetMainCallback2
-_08097CB0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097CB8: .4byte gPlayerPartyCount
-_08097CBC: .4byte sub_80961A8
-	thumb_func_end sub_8097BA0
-
 	thumb_func_start sub_8097CC0
 sub_8097CC0: @ 8097CC0
 	push {r4,lr}