Merge branch 'master' into monster_archieve

asm/code_2.s

@@ -144,7 +144,7 @@ QuickSave:
 	movs r0, 0
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	movs r0, 0
 	movs r1, 0x14
 	bl sub_8009408
@@ -297,7 +297,7 @@ _08000892:
 	movs r0, 0
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	movs r0, 0
 	bl xxx_update_stuff
 	add sp, 0xC
@@ -325,7 +325,7 @@ sub_80008C0:
 	movs r0, 0
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	movs r0, 0
 	movs r1, 0x14
 	bl sub_8009408
@@ -425,7 +425,7 @@ _080009A2:
 	movs r0, 0
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	movs r0, 0
 	bl xxx_update_stuff
 	add sp, 0x4
@@ -514,7 +514,7 @@ _08000A42:
 	mov r1, sp
 	strb r0, [r1, 0x5]
 	mov r0, sp
-	bl sub_800F990
+	bl ShowFriendAreasMap
 	ldr r0, [sp, 0x8]
 	bl MemoryFree
 	mov r0, sp
@@ -622,7 +622,7 @@ _08000B50:
 	add r4, sp, 0x168
 	str r0, [r4]
 	adds r0, r5, 0
-	bl sub_8010268
+	bl ShowWorldMap
 	ldr r0, [r4]
 	bl MemoryFree
 	add r0, sp, 0x16C

asm/code_8010F28.s

