some progress on rowan's overlay

1 files changed, 0 insertions, 197 deletions

diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s
index a48cd966..627f31bf 100644
--- a/arm9/modules/59/asm/mod59_021D74E0_asm.s
+++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s
@@ -3,203 +3,6 @@
 	.section .text
 	.balign 4, 0
 
-	thumb_func_start MOD59_021D7564
-MOD59_021D7564: ; 0x021D7564
-	push {r3, r4, r5, r6, lr}
-	sub sp, #0xc
-	add r5, r1, #0
-	bl OverlayManager_GetData
-	ldr r1, [r5]
-	add r4, r0, #0
-	mov r6, #0
-	cmp r1, #5
-	bls _021D757A
-	b _021D76AC
-_021D757A:
-	add r1, r1, r1
-	add r1, pc
-	ldrh r1, [r1, #6]
-	lsl r1, r1, #0x10
-	asr r1, r1, #0x10
-	add pc, r1
-_021D7586: ; jump table
-	.short _021D7592 - _021D7586 - 2 ; case 0
-	.short _021D75FA - _021D7586 - 2 ; case 1
-	.short _021D7642 - _021D7586 - 2 ; case 2
-	.short _021D7668 - _021D7586 - 2 ; case 3
-	.short _021D7690 - _021D7586 - 2 ; case 4
-	.short _021D76AA - _021D7586 - 2 ; case 5
-_021D7592:
-	add r0, r6, #0
-	add r1, r6, #0
-	bl FUN_0200E3A0
-	mov r0, #1
-	add r1, r6, #0
-	bl FUN_0200E3A0
-	add r0, r6, #0
-	add r1, r0, #0
-	bl Main_SetVBlankIntrCB
-	add r0, r6, #0
-	add r1, r0, #0
-	bl FUN_02015F34
-	bl GX_DisableEngineALayers
-	bl GX_DisableEngineBLayers
-	mov r2, #1
-	lsl r2, r2, #0x1a
-	ldr r1, [r2]
-	ldr r0, _021D76B4 ; =0xFFFFE0FF
-	and r1, r0
-	str r1, [r2]
-	ldr r2, _021D76B8 ; =0x04001000
-	ldr r1, [r2]
-	and r0, r1
-	str r0, [r2]
-	mov r0, #4
-	mov r1, #8
-	bl SetKeyRepeatTimers
-	add r0, r4, #0
-	bl MOD59_021D778C
-	add r0, r4, #0
-	bl MOD59_021D79F8
-	add r0, r4, #0
-	bl MOD59_021D7A4C
-	ldr r0, _021D76BC ; =MOD59_021D7724
-	add r1, r4, #0
-	bl Main_SetVBlankIntrCB
-	bl GX_BothDispOn
-	mov r0, #1
-	str r0, [r5]
-	b _021D76AC
-_021D75FA:
-	bl MOD59_021D8920
-	cmp r0, #1
-	bne _021D761E
-	mov r0, #6
-	str r0, [sp]
-	mov r0, #1
-	str r0, [sp, #4]
-	ldr r0, [r4]
-	str r0, [sp, #8]
-	add r0, r6, #0
-	add r1, r0, #0
-	add r2, r0, #0
-	add r3, r0, #0
-	bl FUN_0200E1D0
-	mov r0, #2
-	str r0, [r5]
-_021D761E:
-	ldr r0, [r4, #0x14]
-	cmp r0, #0
-	beq _021D76AC
-	mov r0, #6
-	str r0, [sp]
-	mov r0, #1
-	str r0, [sp, #4]
-	ldr r0, [r4]
-	str r0, [sp, #8]
-	mov r0, #0
-	add r1, r0, #0
-	add r2, r0, #0
-	add r3, r0, #0
-	bl FUN_0200E1D0
-	mov r0, #3
-	str r0, [r5]
-	b _021D76AC
-_021D7642:
-	bl FUN_0200E308
-	cmp r0, #1
-	bne _021D76AC
-	add r0, r4, #0
-	bl MOD59_021D7A34
-	add r0, r4, #0
-	bl MOD59_021D796C
-	add r0, r4, #0
-	bl MOD59_021D7A5C
-	add r0, r6, #0
-	add r1, r0, #0
-	bl Main_SetVBlankIntrCB
-	mov r6, #1
-	b _021D76AC
-_021D7668:
-	bl FUN_0200E308
-	cmp r0, #1
-	bne _021D76AC
-	add r0, r4, #0
-	bl MOD59_021D7A34
-	add r0, r4, #0
-	bl MOD59_021D796C
-	add r0, r4, #0
-	bl MOD59_021D7A5C
-	add r0, r6, #0
-	add r1, r0, #0
-	bl Main_SetVBlankIntrCB
-	mov r0, #4
-	str r0, [r5]
-	b _021D76AC
-_021D7690:
-	ldr r0, [r4, #0x14]
-	bl OverlayManager_Run
-	cmp r0, #1
-	bne _021D76AC
-	ldr r0, [r4, #0x14]
-	bl OverlayManager_delete
-	add r0, r6, #0
-	str r0, [r4, #0x14]
-	mov r0, #5
-	str r0, [r5]
-	b _021D76AC
-_021D76AA:
-	str r6, [r5]
-_021D76AC:
-	add r0, r6, #0
-	add sp, #0xc
-	pop {r3, r4, r5, r6, pc}
-	nop
-_021D76B4: .word 0xFFFFE0FF
-_021D76B8: .word 0x04001000
-_021D76BC: .word MOD59_021D7724
-	thumb_func_end MOD59_021D7564
-
-	thumb_func_start MOD59_021D76C0
-MOD59_021D76C0: ; 0x021D76C0
-	push {r4, r5, r6, lr}
-	add r6, r0, #0
-	bl OverlayManager_GetData
-	add r4, r0, #0
-	ldr r0, [r4, #4]
-	ldr r5, [r4]
-	bl Sav2_PlayerData_GetProfileAddr
-	ldr r1, [r4, #0x70]
-	ldr r1, [r1, #0x18]
-	bl PlayerName_StringToFlat
-	ldr r0, [r4, #4]
-	bl Sav2_PlayerData_GetProfileAddr
-	ldr r1, [r4, #0x70]
-	ldr r1, [r1, #4]
-	bl PlayerProfile_SetTrainerGender
-	ldr r0, [r4, #4]
-	bl FUN_02024EB4
-	ldr r1, [r4, #0x74]
-	ldr r1, [r1, #0x18]
-	bl RivalsNameToU16Array
-	ldr r0, [r4, #0x70]
-	bl FUN_02077AC4
-	ldr r0, [r4, #0x74]
-	bl FUN_02077AC4
-	add r0, r6, #0
-	bl OverlayManager_FreeData
-	add r0, r5, #0
-	bl DestroyHeap
-	ldr r0, _021D771C ; =SDK_OVERLAY_MODULE_52_ID
-	ldr r1, _021D7720 ; =MOD52_021D76D8
-	bl RegisterMainOverlay
-	mov r0, #1
-	pop {r4, r5, r6, pc}
-	nop
-_021D771C: .word SDK_OVERLAY_MODULE_52_ID
-_021D7720: .word MOD52_021D76D8
-	thumb_func_end MOD59_021D76C0
-
 	thumb_func_start MOD59_021D7724
 MOD59_021D7724: ; 0x021D7724
 	ldr r3, _021D772C ; =FUN_0201AB60