Exp Task

asm/overlay_10.s → asm/overlay_10_trainer_ai.s

@@ -4,164 +4,6 @@
 
 	.text
 
-	thumb_func_start ov10_0221BE20
-ov10_0221BE20: ; 0x0221BE20
-	push {r3, r4, r5, r6, r7, lr}
-	sub sp, #8
-	add r6, r0, #0
-	mov r0, #0xd5
-	str r2, [sp, #4]
-	add r5, r1, #0
-	lsl r0, r0, #2
-	add r2, r3, #0
-	add r3, r5, r0
-	mov r0, #0
-	add r1, r0, #0
-_0221BE36:
-	strb r1, [r3, r0]
-	add r0, r0, #1
-	cmp r0, #0x1c
-	blo _0221BE36
-	mov r7, #0
-	mov r0, #0x64
-_0221BE42:
-	mov r3, #1
-	tst r3, r2
-	beq _0221BE52
-	mov r3, #0xd6
-	add r4, r5, r1
-	lsl r3, r3, #2
-	strb r0, [r4, r3]
-	b _0221BE5A
-_0221BE52:
-	mov r3, #0xd6
-	add r4, r5, r1
-	lsl r3, r3, #2
-	strb r7, [r4, r3]
-_0221BE5A:
-	lsl r2, r2, #0x17
-	add r1, r1, #1
-	lsr r2, r2, #0x18
-	cmp r1, #4
-	blt _0221BE42
-	mov r0, #0
-	mvn r0, r0
-	str r0, [sp]
-	ldr r2, [sp, #4]
-	add r0, r6, #0
-	add r1, r5, #0
-	mov r3, #0
-	bl StruggleCheck
-	lsl r0, r0, #0x18
-	lsr r7, r0, #0x18
-	mov r4, #0
-_0221BE7C:
-	add r0, r4, #0
-	bl MaskOfFlagNo
-	tst r0, r7
-	beq _0221BE90
-	mov r0, #0xd6
-	add r2, r5, r4
-	mov r1, #0
-	lsl r0, r0, #2
-	strb r1, [r2, r0]
-_0221BE90:
-	add r0, r6, #0
-	bl BattleSystem_Random
-	lsr r1, r0, #0x1f
-	lsl r2, r0, #0x1c
-	sub r2, r2, r1
-	mov r0, #0x1c
-	ror r2, r0
-	add r1, r1, r2
-	mov r0, #0x64
-	sub r2, r0, r1
-	mov r0, #0xdb
-	add r1, r5, r4
-	lsl r0, r0, #2
-	add r4, r4, #1
-	strb r2, [r1, r0]
-	cmp r4, #4
-	blt _0221BE7C
-	mov r2, #0xf3
-	mov r0, #0
-	lsl r2, r2, #2
-	strb r0, [r5, r2]
-	mov r0, #1
-	ldr r1, [r6, #0x2c]
-	lsl r0, r0, #8
-	tst r1, r0
-	beq _0221BECA
-	lsl r0, r0, #0x15
-	b _0221BED6
-_0221BECA:
-	ldr r0, [sp, #4]
-	mov r1, #0x34
-	mul r1, r0
-	add r0, r6, r1
-	add r0, #0xb8
-	ldr r0, [r0]
-_0221BED6:
-	sub r2, #0x6c
-	str r0, [r5, r2]
-	ldr r1, [r6, #0x2c]
-	mov r0, #2
-	tst r0, r1
-	beq _0221BEEE
-	mov r1, #0x36
-	lsl r1, r1, #4
-	ldr r2, [r5, r1]
-	mov r0, #0x80
-	orr r0, r2
-	str r0, [r5, r1]
-_0221BEEE:
-	add sp, #8
-	pop {r3, r4, r5, r6, r7, pc}
-	.balign 4, 0
-	thumb_func_end ov10_0221BE20
-
-	thumb_func_start ov10_0221BEF4
-ov10_0221BEF4: ; 0x0221BEF4
-	push {r4, r5, r6, lr}
-	add r5, r0, #0
-	add r2, r1, #0
-	mov r1, #0xd9
-	ldr r4, [r5, #0x30]
-	lsl r1, r1, #2
-	ldrb r6, [r4, r1]
-	mov r3, #0x10
-	tst r3, r6
-	bne _0221BF26
-	add r1, #0x6b
-	strb r2, [r4, r1]
-	add r1, r4, #0
-	bl ov12_02253DA0
-	mov r2, #0x3d
-	lsl r2, r2, #4
-	strb r0, [r4, r2]
-	sub r2, r2, #1
-	ldrb r2, [r4, r2]
-	add r0, r5, #0
-	add r1, r4, #0
-	mov r3, #0xf
-	bl ov10_0221BE20
-_0221BF26:
-	ldr r1, [r5, #0x2c]
-	mov r0, #2
-	tst r0, r1
-	bne _0221BF38
-	add r0, r5, #0
-	add r1, r4, #0
-	bl ov10_0221BF44
-	pop {r4, r5, r6, pc}
-_0221BF38:
-	add r0, r5, #0
-	add r1, r4, #0
-	bl ov10_0221C038
-	pop {r4, r5, r6, pc}
-	.balign 4, 0
-	thumb_func_end ov10_0221BEF4
-
 	thumb_func_start ov10_0221BF44
 ov10_0221BF44: ; 0x0221BF44
 	push {r4, r5, r6, r7, lr}

asm/overlay_12_022378C0.s

@@ -7,145 +7,6 @@
 
 	.text
 
-	thumb_func_start ov12_02237BB8
-ov12_02237BB8: ; 0x02237BB8
-	push {r4, r5, r6, lr}
-	sub sp, #8
-	add r5, r0, #0
-	ldr r0, _02237CB0 ; =FS_OVERLAY_ID(OVY_8)
-	bl UnloadOverlayByID
-	ldr r0, _02237CB4 ; =0x00002445
-	ldrb r0, [r5, r0]
-	cmp r0, #0
-	bne _02237BD6
-	ldr r0, _02237CB8 ; =FS_OVERLAY_ID(OVY_7)
-	mov r1, #2
-	bl HandleLoadOverlay
-	b _02237BDE
-_02237BD6:
-	ldr r0, _02237CBC ; =FS_OVERLAY_ID(OVY_10)
-	mov r1, #2
-	bl HandleLoadOverlay
-_02237BDE:
-	add r0, r5, #0
-	mov r1, #0
-	bl ov12_0223BBF0
-	bl sub_02026E9C
-	add r4, r0, #0
-	bl sub_02026E94
-	add r1, r0, #0
-	mov r0, #0
-	add r2, r4, #0
-	bl MIi_CpuClear16
-	mov r0, #7
-	mov r1, #5
-	bl NARC_New
-	add r6, r0, #0
-	mov r0, #8
-	mov r1, #5
-	bl NARC_New
-	add r4, r0, #0
-	add r0, r5, #0
-	bl ov12_0223BFC0
-	add r1, r0, #0
-	add r0, r5, #0
-	bl BattleSystem_GetTrainerGender
-	add r3, r0, #0
-	mov r0, #7
-	lsl r0, r0, #6
-	ldr r0, [r5, r0]
-	add r1, r4, #0
-	str r0, [sp]
-	add r0, r6, #0
-	add r2, r5, #0
-	bl ov12_022660D0
-	mov r1, #0x67
-	lsl r1, r1, #2
-	str r0, [r5, r1]
-	mov r0, #4
-	mov r1, #5
-	bl FontID_Alloc
-	ldr r1, _02237CC0 ; =0x000023FF
-	mov r0, #2
-	ldrb r2, [r5, r1]
-	orr r0, r2
-	strb r0, [r5, r1]
-	ldr r0, [r5, #4]
-	bl ov12_0226604C
-	mov r0, #0x10
-	mov r1, #1
-	bl GfGfx_EngineBTogglePlanes
-	mov r0, #0x67
-	lsl r0, r0, #2
-	ldr r0, [r5, r0]
-	bl ov12_02266390
-	mov r0, #1
-	str r0, [sp]
-	mov r3, #0
-	mov r2, #0x67
-	str r3, [sp, #4]
-	lsl r2, r2, #2
-	ldr r2, [r5, r2]
-	add r0, r6, #0
-	add r1, r4, #0
-	bl ov12_02266508
-	mov r1, #0x67
-	lsl r1, r1, #2
-	ldr r1, [r5, r1]
-	add r0, r4, #0
-	bl ov12_02266644
-	add r0, r6, #0
-	bl NARC_Delete
-	add r0, r4, #0
-	bl NARC_Delete
-	mov r0, #1
-	bl sub_020027F0
-	add r0, r5, #0
-	bl ov12_0223A620
-	add r5, #0x90
-	ldr r0, [r5]
-	bl SpriteRenderer_GetG2dRendererPtr
-	mov r2, #0x11
-	mov r1, #0
-	lsl r2, r2, #0x10
-	bl G2dRenderer_SetSubSurfaceCoords
-	add sp, #8
-	pop {r4, r5, r6, pc}
-	.balign 4, 0
-_02237CB0: .word FS_OVERLAY_ID(OVY_8)
-_02237CB4: .word 0x00002445
-_02237CB8: .word FS_OVERLAY_ID(OVY_7)
-_02237CBC: .word FS_OVERLAY_ID(OVY_10)
-_02237CC0: .word 0x000023FF
-	thumb_func_end ov12_02237BB8
-
-	thumb_func_start ov12_02237CC4
-ov12_02237CC4: ; 0x02237CC4
-	push {r4, lr}
-	add r4, r0, #0
-	ldr r0, [r4, #8]
-	bl RemoveWindow
-	mov r0, #1
-	mov r1, #0
-	bl GfGfx_EngineATogglePlanes
-	mov r0, #2
-	mov r1, #0
-	bl GfGfx_EngineATogglePlanes
-	ldr r0, [r4, #4]
-	mov r1, #1
-	bl FreeBgTilemapBuffer
-	ldr r0, [r4, #4]
-	mov r1, #2
-	bl FreeBgTilemapBuffer
-	ldr r0, [r4, #4]
-	mov r1, #3
-	bl FreeBgTilemapBuffer
-	add r0, r4, #0
-	bl BattleSystem_SetHpBarDisabled
-	pop {r4, pc}
-	.balign 4, 0
-	thumb_func_end ov12_02237CC4
-
 	thumb_func_start ov12_02237D00
 ov12_02237D00: ; 0x02237D00
 	push {r4, r5, r6, lr}