@@ -1,938 +0,0 @@
-	#include "asm/constants/gba_constants.inc"
-  	#include "asm/macros.inc"
-
-  	.syntax unified
-
-  	.text
-  
-	thumb_func_start sub_8010F28
-sub_8010F28:
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x18
-	add r0, sp, 0x8
-	bl sub_8004E8C
-	add r1, sp, 0x8
-	ldr r0, _08011080
-	strh r0, [r1, 0x4]
-	movs r0, 0x80
-	lsls r0, 4
-	strh r0, [r1, 0xA]
-	ldr r6, _08011084
-	ldr r0, [r6]
-	ldr r2, _08011088
-	adds r1, r0, r2
-	ldr r1, [r1]
-	mov r8, r1
-	ldr r4, _0801108C
-	adds r0, r4
-	bl RunAxAnimationFrame
-	ldr r3, [r6]
-	adds r4, r3, r4
-	ldr r7, _08011090
-	adds r0, r3, r7
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	mov r7, r8
-	lsls r5, r7, 16
-	asrs r5, 16
-	subs r1, r5
-	ldr r2, _08011094
-	adds r0, r3, r2
-	movs r7, 0
-	ldrsh r2, [r0, r7]
-	mov r7, r8
-	asrs r0, r7, 16
-	subs r2, r0
-	ldr r0, _08011098
-	adds r3, r0
-	ldr r0, [r3]
-	str r0, [sp]
-	add r3, sp, 0x8
-	str r3, [sp, 0x4]
-	adds r0, r4, 0
-	movs r3, 0x3
-	bl DoAxFrame_800558C
-	movs r7, 0
-	mov r10, r6
-	ldr r6, _0801109C
-	mov r9, r5
-_08010F98:
-	mov r4, r10
-	ldr r0, [r4]
-	adds r4, r0, r6
-	ldr r1, _080110A0
-	adds r0, r1
-	lsls r1, r7, 5
-	ldr r0, [r0]
-	adds r5, r0, r1
-	ldrb r0, [r4]
-	cmp r0, 0
-	beq _08010FD8
-	adds r4, 0x14
-	adds r0, r4, 0
-	bl RunAxAnimationFrame
-	movs r2, 0x4
-	ldrsh r1, [r5, r2]
-	mov r3, r9
-	subs r1, r3
-	movs r0, 0x6
-	ldrsh r2, [r5, r0]
-	mov r3, r8
-	asrs r0, r3, 16
-	subs r2, r0
-	movs r0, 0
-	str r0, [sp]
-	add r0, sp, 0x8
-	str r0, [sp, 0x4]
-	adds r0, r4, 0
-	movs r3, 0x1
-	bl DoAxFrame_800558C
-_08010FD8:
-	adds r6, 0x50
-	adds r7, 0x1
-	cmp r7, 0x1F
-	ble _08010F98
-	movs r5, 0
-	ldr r1, _08011084
-	mov r9, r1
-	ldr r6, _080110A4
-	movs r2, 0
-	str r2, [sp, 0x14]
-_08010FEC:
-	mov r3, r9
-	ldr r1, [r3]
-	ldr r4, [sp, 0x14]
-	adds r0, r4, r1
-	ldr r7, _080110A4
-	adds r0, r7
-	ldrh r0, [r0]
-	lsrs r0, 15
-	cmp r0, 0
-	beq _08011062
-	adds r0, r1, r6
-	bl RunAxAnimationFrame
-	ldr r0, _080110A8
-	ldrh r0, [r0]
-	movs r2, 0x80
-	lsls r2, 1
-	adds r1, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0801101E
-	movs r0, 0x1
-	ands r0, r5
-	cmp r0, 0
-	beq _08011062
-_0801101E:
-	mov r3, r9
-	ldr r4, [r3]
-	adds r0, r4, r6
-	ldr r1, _080110AC
-	lsls r3, r5, 2
-	adds r3, r1
-	movs r7, 0
-	ldrsh r1, [r3, r7]
-	ldr r7, _08011090
-	adds r2, r4, r7
-	movs r7, 0
-	ldrsh r2, [r2, r7]
-	adds r1, r2
-	mov r7, r8
-	lsls r2, r7, 16
-	asrs r2, 16
-	subs r1, r2
-	movs r7, 0x2
-	ldrsh r2, [r3, r7]
-	ldr r3, _08011094
-	adds r3, r4
-	movs r4, 0
-	ldrsh r3, [r3, r4]
-	adds r2, r3
-	mov r7, r8
-	asrs r3, r7, 16
-	subs r2, r3
-	movs r3, 0
-	str r3, [sp]
-	add r3, sp, 0x8
-	str r3, [sp, 0x4]
-	movs r3, 0x2
-	bl DoAxFrame_800558C
-_08011062:
-	adds r6, 0x3C
-	ldr r4, [sp, 0x14]
-	adds r4, 0x3C
-	str r4, [sp, 0x14]
-	adds r5, 0x1
-	cmp r5, 0x7
-	ble _08010FEC
-	add sp, 0x18
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08011080: .4byte 0x0000f3ff
-_08011084: .4byte gUnknown_203B0E4
-_08011088: .4byte 0x00004dd4
-_0801108C: .4byte 0x00004c10
-_08011090: .4byte 0x00004dd8
-_08011094: .4byte 0x00004dda
-_08011098: .4byte 0x00004dd0
-_0801109C: .4byte 0x00004018
-_080110A0: .4byte 0x00004014
-_080110A4: .4byte 0x00004a30
-_080110A8: .4byte gRealInputs
-_080110AC: .4byte gUnknown_80D40C4
-	thumb_func_end sub_8010F28
-
-	thumb_func_start sub_80110B0
-sub_80110B0:
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	ldr r0, _08011150
-	ldr r1, [r0]
-	ldr r2, _08011154
-	adds r1, r2
-	ldrh r1, [r1]
-	lsls r1, 16
-	asrs r6, r1, 19
-	adds r2, r6, 0
-	movs r3, 0
-	mov r10, r0
-	movs r0, 0x1F
-	mov r9, r0
-_080110D4:
-	mov r1, r10
-	ldr r0, [r1]
-	ldr r1, _08011158
-	adds r0, r1
-	ldrh r0, [r0]
-	lsls r0, 16
-	asrs r4, r0, 19
-	lsls r1, r2, 7
-	adds r2, 0x1
-	mov r12, r2
-	adds r3, 0x1
-	mov r8, r3
-	movs r7, 0x1E
-	lsls r0, r4, 1
-	adds r5, r0, r1
-_080110F2:
-	mov r2, r9
-	ands r4, r2
-	ands r6, r2
-	lsls r2, r4, 1
-	lsls r0, r6, 6
-	adds r2, r0
-	ldr r3, _0801115C
-	adds r3, r2, r3
-	str r3, [sp]
-	mov r0, r10
-	ldr r1, [r0]
-	ldr r3, _08011160
-	adds r0, r1, r3
-	adds r0, r5
-	ldrh r0, [r0]
-	ldr r3, [sp]
-	strh r0, [r3]
-	ldr r0, _08011164
-	adds r2, r0
-	adds r1, 0x14
-	adds r1, r5
-	ldrh r0, [r1]
-	strh r0, [r2]
-	adds r5, 0x2
-	adds r4, 0x1
-	subs r7, 0x1
-	cmp r7, 0
-	bge _080110F2
-	mov r2, r12
-	adds r6, 0x1
-	mov r3, r8
-	cmp r3, 0x14
-	ble _080110D4
-	movs r0, 0x2
-	bl sub_80098F8
-	movs r0, 0x3
-	bl sub_80098F8
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08011150: .4byte gUnknown_203B0E4
-_08011154: .4byte 0x00004dd6
-_08011158: .4byte 0x00004dd4
-_0801115C: .4byte gUnknown_202B038 + 0x1000
-_08011160: .4byte 0x00002014
-_08011164: .4byte gUnknown_202B038 + 0x1800
-	thumb_func_end sub_80110B0
-
-	thumb_func_start sub_8011168
-sub_8011168:
-	push {r4,r5,lr}
-	movs r0, 0
-	movs r1, 0x1
-	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
-	ldr r3, _080111B0
-	ldr r1, [r3]
-	ldr r2, _080111B4
-	adds r0, r1, r2
-	movs r2, 0
-	str r2, [r0]
-	ldr r4, _080111B8
-	adds r0, r1, r4
-	str r2, [r0]
-	adds r4, 0x4
-	adds r0, r1, r4
-	str r2, [r0]
-	ldr r0, _080111BC
-	adds r1, r0
-	str r2, [r1]
-	adds r5, r3, 0
-	ldr r4, _080111C0
-	movs r3, 0
-	movs r1, 0x7
-_0801119A:
-	ldr r0, [r5]
-	adds r0, r2, r0
-	adds r0, r4
-	strh r3, [r0]
-	adds r2, 0x3C
-	subs r1, 0x1
-	cmp r1, 0
-	bge _0801119A
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080111B0: .4byte gUnknown_203B0E4
-_080111B4: .4byte 0x00004ddc
-_080111B8: .4byte 0x00004de0
-_080111BC: .4byte 0x00004de8
-_080111C0: .4byte 0x00004a30
-	thumb_func_end sub_8011168
-
-	thumb_func_start sub_80111C4
-sub_80111C4:
-	push {r4-r6,lr}
-	movs r3, 0
-	ldr r6, _08011238
-	ldr r0, [r6]
-	ldr r2, _0801123C
-	adds r1, r0, r2
-	ldr r2, [r1]
-	cmp r2, 0x1E
-	bgt _0801122E
-	ldr r0, [r0]
-	ldr r5, [r0, 0x4]
-	adds r0, r2, 0x1
-	str r0, [r1]
-	cmp r0, 0x1E
-	ble _080111E6
-	movs r0, 0x1F
-	str r0, [r1]
-_080111E6:
-	movs r4, 0
-_080111E8:
-	ldr r0, [r6]
-	ldr r1, _0801123C
-	adds r0, r1
-	ldr r2, [r0]
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r3, 0
-	bl SetBGPaletteBufferColorRGB
-	adds r5, 0x4
-	adds r4, 0x1
-	cmp r4, 0xDF
-	ble _080111E8
-	ldr r0, _08011238
-	ldr r0, [r0]
-	ldr r0, [r0, 0x4]
-	ldr r5, [r0, 0x4]
-	movs r4, 0
-_0801120C:
-	movs r2, 0x80
-	lsls r2, 1
-	adds r0, r4, r2
-	ldr r1, _08011238
-	ldr r1, [r1]
-	ldr r2, _0801123C
-	adds r1, r2
-	ldr r2, [r1]
-	adds r1, r5, 0
-	movs r3, 0
-	bl SetBGPaletteBufferColorRGB
-	adds r5, 0x4
-	adds r4, 0x1
-	cmp r4, 0xEF
-	ble _0801120C
-	movs r3, 0x1
-_0801122E:
-	adds r0, r3, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08011238: .4byte gUnknown_203B0E4
-_0801123C: .4byte 0x00004dcc
-	thumb_func_end sub_80111C4
-
-	thumb_func_start sub_8011240
-sub_8011240:
-	push {r4-r6,lr}
-	ldr r2, _08011264
-	ldr r0, [r2]
-	ldr r1, _08011268
-	adds r3, r0, r1
-	movs r4, 0
-	ldrsh r1, [r3, r4]
-	ldr r5, _0801126C
-	adds r4, r0, r5
-	movs r6, 0
-	ldrsh r0, [r4, r6]
-	subs r1, r0
-	adds r5, r2, 0
-	cmp r1, 0x2F
-	bgt _08011270
-	ldrh r0, [r3]
-	subs r0, 0x30
-	b _08011278
-	.align 2, 0
-_08011264: .4byte gUnknown_203B0E4
-_08011268: .4byte 0x00004dd8
-_0801126C: .4byte 0x00004dd4
-_08011270:
-	cmp r1, 0xC0
-	ble _0801127A
-	ldrh r0, [r3]
-	subs r0, 0xC0
-_08011278:
-	strh r0, [r4]
-_0801127A:
-	ldr r0, [r5]
-	ldr r1, _08011298
-	adds r3, r0, r1
-	movs r2, 0
-	ldrsh r1, [r3, r2]
-	ldr r4, _0801129C
-	adds r2, r0, r4
-	movs r6, 0
-	ldrsh r0, [r2, r6]
-	subs r1, r0
-	cmp r1, 0x2F
-	bgt _080112A0
-	ldrh r0, [r3]
-	subs r0, 0x30
-	b _080112A8
-	.align 2, 0
-_08011298: .4byte 0x00004dda
-_0801129C: .4byte 0x00004dd6
-_080112A0:
-	cmp r1, 0x70
-	ble _080112AA
-	ldrh r0, [r3]
-	subs r0, 0x70
-_080112A8:
-	strh r0, [r2]
-_080112AA:
-	adds r3, r5, 0
-	ldr r0, [r3]
-	ldr r4, _080112F8
-	adds r1, r0, r4
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	bge _080112BE
-	movs r0, 0
-	strh r0, [r1]
-_080112BE:
-	ldr r0, [r3]
-	ldr r2, _080112FC
-	adds r1, r0, r2
-	movs r6, 0
-	ldrsh r0, [r1, r6]
-	cmp r0, 0
-	bge _080112D0
-	movs r0, 0
-	strh r0, [r1]
-_080112D0:
-	ldr r0, [r3]
-	adds r1, r0, r4
-	movs r3, 0
-	ldrsh r0, [r1, r3]
-	cmp r0, 0xEF
-	ble _080112E0
-	movs r0, 0xEF
-	strh r0, [r1]
-_080112E0:
-	ldr r0, [r5]
-	adds r2, r0, r2
-	movs r4, 0
-	ldrsh r0, [r2, r4]
-	cmp r0, 0x97
-	ble _080112F0
-	movs r0, 0x97
-	strh r0, [r2]
-_080112F0:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080112F8: .4byte 0x00004dd4
-_080112FC: .4byte 0x00004dd6
-	thumb_func_end sub_8011240
-
-	thumb_func_start sub_8011300
-sub_8011300:
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0xC
-	ldr r0, _08011388
-	ldr r2, [r0]
-	ldr r1, _0801138C
-	adds r0, r2, r1
-	ldr r1, [r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 4
-	ldr r3, _08011390
-	adds r0, r3
-	adds r2, r0
-	mov r9, r2
-	movs r4, 0
-	ldr r0, _08011394
-	mov r8, r0
-	movs r7, 0
-	mov r6, r8
-	movs r5, 0
-_0801132E:
-	ldr r0, _08011388
-	ldr r2, [r0]
-	adds r0, r5, r2
-	add r0, r8
-	strh r7, [r0]
-	lsls r1, r4, 1
-	mov r0, r9
-	adds r0, 0x2
-	adds r1, r0, r1
-	movs r3, 0
-	ldrsh r0, [r1, r3]
-	cmp r0, 0
-	blt _08011370
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 4
-	ldr r0, _08011390
-	adds r1, r0
-	adds r1, r2, r1
-	ldrb r0, [r1]
-	cmp r0, 0
-	beq _08011370
-	adds r0, r2, r6
-	ldr r1, [r2, 0x8]
-	adds r2, r4, 0x4
-	movs r3, 0x40
-	str r3, [sp]
-	str r7, [sp, 0x4]
-	movs r3, 0x1
-	str r3, [sp, 0x8]
-	movs r3, 0
-	bl AxResInitFile
-_08011370:
-	adds r6, 0x3C
-	adds r5, 0x3C
-	adds r4, 0x1
-	cmp r4, 0x7
-	ble _0801132E
-	add sp, 0xC
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08011388: .4byte gUnknown_203B0E4
-_0801138C: .4byte 0x00004a18
-_08011390: .4byte 0x00004018
-_08011394: .4byte 0x00004a30
-	thumb_func_end sub_8011300
-
-	thumb_func_start sub_8011398
-sub_8011398:
-	push {r4-r6,lr}
-	sub sp, 0x12C
-	ldr r5, _080113F4
-	ldr r0, [r5]
-	ldr r2, _080113F8
-	adds r1, r0, r2
-	ldr r1, [r1]
-	ldr r3, _080113FC
-	adds r0, r3
-	lsls r1, 5
-	ldr r0, [r0]
-	adds r6, r0, r1
-	add r4, sp, 0xCC
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x60
-	bl memset
-	movs r2, 0x3
-	str r2, [r4, 0x4]
-	movs r0, 0x7
-	strh r0, [r4, 0x8]
-	movs r1, 0x2
-	strh r1, [r4, 0xA]
-	movs r0, 0x15
-	strh r0, [r4, 0xC]
-	strh r1, [r4, 0xE]
-	strh r1, [r4, 0x10]
-	str r2, [r4, 0x1C]
-	str r2, [r4, 0x34]
-	str r2, [r4, 0x4C]
-	ldr r0, [r5]
-	ldr r2, _08011400
-	adds r1, r0, r2
-	movs r3, 0
-	ldrsh r1, [r1, r3]
-	subs r2, 0x4
-	adds r0, r2
-	movs r3, 0
-	ldrsh r0, [r0, r3]
-	subs r1, r0
-	cmp r1, 0x50
-	bgt _08011404
-	movs r0, 0x11
-	b _08011406
-	.align 2, 0
-_080113F4: .4byte gUnknown_203B0E4
-_080113F8: .4byte 0x00004a18
-_080113FC: .4byte 0x00004014
-_08011400: .4byte 0x00004dda
-_08011404:
-	movs r0, 0x1
-_08011406:
-	strh r0, [r4, 0xA]
-	adds r0, r4, 0
-	movs r1, 0x1
-	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
-	movs r0, 0
-	bl sub_80073B8
-	ldr r1, _0801147C
-	ldr r2, [r6]
-	add r0, sp, 0x4
-	bl sprintfStatic
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0xC
-	movs r1, 0x2
-	add r2, sp, 0x4
-	movs r3, 0
-	bl PrintFormattedStringOnWindow
-	movs r0, 0
-	bl sub_80073E0
-	ldr r0, _08011480
-	ldr r1, [r0]
-	ldr r0, _08011484
-	adds r2, r1, r0
-	movs r3, 0x8
-	ldrsh r0, [r4, r3]
-	lsls r0, 3
-	subs r0, 0x5
-	str r0, [r2]
-	ldr r0, _08011488
-	adds r2, r1, r0
-	movs r3, 0xA
-	ldrsh r0, [r4, r3]
-	lsls r0, 3
-	adds r0, 0x5
-	str r0, [r2]
-	ldr r0, _0801148C
-	adds r2, r1, r0
-	movs r3, 0xC
-	ldrsh r0, [r4, r3]
-	lsls r0, 3
-	adds r0, 0xA
-	str r0, [r2]
-	ldr r0, _08011490
-	adds r1, r0
-	movs r2, 0xE
-	ldrsh r0, [r4, r2]
-	lsls r0, 3
-	adds r0, 0xA
-	str r0, [r1]
-	add sp, 0x12C
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0801147C: .4byte gUnknown_80D40FC
-_08011480: .4byte gUnknown_203B0E4
-_08011484: .4byte 0x00004ddc
-_08011488: .4byte 0x00004de0
-_0801148C: .4byte 0x00004de4
-_08011490: .4byte 0x00004de8
-	thumb_func_end sub_8011398
-
-	thumb_func_start sub_8011494
-sub_8011494:
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC8
-	ldr r0, _08011610
-	ldr r2, [r0]
-	ldr r1, _08011614
-	adds r0, r2, r1
-	ldr r0, [r0]
-	ldr r3, _08011618
-	adds r1, r2, r3
-	lsls r0, 5
-	ldr r1, [r1]
-	adds r1, r0
-	mov r8, r1
-	ldr r0, _0801161C
-	adds r7, r2, r0
-	add r4, sp, 0x64
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x60
-	bl memset
-	movs r0, 0x6
-	str r0, [sp, 0x68]
-	add r1, sp, 0x6C
-	movs r0, 0x7
-	strh r0, [r1]
-	movs r2, 0x2
-	strh r2, [r1, 0x2]
-	add r1, sp, 0x70
-	movs r0, 0x15
-	strh r0, [r1]
-	mov r0, sp
-	adds r0, 0x72
-	strh r2, [r0]
-	add r0, sp, 0x74
-	strh r2, [r0]
-	add r5, sp, 0xC4
-	str r5, [sp, 0x78]
-	movs r1, 0x3
-	str r1, [sp, 0x80]
-	add r0, sp, 0x94
-	str r1, [r0, 0x4]
-	add r0, sp, 0xAC
-	str r1, [r0, 0x4]
-	add r0, sp, 0x4
-	adds r1, r4, 0
-	movs r2, 0x60
-	bl memcpy
-	movs r1, 0
-	mov r9, r1
-	movs r6, 0
-	mov r10, r5
-_08011506:
-	mov r0, r8
-	adds r0, 0x8
-	adds r4, r0, r6
-	ldrb r0, [r4]
-	bl sub_800FFE8
-	lsls r0, 24
-	cmp r0, 0
-	beq _0801152A
-	ldr r0, _08011610
-	ldr r0, [r0]
-	ldr r2, _08011620
-	adds r0, r2
-	add r0, r9
-	ldrb r1, [r4]
-	strb r1, [r0]
-	movs r3, 0x1
-	add r9, r3
-_0801152A:
-	adds r6, 0x1
-	cmp r6, 0x7
-	ble _08011506
-	ldr r5, _08011610
-	ldr r0, [r5]
-	ldr r1, _08011624
-	adds r0, r1
-	mov r2, r9
-	str r2, [r0]
-	movs r4, 0
-	movs r0, 0x1
-	mov r3, r10
-	strb r0, [r3]
-	add r0, sp, 0xC4
-	strb r4, [r0, 0x1]
-	movs r1, 0x12
-	strb r1, [r0, 0x2]
-	strb r4, [r0, 0x3]
-	strh r4, [r7, 0x18]
-	strh r2, [r7, 0x1A]
-	mov r0, r9
-	strh r0, [r7, 0x1C]
-	strh r4, [r7, 0x1E]
-	strh r4, [r7, 0x20]
-	strh r4, [r7, 0x4]
-	movs r0, 0x10
-	strh r0, [r7, 0x6]
-	str r4, [r7]
-	strh r4, [r7, 0xC]
-	strh r4, [r7, 0xE]
-	strh r4, [r7, 0x14]
-	strh r4, [r7, 0x16]
-	movs r0, 0x8
-	strh r0, [r7, 0x8]
-	strh r0, [r7, 0xA]
-	adds r0, r7, 0
-	adds r0, 0x28
-	bl sub_801317C
-	movs r1, 0x1C
-	ldrsh r0, [r7, r1]
-	movs r1, 0
-	bl sub_80095E4
-	adds r1, r0, 0
-	add r3, sp, 0x4
-	adds r2, r3, 0
-	adds r0, r1, 0x2
-	strh r0, [r2, 0xE]
-	strh r0, [r3, 0x10]
-	lsls r1, 3
-	adds r0, r7, 0
-	bl sub_80137B0
-	add r0, sp, 0x4
-	movs r1, 0x1
-	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
-	ldr r1, [r5]
-	ldr r2, _08011628
-	adds r0, r1, r2
-	str r4, [r0]
-	ldr r3, _0801162C
-	adds r0, r1, r3
-	str r4, [r0]
-	adds r2, 0x8
-	adds r0, r1, r2
-	str r4, [r0]
-	adds r3, 0x8
-	adds r1, r3
-	str r4, [r1]
-	movs r0, 0
-	bl sub_80073B8
-	ldr r2, _08011630
-	str r4, [sp]
-	movs r0, 0x10
-	movs r1, 0
-	movs r3, 0
-	bl PrintFormattedStringOnWindow
-	movs r6, 0
-	cmp r6, r9
-	bge _08011678
-	add r0, sp, 0x64
-	mov r8, r0
-	ldr r1, _08011634
-	mov r10, r1
-_080115DC:
-	adds r0, r7, 0
-	adds r1, r6, 0
-	bl sub_8013800
-	adds r4, r0, 0
-	ldr r2, _08011610
-	ldr r0, [r2]
-	ldr r3, _08011620
-	adds r0, r3
-	adds r0, r6
-	ldrb r5, [r0]
-	ldr r0, _08011638
-	adds r1, r5, 0
-	bl sub_80101F8
-	cmp r5, 0
-	bne _08011640
-	str r5, [sp]
-	movs r0, 0xC
-	adds r1, r4, 0
-	ldr r2, _0801163C
-	movs r3, 0
-	bl PrintFormattedStringOnWindow
-	b _08011672
-	.align 2, 0
-_08011610: .4byte gUnknown_203B0E4
-_08011614: .4byte 0x00004a18
-_08011618: .4byte 0x00004014
-_0801161C: .4byte 0x00004dfc
-_08011620: .4byte 0x00004dec
-_08011624: .4byte 0x00004df8
-_08011628: .4byte 0x00004ddc
-_0801162C: .4byte 0x00004de0
-_08011630: .4byte gUnknown_80D4104
-_08011634: .4byte gFormatArgs
-_08011638: .4byte gFormatBuffer_Items
-_0801163C: .4byte gUnknown_80D4120
-_08011640:
-	ldr r1, _08011690
-	ldr r0, [r1]
-	ldr r2, _08011694
-	adds r0, r2
-	ldrb r2, [r0]
-	adds r0, r5, 0
-	mov r1, r8
-	bl sub_80926F8
-	mov r3, r8
-	movs r1, 0x2
-	ldrsh r0, [r3, r1]
-	mov r2, r10
-	str r0, [r2]
-	movs r1, 0
-	ldrsh r0, [r3, r1]
-	str r0, [r2, 0x4]
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0xC
-	adds r1, r4, 0
-	ldr r2, _08011698
-	movs r3, 0
-	bl PrintFormattedStringOnWindow
-_08011672:
-	adds r6, 0x1
-	cmp r6, r9
-	blt _080115DC
-_08011678:
-	movs r0, 0
-	bl sub_80073E0
-	add sp, 0xC8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08011690: .4byte gUnknown_203B0E4
-_08011694: .4byte 0x00004a2c
-_08011698: .4byte gUnknown_80D4124
-	thumb_func_end sub_8011494
-
-        .align 2,0

asm/code_8023868.s

@@ -219,7 +219,7 @@ _08023A04:
 	adds r0, r6
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	ldr r4, [r5]
 	movs r0, 0xD6
 	lsls r0, 2
@@ -408,7 +408,7 @@ sub_8023B7C:
 	adds r0, r1
 	movs r1, 0
 	movs r2, 0
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	bl sub_8023BD8
 	adds r2, r0, 0
 	ldr r0, [r5]
@@ -557,7 +557,7 @@ sub_8023C60:
 	adds r0, r4
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	ldr r0, [r5]
 	bl MemoryFree
 	movs r0, 0
@@ -660,7 +660,7 @@ _08023D38:
 	adds r0, r2
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -866,7 +866,7 @@ _08023F02:
 	lsls r2, 2
 	adds r0, r2
 	adds r1, r7, 0
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	mov r4, r8
 	ldr r0, [r4]

asm/code_803B050.s

@@ -42,7 +42,7 @@ sub_803B050:
 	adds r0, 0x3C
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	movs r2, 0
 	movs r3, 0
 	movs r7, 0xCB
@@ -215,7 +215,7 @@ sub_803B1BC:
 	adds r0, 0x3C
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	ldr r0, [r4]
 	bl MemoryFree
 	movs r0, 0
@@ -253,7 +253,7 @@ sub_803B204:
 	adds r0, 0x3C
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	ldr r0, [r4]
 	movs r1, 0x1A
 	ldrsh r0, [r0, r1]
@@ -284,7 +284,7 @@ sub_803B204:
 	adds r0, 0x3C
 	movs r1, 0x1
 	movs r2, 0x1
-	bl xxx_call_save_unk_text_struct_800641C
+	bl ShowWindows
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -354,7 +354,7 @@ _0803B2DC:
 	ldr r1, _0803B340
 	adds r4, r1
 	adds r1, r5, 0
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	ldr r2, [r4, 0x4]
 	ldr r0, [r6]

asm/code_803D110.s

@@ -250,5 +250,5 @@ _0803E458: .4byte gDungeon
 _0803E45C: .4byte 0x00018217
 _0803E460: .4byte 0x00018218
 _0803E464: .4byte gDungeonBrightness
-_0803E468: .4byte gUnknown_202D058
+_0803E468: .4byte gFontPalette + 0x20
 	thumb_func_end sub_803E250

asm/code_8040094.s

@@ -150,7 +150,7 @@ _08040256:
 	.align 2, 0
 _0804026C: .4byte gUnknown_202EE04
 _08040270: .4byte gUnknown_202EE01
-_08040274: .4byte gUnknown_202D03C
+_08040274: .4byte gFontPalette + 0x4
 _08040278:
 	adds r5, r6, 0
 	adds r5, 0xE0

asm/code_805D8C8.s

@@ -3496,7 +3496,7 @@ _0806361E:
 	bl BufferMoveName
 	ldr r0, _08063690
 	mov r1, r9
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r4, r0, 0
 	ldrb r1, [r7]
 	movs r0, 0x2
@@ -7171,7 +7171,7 @@ _080652D2:
 	bl PrintFormattedStringOnWindow
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	ldr r0, _080653E0
 	ldr r2, [r0]
@@ -7181,7 +7181,7 @@ _080652D2:
 	bl PrintFormattedStringOnWindow
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	ldr r0, _080653E4
 	ldr r2, [r0]
@@ -7191,7 +7191,7 @@ _080652D2:
 	bl PrintFormattedStringOnWindow
 	adds r0, r4, 0
 	movs r1, 0x2
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	ldr r0, _080653E8
 	ldr r2, [r0]
@@ -7202,7 +7202,7 @@ _080652D2:
 	movs r5, 0x4
 	adds r0, r4, 0
 	movs r1, 0x3
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	ldr r0, _080653EC
 	ldr r2, [r0]
@@ -7225,7 +7225,7 @@ _080652D2:
 	movs r5, 0x5
 	adds r0, r4, 0
 	movs r1, 0x4
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	ldr r0, _080653F0
 	ldr r2, [r0]
@@ -7248,7 +7248,7 @@ _080653F4:
 	movs r5, 0x5
 	adds r0, r4, 0
 	movs r1, 0x4
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	ldr r0, _08065440
 	ldr r2, [r0]
@@ -7259,7 +7259,7 @@ _080653F4:
 _0806540E:
 	ldr r0, _08065444
 	adds r1, r5, 0
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	ldr r0, _08065448
 	ldr r2, [r0]
@@ -7381,7 +7381,7 @@ sub_806544C:
 	bl PrintFormattedStringOnWindow
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	ldr r6, _08065570
 	movs r2, 0xAC
@@ -7394,7 +7394,7 @@ sub_806544C:
 	bl PrintFormattedStringOnWindow
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	movs r2, 0xB8
 	lsls r2, 1
@@ -7512,15 +7512,15 @@ CreateFieldGameOptionsMenu:
 	bl sub_80137B0
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	str r0, [sp, 0x4]
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	str r0, [sp, 0x8]
 	adds r0, r4, 0
 	movs r1, 0x2
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	str r0, [sp, 0xC]
 	movs r0, 0
 	bl sub_80073B8
@@ -7666,23 +7666,23 @@ CreateFieldDungeonMenu:
 	bl sub_80137B0
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	str r0, [sp, 0x4]
 	adds r0, r4, 0
 	movs r1, 0x1
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	str r0, [sp, 0x8]
 	adds r0, r4, 0
 	movs r1, 0x2
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	str r0, [sp, 0xC]
 	adds r0, r4, 0
 	movs r1, 0x3
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	str r0, [sp, 0x10]
 	adds r0, r4, 0
 	movs r1, 0x4
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	str r0, [sp, 0x14]
 	movs r0, 0
 	bl sub_80073B8
@@ -7961,7 +7961,7 @@ CreateFieldOthersMenu:
 _08065A0A:
 	ldr r0, _08065A7C
 	adds r1, r4, 0
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	stm r5!, {r0}
 	adds r4, 0x1
 	cmp r4, 0
@@ -8418,7 +8418,7 @@ sub_8065CAC:
 _08065D7A:
 	ldr r0, _08065DB0
 	adds r1, r4, 0
-	bl sub_8013800
+	bl GetMenuEntryYCoord
 	adds r1, r0, 0
 	ldm r5!, {r2}
 	movs r0, 0

asm/code_805D8C8_1.s

@@ -526,7 +526,7 @@ _08068D1C:
 	add r1, sp, 0x214
 	movs r2, 0
 	movs r3, 0
-	bl sub_8092638
+	bl GetFriendAreaCapacity2
 	movs r7, 0
 	add r1, sp, 0x1F0
 	ldrh r0, [r1]

asm/code_8099360.s

@@ -31,12 +31,12 @@ sub_8099690:
 _080996BC: .4byte gUnknown_8116028
 _080996C0: .4byte gSystemFileArchive
 _080996C4: .4byte gGameOptionsRef
-_080996C8: .4byte gFontPaletteAlt
+_080996C8: .4byte gFontPalette + 0x40
 _080996CC:
 	ldr r4, _080996D0
 	b _080996D6
 	.align 2, 0
-_080996D0: .4byte gUnknown_202D1B8
+_080996D0: .4byte gFontPalette + 0x180
 _080996D4:
 	ldr r4, _08099704
 _080996D6:
@@ -61,7 +61,7 @@ _080996E4:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08099704: .4byte gUnknown_202D1F8
+_08099704: .4byte gFontPalette + 0x1C0
 	thumb_func_end sub_8099690
 
 	thumb_func_start sub_8099708

asm/ground_lives.s

@@ -720,7 +720,7 @@ _080A7D12:
 	mov r1, sp
 	movs r2, 0
 	movs r3, 0
-	bl sub_8092638
+	bl GetFriendAreaCapacity2
 	mov r0, sp
 	movs r1, 0
 	ldrsh r0, [r0, r1]
@@ -923,7 +923,7 @@ _080A7EB8:
 	mov r1, sp
 	movs r2, 0
 	movs r3, 0
-	bl sub_8092638
+	bl GetFriendAreaCapacity2
 	mov r0, sp
 	movs r1, 0
 	ldrsh r0, [r0, r1]
@@ -2965,7 +2965,7 @@ _080A8DF8:
 	adds r1, r4, 0
 	movs r2, 0
 	movs r3, 0
-	bl sub_8092638
+	bl GetFriendAreaCapacity2
 	movs r1, 0
 	ldrsh r0, [r4, r1]
 	cmp r5, r0

data/data_80CE77C.s

@@ -62,542 +62,3 @@ gStatusSprites: @ 80D3474
 gUnknown_80D3564: @ 80D3564
         .byte 0,0,0,0
 
-@ 
-        .string "pksdir0\0"
-        .align 2,0
-
-@ Friend Area Data
-
-	.global gFriendAreaLocations
-gFriendAreaLocations: @ 80D3570
-@ replacing .incbin "baserom.gba", 0x000d3570, 0x94c
-    .4byte gUnknown_80D3EAC
-    .byte 0xc5, 0x01, 0x71, 0x00, 0x08, 0x09, 0x0a, 0x27, 0x2f, 0x0b, 0x3f, 0x3f, 0x05, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0c, 0x00, 0x02, 0x00, 0x07, 0x00 @ Mountain Range
-    .4byte gUnknown_80D3EA4
-    .byte 0xcd, 0x01, 0x1c, 0x00, 0x30, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0a, 0x00, 0x0c, 0x00
-    .4byte gUnknown_80D3E9C
-    .byte 0x61, 0x01, 0x78, 0x00, 0x0d, 0x0e, 0x11, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x1b, 0x00, 0x07, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x0d, 0x00, 0xff, 0xff, 0x09, 0x00, 0xff, 0xff
-    .4byte gUnknown_80D3E8C
-    .byte 0x62, 0x01, 0x2d, 0x01, 0x0f, 0x0c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0x0e, 0x00, 0x12, 0x00, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3E80
-    .byte 0x94, 0x01, 0x02, 0x01, 0x34, 0x35, 0x28, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0x11, 0x00, 0xff, 0xff, 0x0b, 0x00, 0x08, 0x00, 0xff, 0xff, 0x0e, 0x00, 0x03, 0x00
-    .4byte gUnknown_80D3E70
-    .byte 0xc7, 0x01, 0x9d, 0x00, 0x12, 0x13, 0x14, 0x15, 0x3f, 0x3f, 0x3f, 0x3f, 0x0b, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x07, 0x00, 0x08, 0x00
-    .4byte gUnknown_80D3E60
-    .byte 0x08, 0x01, 0x9d, 0x00, 0x16, 0x17, 0x18, 0x19, 0x3f, 0x3f, 0x3f, 0x3f, 0x10, 0x00, 0xff, 0xff, 0x1b, 0x00, 0x09, 0x00, 0x14, 0x00, 0x1a, 0x00, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3E58
-    .byte 0x97, 0x01, 0xa0, 0x00, 0x1a, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x08, 0x00, 0x0b, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x02, 0x00, 0x1b, 0x00, 0xff, 0xff
-    .4byte gUnknown_80D3E48
-    .byte 0x98, 0x01, 0xcf, 0x00, 0x1b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x04, 0x00, 0xff, 0xff, 0x0b, 0x00, 0x05, 0x00, 0x07, 0x00, 0x1b, 0x00, 0xff, 0xff, 0x0e, 0x00
-    .4byte gUnknown_80D3E40
-    .byte 0x33, 0x01, 0x79, 0x00, 0x1c, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0x1b, 0x00, 0x02, 0x00, 0x0d, 0x00, 0x0f, 0x00, 0x14, 0x00, 0xff, 0xff, 0x06, 0x00
-    .4byte gUnknown_80D3E30
-    .byte 0x82, 0x01, 0x1d, 0x00, 0x1d, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0x0c, 0x00, 0x01, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x0d, 0x00
-    .4byte gUnknown_80D3E20
-    .byte 0xc6, 0x01, 0xd0, 0x00, 0x1e, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x05, 0x00, 0x07, 0x00, 0x08, 0x00, 0x04, 0x00
-    .4byte gUnknown_80D3E18
-    .byte 0xa2, 0x01, 0x46, 0x00, 0x1f, 0x20, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x07, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0xff, 0xff, 0x0a, 0x00, 0x0d, 0x00, 0x02, 0x00
-    .4byte gUnknown_80D3E10
-    .byte 0x60, 0x01, 0x47, 0x00, 0x21, 0x23, 0x24, 0x22, 0x3f, 0x3f, 0x3f, 0x3f, 0x02, 0x00, 0xff, 0xff, 0x0c, 0x00, 0x0a, 0x00, 0xff, 0xff, 0x0f, 0x00, 0x14, 0x00, 0x09, 0x00
-    .4byte gUnknown_80D3E08
-    .byte 0x63, 0x01, 0x04, 0x01, 0x25, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x03, 0x00, 0xff, 0xff, 0x04, 0x00, 0x08, 0x00, 0x1b, 0x00, 0xff, 0xff, 0x12, 0x00, 0xff, 0xff
-    .4byte gUnknown_80D3E00
-    .byte 0x36, 0x01, 0x1c, 0x00, 0x26, 0x29, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x09, 0x00, 0x0d, 0x00, 0x0a, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x18, 0x00, 0x14, 0x00
-    .4byte gUnknown_80D3DF8
-    .byte 0x07, 0x01, 0xcb, 0x00, 0x10, 0x2a, 0x32, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0x12, 0x00, 0xff, 0xff, 0x1b, 0x00, 0x06, 0x00, 0xff, 0xff, 0xff, 0xff, 0x19, 0x00
-    .4byte gUnknown_80D3DF0
-    .byte 0xc4, 0x01, 0x2d, 0x01, 0x2b, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x04, 0x00, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3DE8
-    .byte 0x31, 0x01, 0x05, 0x01, 0x2e, 0x2c, 0x2d, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0x03, 0x00, 0x0e, 0x00, 0xff, 0xff, 0xff, 0xff, 0x10, 0x00, 0x19, 0x00, 0xff, 0xff
-    .4byte gUnknown_80D3DE4
-    .byte 0x2f, 0x00, 0x15, 0x00, 0x33, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x17, 0x00, 0x1a, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3DD4
-    .byte 0x07, 0x01, 0x47, 0x00, 0x36, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x06, 0x00, 0x09, 0x00, 0x0d, 0x00, 0x0f, 0x00, 0xff, 0xff, 0x18, 0x00, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3DC4
-    .byte 0x5d, 0x00, 0x0c, 0x01, 0x37, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x19, 0x00, 0xff, 0xff, 0xff, 0xff, 0x16, 0x00, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3DB4
-    .byte 0x2d, 0x00, 0xcb, 0x00, 0x38, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0x15, 0x00, 0xff, 0xff, 0xff, 0xff, 0x17, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3DA4
-    .byte 0x2d, 0x00, 0x70, 0x00, 0x39, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x16, 0x00, 0xff, 0xff, 0xff, 0xff, 0x1a, 0x00, 0x13, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D94
-    .byte 0xd0, 0x00, 0x16, 0x00, 0x01, 0x03, 0x05, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0x14, 0x00, 0x0f, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1a, 0x00
-    .4byte gUnknown_80D3D84
-    .byte 0xb2, 0x00, 0x0d, 0x01, 0x02, 0x04, 0x06, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x12, 0x00, 0x10, 0x00, 0xff, 0xff, 0xff, 0xff, 0x15, 0x00, 0xff, 0xff
-    .4byte gUnknown_80D3D7C
-    .byte 0x81, 0x00, 0x42, 0x00, 0x07, 0x31, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0x06, 0x00, 0xff, 0xff, 0x18, 0x00, 0xff, 0xff, 0x13, 0x00, 0xff, 0xff, 0x17, 0x00 @ Beach
-    .4byte gUnknown_80D3D78
-    .byte 0x63, 0x01, 0xa1, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x0e, 0x00, 0x08, 0x00, 0x07, 0x00, 0xff, 0xff, 0x02, 0x00, 0x09, 0x00, 0x06, 0x00, 0x10, 0x00 @ Team Name
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-    .4byte gUnknown_80D3D70
-    .byte 0x00, 0x00, 0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-        @ Start of Friend Area String Pool (80D3D70)
-        @ These are what show on the map when going to Friend Areas
-    .global gUnknown_80D3D70
-    gUnknown_80D3D70:
-        .string "ななし\0"
-        .align 2,0
-    .global gUnknown_80D3D78
-    gUnknown_80D3D78:
-        .string "$t\0" @ Team Name
-        .align 2,0
-    .global gUnknown_80D3D7C
-    gUnknown_80D3D7C:
-        .string "Beach\0"
-        .align 2,0
-    .global gUnknown_80D3D84
-    gUnknown_80D3D84:
-        .string "Southern Sea\0"
-        .align 2,0
-    .global gUnknown_80D3D94
-    gUnknown_80D3D94:
-        .string "Northern Sea\0"
-        .align 2,0
-    .global gUnknown_80D3DA4
-    gUnknown_80D3DA4:
-        .string "Western Isles\0"
-        .align 2,0
-    .global gUnknown_80D3DB4
-    gUnknown_80D3DB4:
-        .string "Southwest Isles\0"
-        .align 2,0
-    .global gUnknown_80D3DC4
-    gUnknown_80D3DC4:
-        .string "Southern Isles\0"
-        .align 2,0
-    .global gUnknown_80D3DD4
-    gUnknown_80D3DD4:
-        .string "Northern Isles\0"
-        .align 2,0
-    .global gUnknown_80D3DE4
-    gUnknown_80D3DE4:
-        .string "Sky\0"
-        .align 2,0
-    .global gUnknown_80D3DE8
-    gUnknown_80D3DE8:
-        .string "Relics\0"
-        .align 2,0
-    .global gUnknown_80D3DF0
-    gUnknown_80D3DF0:
-        .string "Desert\0"
-        .align 2,0
-    .global gUnknown_80D3DF8
-    gUnknown_80D3DF8:
-        .string "Volcano\0"
-        .align 2,0
-    .global gUnknown_80D3E00
-    gUnknown_80D3E00:
-        .string "Ruins\0"
-        .align 2,0
-    .global gUnknown_80D3E08
-    gUnknown_80D3E08:
-        .string "Jungle\0"
-        .align 2,0
-    .global gUnknown_80D3E10
-    gUnknown_80D3E10:
-        .string "Cave\0"
-        .align 2,0
-    .global gUnknown_80D3E18
-    gUnknown_80D3E18:
-        .string "Marsh\0"
-        .align 2,0
-    .global gUnknown_80D3E20
-    gUnknown_80D3E20:
-        .string "Eastern Lakes\0"
-        .align 2,0
-    .global gUnknown_80D3E30
-    gUnknown_80D3E30:
-        .string "Northern Lakes\0"
-        .align 2,0
-    .global gUnknown_80D3E40
-    gUnknown_80D3E40:
-        .string "Pond\0"
-        .align 2,0
-    .global gUnknown_80D3E48
-    gUnknown_80D3E48:
-        .string "Eastern Ponds\0"
-        .align 2,0
-    .global gUnknown_80D3E58
-    gUnknown_80D3E58:
-        .string "River\0"
-        .align 2,0
-    .global gUnknown_80D3E60
-    gUnknown_80D3E60:
-        .string "Western Forest\0"
-        .align 2,0
-    .global gUnknown_80D3E70
-    gUnknown_80D3E70:
-        .string "Eastern Forest\0"
-        .align 2,0
-    .global gUnknown_80D3E80
-    gUnknown_80D3E80:
-        .string "Badlands\0"
-        .align 2,0
-    .global gUnknown_80D3E8C
-    gUnknown_80D3E8C:
-        .string "South Plains\0"
-        .align 2,0
-    .global gUnknown_80D3E9C
-    gUnknown_80D3E9C:
-        .string "Plains\0"
-        .align 2,0
-    .global gUnknown_80D3EA4
-    gUnknown_80D3EA4:
-        .string "Glacier\0"
-        .align 2,0
-    .global gUnknown_80D3EAC
-    gUnknown_80D3EAC:
-        .string "Mountain Range\0"
-        .align 2,0
-
-	.global gUnknown_80D3EBC
-gUnknown_80D3EBC: @ 80D3EBC
-@ replacing .incbin "baserom.gba", 0x000d3ebc, 0x20
-        .byte 0x80, 0x03
-        .byte 0x80, 0x04
-        .byte 0x80, 0x00
-        .byte 0x80, 0x03
-        .byte 0x80, 0x0f
-        .byte 0x80, 0x00
-        .byte 0x80, 0x0c
-        .byte 0x80, 0x0f
-        .byte 0x80, 0x0b
-        .byte 0x80, 0x0c
-        .byte 0x80, 0x08
-        .byte 0x80, 0x0b
-        .byte 0x80, 0x07
-        .byte 0x80, 0x08
-        .byte 0x80, 0x04
-        .byte 0x80, 0x07
-
-	.global gUnknown_80D3EDC
-gUnknown_80D3EDC: @ 80D3EDC
-        .byte 0xff, 0x00, 0x02, 0x01
-        .byte 0x04, 0xff, 0x03, 0xff
-        .byte 0x06, 0x07, 0xff, 0xff
-        .byte 0x05, 0xff, 0xff, 0xff
-
-
-	.global gUnknown_80D3EEC
-gUnknown_80D3EEC: @ 80D3EEC
-        .byte 0xff, 0xff, 0xff, 0x01
-        .byte 0xff, 0xff, 0x03, 0xff
-        .byte 0xff, 0x07, 0xff, 0xff
-        .byte 0x05, 0xff, 0xff, 0xff
-
-	.global gUnknown_80D3EFC
-gUnknown_80D3EFC: @ 80D3EFC
-        .string "$t Team Base\0"
-        .align 2,0
-        .string "pksdir0\0"
-        .align 2,0
-
-	.global gDungeonCoordinates
-gDungeonCoordinates: @ 80D3F14
-@ replacing .incbin "baserom.gba", 0x000d3f14, 0x100
-@ 2 byte X and 2 byte Y
-        .2byte 172, 174 @ Tiny Woods
-        .2byte 171, 111
-        .2byte 242, 126
-        .2byte 232, 181
-        .2byte 263, 155
-        .2byte 298, 159
-        .2byte 299, 142
-        .2byte 203, 255
-        .2byte 385, 166
-        .2byte 388, 126
-        .2byte 389, 109
-        .2byte 417, 112
-        .2byte 422, 101
-        .2byte 432, 85
-        .2byte 436, 69
-        .2byte 442, 150
-        .2byte 446, 163
-        .2byte 365, 27
-        .2byte 352, 12
-        .2byte 133, 238
-        .2byte 129, 143
-        .2byte 344, 105
-        .2byte 427, 62
-        .2byte 27, 211
-        .2byte 246, 315
-        .2byte 443, 6
-        .2byte 32, 279
-        .2byte 404, 262
-        .2byte 194, 63
-        .2byte 159, 46
-        .2byte 441, 310
-        .2byte 231, 235
-        .2byte 169, 287
-        .2byte 441, 273
-        .2byte 64, 87
-        .2byte 80, 54
-        .2byte 431, 225
-        .2byte 27, 94
-        .2byte 354, 298
-        .2byte 336, 253
-        .2byte 287, 222
-        .2byte 63, 163
-        .2byte 275, 111
-        .2byte 202, 232
-        .2byte 268, 302
-        .2byte 336, 260
-        .2byte 110, 79
-        .2byte 225, 314
-        .2byte 206, 314
-        .2byte 11, 307
-        .2byte 472, 25
-        .2byte 250, 8
-        .2byte 187, 190
-        .2byte 205, 111
-        .2byte 474, 6
-        .2byte 183, 9
-        .2byte 367, 214
-        .2byte 278, 273
-        .2byte 68, 305
-        .2byte 270, 33
-        .2byte 33, 39
-        .2byte 217, 8
-        .2byte 69, 280
-        .2byte 192, 183 @ D63
-
-	.global gUnknown_80D4014
-gUnknown_80D4014: @ 80D4014
-        .4byte wmp2font_text
-        .4byte wmp2mcc_text
-        .4byte wmp2cani_text
-        .4byte wmp2pal_text
-        .4byte wmp2fon1_text
-
-        .global wmp2fon1_text
-        wmp2fon1_text:
-        .string "wmp2fon1\0"
-        .align 2,0
-
-        .global wmp2pal_text
-        wmp2pal_text:
-        .string "wmp2pal\0"
-        .align 2,0
-
-        .global wmp2cani_text
-        wmp2cani_text:
-        .string "wmp2cani\0"
-        .align 2,0
-
-        .global wmp2mcc_text
-        wmp2mcc_text:
-        .string "wmp2mcc\0"
-        .align 2,0
-
-        .global wmp2font_text
-        wmp2font_text:
-        .string "wmp2font\0"
-        .align 2,0
-
-	.global gUnknown_80D405C
-gUnknown_80D405C: @ 80D405C
-        .string "ax%03d\0"
-        .align 2,0
-
-	.global gUnknown_80D4064
-gUnknown_80D4064: @ 80D4064
-        .string "wmapspr\0"
-        .align 2,0
-
-	.global gUnknown_80D406C
-gUnknown_80D406C: @ 80D406C
-        .string "palet\0"
-        .align 2,0
-
-	.global gUnknown_80D4074
-gUnknown_80D4074: @ 80D4074
-        .string "{CENTER_ALIGN}{POKEMON_0}\0"
-        .align 2,0
-
-	.global gUnknown_80D407C
-gUnknown_80D407C: @ 80D4074
-        .string "Yes\0"
-        .align 2,0
-
-	.global gUnknown_80D4080
-gUnknown_80D4080: @ 80D4080
-        .string "No\0"
-        .align 2,0
-        .string "pksdir0\0"
-        .align 2,0
-
-	.global gUnknown_80D408C
-gUnknown_80D408C: @ 80D408C
-        .4byte wmapfont_text
-        .4byte wmapmcc_text
-        .4byte wmapcani_text
-        .4byte wmappal_text
-
-        .global wmappal_text
-        wmappal_text:
-        .string "wmappal\0"
-        .align 2,0
-
-        .global wmapcani_text
-        wmapcani_text:
-        .string "wmapcani\0"
-        .align 2,0
-
-        .global wmapmcc_text
-        wmapmcc_text:
-        .string "wmapmcc\0"
-        .align 2,0
-
-        .global wmapfont_text
-        wmapfont_text:
-        .string "wmapfont\0"
-        .align 2,0
-
-	.global gUnknown_80D40C4
-gUnknown_80D40C4: @ 80D40C4
-        .byte 0x00, 0x00, 0x18, 0x00
-        .byte 0x18, 0x00, 0x18, 0x00
-        .byte 0x18, 0x00, 0x00, 0x00
-        .byte 0x18, 0x00, 0xE8, 0xFF
-        .byte 0x00, 0x00, 0xE8, 0xFF
-        .byte 0xE8, 0xFF, 0xE8, 0xFF
-        .byte 0xE8, 0xFF, 0x00, 0x00
-        .byte 0xE8, 0xFF, 0x18, 0x00
-
-	.global gUnknown_80D40E4
-gUnknown_80D40E4: @ 80D40E4
-        .string "ax%03d\0"
-        .align 2,0
-
-	.global gUnknown_80D40EC
-gUnknown_80D40EC: @ 80D40EC
-        .string "wmapspr\0"
-        .align 2,0
-
-	.global gUnknown_80D40F4
-gUnknown_80D40F4: @ 80D40F4
-        .string "palet\0"
-        .align 2,0
-
-	.global gUnknown_80D40FC
-gUnknown_80D40FC: @ 80D40FC
-        .string "{CENTER_ALIGN}%s\0"
-        .align 2,0
-
-	.global gUnknown_80D4104
-gUnknown_80D4104: @ 80D4104
-	.string "Where would you like to go?\0"
-        .align 2,0
-
-	.global gUnknown_80D4120
-gUnknown_80D4120: @ 80D4120
-	.string "{MOVE_ITEM_0}\0"
-        .align 2,0
-
-	.global gUnknown_80D4124
-gUnknown_80D4124: @ 80D4124
-        .string "{MOVE_ITEM_0}($v02"
-        .byte 0x81, 0x5E
-        .asciz "$v12)"
-        .align 2,0
-
-        .asciz "pksdir0"
-        .asciz "pksdir0"
-
-	.global gUnknown_80D4144
-gUnknown_80D4144: @ 80D4144
-        .2byte 302
-        .2byte 303
-        .2byte 303
-        .2byte 301
-        .2byte 304
-        .2byte 306
-        .2byte 307
-        .2byte 0
-
-        .string "pksdir0\0"
-        .string "pksdir0\0"
-        .4byte noneText
-        .byte 0xff, 0xff, 0xff, 0xff
-        .4byte noneText
-
-        .global noneText
-        noneText:
-        .string "none\0"
-        .align 2,0
-
-        .4byte defaultText
-        .byte 0xff, 0xff, 0xff, 0xff
-        .4byte noneText
-
-        .global defaultText
-        defaultText:
-        .string "default\0"

data/data_80CE77C_2.s

@@ -0,0 +1,36 @@
+    .section .rodata
+
+    .align 2,0
+
+        .asciz "pksdir0"
+        .asciz "pksdir0"
+
+	.global gUnknown_80D4144
+gUnknown_80D4144: @ 80D4144
+        .2byte 302
+        .2byte 303
+        .2byte 303
+        .2byte 301
+        .2byte 304
+        .2byte 306
+        .2byte 307
+        .2byte 0
+
+        .string "pksdir0\0"
+        .string "pksdir0\0"
+        .4byte noneText
+        .byte 0xff, 0xff, 0xff, 0xff
+        .4byte noneText
+
+        .global noneText
+        noneText:
+        .string "none\0"
+        .align 2,0
+
+        .4byte defaultText
+        .byte 0xff, 0xff, 0xff, 0xff
+        .4byte noneText
+
+        .global defaultText
+        defaultText:
+        .string "default\0"

data/data_80F59C8.s

@@ -2,121 +2,6 @@
 .section .rodata
 #.incbin "baserom.gba", 0xF59C4, 0x4
 
-
-
-.global gUnknown_80F5F70
-gUnknown_80F5F70: @ 80F5F70
-@ replacing .incbin "baserom.gba", 0xF5F70, 0x3C
-.byte 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0d, 0x00, 0x0c, 0x00, 0x0c, 0x00
-.byte 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00
-.byte 0x0d, 0x00, 0x0d, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00
-.byte 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0d, 0x00, 0x0c, 0x00, 0x00, 0x00
-
-.global gUnknown_80F5FAC
-gUnknown_80F5FAC: @ 80F5FAC
-@ replacing .incbin "baserom.gba", 0xF5FAC, 0x130
-.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-.byte 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-.byte 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-.byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-.byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-.byte 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
-
-.global gUnknown_80F60DC
-gUnknown_80F60DC: @ 80F60DC
-@ replacing .incbin "baserom.gba", 0xF60DC, 0x1C
-.byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
-.byte 0x04, 0x00, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
-
-.global gUnknown_80F60F8
-gUnknown_80F60F8: @ 80F60F8
-@ replacing .incbin "baserom.gba", 0x000f60f8, 0x8
-.string "banrpal\0"
-
-.global gUnknown_80F6100
-gUnknown_80F6100: @ 80F6100
-@ replacing .incbin "baserom.gba", 0x000f6100, 0x8
-.string "banfont\0"
-
-.global gUnknown_80F6108
-gUnknown_80F6108: @ 80F6108
-@ replacing .incbin "baserom.gba", 0x000f6108, 0x4
-.byte 0x23, 0x00, 0x00, 0x00
-
-.global gUnknown_80F610C
-gUnknown_80F610C: @ 80F610C
-@ replacing .incbin "baserom.gba", 0x000f610c, 0x4
-.byte 0x42, 0x00, 0x00, 0x00
-
-.global gUnknown_80F6110
-gUnknown_80F6110: @ 80F6110
-@ replacing .incbin "baserom.gba", 0x000f6110, 0x8
-.string "%s%c%cF\0"
-
-.global gUnknown_80F6118
-gUnknown_80F6118: @ 80F6118
-@ replacing .incbin "baserom.gba", 0x000f6118, 0x8
-.string "%s%cF\0"
-.align 2,0
-
-.global gUnknown_80F6120
-gUnknown_80F6120: @ 80F6120
-@ replacing .incbin "baserom.gba", 0x000f6120, 0x88
-.byte 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00
-.byte 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00
-.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x14, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00
-.byte 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x18, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0x1c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
-.string "pksdir0\0"
-
-.global gUnknown_80F61A8
-gUnknown_80F61A8: @ 80F61A8
-@ replacing .incbin "baserom.gba", 0x000f61a8, 0x8
-.string "itempat\0"
-
-.global gUnknown_80F61B0
-gUnknown_80F61B0: @ 80F61B0
-@ replacing .incbin "baserom.gba", 0x000f61b0, 0x8
-.string "etcfont\0"
-
-.global gUnknown_80F61B8
-gUnknown_80F61B8: @ 80F61B8
-@ replacing .incbin "baserom.gba", 0x000f61b8, 0xc
-.string "etcfonta\0"
-.align 2,0
-
-.global gUnknown_80F61C4
-gUnknown_80F61C4: @ 80F61C4
-@ replacing .incbin "baserom.gba", 0x000f61c4, 0x8
-.string "levfont\0"
-
-.global gUnknown_80F61CC
-gUnknown_80F61CC: @ 80F61CC
-@ replacing .incbin "baserom.gba", 0x000f61cc, 0x8
-.string "hp5font\0"
-
-.global gUnknown_80F61D4
-gUnknown_80F61D4: @ 80F61D4
-@ replacing .incbin "baserom.gba", 0x000f61d4, 0x8
-.string "colvec\0"
-.align 2,0
-
-.global gUnknown_80F61DC
-gUnknown_80F61DC: @ 80F61DC
-@ replacing .incbin "baserom.gba", 0x000f61dc, 0x10
-.string "trappat\0"
 .string "pksdir0\0"
 
 .global gUnknown_80F61EC

data/data_80F59C8_1.s

@@ -0,0 +1,83 @@
+#include "constants/status.h"
+.section .rodata
+#.incbin "baserom.gba", 0xF59C4, 0x4
+
+
+
+.global gUnknown_80F5F70
+gUnknown_80F5F70: @ 80F5F70
+@ replacing .incbin "baserom.gba", 0xF5F70, 0x3C
+.byte 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0d, 0x00, 0x0c, 0x00, 0x0c, 0x00
+.byte 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00
+.byte 0x0d, 0x00, 0x0d, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00
+.byte 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0d, 0x00, 0x0c, 0x00, 0x00, 0x00
+
+.global gUnknown_80F5FAC
+gUnknown_80F5FAC: @ 80F5FAC
+@ replacing .incbin "baserom.gba", 0xF5FAC, 0x130
+.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+.byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+.byte 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+.byte 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+.byte 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+.byte 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+.byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+.byte 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
+
+.global gUnknown_80F60DC
+gUnknown_80F60DC: @ 80F60DC
+@ replacing .incbin "baserom.gba", 0xF60DC, 0x1C
+.byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
+.byte 0x04, 0x00, 0x00, 0x00, 0x70, 0x6b, 0x73, 0x64, 0x69, 0x72, 0x30, 0x00
+
+.global gUnknown_80F60F8
+gUnknown_80F60F8: @ 80F60F8
+@ replacing .incbin "baserom.gba", 0x000f60f8, 0x8
+.string "banrpal\0"
+
+.global gUnknown_80F6100
+gUnknown_80F6100: @ 80F6100
+@ replacing .incbin "baserom.gba", 0x000f6100, 0x8
+.string "banfont\0"
+
+.global gUnknown_80F6108
+gUnknown_80F6108: @ 80F6108
+@ replacing .incbin "baserom.gba", 0x000f6108, 0x4
+.byte 0x23, 0x00, 0x00, 0x00
+
+.global gUnknown_80F610C
+gUnknown_80F610C: @ 80F610C
+@ replacing .incbin "baserom.gba", 0x000f610c, 0x4
+.byte 0x42, 0x00, 0x00, 0x00
+
+.global gUnknown_80F6110
+gUnknown_80F6110: @ 80F6110
+@ replacing .incbin "baserom.gba", 0x000f6110, 0x8
+.string "%s%c%cF\0"
+
+.global gUnknown_80F6118
+gUnknown_80F6118: @ 80F6118
+@ replacing .incbin "baserom.gba", 0x000f6118, 0x8
+.string "%s%cF\0"
+.align 2,0
+
+.global gUnknown_80F6120
+gUnknown_80F6120: @ 80F6120
+@ replacing .incbin "baserom.gba", 0x000f6120, 0x88
+.byte 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0x04, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00
+.byte 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0x08, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00
+.byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0xff, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0x14, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00
+.byte 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x18, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0xf0, 0xff, 0xff, 0xff, 0x1c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
+.string "pksdir0\0"
+

data/data_8106A4C.s

@@ -257,101 +257,3 @@ gUnknown_8106D8C: @ 8106D8C
 @ ???
         .align 2,0
         .string "pksdir0\0"
-
-@ sub_8067A80 - sub_806806C
-        .align 2,0
-        .string "pksdir0\0"
-        .align 2,0
-
-	.global gUnknown_8106DA4
-gUnknown_8106DA4: @ 8106DA4
-        .byte 0x01, 0x00, 0x38, 0x00, 0x00, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x02, 0x00, 0x38, 0x00, 0x68, 0x00, 0x18, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00
-
-	.global gUnknown_8106DC8
-gUnknown_8106DC8: @ 8106DC8
-        .byte 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 0x00, 0x11, 0x00, 0x0e, 0x00, 0x12, 0x00, 0x02, 0x00, 0x08, 0xf3, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
-        .byte 0x15, 0x00, 0x04, 0x00, 0x07, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-	.global gUnknown_8106E28
-gUnknown_8106E28: @ 8106E28
-        .string "{POKEMON_0}\0"
-        .align 2,0
-
-	.global gUnknown_8106E2C
-gUnknown_8106E2C: @ 8106E2C
-        .byte 0x87, 0x42, 0x00, 0x00
-
-	.global gUnknown_8106E30
-gUnknown_8106E30: @ 8106E30
-        .byte 0x87, 0x40, 0x00, 0x00
-
-	.global gUnknown_8106E34
-gUnknown_8106E34: @ 8106E34
-        .string "{MOVE_ITEM_0}{color CYAN}$v02:{POKEMON_0}{reset}\0"
-        .align 2,0
-
-	.global gUnknown_8106E48
-gUnknown_8106E48: @ 8106E48
-        .string "{MOVE_ITEM_0}{color YELLOW}$v02:{POKEMON_0}{reset}\0"
-        .align 2,0
-
-	.global gUnknown_8106E5C
-gUnknown_8106E5C: @ 8106E5C
-        .string "Press {B_BUTTON}\n"
-        .string "if OK.\0"
-        .align 2,0
-
-	.global gUnknown_8106E6C
-gUnknown_8106E6C: @ 8106E6C
-        .string "Say bye to\n"
-        .string "{VALUE_0} more\0"
-        .align 2,0
-
-	.global gUnknown_8106E80
-gUnknown_8106E80: @ 8106E80
-        .byte 0x02, 0x00, 0x00, 0x00
-        .byte 0x03, 0x00, 0x00, 0x00
-        .byte 0x04, 0x00, 0x00, 0x00
-        .byte 0x05, 0x00, 0x00, 0x00
-
-@ sub_8068614 - sub_806A3D4
-        .string "pksdir0\0"
-        .align 2,0
-
-	.global gUnknown_8106E98
-gUnknown_8106E98: @ 8106E98
-        .string "palet\0"
-        .align 2,0
-
-	.global gUnknown_8106EA0
-gUnknown_8106EA0: @ 8106EA0
-        .string "ax%03d\0"
-        .align 2,0
-
-	.global gUnknown_8106EA8
-gUnknown_8106EA8: @ 8106EA8
-        .string "talkp%d\0"
-        .align 2,0
-
-	.global gUnknown_8106EB0
-gUnknown_8106EB0: @ 8106EB0
-        .string "talk%d\0"
-
-@ ???
-        .align 2,0
-        .string "pksdir0\0"
-
-@ sub_806C51C - sub_806E100
-        .align 2,0
-        .string "pksdir0\0"
-        .align 2,0
-
-	.global gUnknown_8106EC8
-gUnknown_8106EC8: @ 8106EC8
-.byte 0x00, 0x01, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07
-.byte 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x05
-.byte 0x06, 0x07, 0x07, 0x07, 0x07, 0x0b, 0x07
-
-

data/data_8106A4C_2.s

@@ -0,0 +1,40 @@
+        .section .rodata
+
+.align 2,0
+@ sub_8068614 - sub_806A3D4
+        .string "pksdir0\0"
+        .align 2,0
+
+	.global gUnknown_8106E98
+gUnknown_8106E98: @ 8106E98
+        .string "palet\0"
+        .align 2,0
+
+	.global gUnknown_8106EA0
+gUnknown_8106EA0: @ 8106EA0
+        .string "ax%03d\0"
+        .align 2,0
+
+	.global gUnknown_8106EA8
+gUnknown_8106EA8: @ 8106EA8
+        .string "talkp%d\0"
+        .align 2,0
+
+	.global gUnknown_8106EB0
+gUnknown_8106EB0: @ 8106EB0
+        .string "talk%d\0"
+
+@ ???
+        .align 2,0
+        .string "pksdir0\0"
+
+@ sub_806C51C - sub_806E100
+        .align 2,0
+        .string "pksdir0\0"
+        .align 2,0
+
+	.global gUnknown_8106EC8
+gUnknown_8106EC8: @ 8106EC8
+.byte 0x00, 0x01, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07
+.byte 0x07, 0x07, 0x05, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x05
+.byte 0x06, 0x07, 0x07, 0x07, 0x07, 0x0b, 0x07

include/code_8004AA0.h

@@ -18,20 +18,6 @@ typedef struct unkStruct_202EE8C
 
 extern unkStruct_202EE8C gUnknown_202EE8C[32];
 
-// size: 0x4DD8
-struct UnkBgStruct
-{
-    OpenedFile *unk0[5];
-    u8 padding[0x4C4C - 0x14];
-    unkStruct_202EE8C unk4C4C[16];
-    u32 unk4DCC;
-    u32 unk4DD0;
-    /* 0x4DD4 */ s16 xoffset;
-    /* 0x4DD6 */ s16 yoffset;
-};
-
-extern struct UnkBgStruct *gUnknown_203B0E4;
-
 // size: Variable
 typedef struct unkDataFor8004AA4
 {

include/code_8009804.h

@@ -3,6 +3,8 @@
 
 #include "structs/rgb.h"
 
+extern RGB gFontPalette[128];
+
 // size: 0xC
 struct unkStruct_202D240
 {

include/code_801B3C0.h

@@ -17,7 +17,7 @@ typedef struct unkStruct_203B230
     u8 fill18[0x20 - 0x18];
     u32 unk20;
     u32 unk24;
-    UnkTextStruct2 unk28[4];
+    Windows unk28;
     MenuInputStructSub unk88;
 } unkStruct_203B230;
 
@@ -25,4 +25,4 @@ bool8 sub_801B3C0(Item *item);
 u32 sub_801B410(void);
 void sub_801B450(void);
 
-#endif // GUARD_CODE_801B3C0_H
+#endif // GUARD_CODE_801B3C0_H

include/code_801B60C.h

@@ -20,11 +20,11 @@ typedef struct unkStruct_203B234
     MenuStruct unk78;
     /* 0xC8 */ u32 menuAction;
     MenuItem unkCC[5];
-    UnkTextStruct2 unkF4[4];
+    Windows windows;
 } unkStruct_203B234;
 
 bool8 sub_801B60C(u32, u8 id, u8 quantity);
 u32 sub_801B6AC(void);
 void sub_801B72C(void);
 
-#endif // GUARD_CODE_801B60C_H
+#endif // GUARD_CODE_801B60C_H

include/code_801C8C4.h

@@ -15,7 +15,7 @@ struct unkStruct_203B244
     /* 0x4B4 */ struct_Sub80095E4_2 unk4B4;
 };
 
