Merge pull request #345 from red031000/master

more scrcmd, struct changes

1 files changed, 1 insertions, 478 deletions

diff --git a/arm9/asm/scrcmd_asm.s b/arm9/asm/scrcmd_asm.s
index dcf84948..c10ba0f5 100644
--- a/arm9/asm/scrcmd_asm.s
+++ b/arm9/asm/scrcmd_asm.s
@@ -1,11 +1,11 @@
     .include "asm/macros.inc"
     .include "global.inc"
 
-	.extern UNK_020F34E0
 	.extern UNK_020F34FC
 	.extern UNK_020F3538
 	.extern gMain
 	.extern FUN_0203A2F0
+	.extern FUN_0203AD2C
 
 	.section .bss
 
@@ -15,483 +15,6 @@ UNK_021C5A0C: ; 0x021C5A0C
 
 	.text
 
-	thumb_func_start FUN_0203AA0C
-FUN_0203AA0C: ; 0x0203AA0C
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	ldr r1, [r5, #0x64]
-	add r0, #0x80
-	lsl r1, r1, #0x10
-	ldr r0, [r0, #0x0]
-	lsr r1, r1, #0x10
-	bl GetVarPointer
-	add r4, r0, #0x0
-	ldr r0, _0203AA88 ; =gMain
-	ldr r1, _0203AA8C ; =0x0000FFFF
-	ldr r2, [r0, #0x48]
-	mov r0, #0x3
-	add r3, r2, #0x0
-	tst r3, r0
-	beq _0203AA36
-	mov r0, #0x0
-	strh r0, [r4, #0x0]
-	mov r0, #0x1
-	pop {r3-r5, pc}
-_0203AA36:
-	mov r3, #0x40
-	tst r3, r2
-	beq _0203AA40
-	mov r1, #0x0
-	b _0203AA5C
-_0203AA40:
-	mov r3, #0x80
-	tst r3, r2
-	beq _0203AA4A
-	mov r1, #0x1
-	b _0203AA5C
-_0203AA4A:
-	mov r3, #0x20
-	tst r3, r2
-	beq _0203AA54
-	mov r1, #0x2
-	b _0203AA5C
-_0203AA54:
-	mov r3, #0x10
-	tst r3, r2
-	beq _0203AA5C
-	add r1, r0, #0x0
-_0203AA5C:
-	ldr r0, _0203AA8C ; =0x0000FFFF
-	cmp r1, r0
-	beq _0203AA74
-	add r5, #0x80
-	ldr r0, [r5, #0x0]
-	ldr r0, [r0, #0x38]
-	bl FUN_02055304
-	mov r0, #0x0
-	strh r0, [r4, #0x0]
-	mov r0, #0x1
-	pop {r3-r5, pc}
-_0203AA74:
-	mov r0, #0x1
-	lsl r0, r0, #0xa
-	tst r0, r2
-	beq _0203AA82
-	mov r0, #0x1
-	strh r0, [r4, #0x0]
-	pop {r3-r5, pc}
-_0203AA82:
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	nop
-_0203AA88: .word gMain
-_0203AA8C: .word 0x0000FFFF
-
-	thumb_func_start FUN_0203AA90
-FUN_0203AA90: ; 0x0203AA90
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl FUN_02039460
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_0203AAA0
-FUN_0203AAA0: ; 0x0203AAA0
-	push {r3-r7, lr}
-	sub sp, #0x8
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r4, [r0, #0x0]
-	mov r1, #0x2
-	add r0, r4, #0x0
-	bl FUN_02039438
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r7, r0, #0x0
-	mov r0, #0x0
-	str r0, [sp, #0x0]
-	mov r0, #0x4
-	str r0, [sp, #0x4]
-	ldr r0, [r4, #0x8]
-	ldr r2, _0203AAF4 ; =0x000003D9
-	mov r1, #0x3
-	mov r3, #0xb
-	bl FUN_0200CB00
-	mov r0, #0x4
-	str r0, [sp, #0x0]
-	ldr r0, [r4, #0x8]
-	ldr r1, _0203AAF8 ; =UNK_020F34E0
-	ldr r2, _0203AAF4 ; =0x000003D9
-	mov r3, #0xb
-	bl Std_CreateYesNoMenu
-	str r0, [r6, #0x0]
-	ldr r1, _0203AAFC ; =FUN_0203AB00
-	add r0, r5, #0x0
-	str r7, [r5, #0x64]
-	bl SetupNativeScript
-	mov r0, #0x1
-	add sp, #0x8
-	pop {r3-r7, pc}
-	nop
-_0203AAF4: .word 0x000003D9
-_0203AAF8: .word UNK_020F34E0
-_0203AAFC: .word FUN_0203AB00 
-
-	thumb_func_start FUN_0203AB00
-FUN_0203AB00: ; 0x0203AB00
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r6, [r0, #0x0]
-	mov r1, #0x2
-	add r0, r6, #0x0
-	bl FUN_02039438
-	ldr r1, [r5, #0x64]
-	add r4, r0, #0x0
-	lsl r1, r1, #0x10
-	add r0, r6, #0x0
-	lsr r1, r1, #0x10
-	bl GetVarPointer
-	add r5, r0, #0x0
-	ldr r0, [r4, #0x0]
-	mov r1, #0x4
-	bl FUN_020021AC
-	mov r1, #0x0
-	mvn r1, r1
-	cmp r0, r1
-	bne _0203AB34
-	mov r0, #0x0
-	pop {r4-r6, pc}
-_0203AB34:
-	cmp r0, #0x0
-	bne _0203AB3C
-	mov r0, #0x0
-	b _0203AB3E
-_0203AB3C:
-	mov r0, #0x1
-_0203AB3E:
-	strh r0, [r5, #0x0]
-	mov r0, #0x1
-	pop {r4-r6, pc}
-
-	thumb_func_start FUN_0203AB44
-FUN_0203AB44: ; 0x0203AB44
-	push {r3-r5, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x1
-	bl FUN_02039438
-	add r5, #0x80
-	add r4, r0, #0x0
-	ldr r0, [r5, #0x0]
-	mov r1, #0x12
-	bl FUN_02039438
-	add r5, r0, #0x0
-	ldr r1, _0203AB70 ; =0x000003E2
-	add r0, r4, #0x0
-	bl FUN_0200D858
-	str r0, [r5, #0x0]
-	mov r0, #0x0
-	pop {r3-r5, pc}
-	nop
-_0203AB70: .word 0x000003E2
-
-	thumb_func_start FUN_0203AB74
-FUN_0203AB74: ; 0x0203AB74
-	push {r3, lr}
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x12
-	bl FUN_02039438
-	ldr r0, [r0, #0x0]
-	bl FUN_0200DBFC
-	mov r0, #0x0
-	pop {r3, pc}
-	.balign 4
-
-	thumb_func_start FUN_0203AB8C
-FUN_0203AB8C: ; 0x0203AB8C
-	push {r4-r7, lr}
-	sub sp, #0x2c
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r6, [r0, #0x0]
-	mov r1, #0x0
-	add r0, r6, #0x0
-	bl FUN_02039438
-	str r0, [sp, #0x1c]
-	add r0, r6, #0x0
-	mov r1, #0xf
-	bl FUN_02039438
-	str r0, [sp, #0x20]
-	ldr r0, [r5, #0x8]
-	add r1, r0, #0x1
-	str r1, [r5, #0x8]
-	ldrb r0, [r0, #0x0]
-	add r2, r1, #0x1
-	str r0, [sp, #0x18]
-	str r2, [r5, #0x8]
-	ldrb r0, [r1, #0x0]
-	add r1, r2, #0x1
-	str r0, [sp, #0x14]
-	str r1, [r5, #0x8]
-	ldrb r7, [r2, #0x0]
-	add r0, r1, #0x1
-	str r0, [r5, #0x8]
-	add r0, r5, #0x0
-	ldrb r4, [r1, #0x0]
-	bl ScriptReadHalfword
-	str r0, [sp, #0x24]
-	ldr r1, [sp, #0x24]
-	add r0, r6, #0x0
-	bl GetVarPointer
-	str r0, [sp, #0x28]
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x1
-	bl FUN_02039438
-	ldr r1, [sp, #0x28]
-	str r4, [sp, #0x0]
-	str r1, [sp, #0x4]
-	ldr r1, [sp, #0x20]
-	add r3, r7, #0x0
-	ldr r1, [r1, #0x0]
-	str r1, [sp, #0x8]
-	str r0, [sp, #0xc]
-	mov r0, #0x0
-	str r0, [sp, #0x10]
-	ldr r1, [sp, #0x18]
-	ldr r2, [sp, #0x14]
-	add r0, r6, #0x0
-	bl MOD05_021E1BF8
-	ldr r1, [sp, #0x1c]
-	str r0, [r1, #0x0]
-	ldr r0, [sp, #0x24]
-	str r0, [r5, #0x64]
-	mov r0, #0x1
-	add sp, #0x2c
-	pop {r4-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0203AC14
-FUN_0203AC14: ; 0x0203AC14
-	push {r4-r7, lr}
-	sub sp, #0x2c
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r6, [r0, #0x0]
-	mov r1, #0x0
-	add r0, r6, #0x0
-	bl FUN_02039438
-	str r0, [sp, #0x1c]
-	add r0, r6, #0x0
-	mov r1, #0xf
-	bl FUN_02039438
-	str r0, [sp, #0x20]
-	ldr r0, [r5, #0x8]
-	add r1, r0, #0x1
-	str r1, [r5, #0x8]
-	ldrb r0, [r0, #0x0]
-	add r2, r1, #0x1
-	str r0, [sp, #0x18]
-	str r2, [r5, #0x8]
-	ldrb r0, [r1, #0x0]
-	add r1, r2, #0x1
-	str r0, [sp, #0x14]
-	str r1, [r5, #0x8]
-	ldrb r7, [r2, #0x0]
-	add r0, r1, #0x1
-	str r0, [r5, #0x8]
-	add r0, r5, #0x0
-	ldrb r4, [r1, #0x0]
-	bl ScriptReadHalfword
-	str r0, [sp, #0x24]
-	ldr r1, [sp, #0x24]
-	add r0, r6, #0x0
-	bl GetVarPointer
-	str r0, [sp, #0x28]
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x1
-	bl FUN_02039438
-	ldr r1, [sp, #0x28]
-	str r4, [sp, #0x0]
-	str r1, [sp, #0x4]
-	ldr r1, [sp, #0x20]
-	add r3, r7, #0x0
-	ldr r1, [r1, #0x0]
-	str r1, [sp, #0x8]
-	str r0, [sp, #0xc]
-	ldr r0, [r5, #0x78]
-	str r0, [sp, #0x10]
-	ldr r1, [sp, #0x18]
-	ldr r2, [sp, #0x14]
-	add r0, r6, #0x0
-	bl MOD05_021E1BF8
-	ldr r1, [sp, #0x1c]
-	str r0, [r1, #0x0]
-	ldr r0, [sp, #0x24]
-	str r0, [r5, #0x64]
-	mov r0, #0x1
-	add sp, #0x2c
-	pop {r4-r7, pc}
-	.balign 4
-
-	thumb_func_start FUN_0203AC9C
-FUN_0203AC9C: ; 0x0203AC9C
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x0
-	bl FUN_02039438
-	ldr r1, [r4, #0x8]
-	add r3, r1, #0x1
-	str r3, [r4, #0x8]
-	ldrb r1, [r1, #0x0]
-	add r2, r3, #0x1
-	str r2, [r4, #0x8]
-	ldrb r2, [r3, #0x0]
-	ldr r0, [r0, #0x0]
-	bl MOD05_021E1C4C
-	mov r0, #0x0
-	pop {r4, pc}
-	.balign 4
-
-	thumb_func_start FUN_0203ACC4
-FUN_0203ACC4: ; 0x0203ACC4
-	push {r4-r6, lr}
-	add r5, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x0
-	bl FUN_02039438
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r1, r0, #0x0
-	add r0, r5, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	bl VarGet
-	add r6, r0, #0x0
-	add r0, r5, #0x0
-	bl ScriptReadHalfword
-	add r5, #0x80
-	add r1, r0, #0x0
-	ldr r0, [r5, #0x0]
-	bl VarGet
-	add r2, r0, #0x0
-	ldr r0, [r4, #0x0]
-	add r1, r6, #0x0
-	bl MOD05_021E1C4C
-	mov r0, #0x0
-	pop {r4-r6, pc}
-	.balign 4
-
-	thumb_func_start FUN_0203AD08
-FUN_0203AD08: ; 0x0203AD08
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x0
-	bl FUN_02039438
-	ldr r0, [r0, #0x0]
-	bl MOD05_021E1C54
-	ldr r1, _0203AD28 ; =FUN_0203AD2C
-	add r0, r4, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r4, pc}
-	.balign 4
-_0203AD28: .word FUN_0203AD2C 
-
-	thumb_func_start FUN_0203AD2C
-FUN_0203AD2C: ; 0x0203AD2C
-	push {r3, lr}
-	add r1, r0, #0x0
-	ldr r1, [r1, #0x64]
-	add r0, #0x80
-	lsl r1, r1, #0x10
-	ldr r0, [r0, #0x0]
-	lsr r1, r1, #0x10
-	bl GetVarPointer
-	ldrh r1, [r0, #0x0]
-	ldr r0, _0203AD50 ; =0x0000EEEE
-	cmp r1, r0
-	beq _0203AD4A
-	mov r0, #0x1
-	pop {r3, pc}
-_0203AD4A:
-	mov r0, #0x0
-	pop {r3, pc}
-	nop
-_0203AD50: .word 0x0000EEEE
-
-	thumb_func_start FUN_0203AD54
-FUN_0203AD54: ; 0x0203AD54
-	push {r4, lr}
-	add r4, r0, #0x0
-	add r0, #0x80
-	ldr r0, [r0, #0x0]
-	mov r1, #0x0
-	bl FUN_02039438
-	ldr r0, [r0, #0x0]
-	bl MOD05_021E1C54
-	ldr r1, _0203AD74 ; =FUN_0203AD78
-	add r0, r4, #0x0
-	bl SetupNativeScript
-	mov r0, #0x1
-	pop {r4, pc}
-	.balign 4
-_0203AD74: .word FUN_0203AD78 
-
-	thumb_func_start FUN_0203AD78
-FUN_0203AD78: ; 0x0203AD78
-	push {r4-r6, lr}
-	add r1, r0, #0x0
-	add r0, #0x80
-	ldr r1, [r1, #0x64]
-	ldr r5, [r0, #0x0]
-	lsl r1, r1, #0x10
-	add r0, r5, #0x0
-	lsr r1, r1, #0x10
-	bl GetVarPointer
-	add r4, r0, #0x0
-	add r0, r5, #0x0
-	mov r1, #0x0
-	bl FUN_02039438
-	add r6, r0, #0x0
-	ldrh r1, [r4, #0x0]
-	ldr r0, _0203ADC0 ; =0x0000EEEE
-	cmp r1, r0
-	bne _0203ADBC
-	ldr r0, [r5, #0x78]
-	bl FUN_02052714
-	cmp r0, #0x0
-	beq _0203ADB8
-	mov r0, #0x8
-	strh r0, [r4, #0x0]
-	ldr r0, [r6, #0x0]
-	bl MOD05_021E1ECC
-	mov r0, #0x1
-	pop {r4-r6, pc}
-_0203ADB8:
-	mov r0, #0x0
-	pop {r4-r6, pc}
-_0203ADBC:
-	mov r0, #0x1
-	pop {r4-r6, pc}
-	.balign 4
-_0203ADC0: .word 0x0000EEEE
-
 	thumb_func_start FUN_0203ADC4
 FUN_0203ADC4: ; 0x0203ADC4
 	push {r4-r7, lr}