Merge secret base source files

1 files changed, 0 insertions, 183 deletions

diff --git a/asm/secret_base.s b/asm/secret_base.s
index a42f1d75b..56f9ef3d4 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -4,189 +4,6 @@
 
 	.syntax unified
 
-	.section .text_b
-
-	thumb_func_start sub_80BC038
-sub_80BC038: @ 80BC038
-	push {lr}
-	bl sub_80BBFD8
-	bl sub_80BB5E4
-	ldr r0, _080BC04C @ =gUnknown_081A2E14
-	bl ScriptContext1_SetupScript
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BC04C: .4byte gUnknown_081A2E14
-	thumb_func_end sub_80BC038
-
-	thumb_func_start sub_80BC050
-sub_80BC050: @ 80BC050
-	push {lr}
-	bl sub_80BB5D0
-	bl sub_80BB5E4
-	ldr r0, _080BC068 @ =gScriptResult
-	ldrh r0, [r0]
-	cmp r0, 0x1
-	beq _080BC06C
-	movs r0, 0x1
-	b _080BC06E
-	.align 2, 0
-_080BC068: .4byte gScriptResult
-_080BC06C:
-	movs r0, 0
-_080BC06E:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80BC050
-
-	thumb_func_start sub_80BC074
-sub_80BC074: @ 80BC074
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r1, _080BC098 @ =gTasks
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	adds r4, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _080BC0AC
-	cmp r0, 0x1
-	bgt _080BC09C
-	cmp r0, 0
-	beq _080BC0A2
-	b _080BC0E4
-	.align 2, 0
-_080BC098: .4byte gTasks
-_080BC09C:
-	cmp r0, 0x2
-	beq _080BC0C4
-	b _080BC0E4
-_080BC0A2:
-	bl ScriptContext2_Enable
-	movs r0, 0x1
-	strh r0, [r4, 0x8]
-	b _080BC0E4
-_080BC0AC:
-	ldr r0, _080BC0C0 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080BC0E4
-	movs r0, 0x2
-	strh r0, [r4, 0x8]
-	b _080BC0E4
-	.align 2, 0
-_080BC0C0: .4byte gPaletteFade
-_080BC0C4:
-	movs r0, 0x7E
-	bl copy_saved_warp2_bank_and_enter_x_to_warp1
-	bl warp_in
-	ldr r0, _080BC0EC @ =gUnknown_0300485C
-	ldr r1, _080BC0F0 @ =mapldr_default
-	str r1, [r0]
-	ldr r0, _080BC0F4 @ =CB2_LoadMap
-	bl SetMainCallback2
-	bl ScriptContext2_Disable
-	adds r0, r5, 0
-	bl DestroyTask
-_080BC0E4:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BC0EC: .4byte gUnknown_0300485C
-_080BC0F0: .4byte mapldr_default
-_080BC0F4: .4byte CB2_LoadMap
-	thumb_func_end sub_80BC074
-
-	thumb_func_start sub_80BC0F8
-sub_80BC0F8: @ 80BC0F8
-	push {lr}
-	ldr r0, _080BC110 @ =sub_80BC074
-	movs r1, 0
-	bl CreateTask
-	movs r0, 0x1
-	movs r1, 0
-	bl fade_screen
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BC110: .4byte sub_80BC074
-	thumb_func_end sub_80BC0F8
-
-	thumb_func_start sub_80BC114
-sub_80BC114: @ 80BC114
-	push {lr}
-	ldr r0, _080BC12C @ =gSaveBlock1
-	ldr r1, _080BC130 @ =0x00001a08
-	adds r0, r1
-	ldr r1, _080BC134 @ =gUnknown_020387DC
-	ldrb r0, [r0]
-	ldrb r1, [r1]
-	cmp r0, r1
-	beq _080BC13C
-	ldr r1, _080BC138 @ =gScriptResult
-	movs r0, 0x1
-	b _080BC140
-	.align 2, 0
-_080BC12C: .4byte gSaveBlock1
-_080BC130: .4byte 0x00001a08
-_080BC134: .4byte gUnknown_020387DC
-_080BC138: .4byte gScriptResult
-_080BC13C:
-	ldr r1, _080BC148 @ =gScriptResult
-	movs r0, 0
-_080BC140:
-	strh r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BC148: .4byte gScriptResult
-	thumb_func_end sub_80BC114
-
-	thumb_func_start sub_80BC14C
-sub_80BC14C: @ 80BC14C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	movs r2, 0
-	ldr r5, _080BC174 @ =gSaveBlock1
-	ldr r4, _080BC178 @ =0x00001a08
-_080BC158:
-	lsls r0, r2, 16
-	asrs r1, r0, 16
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 5
-	adds r0, r5
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, r3
-	bne _080BC17C
-	lsls r0, r2, 24
-	lsrs r0, 24
-	b _080BC18A
-	.align 2, 0
-_080BC174: .4byte gSaveBlock1
-_080BC178: .4byte 0x00001a08
-_080BC17C:
-	adds r0, r1, 0x1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	asrs r0, 16
-	cmp r0, 0x13
-	ble _080BC158
-	movs r0, 0
-_080BC18A:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80BC14C
-
 .section .text_80BC1D0
 
 	thumb_func_start sub_80BC300