-bool8 sub_801C8C4(s32, s32, UnkTextStruct2_sub *, u32);
+bool8 sub_801C8C4(s32, s32, DungeonPos *, u32);
 u32 sub_801CA08(bool8);
 u8 sub_801CB24(void);
 void sub_801CB5C(bool8);

include/code_801D014.h

@@ -21,7 +21,7 @@ struct unk_203B250
     MenuStruct unk18;
     MenuItem unk68[8];
     u16 unkA8[8];
-    UnkTextStruct2 unkB8[4];
+    Windows windows;
 };
 
 // size: 0x8

include/code_801EE10.h

@@ -21,7 +21,7 @@ typedef struct unkStruct_203B270
     /* 0x1C */ MenuInputStruct input;
     u32 unk50;
     u32 unk54;
-    UnkTextStruct2 unk58[4];
+    Windows windows;
     const u8 *text;
 } unkStruct_203B270;
 

include/code_80227B8.h

@@ -26,11 +26,11 @@ typedef struct unkStruct_203B294
     /* 0xF4 */ u32 menuAction;
     MenuItem unkF8[8];
     u16 unk138[8];
-    UnkTextStruct2 unk148[4];
+    Windows windows;
 } unkStruct_203B294;
 
 bool8 sub_80227B8(PokemonStruct1 *pkmn);
 u32 sub_8022860(void);
 void sub_8022908(void);
 
