Merge github.com:pikalaxalt/pokeruby

1 files changed, 1 insertions, 176 deletions

diff --git a/asm/secret_base.s b/asm/secret_base.s
index 834a63350..d3f8f7d86 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -4,182 +4,7 @@
 
 	.syntax unified
 
-	.text
-
-	thumb_func_start sub_80BB764
-sub_80BB764: @ 80BB764
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x8
-	mov r9, r0
-	mov r10, r1
-	lsls r2, 16
-	lsrs r2, 16
-	mov r8, r2
-	movs r0, 0
-	mov r12, r0
-	ldr r1, _080BB7C8 @ =gMapHeader
-	ldr r0, [r1]
-	ldr r3, [r0, 0x4]
-	cmp r12, r3
-	bge _080BB7EE
-	ldr r0, [r0]
-	str r0, [sp, 0x4]
-	str r3, [sp]
-_080BB78E:
-	movs r2, 0
-	mov r1, r12
-	lsls r7, r1, 16
-	ldr r0, [sp, 0x4]
-	cmp r2, r0
-	bge _080BB7DC
-	ldr r0, _080BB7C8 @ =gMapHeader
-	ldr r1, [r0]
-	asrs r0, r7, 16
-	ldr r4, [r1]
-	adds r6, r0, 0
-	muls r6, r4
-	ldr r5, [r1, 0xC]
-_080BB7A8:
-	lsls r0, r2, 16
-	asrs r3, r0, 16
-	adds r0, r6, r3
-	lsls r0, 1
-	adds r0, r5
-	ldrh r1, [r0]
-	ldr r0, _080BB7CC @ =0x000003ff
-	ands r0, r1
-	cmp r0, r8
-	bne _080BB7D0
-	mov r1, r9
-	strh r2, [r1]
-	mov r1, r12
-	mov r0, r10
-	strh r1, [r0]
-	b _080BB7EE
-	.align 2, 0
-_080BB7C8: .4byte gMapHeader
-_080BB7CC: .4byte 0x000003ff
-_080BB7D0:
-	adds r0, r3, 0x1
-	lsls r0, 16
-	lsrs r2, r0, 16
-	asrs r0, 16
-	cmp r0, r4
-	blt _080BB7A8
-_080BB7DC:
-	movs r1, 0x80
-	lsls r1, 9
-	adds r0, r7, r1
-	lsrs r1, r0, 16
-	mov r12, r1
-	asrs r0, 16
-	ldr r1, [sp]
-	cmp r0, r1
-	blt _080BB78E
-_080BB7EE:
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80BB764
-
-	thumb_func_start sub_80BB800
-sub_80BB800: @ 80BB800
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x4
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl GetXYCoordsOneStepInFrontOfPlayer
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileIdAt
-	movs r5, 0
-	mov r12, r4
-	lsls r0, 16
-	asrs r3, r0, 16
-	ldr r1, _080BB84C @ =gUnknown_083D1358
-	mov r8, r1
-	adds r7, r0, 0
-	mov r4, sp
-	mov r6, r12
-_080BB834:
-	ldr r0, _080BB84C @ =gUnknown_083D1358
-	lsls r1, r5, 2
-	adds r2, r1, r0
-	ldrh r0, [r2]
-	cmp r0, r3
-	bne _080BB850
-	movs r3, 0
-	ldrsh r0, [r4, r3]
-	movs r5, 0
-	ldrsh r1, [r6, r5]
-	ldrh r3, [r2, 0x2]
-	b _080BB878
-	.align 2, 0
-_080BB84C: .4byte gUnknown_083D1358
-_080BB850:
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	cmp r5, 0x6
-	bls _080BB834
-	movs r5, 0
-	mov r4, sp
-	mov r6, r12
-_080BB860:
-	lsls r0, r5, 2
-	mov r1, r8
-	adds r3, r0, r1
-	ldrh r1, [r3, 0x2]
-	asrs r0, r7, 16
-	cmp r1, r0
-	bne _080BB892
-	movs r2, 0
-	ldrsh r0, [r4, r2]
-	movs r5, 0
-	ldrsh r1, [r6, r5]
-	ldrh r3, [r3]
-_080BB878:
-	movs r5, 0xC0
-	lsls r5, 4
-	adds r2, r5, 0
-	orrs r2, r3
-	bl MapGridSetMetatileIdAt
-	movs r1, 0
-	ldrsh r0, [r4, r1]
-	movs r2, 0
-	ldrsh r1, [r6, r2]
-	bl CurrentMapDrawMetatileAt
-	b _080BB89C
-_080BB892:
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	cmp r5, 0x6
-	bls _080BB860
-_080BB89C:
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80BB800
+	.section .text_b
 
 	thumb_func_start sub_80BB8A8
 sub_80BB8A8: @ 80BB8A8