Miscellaneous Work (Again) (#30)

* work on debug menu and document that and main menu

* split, decomp, label more funcs

* split exclusive pokemon data out into C

* macro-ize exlusive pokemon data

* decomp 2 more funcs

* decomp a few more

* finally match PromptNewQuestion

* woot 7% aka more debug menu stuff

1 files changed, 0 insertions, 331 deletions

diff --git a/asm/debug_menu.s b/asm/debug_menu.s
index 2b25b3e..60e049e 100644
--- a/asm/debug_menu.s
+++ b/asm/debug_menu.s
@@ -5,230 +5,6 @@
 
 	.text
 
-        thumb_func_start CreateDebugMenu
-CreateDebugMenu:
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r5, _0803A270
-	ldr r0, [r5]
-	cmp r0, 0
-	bne _0803A224
-	movs r4, 0xD2
-	lsls r4, 1
-	adds r0, r4, 0
-	movs r1, 0x8
-	bl MemoryAlloc
-	str r0, [r5]
-	movs r1, 0
-	adds r2, r4, 0
-	bl MemoryFill8
-_0803A224:
-	mov r12, r5
-	movs r0, 0xA0
-	lsls r0, 1
-	mov r8, r0
-	ldr r4, _0803A274
-	movs r3, 0
-	movs r2, 0x3
-_0803A232:
-	mov r5, r12
-	ldr r1, [r5]
-	adds r1, r3
-	add r1, r8
-	adds r0, r4, 0
-	ldm r0!, {r5-r7}
-	stm r1!, {r5-r7}
-	ldm r0!, {r5-r7}
-	stm r1!, {r5-r7}
-	adds r3, 0x18
-	subs r2, 0x1
-	cmp r2, 0
-	bge _0803A232
-	bl ResetUnusedInputStruct
-	ldr r0, _0803A270
-	ldr r0, [r0]
-	movs r6, 0xA0
-	lsls r6, 1
-	adds r0, r6
-	movs r1, 0x1
-	movs r2, 0x1
-	bl sub_800641C
-	bl SetDebugMenuItems
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0803A270: .4byte gUnknown_203B3EC
-_0803A274: .4byte gUnknown_80E7D40
-	thumb_func_end CreateDebugMenu
-
-	thumb_func_start DeleteDebugMenu
-DeleteDebugMenu:
-	push {r4,lr}
-	bl ResetUnusedInputStruct
-	movs r0, 0
-	movs r1, 0x1
-	movs r2, 0x1
-	bl sub_800641C
-	ldr r4, _0803A2A0
-	ldr r0, [r4]
-	cmp r0, 0
-	beq _0803A298
-	bl MemoryFree
-	movs r0, 0
-	str r0, [r4]
-_0803A298:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0803A2A0: .4byte gUnknown_203B3EC
-	thumb_func_end DeleteDebugMenu
-
-	thumb_func_start sub_803A2A4
-sub_803A2A4:
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r4, _0803A2D4
-	movs r0, 0xB
-	str r0, [sp]
-	ldr r5, _0803A2D8
-	ldr r0, [r5]
-	bl sub_8012FD8
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803A2C4
-	ldr r0, [r5]
-	mov r1, sp
-	bl sub_8013114
-_0803A2C4:
-	ldr r0, [sp]
-	cmp r0, 0xB
-	bhi _0803A34E
-	lsls r0, 2
-	ldr r1, _0803A2DC
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0803A2D4: .4byte 0x0000ffdc
-_0803A2D8: .4byte gUnknown_203B3EC
-_0803A2DC: .4byte _0803A2E0
-	.align 2, 0
-_0803A2E0:
-	.4byte _0803A310
-	.4byte _0803A314
-	.4byte _0803A318
-	.4byte _0803A31C
-	.4byte _0803A320
-	.4byte _0803A324
-	.4byte _0803A328
-	.4byte _0803A34E
-	.4byte _0803A34E
-	.4byte _0803A330
-	.4byte _0803A344
-	.4byte _0803A34C
-_0803A310:
-	movs r4, 0x2F
-	b _0803A34E
-_0803A314:
-	movs r4, 0x30
-	b _0803A34E
-_0803A318:
-	movs r4, 0x31
-	b _0803A34E
-_0803A31C:
-	movs r4, 0x32
-	b _0803A34E
-_0803A320:
-	movs r4, 0x33
-	b _0803A34E
-_0803A324:
-	movs r4, 0x34
-	b _0803A34E
-_0803A328:
-	bl sub_803A3BC
-	movs r4, 0x1
-	b _0803A34E
-_0803A330:
-	movs r4, 0
-_0803A332:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	bl sub_80976F8
-	adds r4, 0x1
-	cmp r4, 0x1F
-	ble _0803A332
-	movs r4, 0x1
-	b _0803A34E
-_0803A344:
-	bl sub_803A3A0
-	movs r4, 0x1
-	b _0803A34E
-_0803A34C:
-	ldr r4, _0803A358
-_0803A34E:
-	adds r0, r4, 0
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0803A358: .4byte 0x0000ffdc
-	thumb_func_end sub_803A2A4
-
-	thumb_func_start SetDebugMenuItems
-SetDebugMenuItems:
-	push {r4,lr}
-	sub sp, 0x10
-	ldr r4, _0803A394
-	ldr r0, [r4]
-	movs r2, 0xA0
-	lsls r2, 1
-	adds r1, r0, r2
-	ldr r3, _0803A398
-	ldr r2, _0803A39C
-	str r2, [sp]
-	movs r2, 0x1
-	str r2, [sp, 0x4]
-	movs r2, 0xD
-	str r2, [sp, 0x8]
-	movs r2, 0
-	str r2, [sp, 0xC]
-	bl SetMenuItems
-	ldr r0, [r4]
-	movs r1, 0
-	movs r2, 0x1
-	bl sub_8035CF4
-	add sp, 0x10
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0803A394: .4byte gUnknown_203B3EC
-_0803A398: .4byte gUnknown_80E7D58
-_0803A39C: .4byte gDebugMenuItems
-	thumb_func_end SetDebugMenuItems
-
-	thumb_func_start sub_803A3A0
-sub_803A3A0:
-	push {lr}
-	ldr r0, _0803A3B8
-	ldr r0, [r0]
-	movs r1, 0xA0
-	lsls r1, 1
-	adds r0, r1
-	movs r1, 0
-	bl sub_8035CC0
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0803A3B8: .4byte gUnknown_203B3EC
-	thumb_func_end sub_803A3A0
-
 	thumb_func_start sub_803A3BC
 sub_803A3BC:
 	push {r4-r7,lr}
@@ -1734,111 +1510,4 @@ _0803AF82:
 	bx r0
 	thumb_func_end sub_803AF38
 
-	thumb_func_start sub_803AF88
-sub_803AF88:
-	push {r4,lr}
-	sub sp, 0x4
-	movs r0, 0
-	str r0, [sp]
-	bl sub_8023A94
-	ldr r4, _0803AFC0
-	ldr r0, [r4]
-	adds r0, 0x10
-	bl sub_8012FD8
-	lsls r0, 24
-	cmp r0, 0
-	bne _0803AFAE
-	ldr r0, [r4]
-	adds r0, 0x10
-	mov r1, sp
-	bl sub_8013114
-_0803AFAE:
-	ldr r0, [sp]
-	cmp r0, 0x4
-	beq _0803AFCA
-	cmp r0, 0x4
-	bgt _0803AFC4
-	cmp r0, 0x1
-	beq _0803AFDA
-	b _0803AFE0
-	.align 2, 0
-_0803AFC0: .4byte gUnknown_203B3F8
-_0803AFC4:
-	cmp r0, 0x5
-	beq _0803AFD2
-	b _0803AFE0
-_0803AFCA:
-	movs r0, 0x5
-	bl sub_803ACD0
-	b _0803AFE0
-_0803AFD2:
-	movs r0, 0x6
-	bl sub_803ACD0
-	b _0803AFE0
-_0803AFDA:
-	movs r0, 0x2
-	bl sub_803ACD0
-_0803AFE0:
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_803AF88
-
-	thumb_func_start sub_803AFE8
-sub_803AFE8:
-	push {r4,lr}
-	movs r0, 0
-	bl sub_8023A94
-	ldr r4, _0803B010
-	ldr r0, [r4]
-	adds r0, 0x10
-	bl sub_8012FD8
-	ldr r0, [r4]
-	adds r0, 0x60
-	bl sub_8013BBC
-	cmp r0, 0x2
-	beq _0803B020
-	cmp r0, 0x2
-	bhi _0803B014
-	cmp r0, 0x1
-	beq _0803B028
-	b _0803B02C
-	.align 2, 0
-_0803B010: .4byte gUnknown_203B3F8
-_0803B014:
-	cmp r0, 0x3
-	bne _0803B02C
-	ldr r0, [r4]
-	ldr r1, [r0, 0x8]
-	ldr r0, [r0, 0x60]
-	strb r0, [r1, 0x3]
-_0803B020:
-	movs r0, 0x2
-	bl sub_803ACD0
-	b _0803B02C
-_0803B028:
-	bl sub_803AE58
-_0803B02C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_803AFE8
-
-	thumb_func_start sub_803B034
-sub_803B034:
-	push {lr}
-	bl sub_8016080
-	cmp r0, 0x3
-	bhi _0803B04C
-	cmp r0, 0x2
-	bcc _0803B04C
-	bl sub_80160D8
-	movs r0, 0x2
-	bl sub_803ACD0
-_0803B04C:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_803B034
-
         .align 2,0