-#endif // GUARD_CODE_80227B8_H
+#endif // GUARD_CODE_80227B8_H

include/code_8023144.h

@@ -11,15 +11,13 @@ typedef struct unkStruct_3001B5C
     u8 unk0;
     u32 unk4;
     s32 unk8;
-    s16 unkC[2];
-    u32 unk10;
-    u8 fill14[0x354 - 0x14];
+    s16 unkC[420];
     u8 unk354;
     u8 fill355[0x35C - 0x355];
     /* 0x35C */ struct_Sub80095E4_2 s35C;
 } unkStruct_3001B5C;
 
-bool8 sub_8023144(s32, s32 index, UnkTextStruct2_sub *sub, u32);
+bool8 sub_8023144(s32, s32 index, DungeonPos *sub, u32);
 u32 sub_8023278(bool8);
 s16 sub_802331C(void);
 void sub_8023354(bool8 cursorSprite);

include/code_8024458.h

@@ -13,12 +13,11 @@ struct unkStruct_203B2AC
     u8 unk40[0x48 - 0x40];
     s16 speciesNum;
     struct unkStruct_808FF20 unk4C;
-    u32 unkB0;
-    u8 fillB4[0xE0 - 0xB4];
+    struct UnkInfoTabStruct unkB0;
     u32 unkE0;
