Another map-changing field effect (evil team hideout warp pads?)

1 files changed, 0 insertions, 598 deletions

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 073fec5db..311ec86a0 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,604 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8087BA8
-sub_8087BA8: @ 8087BA8
-	push {lr}
-	ldr r0, _08087BB8 @ =sub_8087BBC
-	movs r1, 0
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087BB8: .4byte sub_8087BBC
-	thumb_func_end sub_8087BA8
-
-	thumb_func_start sub_8087BBC
-sub_8087BBC: @ 8087BBC
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _08087BE4 @ =gUnknown_0839F390
-	ldr r2, _08087BE8 @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087BE4: .4byte gUnknown_0839F390
-_08087BE8: .4byte gTasks
-	thumb_func_end sub_8087BBC
-
-	thumb_func_start sub_8087BEC
-sub_8087BEC: @ 8087BEC
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptContext2_Enable
-	bl FreezeMapObjects
-	bl CameraObjectReset2
-	bl player_get_direction_lower_nybble
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8087BEC
-
-	thumb_func_start sub_8087C14
-sub_8087C14: @ 8087C14
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _08087C98 @ =gUnknown_0839F380
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	ldr r0, _08087C9C @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087CA0 @ =gMapObjects
-	adds r5, r0, r1
-	ldrh r1, [r4, 0xA]
-	movs r2, 0xA
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _08087C46
-	subs r0, r1, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08087C60
-_08087C46:
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r1, [r0]
-	adds r0, r5, 0
-	bl FieldObjectTurn
-	movs r0, 0x8
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-_08087C60:
-	movs r1, 0xC
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x7
-	ble _08087C8E
-	movs r2, 0x26
-	ldrsh r1, [r4, r2]
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	cmp r1, r0
-	bne _08087C8E
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x4
-	strh r0, [r4, 0xA]
-	movs r0, 0x8
-	strh r0, [r4, 0xC]
-	movs r0, 0x1
-	strh r0, [r4, 0xE]
-	movs r0, 0x2D
-	bl PlaySE
-_08087C8E:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087C98: .4byte gUnknown_0839F380
-_08087C9C: .4byte gPlayerAvatar
-_08087CA0: .4byte gMapObjects
-	thumb_func_end sub_8087C14
-
-	thumb_func_start sub_8087CA4
-sub_8087CA4: @ 8087CA4
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _08087D68 @ =gUnknown_0839F380
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	ldr r2, _08087D6C @ =gPlayerAvatar
-	ldrb r1, [r2, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087D70 @ =gMapObjects
-	adds r3, r0, r1
-	ldrb r1, [r2, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087D74 @ =gSprites
-	adds r5, r0, r1
-	ldrh r0, [r4, 0xA]
-	subs r0, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	cmp r0, 0
-	bgt _08087CEE
-	movs r0, 0x4
-	strh r0, [r4, 0xA]
-	ldrb r0, [r3, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r1, [r0]
-	adds r0, r3, 0
-	bl FieldObjectTurn
-_08087CEE:
-	ldrh r0, [r5, 0x22]
-	ldrh r1, [r4, 0xE]
-	subs r0, r1
-	strh r0, [r5, 0x22]
-	ldrh r1, [r4, 0xE]
-	ldrh r2, [r4, 0x10]
-	adds r0, r1, r2
-	strh r0, [r4, 0x10]
-	ldrh r0, [r4, 0xC]
-	subs r0, 0x1
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	cmp r0, 0
-	bgt _08087D1A
-	movs r0, 0x4
-	strh r0, [r4, 0xC]
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r0, 0x7
-	bgt _08087D1A
-	lsls r0, r1, 1
-	strh r0, [r4, 0xE]
-_08087D1A:
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x8
-	ble _08087D48
-	ldrb r1, [r5, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r5, 0x5]
-	adds r2, r5, 0
-	adds r2, 0x42
-	ldrb r1, [r2]
-	movs r0, 0xC0
-	ands r0, r1
-	cmp r0, 0
-	beq _08087D48
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2]
-_08087D48:
-	movs r2, 0x10
-	ldrsh r0, [r4, r2]
-	cmp r0, 0xA7
-	ble _08087D5E
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	bl sub_8053FF8
-	bl fade_8080918
-_08087D5E:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087D68: .4byte gUnknown_0839F380
-_08087D6C: .4byte gPlayerAvatar
-_08087D70: .4byte gMapObjects
-_08087D74: .4byte gSprites
-	thumb_func_end sub_8087CA4
-
-	thumb_func_start sub_8087D78
-sub_8087D78: @ 8087D78
-	push {lr}
-	ldr r0, _08087DB8 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08087DB4
-	bl sub_8054034
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08087DB4
-	bl sub_8053570
-	bl warp_in
-	ldr r0, _08087DBC @ =CB2_LoadMap
-	bl SetMainCallback2
-	ldr r1, _08087DC0 @ =gUnknown_0300485C
-	ldr r0, _08087DC4 @ =mapldr_08085D88
-	str r0, [r1]
-	ldr r0, _08087DC8 @ =sub_8087BBC
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_08087DB4:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087DB8: .4byte gPaletteFade
-_08087DBC: .4byte CB2_LoadMap
-_08087DC0: .4byte gUnknown_0300485C
-_08087DC4: .4byte mapldr_08085D88
-_08087DC8: .4byte sub_8087BBC
-	thumb_func_end sub_8087D78
-
-	thumb_func_start mapldr_08085D88
-mapldr_08085D88: @ 8087DCC
-	push {lr}
-	bl sub_8053E90
-	bl pal_fill_for_map_transition
-	bl ScriptContext2_Enable
-	bl FreezeMapObjects
-	ldr r1, _08087E0C @ =gUnknown_0300485C
-	movs r0, 0
-	str r0, [r1]
-	ldr r2, _08087E10 @ =gMapObjects
-	ldr r0, _08087E14 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x1]
-	movs r2, 0x20
-	orrs r1, r2
-	strb r1, [r0, 0x1]
-	bl CameraObjectReset2
-	ldr r0, _08087E18 @ =sub_8087E1C
-	movs r1, 0
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087E0C: .4byte gUnknown_0300485C
-_08087E10: .4byte gMapObjects
-_08087E14: .4byte gPlayerAvatar
-_08087E18: .4byte sub_8087E1C
-	thumb_func_end mapldr_08085D88
-
-	thumb_func_start sub_8087E1C
-sub_8087E1C: @ 8087E1C
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _08087E44 @ =gUnknown_0839F3A0
-	ldr r2, _08087E48 @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087E44: .4byte gUnknown_0839F3A0
-_08087E48: .4byte gTasks
-	thumb_func_end sub_8087E1C
-
-	thumb_func_start sub_8087E4C
-sub_8087E4C: @ 8087E4C
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl sub_807D770
-	lsls r0, 24
-	cmp r0, 0
-	beq _08087EC2
-	ldr r5, _08087EC8 @ =gPlayerAvatar
-	ldrb r0, [r5, 0x4]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, _08087ECC @ =gSprites
-	adds r2, r0
-	adds r0, r2, 0
-	adds r0, 0x29
-	movs r4, 0
-	ldrsb r4, [r0, r4]
-	lsls r0, r4, 17
-	negs r0, r0
-	ldrh r1, [r2, 0x22]
-	ldr r3, _08087ED0 @ =gSpriteCoordOffsetY
-	adds r1, r4
-	ldrh r3, [r3]
-	adds r1, r3
-	asrs r0, 16
-	adds r0, r1
-	negs r0, r0
-	strh r0, [r2, 0x26]
-	ldr r3, _08087ED4 @ =gMapObjects
-	ldrb r0, [r5, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r3, [r1, 0x1]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r3
-	strb r0, [r1, 0x1]
-	ldrh r0, [r6, 0x8]
-	adds r0, 0x1
-	strh r0, [r6, 0x8]
-	movs r0, 0x8
-	strh r0, [r6, 0xA]
-	movs r0, 0x1
-	strh r0, [r6, 0xC]
-	adds r2, 0x42
-	ldrb r0, [r2]
-	lsrs r0, 6
-	strh r0, [r6, 0x24]
-	bl player_get_direction_lower_nybble
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r6, 0x26]
-	movs r0, 0x2D
-	bl PlaySE
-_08087EC2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087EC8: .4byte gPlayerAvatar
-_08087ECC: .4byte gSprites
-_08087ED0: .4byte gSpriteCoordOffsetY
-_08087ED4: .4byte gMapObjects
-	thumb_func_end sub_8087E4C
-
-	thumb_func_start sub_8087ED8
-sub_8087ED8: @ 8087ED8
-	push {r4-r7,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _08087F40 @ =gUnknown_0839F380
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	ldr r2, _08087F44 @ =gPlayerAvatar
-	ldrb r1, [r2, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087F48 @ =gMapObjects
-	adds r6, r0, r1
-	ldrb r1, [r2, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087F4C @ =gSprites
-	adds r5, r0, r1
-	ldrh r0, [r4, 0xA]
-	ldrh r1, [r5, 0x26]
-	adds r0, r1
-	strh r0, [r5, 0x26]
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0x8
-	negs r1, r1
-	cmp r0, r1
-	blt _08087F50
-	ldrh r1, [r4, 0x22]
-	movs r2, 0x22
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	bne _08087F76
-	adds r0, r1, 0x1
-	strh r0, [r4, 0x22]
-	ldrb r0, [r6]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r6]
-	ldrh r1, [r4, 0x24]
-	adds r3, r5, 0
-	adds r3, 0x42
-	lsls r1, 6
-	ldrb r2, [r3]
-	movs r0, 0x3F
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	b _08087F76
-	.align 2, 0
-_08087F40: .4byte gUnknown_0839F380
-_08087F44: .4byte gPlayerAvatar
-_08087F48: .4byte gMapObjects
-_08087F4C: .4byte gSprites
-_08087F50:
-	ldrb r1, [r5, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r5, 0x5]
-	adds r2, r5, 0
-	adds r2, 0x42
-	ldrb r1, [r2]
-	movs r0, 0xC0
-	ands r0, r1
-	cmp r0, 0
-	beq _08087F76
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2]
-_08087F76:
-	ldrh r2, [r5, 0x26]
-	movs r3, 0x26
-	ldrsh r1, [r5, r3]
-	movs r0, 0x30
-	negs r0, r0
-	cmp r1, r0
-	blt _08087F9A
-	ldrh r1, [r4, 0xA]
-	movs r3, 0xA
-	ldrsh r0, [r4, r3]
-	cmp r0, 0x1
-	ble _08087F9A
-	movs r0, 0x1
-	ands r0, r2
-	cmp r0, 0
-	bne _08087F9A
-	subs r0, r1, 0x1
-	strh r0, [r4, 0xA]
-_08087F9A:
-	ldrh r0, [r4, 0xC]
-	subs r0, 0x1
-	movs r7, 0
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08087FBC
-	movs r0, 0x4
-	strh r0, [r4, 0xC]
-	ldrb r0, [r6, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r1, [r0]
-	adds r0, r6, 0
-	bl FieldObjectTurn
-_08087FBC:
-	movs r1, 0x26
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	blt _08087FD2
-	strh r7, [r5, 0x26]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x1
-	strh r0, [r4, 0xA]
-	strh r7, [r4, 0xC]
-_08087FD2:
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8087ED8
-
-	thumb_func_start sub_8087FDC
-sub_8087FDC: @ 8087FDC
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _08088058 @ =gUnknown_0839F380
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	ldr r0, _0808805C @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088060 @ =gMapObjects
-	adds r5, r0, r1
-	ldrh r0, [r4, 0xA]
-	subs r0, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08088050
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r1, [r0]
-	adds r0, r5, 0
-	bl FieldObjectTurn
-	movs r0, 0x8
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	ble _08088050
-	movs r0, 0x24
-	ldrsh r1, [r4, r0]
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	cmp r1, r0
-	bne _08088050
-	bl ScriptContext2_Disable
-	bl CameraObjectReset1
-	bl UnfreezeMapObjects
-	ldr r0, _08088064 @ =sub_8087E1C
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_08088050:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088058: .4byte gUnknown_0839F380
-_0808805C: .4byte gPlayerAvatar
-_08088060: .4byte gMapObjects
-_08088064: .4byte sub_8087E1C
-	thumb_func_end sub_8087FDC
-
 	thumb_func_start FldEff_FieldMoveShowMon
 FldEff_FieldMoveShowMon: @ 8088068
 	push {r4,lr}