-    UnkTextStruct2 *unkE4;
-    UnkTextStruct2 unkE8[4];
-    UnkTextStruct2_sub2 unk148;
+    Window *unkE4;
+    Windows unkE8;
+    WindowHeader unk148;
 };
 
 bool8 sub_8024458(s16 speciesNum, s32);

include/code_802DB28.h

@@ -15,7 +15,7 @@ struct unkStruct_203B2FC
     /* 0x30 */ u8 jobSlotIndex;
     /* 0x34 */ WonderMail *jobInfo;
     /* 0x38 */ struct MonPortraitMsg monPortrait;
-    UnkTextStruct2 unk48[4];
+    Windows unk48;
 };
 
 bool8 sub_802DB28(u8 jobSlotIndex, u8 dungeon);

include/code_802DE84.h

@@ -11,8 +11,8 @@ struct unkStruct_203B300
     MenuInputStructSub unk0;
     /* 0xC */ unkStruct_802C39C *mail;
     u32 unk10;
-    UnkTextStruct2 *unk14;
-    UnkTextStruct2 unk18[4];
+    Window *unk14;
+    Windows unk18;
     u8 unk78[4];
 };
 
@@ -20,4 +20,4 @@ bool8 sub_802DE84(unkStruct_802C39C *mail);
 u32 sub_802DEE0(void);
 void sub_802DF24(void);
 
-#endif // GUARD_CODE_802DE84_H
+#endif // GUARD_CODE_802DE84_H

include/constants/friend_area.h

@@ -1,9 +1,6 @@
 #ifndef GUARD_CONSTANTS_FRIEND_AREA_H
 #define GUARD_CONSTANTS_FRIEND_AREA_H
 
-
-#define NUM_FRIEND_AREAS 58
-
 // Unlock Condition
 #define UNLOCK_SHOP_STORY 0
 #define UNLOCK_SHOP_POST_GAME 1
@@ -68,5 +65,6 @@
 #define SOUTHERN_ISLAND 55
 #define ENCLOSED_ISLAND 56
 #define FINAL_ISLAND 57
+#define NUM_FRIEND_AREAS 58
 
 #endif

include/credits1.h

@@ -6,7 +6,7 @@
 // size: 0x6C
 typedef struct Credits1Work
 {
-    UnkTextStruct2 unk0[4];
+    Windows unk0;
     s32 unk60;
     s32 unk64;
     /* 0x68 */ s32 creditsCategoryIndex;
@@ -26,4 +26,4 @@ bool8 DrawCredits(s32 creditsCategoryIndex, s32);
 s32 sub_8035574(void);
 void sub_803565C(void);
 
-#endif // GUARD_CREDITS1_H
+#endif // GUARD_CREDITS1_H

include/debug_menu1.h

@@ -8,7 +8,7 @@
 struct DebugMenu
 {
     MenuStruct unk0[4];
-    UnkTextStruct2 unk140[4];
+    Windows unk140;
     u32 fill1A0;
 };
 
@@ -16,4 +16,4 @@ void CreateDebugMenu(void);
 void DeleteDebugMenu(void);
 u32 UpdateDebugMenu(void);
 
-#endif // GUARD_DEBUG_MENU1_H
+#endif // GUARD_DEBUG_MENU1_H

include/debug_menu2.h

@@ -14,7 +14,7 @@ typedef struct unkStruct_203B3F0
     MenuStruct unk4C;
     unkStructFor8013AA0 unk9C;
     u8 fillCC[0xD8 - 0xCC];
-    UnkTextStruct2 unkD8[4];
+    Windows unkD8;
 } unkStruct_203B3F0;
 
-#endif // GUARD_DEBUG_MENU2_H
+#endif // GUARD_DEBUG_MENU2_H

include/debug_menu3.h

@@ -12,7 +12,7 @@ typedef struct unkStruct_203B3F4
     /* 0x8 */ u32 menuAction;
     /* 0xC */ MenuItem menuItems[8];
     MenuStruct unk4C;
-    UnkTextStruct2 unk9C[4];
+    Windows unk9C;
 } unkStruct_203B3F4;
 
-#endif // GUARD_DEBUG_MENU3_H
+#endif // GUARD_DEBUG_MENU3_H

include/debug_menu4.h

@@ -17,7 +17,7 @@ typedef struct unkStruct_203B3F8
     unkStructFor8013AA0 unk60;
     MenuItem unk90[8];
     u16 unkD0[8];
-    UnkTextStruct2 unkE0[4];
+    Windows unkE0;
 } unkStruct_203B3F8;
 
-#endif // GUARD_DEBUG_MENU4_H
+#endif // GUARD_DEBUG_MENU4_H

include/dungeon_move.h

@@ -0,0 +1,9 @@
+#ifndef GUARD_DUNGEON_MOVE_H
+#define GUARD_DUNGEON_MOVE_H
+
+#include "structs/str_pokemon.h"
+#include "structs/str_moves.h"
+
+bool8 TryUseChosenMove(struct Entity *attacker, u32 r6, s32 itemId, u32 var_30, bool32 isLinkedMove, struct Move *move);
+
+#endif

include/felicity_bank.h

@@ -22,7 +22,7 @@ typedef struct FelicityBankWork
     unkStructFor8013AA0 unk64;
     /* 0x94 */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    UnkTextStruct2 unkA8[4];
+    Windows unkA8;
 } FelicityBankWork;
 
 bool8 CreateFelicityBank(s32 mode);

include/friend_area.h

@@ -10,13 +10,13 @@ typedef struct FriendAreaSettings
 } FriendAreaSettings;
 
 // size: 0xC
-typedef struct unkStruct_8092638
-{ 
-    /* 0x0 */ s16 numPokemon;
-    s16 unk2;
+typedef struct FriendAreaCapacity
+{
+    /* 0x0 */ s16 maxPokemon;
+    /* 0x2 */ s16 currNoPokemon;
     /* 0x4 */ bool8 hasFriendArea;
     s32 unk8;
-} unkStruct_8092638;
+} FriendAreaCapacity;
 
 extern bool8 *gFriendAreas;
 
@@ -38,7 +38,7 @@ void sub_8092404(u8, u16 *, bool8, bool8);
 void sub_809249C(u8 friendArea, bool8 clear);
 void sub_8092558(u8 *buffer, u8 index);
 void WriteFriendAreaName(u8 *buffer, u8 index, bool8 printPrice);
-void sub_8092638(u8 friendArea, unkStruct_8092638 *, bool8 checkLeader, bool8 checkDungeon);
-void sub_80926F8(u8, unkStruct_8092638 *, u8);
+void GetFriendAreaCapacity2(u8 friendArea, FriendAreaCapacity *dst, bool8 checkLeader, bool8 checkPartner);
+void GetFriendAreaCapacity(u8 areaId, FriendAreaCapacity *dst, bool8 checkPartner);
 
-#endif // GUARD_FRIEND_AREA_H
+#endif // GUARD_FRIEND_AREA_H

include/friend_area_action_menu.h

@@ -65,11 +65,11 @@ struct unkStruct_203B2BC
     MenuItem menuItems[4];
     u8 fill120[0x16C - 0x13C];
     u16 unk16C[10];
-    UnkTextStruct2 unk180[4];
+    Windows unk180;
 };
 
 u32 sub_8027074(void);
 u32 sub_80270A4(void);
 void sub_8027168(void);
 
-#endif // GUARD_FRIEND_AREA_ACTION_MENU_H
+#endif // GUARD_FRIEND_AREA_ACTION_MENU_H

include/friend_areas_map.h

@@ -0,0 +1,121 @@
+#ifndef GUARD_FRIEND_AREAS_MAP_H
+#define GUARD_FRIEND_AREAS_MAP_H
+
+#include "file_system.h"
+#include "code_8004AA0.h"
+#include "menu_input.h"
+#include "structs/axdata.h"
+#include "structs/str_position.h"
+#include "constants/direction.h"
+
+#define MAX_AREAS_PER_LOCATION 8
+
+struct FriendAreaLocationInfo
+{
+    const u8 *name;
+    DungeonPos pos;
+    u8 areasIds[MAX_AREAS_PER_LOCATION];
+    s16 adjacentLocations[NUM_DIRECTIONS];
+};
+
+struct MapLocation
+{
+    bool8 isShown;
+    s16 locationsByDirection[NUM_DIRECTIONS];
+    axdata sprite;
+};
+
+enum FriendAreaLocations
+{
+    LOCATION_MOUNTAIN_RANGE,
+    LOCATION_GLACIER,
+    LOCATION_PLAINS,
+    LOCATION_SOUTH_PLAINS,
+    LOCATION_BADLANDS,
+    LOCATION_EASTERN_FOREST,
+    LOCATION_WESTERN_FOREST,
+    LOCATION_RIVER,
+    LOCATION_EASTERN_PONDS,
+    LOCATION_POND,
+    LOCATION_NORTHERN_LAKES,
+    LOCATION_EASTERN_LAKES,
+    LOCATION_MARSH,
+    LOCATION_CAVE,
+    LOCATION_JUNGLE,
+    LOCATION_RUINS,
+    LOCATION_VOLCANO,
+    LOCATION_DESERT,
+    LOCATION_RELICS,
+    LOCATION_SKY,
+    LOCATION_NORTHERN_ISLES,
+    LOCATION_SOUTHERN_ISLES,
+    LOCATION_SOUTHWEST_ISLES,
+    LOCATION_WESTERN_ISLES,
+    LOCATION_NORTHERN_SEA,
+    LOCATION_SOUTHERN_SEA,
+    LOCATION_BEACH,
+    LOCATION_TEAM_BASE,
+    LOCATION_UNUSED_28,
+    LOCATION_UNUSED_29,
+    LOCATION_UNUSED_30,
+    LOCATION_UNUSED_31,
+    NUM_FRIEND_AREA_LOCATIONS
+};
+
+// size: 0x4DD8
+struct FriendAreasMap
+{
+    OpenedFile *unk0[5];
+    u16 unk14[64][64];
+    u16 unk2014[64][64];
+    const struct FriendAreaLocationInfo *locationsInfo;
+    struct MapLocation mapLocations[NUM_FRIEND_AREA_LOCATIONS];
+    s32 currLocationId;
+    s32 unk4A1C;
+    s32 locationIdOnBPress;
+    s32 teamBaseLocationId;
+    s32 unk4A28;
+    u8 unk4A2C;
+    axdata arrowSprites[NUM_DIRECTIONS];
+    axdata monAxSprite;
+    unkStruct_202EE8C unk4C4C[16];
+    s32 brightness;
+    u32 unk4DD0;
+    DungeonPos bgPos;
+    DungeonPos monSpritePos;
+    s32 unk4DDC;
+    s32 unk4DE0;
+    s32 unk4DE4;
+    s32 unk4DE8;
+    u8 displayedAreas[MAX_AREAS_PER_LOCATION];
+    u8 chosenFriendAreaId;
+    s32 displayedAreasCount;
+    MenuInputStruct menu;
+};
+
+extern struct FriendAreasMap *gFriendAreasMapPtr;
+
+struct struct_unk800F990
+{
+    u32 unk0;
+    u8 startingFriendAreaId;
+    u8 unk5;
+    struct FriendAreasMap *friendAreasMapPtr;
+    u8 unkC;
+};
+
+void ShowFriendAreasMap(struct struct_unk800F990 *param_1);
+void PrintFriendAreaNameInMap(u8 *strBuffer, u8 index);
+bool8 IsFriendAreaShownOnMap(u8 friendAreaId);
+
+void FriendAreasMap_UpdateMonSpritePosition(void);
+void FriendAreasMap_UpdateBg(void);
+void FriendAreasMap_HideTextWindowAndArrows(void);
+void FriendAreasMap_RunFrameActions(void);
+void FriendAreasMap_ShowDirectionArrows(void);
+void FriendAreasMap_PrintCurrAreaName(void);
+void FriendAreasMap_PrintAvailableSubAreas(void);
+void FriendAreasMap_CloseFiles(void);
+void FriendAreasMap_InitGfx(void);
+
+#endif

include/friend_list_menu.h

@@ -31,7 +31,7 @@ typedef struct unkStruct_203B2B4
     MenuStruct unk78;
     MenuItem unkC8[8];
     u16 unk108[8];
-    UnkTextStruct2 unk118[4];
+    Windows unk118;
 } unkStruct_203B2B4;
 
 bool8 CreateFriendListMenu(s32 param_1);

include/friend_rescue.h

@@ -23,8 +23,8 @@ typedef struct WonderMailStruct_203B33C
     unkStruct_203B480 unk1E8;
     u8 unk218;
     MenuStruct unk21C[4];
-    UnkTextStruct2 unk35C[4];
-    UnkTextStruct2 unk3BC[4];
+    Windows unk35C;
+    Windows unk3BC;
     /* 0x41C */ Item item;
     u32 unk420; // Is this supposed to be a File like 203B2C4?
     u8 unk424[0x100];

include/global.h

@@ -31,6 +31,17 @@ static inline s16 Self_s16(s16 a)
     return a;
 }
 
+// Needed to match a couple of functions.
+static inline void InlineStrcpy(u8 *dst, const u8 *src)
+{
+    strcpy(dst, src);
+}
+
+static inline void InlineStrncpy(u8 *dst, const u8 *src, s32 n)
+{
+    strncpy(dst, src, n);
+}
+
 // Sometimes incrementing and decrementing a variable changes how registers are allocated, which helps with matching functions. Functionality-wise this doesn't do anything.
 #ifdef NONMATCHING
 #define ASM_MATCH_TRICK(a) {;}
@@ -43,8 +54,6 @@ static inline s16 Self_s16(s16 a)
 
 #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided\n")
 
-#define NAKED __attribute__((naked))
-
 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
 #define ARRAY_COUNT_INT(array) ((s32)(sizeof(array) / sizeof((array)[0]))) // When an int is needed to match.
 

include/gulpin_shop.h

@@ -27,7 +27,7 @@ typedef struct GulpinShopWork
     u8 fillC8[0x118 - 0xC8];
     /* 0x118 */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    UnkTextStruct2 unk12C[4];
+    Windows unk12C;
 } GulpinShopWork;
 
 bool8 CreateGulpinShop(u32 mode, s16 pokeSpecies, Move *moves);

include/gulpin_shop_801FB50.h

@@ -35,7 +35,7 @@ typedef struct unkStruct_203B27C
     u8 fill11C[0x16C - 0x11C];
     /* 0x16C */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    UnkTextStruct2 unk180[4];
+    Windows unk180;
 } unkStruct_203B27C;
 
 bool8 sub_801FB50(u32 mode);

include/iq_skill_info_menu.h

@@ -16,7 +16,7 @@ struct IQSkillInfoMenu
     u8 fill14[0x20 - 0x18];
     u32 unk20;
     u32 unk24;
-    UnkTextStruct2 unk28[4];
+    Windows unk28;
     MenuInputStructSub unk88;
 };
 

include/iq_skill_menu.h

@@ -19,7 +19,7 @@ struct IQSkillMenu
     /* 0x30 */ s32 menuAction;
     MenuItem unk34[8];
     MenuStruct unk74;
-    UnkTextStruct2 unkC4[4];
+    Windows unkC4;
 };
 
 bool8 CreateIQSkillMenu(s16 species);

include/kangaskhan_storage1.h

@@ -47,7 +47,7 @@ struct KangaskhanStorageWork
     unkStructFor8013AA0 unkA8;
     /* 0xD8 */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    UnkTextStruct2 unkEC[4];
+    Windows unkEC;
 };
 
 bool8 CreateKangaskhanStorage(u32 mode);

include/kangaskhan_storage2.h

@@ -27,7 +27,7 @@ typedef struct unkStruct_203B20C
     u16 unk60[8];
     MenuStruct unk70;
     unkStructFor8013AA0 unkC0;
-    UnkTextStruct2 unkF0[4];
+    Windows unkF0;
 } unkStruct_203B20C;
 
 bool8 sub_8017E1C(void);

include/kecleon_bros1.h

@@ -65,7 +65,7 @@ typedef struct KecleonBrosWork1
     /* 0x84 */ MenuStruct menu;
     /* 0xD4 */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    UnkTextStruct2 unkE8[4];
+    Windows unkE8;
 } KecleonBrosWork1;
 
 // mode corresponds to the enum: KecleonBrosMode

include/kecleon_bros4.h

@@ -13,7 +13,7 @@ typedef struct unkStruct_203B224
     /* 0x54 */ struct_Sub80095E4_2 unk54;
 } unkStruct_203B224;
 
-bool8 sub_801A5D8(u32, s32, UnkTextStruct2_sub *, u32);
+bool8 sub_801A5D8(u32, s32, DungeonPos *, u32);
 u32 sub_801A6E8(bool8);
 s32 sub_801A8AC(void);
 void sub_801A8D0(bool8);

include/luminous_cave.h

@@ -33,7 +33,7 @@ typedef struct LuminousCaveWork
     u8 unk110;
     u8 unk111;
     u8 unk112;
-    UnkTextStruct2 unk114[4];
+    Windows unk114;
 } LuminousCaveWork;
 
 void CleanLuminousCave(void);

include/mailbox.h

@@ -19,7 +19,7 @@ struct unkStruct_203B304
     MenuStruct unk6C;
     MenuItem menuItems[8];
     u16 unkFC[8];
-    UnkTextStruct2 unk10C[4];
+    Windows unk10C;
 };
 
 extern void SetMailboxState(u32);

include/main_menu1.h

@@ -38,12 +38,12 @@ void CleanUpMenu(void);
 void DeleteMainMenu(void);
 MainMenu1Work *GetMainMenu(void);
 void InitMainMenu(void);
-void SetMenuItems(MenuStruct *, UnkTextStruct2 *, s32 index, const UnkTextStruct2 *, const MenuItem *menuItems, bool8, u32 menuAction, bool8 unused);
+void SetMenuItems(MenuStruct *, Windows *, s32 index, const Window *, const MenuItem *menuItems, bool8, u32 menuAction, bool8 unused);
 void SetUpMenu(void);
 s32 UpdateMenu(void);
 
 void sub_8035C1C(void);
-void sub_8035CC0(UnkTextStruct2 *dataArray, u32 index);
+void sub_8035CC0(Windows *dataArray, u32 index);
 void sub_8035CF4(MenuStruct *menu, u32 index, bool8);
 void sub_8035D1C(void);
 s16 sub_8035D3C(void);
@@ -51,4 +51,4 @@ s32 sub_8035D74(void);
 unkStruct_8035D94 *sub_8035D94(void);
 void sub_8035DA0(void);
 
-#endif // GUARD_MAIN_MENU1_H
+#endif // GUARD_MAIN_MENU1_H

include/main_menu2.h

@@ -9,7 +9,7 @@ typedef struct MainMenu2Work
 {
     u32 unk0;
     MenuStruct unk4[4];
-    UnkTextStruct2 unk144[4];
+    Windows unk144;
     /* 0x1A4 */ u32 currMenuChoice;
 } MainMenu2Work;
 

include/makuhita_dojo1.h

@@ -30,7 +30,7 @@ typedef struct MakuhitaDojoWork1
     u8 fill38[0x58 - 0x38];
     /* 0x58 */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    UnkTextStruct2 unk6C[4];
+    Windows unk6C;
 } MakuhitaDojoWork1;
 
 void MakuhitaDojo_Delete(void);

include/makuhita_dojo2.h

@@ -15,7 +15,7 @@ typedef struct MakuhitaDojoWork2
 
 bool8 MakuhitaDojo_ReturnFalse(void);
 
-bool8 sub_80302E8(s32, UnkTextStruct2_sub *, u32);
+bool8 sub_80302E8(s32, DungeonPos *, u32);
 u32 sub_80303AC(bool8);
 s16 sub_8030418(void);
 void sub_8030480(void);

include/menu_input.h

@@ -9,9 +9,9 @@ s32 GetKeyPress(MenuInputStruct *r0);
 s32 sub_8012AE8(void);
 void sub_8012BC4(u32 x, u32 y, s32 n, s32 len, u32 color, u32 param_6);
 void sub_8012C60(u32 x, u32 y, u32 param_3, u32 color, u32 param_5);
-void sub_8012CAC(UnkTextStruct2 *param_1, const MenuItem *param_2);
-void sub_8012D08(UnkTextStruct2 *param_1, s32 param_2);
-void sub_8012D34(UnkTextStruct2 *param_1, s32 param_2);
+void sub_8012CAC(Window *param_1, const MenuItem *param_2);
+void sub_8012D08(Window *param_1, s32 param_2);
+void sub_8012D34(Window *param_1, s32 param_2);
 void sub_8012D60(MenuStruct *param_1, const MenuItem *menuItems, const u32 *colorArray, u16 *param_4, s32 menuAction, s32 index);
 void sub_8012E04(MenuStruct *param_1, const MenuItem *menuItems, const u32 *colorArray, u16 *param_4, s32 menuAction, s32 index);
 void sub_8012EA4(MenuStruct *param_1, bool8 r1);
@@ -31,7 +31,7 @@ void sub_8013780(MenuInputStruct *param_1, s32 param_2);
 s32 sub_80137A8(MenuInputStruct *param_1);
 void sub_80137B0(MenuInputStruct *param_1, s32 param_2);
 void sub_80137F8(MenuInputStruct *param_1, u32 param_2);
-s32 sub_8013800(MenuInputStruct *param_1, s32 param_2);
+s32 GetMenuEntryYCoord(MenuInputStruct *menu, s32 entryId);
 void sub_8013818(MenuInputStruct *param_1, s32 param_2, u32 param_3, s32 param_4);
 void sub_8013848(MenuInputStruct *param_1, s32 param_2, u32 param_3, s32 param_4);
 void sub_8013878(MenuInputStruct *param_1, s32 param_2);
@@ -49,7 +49,7 @@ void sub_8013C68(unkStructFor8013AA0 *);
 void sub_8013D10(unkStructFor8013AA0 *);
 void sub_8013E54(void);
 void sub_8013F84(void);
-void sub_80140B4(UnkTextStruct2 *);
+void sub_80140B4(Windows *);
 
 
 #endif // GUARD_MENU_INPUT_H

include/options_menu1.h

@@ -14,7 +14,7 @@ struct unkStruct_203B25C
     /* 0x1C */ MenuStruct menu;
     /* 0x6C */ MenuItem menuItems[8];
     u16 unkAC[8];
-    UnkTextStruct2 unkBC[4];
+    Windows unkBC;
 };
 
 bool8 sub_801DCC4(void);

include/options_menu2.h

@@ -11,8 +11,8 @@ struct unkStruct_203B260
     /* 0x4 */ MenuInputStructSub unk4;
     /* 0x10 */ MenuInputStruct input;
     u32 unk44;
-    UnkTextStruct2 *unk48;
-    UnkTextStruct2 unk4C[4];
+    Window *unk48;
+    Windows unk4C;
 };
 
 bool8 sub_801E198(GameOptions *optionsMenu);

include/other_menus1.h

@@ -18,7 +18,7 @@ typedef struct unkStruct_203B35C
     u32 unk14;
     u8 fill18[0x1C - 0x18];
     MenuStruct unk1C[4];
-    UnkTextStruct2 unk15C[4];
+    Windows unk15C;
     unkStruct_8035D94 unk1BC[2];
     unkStruct_203B480 unk1CC;
     unkStruct_203B480 unk1FC;

include/party_list_menu.h

@@ -32,7 +32,7 @@ typedef struct unkStruct_203B2B8
     MenuItem unk16C[10];
     MenuItem unk1BC[10];
     u16 unk20C[10];
-    UnkTextStruct2 unk220[4];
+    Windows unk220;
 } unkStruct_203B2B8;
 
 bool8 CreatePartyListMenu(PokemonStruct1 *pokeStruct);

include/pelipper_board.h

@@ -17,7 +17,7 @@ struct unkStruct_203B308
     MenuStruct unk6C;
     MenuItem menuItems[8];
     u16 unkFC[8];
-    UnkTextStruct2 unk10C[4];
+    Windows unk10C;
 };
 extern struct unkStruct_203B308 *gPelipperBoard;
 

include/pokemon_3.h

@@ -49,6 +49,12 @@ struct unkStruct_808FF20
     u8 unk58[12];
 };
 
+struct UnkInfoTabStruct
+{
+    u8 unk0[0xC];
+    s32 unkC[9];
+};
+
 bool8 HasRecruitedMon(s16 species);
 s16 GetBaseSpecies(s16 index);
 s16 GetBaseSpeciesNoUnown(s16 index);
@@ -63,14 +69,14 @@ void ToggleIQSkill(IqSkillFlags *iq, u32 skillIndex);
 void SetIQSkill(IqSkillFlags *iq, u32 skillIndex);
 bool8 IsIQSkillSet(IqSkillFlags *iq, u32 IQSkillBit);
 void SetDefaultIQSkills(IqSkillFlags *iq, bool8 enableSelfCurer);
-void sub_808F468(PokemonStruct1 *param_1, EvolveStatus *evolveStatus, u8 param_3);
+void sub_808F468(PokemonStruct1 *param_1, EvolveStatus *evolveStatus, bool8 param_3);
 s32 sub_808F700(PokemonStruct1 *pokemon);
 PokemonStruct1 *sub_808F734(PokemonStruct1 *pokemon, s16 _species);
 s16 ExtractSpeciesIndex(UnkDungeonGlobal_unk1CD98 *r0);
 void SetSpeciesLevelToExtract(UnkDungeonGlobal_unk1CD98 *r0, s32 level, s32 species);
 s32 ExtractLevel(UnkDungeonGlobal_unk1CD98 *r0);
 PokemonStruct1 *sub_808F798(PokemonStruct1 *pokemon, short _species);
-void CreatePokemonInfoTabScreen(u32, s32, struct unkStruct_808FF20 *, u8 *, u32);
+void CreatePokemonInfoTabScreen(s32 param_1, s32 param_2, struct unkStruct_808FF20 *mon, struct UnkInfoTabStruct *param_4, u32 windowId);
 void sub_808FF20(struct unkStruct_808FF20 *param_1, struct PokemonStruct1 *pokemon, bool8 param_3);
 
 #endif // GUARD_POKEMON_3_H

include/pokemon_news1.h

@@ -16,7 +16,7 @@ struct unkStruct_203B2CC
 u8 GetPokemonNewsIndex(void);
 bool8 HasNoPKMNNews(void);
 
-bool8 sub_802B640(u32, UnkTextStruct2_sub *, u32);
+bool8 sub_802B640(u32, DungeonPos *, u32);
 u32 sub_802B720(bool8);
 void sub_802B7D0(bool8 cursorSprite);
 void sub_802B81C(void);

include/pokemon_news2.h

@@ -14,7 +14,7 @@ struct unkStruct_203B2D4
     const u8 *unk10[4];
     u32 unk20;
     u32 unk24;
-    UnkTextStruct2 unk28[4];
+    Windows unk28;
     MenuInputStructSub unk88;
 };
 

include/pokemon_news3.h

@@ -14,7 +14,7 @@ struct unkStruct_203B2D8
 void CreateMailMenu(void);
 bool8 HasNoMailinMailbox(void);
 
-bool8 sub_802BD14(s32, UnkTextStruct2_sub *, u32);
+bool8 sub_802BD14(s32, DungeonPos *, u32);
 u32 sub_802BDEC(bool8);
 u8 sub_802BE74(void);
 void sub_802BE94(bool8 cursorSprite);

include/post_office_guide2.h

@@ -11,8 +11,8 @@ typedef struct unkStruct_203B330
     u8 unkC;
     /* 0xD */ u8 dungeonIndex;
     u32 unk10;
-    UnkTextStruct2 *unk14;
-    UnkTextStruct2 unk18[4];
+    Window *unk14;
+    Windows unk18;
 } unkStruct_203B330;
 
 bool8 sub_80319A4(u8, u8 dungeon, s32);

include/rescue_password_menu.h

@@ -12,8 +12,8 @@ struct RescuePasswordMenu
     u32 currMenu;
     u32 state;
     MenuStruct unk8[4];
-    UnkTextStruct2 unk148[4];
-    UnkTextStruct2 unk1A8[4];
+    Windows unk148;
+    Windows unk1A8;
     SpriteOAM unk208;
     u32 unk210;
 };

include/save_menu.h

@@ -9,7 +9,7 @@ typedef struct SaveMenuWork
     /* 0x0 */ u32 currMenu;
     u32 unk4;
     MenuStruct unk8[4];
-    UnkTextStruct2 unk148[4];
+    Windows unk148;
     SpriteOAM unk1A8;
     u32 unk1B0; // Sprite count?
 } SaveMenuWork;

include/sprite.h

@@ -41,6 +41,7 @@ void sub_800533C(ax_pose **, UnkSpriteMem **, axdata1 *, unkStruct_2039DB0 *, bo
 void AxResInitFile(axdata *, OpenedFile *, u32, u32, u32, u32, bool8);
 void AxResInit(axdata *, axmain *, u32, u32, u32, u32, bool8);
 void AxResInitUnorientedFile(axdata *, OpenedFile *, u32, u32, u32, bool8);
-void RunAxAnimationFrame(struct axObject *);
+void RunAxAnimationFrame(struct axdata *);
+void DoAxFrame_800558C(struct axdata *a0, s32 spriteX, s32 spriteY, u32 a3, u32 paletteNum, unkStruct_2039DB0 *spriteMasks);
 
 #endif // GUARD_SPRITE_H

include/structs/menu.h

@@ -24,7 +24,7 @@ typedef struct MenuInputStruct
 {
     s32 unk0;
     u16 unk4;
-    s16 unk6;
+    s16 firstEntryY;
     DungeonPos unk8;
     s16 unkC; // Maybe DungeonPos
     s16 unkE;
@@ -72,7 +72,7 @@ typedef struct unkStructFor8013AA0
     s32 unkC; // maxInclusive?
     s32 unk10;
     s32 unk14; // index of unk18? But read as chosenValue..?
-    UnkTextStruct2 *unk18;
+    Window *unk18;
     s32 unk1C; // width of prompt?
     s32 unk20; // height of prompt?
     u8 unk24; // related to unk10

include/structs/rgb.h

@@ -8,9 +8,4 @@ typedef struct RGB
     u8 b;
 } RGB;
 
-typedef struct Palette32
-{
-    RGB pal[16];
-} Palette32;
-
 #endif // GUARD_RGB_H

include/structs/str_dungeon.h

@@ -148,8 +148,8 @@ typedef struct FloorProperties
 
 typedef struct UnkDungeonGlobal_unk1C590
 {
-    s16 unk0[NUM_ITEM_CATEGORIES];
-    s16 unk18[NUMBER_OF_ITEM_IDS];
+    s16 categoryValues[NUM_ITEM_CATEGORIES];
+    s16 itemValues[NUMBER_OF_ITEM_IDS];
 } UnkDungeonGlobal_unk1C590;
 
 typedef struct UnkDungeonGlobal_unk1CD98
@@ -273,7 +273,7 @@ typedef struct unkDungeon644
     /* 0x30 */ u8 unk30;
     /* 0x31 */ u8 unk31;
     /* 0x32 */ bool8 itemHoldersIdentified;
-    /* 0x33 */ u8 fill33;
+    /* 0x33 */ u8 unk33;
     /* 0x34 */ u8 unk34;
     /* 0x35 */ u8 unk35;
     /* 0x36 */ u8 unk36;
@@ -329,6 +329,8 @@ typedef struct unkDungeon57C
 } unkDungeon57C;
 
 #define COLOR_RAMP_COUNT 256
+#define UNK12A18_ARR_COUNT 29
+#define UNK12A18_ARR_COUNT_2 9
 
 // size: 0x1CEDC
 typedef struct Dungeon
@@ -415,13 +417,8 @@ typedef struct Dungeon
     /* 0x10844 */ s16 naturalJunctionListCounts[MAX_ROOM_COUNT];
     /* 0x10884 */ DungeonPos naturalJunctionList[MAX_ROOM_COUNT][MAX_ROOM_COUNT]; // Arrays of room exits for each room.
     u16 unk11884[250][9];
-    u16 unk12A18[20][9];
-    u16 unk12B80[9];
-    u16 unk12B92[36];
-    u16 unk12BDA[9];
-    u16 unk12BEC[9];
-    u16 unk12BFE[19];
-    u8 unk12C24[0x930];
+    u16 unk12A18[UNK12A18_ARR_COUNT][UNK12A18_ARR_COUNT_2];
+    u8 ALIGNED(4) unk12C24[0x930];
     u16 unk13554[10];
     OpenedFile *unk13568;
     u8 unk1356C;

include/structs/str_dungeon_8042F6C.h

@@ -6,7 +6,7 @@
 #include "structs/str_pokemon.h"
 #include "structs/str_wonder_mail.h"
 
-struct UnkStruct_xxx_dungeon_8042F6C
+struct UnkStruct_RunDungeon
 {
     u8 unk0;
     DungeonLocation unk4;
@@ -30,7 +30,7 @@ struct UnkStruct_xxx_dungeon_8042F6C
     WonderMailSub unk84;
 };
 
-void xxx_dungeon_8042F6C(struct UnkStruct_xxx_dungeon_8042F6C *r8);
+void RunDungeon(struct UnkStruct_RunDungeon *r8);
 
 #endif // GUARD_STR_DUNGEON_8042F6C_H
 

include/structs/str_position.h

@@ -19,6 +19,9 @@ typedef struct PixelPos
     /* 0x4 */ s32 y;
 } PixelPos;
 
+#define X_POS_TO_PIXELPOS(x)((((x) * 24) + 12) << 8)
+#define Y_POS_TO_PIXELPOS(y)((((y) * 24) + 16) << 8)
+
 /**
  * Currently only used in script data, for entities and GroundLink data.
  * DungeonPos expressed in terms of *graphics* tiles, 8 pixels per unit.

include/structs/str_text.h

@@ -28,42 +28,43 @@ typedef struct UnkTextStruct1
     u8 unk46;
 } UnkTextStruct1;
 
-// size: 0x4
-typedef struct UnkTextStruct2_sub
-{
-    // I haven't found a func that reads these separately yet, but simply making an arr[2] will cause assignments to break.
-    // Some funcs only match with this union for some reason even though they don't access the variables separately...
-    // The first func to break is currently sub_801A5D8 in kecleon_bros4.c
-    // The first func I matched that uses the array is sub_8006554 in text2.c (using the separated fields doesn't match or get even close)
-    union {
-        struct {
-        s16 unk0;
-        s16 unk2;
-        } separate;
-        s16 arr[2];
-    } unk0;
-} UnkTextStruct2_sub;
-
-typedef struct UnkTextStruct2_sub2
+typedef struct WindowHeader
 {
     u8 f0;
     u8 f1;
     u8 f2;
     u8 f3;
-} UnkTextStruct2_sub2;
+} WindowHeader;
+
+#include "structs/str_position.h"
 
 // size: 0x18
-typedef struct UnkTextStruct2
+typedef struct Window
 {
     u8 unk0;
-    u8 fill1[0x4 - 0x1];
-    s32 unk4;
-    UnkTextStruct2_sub unk8;
-    s16 unkC;
-    s16 unkE;
-    s16 unk10;
+    s32 type;
+    DungeonPos pos;
+    s16 width;
+    s16 height;
+    s16 unk10; // In most cases it's the same as height. If it's smaller than height, the window may look glitchy. Maybe something with tile allocation/how the window is filled?
     s16 unk12;
-    const UnkTextStruct2_sub2 *unk14; // Pointer to 4 bytes which may be x-coord related. Could be window's header?
-} UnkTextStruct2;
+    const WindowHeader *unk14;
+} Window;
+
+#define WINDOW_TYPE_WITHOUT_BORDER      1
+#define WINDOW_TYPE_NORMAL              3
+#define WINDOW_TYPE_FILL_TRANSPARENT    5
+#define WINDOW_TYPE_WITH_HEADER         6
+#define WINDOW_TYPE_7                   7
+
+#define MAX_WINDOWS 4
+
+typedef struct Windows {
+    Window id[MAX_WINDOWS];
+    // Something ugly, so that sub_805FD74 could match weird compiler memcpy/stack initialization
+    #ifndef NONMATCHING
+    u8 fakeMatch[0];
+    #endif // NONMATCHING
+} Windows;
 
 #endif // GUARD_STR_TEXT_H

include/structs/struct_sub80095e4.h

@@ -12,8 +12,8 @@ typedef struct struct_Sub80095E4
 {
     /* 0x0 */ MenuInputStruct input;
     u32 unk34;
-    UnkTextStruct2 *unk38;
-    UnkTextStruct2 unk3C[4];
+    Window *unk38;
+    Windows windows;
     // size: 0x9C
 } struct_Sub80095E4;
 
@@ -22,7 +22,7 @@ typedef struct struct_Sub80095E4
 typedef struct struct_Sub80095E4_2
 {
     /* 0x0 */ struct_Sub80095E4 s0; // s as in 'struct' ; decided to go against unk as to not have `->unk0->unk3C`
-    UnkTextStruct2_sub2 unk9C;
+    WindowHeader unk9C;
 } struct_Sub80095E4_2;
 
 // Note: In order to get matching ASM, this macro had to be created.
@@ -33,16 +33,16 @@ typedef struct struct_Sub80095E4_2
     s16 newE;                                                                           \
     s16 a0 = (_a0);                                                                     \
     UNUSED s32 a0_ = a0;                                                                \
-    UNUSED s16 oldE = (ptr).unk3C[(ptr).unk34].unkE;                                    \
+    UNUSED s16 oldE = (ptr).windows.id[(ptr).unk34].height;                                    \
     a0_ = 0;                                                                            \
     new10 = a0 + 2;                                                                     \
     newE = a0;                                                                          \
                                                                                         \
-    (ptr).unk3C[(ptr).unk34].unkE = newE;                                               \
-    (ptr).unk3C[(ptr).unk34].unk10 = a0 + 2;                                            \
+    (ptr).windows.id[(ptr).unk34].height = newE;                                               \
+    (ptr).windows.id[(ptr).unk34].unk10 = a0 + 2;                                            \
                                                                                         \
     ResetUnusedInputStruct();                                                           \
-    xxx_call_save_unk_text_struct_800641C((ptr).unk3C, TRUE, TRUE);                                               \
+    ShowWindows(&(ptr).windows, TRUE, TRUE);                                               \
 }
 
 #define SUB_80095E4_CALL(ptr)                                                           \
@@ -54,14 +54,14 @@ typedef struct struct_Sub80095E4_2
 #define SUB_80095E4_CALL_2(ptr)                                                         \
 {                                                                                       \
     s32 a0 = sub_80095E4((ptr).input.unk1A, 12) + 2;                                    \
-    UNUSED s16 oldE = (ptr).unk3C[(ptr).unk34].unkE;                                    \
+    UNUSED s16 oldE = (ptr).windows.id[(ptr).unk34].height;                                    \
     s16 newE = a0;                                                                      \
                                                                                         \
-    (ptr).unk3C[(ptr).unk34].unkE = newE;                                               \
-    (ptr).unk3C[(ptr).unk34].unk10 = newE;                                              \
+    (ptr).windows.id[(ptr).unk34].height = newE;                                               \
+    (ptr).windows.id[(ptr).unk34].unk10 = newE;                                              \
                                                                                         \
     ResetUnusedInputStruct();                                                           \
-    xxx_call_save_unk_text_struct_800641C((ptr).unk3C, TRUE, TRUE);                                               \
+    ShowWindows(&(ptr).windows, TRUE, TRUE);                                               \
 }
 
 // sub_802BF30 and sub_802C328 use a different function call, and 24 instead of 12

include/text.h

@@ -63,8 +63,8 @@ u32 UpdateFadeInTile(u32 a0);
 u32 sub_80063B0(void);
 void SelectCharmap(u32 a0);
 void SetCharacterMask(int a0);
-void xxx_call_save_unk_text_struct_800641C(const UnkTextStruct2 *a0, bool8 a1, bool8 a2);
-void RestoreUnkTextStruct_8006518(UnkTextStruct2 *unkData);
+void ShowWindows(const Windows *windows, bool8 a1, bool8 a2);
+void RestoreUnkTextStruct_8006518(Windows *unkData);
 u32 sub_8006544(u32 index);
 void sub_8007334(s32 a0);
 void sub_80073B8(s32 a0);

include/thank_you_wonder_mail.h

@@ -22,8 +22,8 @@ typedef struct WonderMailStruct_203B2C4
     unkStruct_203B480 unk1E8;
     /* 0x218 */ s8 mailIndex;
     MenuStruct unk21C[4];
-    UnkTextStruct2 unk35C[4];
-    UnkTextStruct2 unk3BC[4];
+    Windows unk35C;
+    Windows unk3BC;
     Item unk41C;
     /* 0x420 */ struct MonPortraitMsg monPortrait;
     u32 unk430;

include/trade_items_menu.h

@@ -47,8 +47,8 @@ struct TradeItemsMenu
     u32 unk10;
     unkStructFor8013AA0 unk14;
     MenuStruct unk44[4];
-    UnkTextStruct2 unk184[4];
-    UnkTextStruct2 unk1E4[4];
+    Windows unk184;
+    Windows unk1E4;
 
     // TODO These might be structs...
     struct TradeItem unk244;

include/wigglytuff_shop2.h

@@ -13,8 +13,8 @@ typedef struct WigglytuffShop2Work
     u32 pokemonStatus[0x10];
     /* 0x70 */ s32 numPokemoninFriendArea;
     s32 unk74;
-    UnkTextStruct2 *unk78;
-    UnkTextStruct2 unk7C[4];
+    Window *unk78;
+    Windows unk7C;
     u8 unkDC[4];
 } WigglytuffShop2Work;
 

include/wigglytuff_shop3.h

@@ -54,7 +54,7 @@ typedef struct WigglytuffShop3Work
     MenuStruct unk6C;
     /* 0xBC */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    UnkTextStruct2 unkD0[4];
+    Windows unkD0;
     u32 unk130;
     u32 unk134;
 } WigglytuffShop3Work;

include/wonder_mail.h

@@ -22,8 +22,8 @@ typedef struct WonderMailStruct_203B2C0
     u8 fill16A[0x218 - 0x1B8];
     /* 0x218 */ u8 mailIndex;
     MenuStruct unk21C[4];
-    UnkTextStruct2 unk35C[4];
-    UnkTextStruct2 unk3BC[4];
+    Windows unk35C;
+    Windows unk3BC;
     /* 0x41C */ u32 unkfill; // ItemSlot?
     /* 0x420 */ struct MonPortraitMsg monPortrait;
     /* 0x430 */ u8 padding3[0x534 - 0x430];

include/wonder_mail_4.h

@@ -3,7 +3,7 @@
 
 #include "structs/str_text.h"
 
-u32 sub_80306A8(u32 wonderMailType, u32 r1, UnkTextStruct2_sub *r2, u32 r3);
+u32 sub_80306A8(u32 wonderMailType, u32 r1, DungeonPos *r2, u32 r3);
 u32 sub_8030768(u8 r0);
 u8 sub_80307EC(void);
 void sub_8030810(u8 r0);

include/wonder_mail_802C10C.h

@@ -15,7 +15,7 @@ struct unkStruct_203B2E0
 void DrawPelipperBoardJobMenu(void);
 bool8 HasNoPelipperBoardJobs(void);
 
-bool8 sub_802C10C(s32, UnkTextStruct2_sub *, s32);
+bool8 sub_802C10C(s32, DungeonPos *, s32);
 u32 sub_802C1E4(bool8);
 u8 sub_802C26C(void);
 void sub_802C28C(bool8 cursorSprite);

include/wonder_mail_802C4C8.h

@@ -7,7 +7,7 @@ void DrawJobListMenu(void);
 bool8 HasNoAcceptedJobs(void);
 u8 GetPelipperBoardSlotIndex(void);
 
-bool8 sub_802C4C8(s32, UnkTextStruct2_sub *, u32);
+bool8 sub_802C4C8(s32, DungeonPos *, u32);
 u32 sub_802C598(bool8);
 void sub_802C640(bool8 cursorSprite);
 void sub_802C688(void);

include/wonder_mail_802C860.h

@@ -19,7 +19,7 @@ struct unkStruct_203B2F0
     MenuItem unk10C[8];
     MenuItem unk14C[8];
     u8 fill18C[0x19C - 0x18C];
-    UnkTextStruct2 unk19C[4];
+    Windows unk19C;
 };
 
 bool8 InitializeJobListMenu(u32);

include/wonder_mail_802D098.h

@@ -34,7 +34,7 @@ typedef struct unkStruct_203B2F8
     MenuItem unk118[8];
     MenuItem unk158[8];
     u16 unk198[8];
-    UnkTextStruct2 unk1A8[4];
+    Windows unk1A8;
 } unkStruct_203B2F8;
 
 bool8 GetWonderMailAccepted(void);

include/world_map.h

@@ -0,0 +1,57 @@
+#ifndef GUARD_WORLD_MAP_H
+#define GUARD_WORLD_MAP_H
+
+#include "file_system.h"
+#include "code_8004AA0.h"
+#include "menu_input.h"
+#include "structs/axdata.h"
+#include "structs/str_position.h"
+#include "structs/str_dungeon.h"
+
+struct UnkStruct_Sub1
+{
+    u8 unk0;
+    DungeonPos unk4;
+    axdata unk8;
+};
+
+struct WorldMap
+{
+    struct UnkStruct_Sub1 unk0[64];
+    OpenedFile *unk1100[5];
+    u16 unk1114[64][64];
+    u16 unk3114[64][64];
+    axdata monAxSprite;
+    unkStruct_202EE8C unk5150[16];
+    s32 brightness;
+    s32 unk52D4;
+    DungeonPos bgPos;
+    DungeonPos monSpritePos;
+    u16 unk52E0[1500];
+    u8 unk5E98[1500];
+};
+
+struct UnkStruct_sub_8010494
+{
+    DungeonLocation unk0;
+    DungeonLocation unk4;
+    u8 pad1[8];
+    u8 unk10;
+    u8 pad2[0xA];
+    s16 unk1C;
+    u8 pad3[0x6E - 0x20];
+    u8 unk6C;
+    u8 unk6D[63];
+};
+
+struct UnkStruct_sub_8010268
+{
+    u8 fill0[4];
+    struct UnkStruct_sub_8010494 unk4;
+    struct WorldMap *unkB0;
+    u8 unkB4;
+};
+
+void ShowWorldMap(struct UnkStruct_sub_8010268 *r5);
+
+#endif

ld_script.txt

@@ -89,9 +89,9 @@ SECTIONS {
         asm/code_800ED38.o(.text);
         src/code_800F034.o(.text);
         src/code_800F958.o(.text);
-        asm/code_800F990.o(.text);
-        src/code_8010EF0.o(.text);
-        asm/code_8010F28.o(.text);
+        src/friend_areas_map.o(.text);
+        src/world_map.o(.text);
+        src/friend_areas_map_util.o(.text);
         src/code_80118A4.o(.text);
         src/debug.o(.text);
         src/save.o(.text);
@@ -229,7 +229,6 @@ SECTIONS {
         src/code_805D8C8_1.o(.text);
         asm/code_805D8C8.o(.text);
         src/code_8066D04.o(.text);
-        asm/code_8066D04.o(.text);
         src/code_805D8C8.o(.text);
         asm/code_805D8C8_1.o(.text);
         src/code_8069D4C.o(.text);
@@ -420,6 +419,10 @@ SECTIONS {
         src/code_800F034.o(.rodata);
         src/code_800F958.o(.rodata);
         data/data_80CE77C.o(.rodata);
+        src/friend_areas_map.o(.rodata);
+        src/world_map.o(.rodata);
+        src/friend_areas_map_util.o(.rodata);
+        data/data_80CE77C_2.o(.rodata);
         src/debug.o(.rodata);
         src/save.o(.rodata);
         src/save_read.o(.rodata);
@@ -530,10 +533,14 @@ SECTIONS {
         src/dungeon_ai_movement.o(.rodata);
         data/data_80F4D44.o(.rodata);
         src/dungeon_config.o(.rodata);
+        data/data_80F59C8_1.o(.rodata);
+        src/code_803D110.o(.rodata);
         data/data_80F59C8.o(.rodata);
         src/dungeon_message.o(.rodata);
         src/dungeon_move.o(.rodata);
         data/data_8106A4C.o(.rodata);
+        src/code_8066D04.o(.rodata);
+        data/data_8106A4C_2.o(.rodata);
         src/code_806CD90.o(.rodata);
         src/type_effectiveness.o(.data);
         data/data_8106F7C.o(.rodata);

src/adventure_log.c

@@ -23,13 +23,13 @@ bool8 CreateAdventureLogScreen(u32 kind)
 {
     sAdventureLog = MemoryAlloc(sizeof(*sAdventureLog), 8);
     sAdventureLog->s0.unk34 = kind;
-    sAdventureLog->s0.unk38 = &sAdventureLog->s0.unk3C[kind];
-    RestoreUnkTextStruct_8006518(sAdventureLog->s0.unk3C);
-    sAdventureLog->s0.unk3C[sAdventureLog->s0.unk34] = sUnknown_80E2008;
+    sAdventureLog->s0.unk38 = &sAdventureLog->s0.windows.id[kind];
+    RestoreUnkTextStruct_8006518(&sAdventureLog->s0.windows);
+    sAdventureLog->s0.windows.id[sAdventureLog->s0.unk34] = sUnknown_80E2008;
     sAdventureLog->s0.unk38->unk14 = &sAdventureLog->unk9C;
 
     ResetUnusedInputStruct();
-    xxx_call_save_unk_text_struct_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE);
+    ShowWindows(&sAdventureLog->s0.windows, TRUE, TRUE);
     sub_8013818(&sAdventureLog->s0.input, 0x20, 8, kind);
     sub_8032084();
     DisplayAdventureLog();
@@ -63,9 +63,9 @@ u32 HandleAdventureLogInput(bool8 a0)
 void CleanAdventureLogScreen(void)
 {
     if (sAdventureLog != NULL) {
-        sAdventureLog->s0.unk3C[sAdventureLog->s0.unk34] = sUnknown_80E1FF0;
+        sAdventureLog->s0.windows.id[sAdventureLog->s0.unk34] = sUnknown_80E1FF0;
         ResetUnusedInputStruct();
-        xxx_call_save_unk_text_struct_800641C(sAdventureLog->s0.unk3C, TRUE, TRUE);
+        ShowWindows(&sAdventureLog->s0.windows, TRUE, TRUE);
         MemoryFree(sAdventureLog);
         sAdventureLog = NULL;
     }
@@ -107,31 +107,31 @@ static void DisplayAdventureLog(void)
                 case AA_NUM_FLOORS_EXPLORED: {
                     s32 v1 = GetAdventureFloorsExplored();
                     gFormatArgs[0] = (s16)v1;
-                    PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
+                    PrintFormattedStringOnWindow(8, GetMenuEntryYCoord(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
                     break;
                 }
                 case AA_NUM_MOVES_LEARNED: {
                     s32 v2 = GetAdventureMovesLearned();
                     gFormatArgs[0] = (s16)v2;
-                    PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
+                    PrintFormattedStringOnWindow(8, GetMenuEntryYCoord(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
                     break;
                 }
                 case AA_NUM_THIEVING_SUCCESSES: {
                     s32 v3 = GetThievingSuccesses();
                     gFormatArgs[0] = (s16)v3;
-                    PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
+                    PrintFormattedStringOnWindow(8, GetMenuEntryYCoord(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
                     break;
                 }
                 case AA_NUM_FRIEND_RESCUE_SUCCESSES: {
                     s32 v4 = GetFriendRescueSuccesses();
                     gFormatArgs[0] = v4;
-                    PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
+                    PrintFormattedStringOnWindow(8, GetMenuEntryYCoord(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
                     break;
                 }
                 case AA_NUM_POKEMON_EVOLVED: {
                     s32 v5 = GetAdventureNumEvolved();
                     gFormatArgs[0] = v5;
-                    PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
+                    PrintFormattedStringOnWindow(8, GetMenuEntryYCoord(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
                     break;
                 }
                 case AA_NUM_POKEMON_JOINED: {
@@ -140,13 +140,13 @@ static void DisplayAdventureLog(void)
                     // fallthrough
                 }
                 default: {
-                    PrintFormattedStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
+                    PrintFormattedStringOnWindow(8, GetMenuEntryYCoord(&sAdventureLog->s0.input, i), GetAdventureLogLine(aa), sAdventureLog->s0.unk34, 0);
                     break;
                 }
             }
         }
         else
-            PrintStringOnWindow(8, sub_8013800(&sAdventureLog->s0.input, i), sPlaceholder, sAdventureLog->s0.unk34, 0);
+            PrintStringOnWindow(8, GetMenuEntryYCoord(&sAdventureLog->s0.input, i), sPlaceholder, sAdventureLog->s0.unk34, 0);
     }
 
     sub_80073E0(sAdventureLog->s0.unk34);

src/adventure_log_menu.c

@@ -13,7 +13,7 @@ void CreateAdventureLogMenu(void)
 void CleanAdventureLogMenu(void)
 {
     ResetUnusedInputStruct();
-    xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
+    ShowWindows(NULL, TRUE, TRUE);
 }
 
 u32 UpdateAdventureLogMenu(void)

src/code.c

@@ -31,7 +31,7 @@ extern void sub_808ED00();
 extern void SetDungeonLocationInfo(DungeonLocation *dl);
 extern void sub_808CE74(s16, bool32, u8*);
 
-void xxx_dungeon_8001340(struct UnkStruct_xxx_dungeon_8042F6C *r0);
+void xxx_dungeon_8001340(struct UnkStruct_RunDungeon *r0);
 void sub_80011E8(u8 *param_1);
 void sub_809542C(WonderMailSub *param_1);
 
@@ -53,7 +53,7 @@ EWRAM_INIT struct PersonalityRelated gPersonalityRelated_203B040 = {
     .PartnerNick = {""},
 };
 
-void SaveLoadRelated_8000EDC(struct UnkStruct_xxx_dungeon_8042F6C *param_1)
+void SaveLoadRelated_8000EDC(struct UnkStruct_RunDungeon *param_1)
 {
     u8 quickSaveValid;
     s32 quickSaveStatus;
@@ -267,7 +267,7 @@ void NDS_LoadOverlay_GroundMain()
 
 }
 
-void nullsub_2(struct UnkStruct_xxx_dungeon_8042F6C *r0)
+void nullsub_2(struct UnkStruct_RunDungeon *r0)
 {
 
 }
@@ -277,10 +277,10 @@ u32 xxx_script_related_8001334(u32 r0)
     return xxx_script_related_8098468(r0);
 }
 
-void xxx_dungeon_8001340(struct UnkStruct_xxx_dungeon_8042F6C *r0)
+void xxx_dungeon_8001340(struct UnkStruct_RunDungeon *r0)
 {
     nullsub_2(r0);
-    xxx_dungeon_8042F6C(r0);
+    RunDungeon(r0);
     NDS_LoadOverlay_GroundMain();
 }
 

src/code_2.c

@@ -39,7 +39,7 @@ extern void nullsub_33(void);
 extern u32 sub_80009D0(u32);
 
 extern u16 gUnknown_2026E4E;
-extern s32 gTitleBrightness;
+EWRAM_DATA s32 sTitleBrightness = 0;
 
 // TODO: figure out the struct
 struct UnkStruct203B040
@@ -101,17 +101,17 @@ void GameLoop(void)
         UpdateFadeInTile(0);
         InitFontPalette();
         sub_800CDA8(2);
-        xxx_call_save_unk_text_struct_800641C(NULL, TRUE, TRUE);
+        ShowWindows(NULL, TRUE, TRUE);
         gUnknown_2026E4E = 0x1000;
         LoadTitleScreen();
         SetBG2RegOffsets(0, 0);
         SetBG3RegOffsets(0, 0);
-        gTitleBrightness = 0;
-        while (gTitleBrightness < 32) {
+        sTitleBrightness = 0;
+        while (sTitleBrightness < 32) {
             s32 i;
-            gTitleBrightness++;
+            sTitleBrightness++;
             for (i = 0; i < 240; i++)
-                SetBGPaletteBufferColorRGB(i, &((RGB*)gTitlePaletteFile->data)[i], gTitleBrightness, NULL);
+                SetBGPaletteBufferColorRGB(i, &((RGB*)gTitlePaletteFile->data)[i], sTitleBrightness, NULL);
             xxx_update_stuff(0);
         }
         if (tmp3) {
@@ -148,11 +148,11 @@ void GameLoop(void)
             if (nextMenu == MENU_NEW_GAME) break;
         }
         DeleteMainMenu();
-        while (gTitleBrightness > 0) {
+        while (sTitleBrightness > 0) {
             s32 i;
-            gTitleBrightness--;
+            sTitleBrightness--;
             for (i = 0; i < 240; i++)
-                SetBGPaletteBufferColorRGB(i, &((RGB*)gTitlePaletteFile->data)[i], gTitleBrightness, NULL);
+                SetBGPaletteBufferColorRGB(i, &((RGB*)gTitlePaletteFile->data)[i], sTitleBrightness, NULL);
             xxx_update_stuff(0);
         }
         CloseFile(gTitlePaletteFile);

src/code_8002774.c

@@ -33,7 +33,7 @@ static inline s8 sub_8002984_sub(s32 direction1, s32 rand, s32 add, s32 multi)
 s32 sub_8002984(s32 _direction1, u32 caseID)
 {
   s32 direction1;
-  
+
   direction1 = (s8)_direction1;
   switch((u8)caseID) {
       case 1:
@@ -189,7 +189,7 @@ PixelPos SetVecFromDirectionSpeed(s8 r1, u32 r2)
 }
 
 s32 VecDirection8Sign(PixelPos *param_1)
-{  
+{
     if (param_1->x < 0) {
         if (param_1->y < 0) {
             return DIRECTION_NORTHWEST;
@@ -242,153 +242,94 @@ s32 VecDirection4SignYX(PixelPos *param_1)
     }
 }
 
-// https://decomp.me/scratch/bD5wO 
-s8 VecDirection8Radial(PixelPos *param_1)
+s8 VecDirection8Radial(PixelPos *pixelPos)
 {
-#ifdef NONMATCHING
-    s32 r0;
-    s32 r1;
-    s32 r2;
-    s32 r3;
-    s32 r4;
-    s32 r5;
-#else
-    register s32 r0;
-    register s32 r1 asm("r1");
-    register s32 r2 asm("r2");
-    register s32 r3 asm("r3");
-    register s32 r4 asm("r4");
-    register s32 r5;
-#endif
+    PixelPos absPos = {abs(pixelPos->x), abs(pixelPos->y)};
 
-
-    r0 = param_1->x;
-    if (r0 < 0) {
-        r0 = -r0;
-    }
-    r1 = r0;
-    r3 = param_1->y;
-    r5 = r3;
-    if (r3 < 0) {
-        r5 = -r3;
-    }
-    r2 = r5;
-    r4 = param_1->x;
-    if (r4 < 0) {
-        if (r3 < 0) {
-            if (r2 > r0 * 2) {
+    if (pixelPos->x < 0) {
+        if (pixelPos->y < 0) {
+            if (absPos.y > absPos.x * 2) {
                 return DIRECTION_NORTH;
             }
-            if (r1 <= r5 * 2) {
+            if (absPos.x <= absPos.y * 2) {
                 return DIRECTION_NORTHWEST;
             }
             return DIRECTION_WEST;
         }
-        if (r2 <= r0 * 2) {
-            if (r1 > r5 * 2) {
+        if (absPos.y <= absPos.x * 2) {
+            if (absPos.x > absPos.y * 2) {
                 return DIRECTION_WEST;
             }
             return DIRECTION_SOUTHWEST;
         }
     }
-    else {
-        if (0 < r4) {
-            if (r3 < 0) {
-                if (r2 > r0 * 2) {
-                    return DIRECTION_NORTH;
-                }
-                if (r1 <= r5 * 2) {
-                    return DIRECTION_NORTHEAST;
-                }
+    else if (pixelPos->x > 0) {
+        if (pixelPos->y < 0) {
+            if (absPos.y > absPos.x * 2) {
+                return DIRECTION_NORTH;
+            }
+            if (absPos.x <= absPos.y * 2) {
+                return DIRECTION_NORTHEAST;
+            }
+            return DIRECTION_EAST;
+        }
+        else {
+            if (absPos.y > absPos.x * 2) {
+                return DIRECTION_SOUTH;
+            }
+            if (absPos.x > absPos.y * 2) {
                 return DIRECTION_EAST;
             }
-            else {
-                if (r2 > r0 * 2) {
-                    return DIRECTION_SOUTH;
-                }
-                if (r1 > r5 * 2) {
-                    return DIRECTION_EAST;
-                }
-                return DIRECTION_SOUTHEAST;
-            }
-
+            return DIRECTION_SOUTHEAST;
         }
-        if (r3 < 0) {
+    }
+    else {
+        if (pixelPos->y < 0) {
             return DIRECTION_NORTH;
         }
-        if (r3 < 1) {
+        if (pixelPos->y < 1) {
             return -1;
-        }  
+        }
     }
     return DIRECTION_SOUTH;
 }
 
-// https://decomp.me/scratch/Bgbxc
-s8 VecDirection4Radial(PixelPos *param_1)
+s8 VecDirection4Radial(PixelPos *pixelPos)
 {
-#ifdef NONMATCHING    
-    s32 r0;
-    s32 r1;
-    s32 r2;
-    s32 r3;
-    s32 r4;
-    s32 r5;
-#else
-    register s32 r0 asm("r3");
-    register s32 r1 asm("r1");
-    register s32 r2 asm("r2");
-    register s32 r3;
-    register s32 r4;
-    register s32 r5 asm("r0");
-#endif
+    PixelPos absPos = {abs(pixelPos->x), abs(pixelPos->y)};
 
-    r0 = param_1->x;
-    if (r0 < 0) {
-        r0 = -r0;
-    }
-    r1 = r0;
-    r3 = param_1->y;
-    r5 = r3;
-    if (r3 < 0) {
-        r5 = -r3;
-    }
-    r2 = r5;
-    r4 = param_1->x;
-    if (r4 < 0) {
-        if (r3 < 0) {
-            if (r2 > r1) {
+    if (pixelPos->x < 0) {
+        if (pixelPos->y < 0) {
+            if (absPos.y > absPos.x) {
                 return DIRECTION_NORTH;
             }
-            else
-                return DIRECTION_WEST;
+            return DIRECTION_WEST;
         }
-        if (r2 <= r1) {
+        if (absPos.y <= absPos.x) {
             return DIRECTION_WEST;
         }
     }
-    else {
-        if (0 < r4) {
-            if (r3 < 0) {
-                if (r2 > r1) {
-                    return DIRECTION_NORTH;
-                }
-                else 
-                    return DIRECTION_EAST;
+    else if (pixelPos->x > 0) {
+        if (pixelPos->y < 0) {
+            if (absPos.y > absPos.x) {
+                return DIRECTION_NORTH;
             }
-            else {
-                if (r2 > r1) {
-                    return DIRECTION_SOUTH;
-                }
-                return DIRECTION_EAST;
-            }
-
+            return DIRECTION_EAST;
         }
-        if (r3 < 0) {
+        else {
+            if (absPos.y > absPos.x) {
+                return DIRECTION_SOUTH;
+            }
+            return DIRECTION_EAST;
+        }
+    }
+    else {
+        if (pixelPos->y < 0) {
             return DIRECTION_NORTH;
         }
-        if (r3 < 1) {
+        if (pixelPos->y < 1) {
             return -1;
-        }  
+        }
     }
     return DIRECTION_SOUTH;
 }
@@ -407,7 +348,7 @@ s8 SizedDeltaDirection4(PixelPos *r0, PixelPos *r1, PixelPos *r2, PixelPos *r3)
         iVar3 = (stack.x + 1);
         iVar3 -= ((r1->x + r3->x) / 2);
         stack.x = iVar3;
-        if(stack.x < 0) stack.x = 0;   
+        if(stack.x < 0) stack.x = 0;
     }
     else
     {
@@ -429,10 +370,10 @@ s8 SizedDeltaDirection4(PixelPos *r0, PixelPos *r1, PixelPos *r2, PixelPos *r3)
         iVar1 = (stack.y - 1);
         iVar1 += ((r1->y + r3->y) / 2);
         stack.y = iVar1;
-        if(stack.y > 0) stack.y = 0;     
+        if(stack.y > 0) stack.y = 0;
     }
-    
-    
+
+
     return VecDirection4Radial(&stack);
 }
 
@@ -450,7 +391,7 @@ s8 SizedDeltaDirection8(PixelPos *r0, PixelPos *r1, PixelPos *r2, PixelPos *r3)
         iVar3 = (stack.x + 1);
         iVar3 -= ((r1->x + r3->x) / 2);
         stack.x = iVar3;
-        if(stack.x < 0) stack.x = 0;   
+        if(stack.x < 0) stack.x = 0;
     }
     else
     {
@@ -472,9 +413,9 @@ s8 SizedDeltaDirection8(PixelPos *r0, PixelPos *r1, PixelPos *r2, PixelPos *r3)
         iVar1 = (stack.y - 1);
         iVar1 += ((r1->y + r3->y) / 2);
         stack.y = iVar1;
-        if(stack.y > 0) stack.y = 0;     
+        if(stack.y > 0) stack.y = 0;
     }
-    
-    
+
+
     return VecDirection8Radial(&stack);
 }

src/code_800558C.c

@@ -6,18 +6,19 @@
 #include "math.h"
 #include "sprite.h"
 
-extern u8 gUnknown_2026E38;
-extern u32 *gUnknown_2026E3C;
-extern s32 gUnknown_2026E40;
-extern s32 gUnknown_2026E44;
-extern s32 gUnknown_2026E48;
-extern bool8 gUnknown_2026E4C;
-extern u16 gUnknown_2026E4E;
-extern bool32 gUnknown_2026E50;
-extern bool32 gUnknown_2026E54;
-extern u32 *gUnknown_2026E58;
-extern s16 gUnknown_2026E60[];
-extern s16 gUnknown_20270E8[];
+EWRAM_DATA u8 gUnknown_2026E38 = 0;
+EWRAM_DATA u32 *gUnknown_2026E3C = 0;
+EWRAM_DATA s32 gUnknown_2026E40 = 0;
+EWRAM_DATA s32 gUnknown_2026E44 = 0;
+EWRAM_DATA s32 gUnknown_2026E48 = 0;
+EWRAM_DATA bool8 gUnknown_2026E4C = 0;
+EWRAM_DATA u16 gUnknown_2026E4E = 0;
+EWRAM_DATA bool32 gUnknown_2026E50 = 0;
+EWRAM_DATA bool32 gUnknown_2026E54 = 0;
+EWRAM_DATA u32 *gUnknown_2026E58 = NULL;
+UNUSED EWRAM_DATA static u32 sUnused0 = 0;
+EWRAM_DATA static s16 gUnknown_2026E60[324] = {0};
+EWRAM_DATA static s16 gUnknown_20270E8[324] = {0};
 
 EWRAM_INIT s16 *gUnknown_203B078 = NULL;
 
@@ -31,28 +32,6 @@ extern const s16 gUnknown_80B83EA[16 * 10];
 static void sub_800561C(struct axMapSprite *, s32, s32, const RGB *);
 const RGB *sub_8005674(struct axMapSprite *, s32);
 
-void DoAxFrame_800558C(struct axObject *a0, s32 spriteX, s32 spriteY, u32 a3, u32 paletteNum, unkStruct_2039DB0 *spriteMasks)
-{
-    if (!(a0->axdata.flags >> 15))
-        return;
-
-    if (a0->axdata.sub1.poseId < 0)
-        RunAxAnimationFrame(a0);
-
-    if (!(a0->axdata.flags >> 15))
-        return;
-
-    a0->axdata.sub1.pos.x = a0->axdata.sub1.offset.x + spriteX;
-    a0->axdata.sub1.pos.y = a0->axdata.sub1.offset.y + spriteY;
-    a0->axdata.sub1.paletteNum = paletteNum;
-    a0->axdata.sub1.unk16 = a3;
-    sub_800533C(a0->axdata.poseData, a0->axdata.spriteData, &a0->axdata.sub1, spriteMasks, !!(a0->axdata.sub1.lastPoseId ^ a0->axdata.sub1.poseId));
-    a0->axdata.sub1.lastPoseId = a0->axdata.sub1.poseId;
-
-    if (a0->axdata.flags & 0x800)
-        a0->axdata.flags &= 0xF7FF;
-}
-
 void sub_8005610(OpenedFile *a0, s32 vramIdx, s32 brightness, const RGB *ramp)
 {
     sub_800561C((struct axMapSprite *)a0->data, vramIdx, brightness, ramp);
@@ -239,7 +218,7 @@ void sub_8005838(s32 *a0, u8 kind)
     if (!gUnknown_2026E4C)
         kind = 0;
 
-    r3 = !gUnknown_2026E54 ? (s16 *) &gUnknown_2026E60 : (s16*) &gUnknown_20270E8;
+    r3 = !gUnknown_2026E54 ? gUnknown_2026E60 : gUnknown_20270E8;
 
     r2 = gUnknown_203B078;
     if (r2 == NULL)

src/code_8009804.c

@@ -8,11 +8,11 @@
 extern const u8 gUnknown_80B88CC[];
 extern const struct FileArchive gSystemFileArchive; // 8300500
 
-extern Palette32 gFontPalette[8];
-extern u8 gUnknown_202D238[4];
-extern s32 gUnknown_202D23C;
-extern u32 gUnknown_202D2A0;
-extern struct unkStruct_202D240 gUnknown_202D240[8];
+EWRAM_DATA RGB gFontPalette[128] = {0};
+EWRAM_DATA static u8 gUnknown_202D238[4] = {0};
+EWRAM_DATA static s32 gUnknown_202D23C = 0;
+EWRAM_DATA static struct unkStruct_202D240 gUnknown_202D240[8] = {0};
+EWRAM_DATA u32 gUnknown_202D2A0 = 0;
 
 typedef struct Palette256
 {
@@ -45,9 +45,9 @@ void InitFontPalette(void)
     CpuCopy(gFontPalette, fontpalFile->data, sizeof(gFontPalette));
 
     if (sub_80063B0() == 1)
-        ptr = gFontPalette[0].pal;
+        ptr = &gFontPalette[0];
     else
-        ptr = gFontPalette[1].pal;
+        ptr = &gFontPalette[16];
 
     for (i = 0; i < 16; ptr++, i++)
         SetBGPaletteBufferColorArray(i + 240, ptr);
@@ -64,11 +64,11 @@ void vram_related_8009804(void)
     for (i = 0; i < 0x13C0; i++)
         *dest++ = 0;
 
-    dest = (u32 *)0x06007000;
+    dest = (u32 *)(VRAM + 0x7000);
     for (i = 0; i < 0x400; i++)
         *dest++ = 0;
 
-    dest = (u32 *)0x06008000;
+    dest = (u32 *)(VRAM + 0x8000);
     for (i = 0; i < 0x2000; i++)
         *dest++ = 0;
 
@@ -85,7 +85,7 @@ void vram_related_8009804(void)
         *dest++ = 0;
 
     dest = (u32 *)OAM;
-    for (i = 0; i < 256; i++)
+    for (i = 0; i < OAM_SIZE / 4; i++)
         *dest++ = 0xA000A0; // TODO: Macro or explanation
 }
 
@@ -150,7 +150,7 @@ void SetFontsBaseColor(RGB a0)
     s32 i;
 
     for (i = 0; i < 8; i++)
-        gFontPalette[i].pal[1] = a0;
+        gFontPalette[16 * i + 1] = a0;
 }
 
 UNUSED static void sub_8009A10(struct unkStruct_8009A1C_ptr *a0, u32 palId, u32 vramDstOffset, u32 r3)

src/code_800E9A8.c

@@ -7,7 +7,7 @@
 
 s32 sub_800E2C0(u32);
 
-struct unkStruct_203B0CC *gUnknown_203B0CC;
+extern struct unkStruct_203B0CC *gUnknown_203B0CC;
 
 void sub_800DE38(struct unkStruct_203B0CC_sub *);
 void sub_800DE8C(struct unkStruct_203B0CC_sub *, DungeonPos *);
@@ -48,7 +48,7 @@ bool8 sub_800E838(u16 *param_1, s32 param_2)
 }
 
 // TODO: look at this later
-// https://decomp.me/scratch/luz2f 
+// https://decomp.me/scratch/luz2f
 u32 sub_800E890(unkStruct_80416E0 *param_1)
 {
     param_1->unk14 = sub_800E900(param_1->unk0);
@@ -101,7 +101,7 @@ bool8 sub_800E90C(DungeonPos *param_1)
                 }
 
             }
-            if(ptr->unk10 > 0) 
+            if(ptr->unk10 > 0)
                 ptr->unk10--;
             sub_800DCD0(ptr);
             if(ptr->unk54 == 0)