Merge pull request #154 from PikalaxALT/dism_more_data

Field Door

asm/field_camera.s

@@ -490,8 +490,8 @@ _0805A914: .4byte gUnknown_3000E90
 _0805A918: .4byte gMapHeader
 	thumb_func_end CurrentMapDrawMetatileAt
 
-	thumb_func_start sub_805A91C
-sub_805A91C: @ 805A91C
+	thumb_func_start DrawDoorMetatileAt
+DrawDoorMetatileAt: @ 805A91C
 	push {r4,r5,lr}
 	adds r3, r0, 0
 	adds r4, r1, 0
@@ -513,7 +513,7 @@ _0805A93E:
 	bx r0
 	.align 2, 0
 _0805A944: .4byte gUnknown_3000E90
-	thumb_func_end sub_805A91C
+	thumb_func_end DrawDoorMetatileAt
 
 	thumb_func_start sub_805A948
 sub_805A948: @ 805A948

asm/field_door.s

@@ -1,667 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_805AF14
-sub_805AF14: @ 805AF14
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	adds r7, r3, 0
-	ldrh r1, [r5, 0x2]
-	ldr r0, _0805AF34 @ =0x0000ffff
-	cmp r1, r0
-	bne _0805AF38
-	adds r0, r4, 0
-	adds r1, r6, 0
-	adds r2, r7, 0
-	bl sub_805AF54
-	b _0805AF4E
-	.align 2, 0
-_0805AF34: .4byte 0x0000ffff
-_0805AF38:
-	ldrh r1, [r5, 0x2]
-	ldr r0, [r4, 0x4]
-	adds r0, r1
-	bl sub_805AF80
-	ldr r3, [r4, 0x8]
-	adds r0, r4, 0
-	adds r1, r6, 0
-	adds r2, r7, 0
-	bl sub_805AF94
-_0805AF4E:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_805AF14
-
-	thumb_func_start sub_805AF54
-sub_805AF54: @ 805AF54
-	push {r4,r5,lr}
-	adds r5, r1, 0
-	adds r4, r2, 0
-	ldrb r0, [r0, 0x3]
-	cmp r0, 0
-	bne _0805AF6A
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl CurrentMapDrawMetatileAt
-	b _0805AF7A
-_0805AF6A:
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl CurrentMapDrawMetatileAt
-	subs r1, r4, 0x1
-	adds r0, r5, 0
-	bl CurrentMapDrawMetatileAt
-_0805AF7A:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_805AF54
-
-	thumb_func_start sub_805AF80
-sub_805AF80: @ 805AF80
-	push {lr}
-	ldr r1, _0805AF90 @ =0x06007f00
-	movs r2, 0x40
-	bl CpuFastSet
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805AF90: .4byte 0x06007f00
-	thumb_func_end sub_805AF80
-
-	thumb_func_start sub_805AF94
-sub_805AF94: @ 805AF94
-	push {r4-r6,lr}
-	sub sp, 0x10
-	adds r5, r1, 0
-	adds r6, r2, 0
-	adds r4, r3, 0
-	ldrb r0, [r0, 0x3]
-	cmp r0, 0
-	bne _0805AFB2
-	movs r1, 0xFE
-	lsls r1, 2
-	mov r0, sp
-	adds r2, r4, 0
-	bl sub_805AFE8
-	b _0805AFD4
-_0805AFB2:
-	movs r1, 0xFE
-	lsls r1, 2
-	mov r0, sp
-	adds r2, r4, 0
-	bl sub_805AFE8
-	subs r1, r6, 0x1
-	adds r0, r5, 0
-	mov r2, sp
-	bl sub_805A91C
-	movs r1, 0xFF
-	lsls r1, 2
-	adds r2, r4, 0x4
-	mov r0, sp
-	bl sub_805AFE8
-_0805AFD4:
-	adds r0, r5, 0
-	adds r1, r6, 0
-	mov r2, sp
-	bl sub_805A91C
-	add sp, 0x10
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_805AF94
-
-	thumb_func_start sub_805AFE8
-sub_805AFE8: @ 805AFE8
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	lsls r1, 16
-	lsrs r5, r1, 16
-	movs r4, 0
-	adds r1, r6, 0
-_0805AFF4:
-	ldrb r0, [r2]
-	lsls r0, 28
-	lsrs r3, r0, 16
-	adds r2, 0x1
-	adds r0, r5, r4
-	orrs r3, r0
-	strh r3, [r1]
-	adds r1, 0x2
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _0805AFF4
-	cmp r4, 0x7
-	bgt _0805B022
-	lsls r0, r4, 1
-	adds r1, r0, r6
-_0805B012:
-	ldrb r0, [r2]
-	lsls r3, r0, 12
-	adds r2, 0x1
-	strh r3, [r1]
-	adds r1, 0x2
-	adds r4, 0x1
-	cmp r4, 0x7
-	ble _0805B012
-_0805B022:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_805AFE8
-
-	thumb_func_start sub_805B028
-sub_805B028: @ 805B028
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r2, r4, 2
-	adds r2, r4
-	lsls r2, 3
-	ldr r0, _0805B05C @ =gTasks+0x8
-	adds r2, r0
-	ldrh r1, [r2]
-	lsls r1, 16
-	ldrh r0, [r2, 0x2]
-	orrs r1, r0
-	ldrh r0, [r2, 0x4]
-	lsls r0, 16
-	ldrh r3, [r2, 0x6]
-	orrs r0, r3
-	bl sub_805B060
-	cmp r0, 0
-	bne _0805B056
-	adds r0, r4, 0
-	bl DestroyTask
-_0805B056:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805B05C: .4byte gTasks+0x8
-	thumb_func_end sub_805B028
-
-	thumb_func_start sub_805B060
-sub_805B060: @ 805B060
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	adds r5, r1, 0
-	adds r4, r2, 0
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _0805B086
-	movs r2, 0x8
-	ldrsh r1, [r4, r2]
-	lsls r1, 2
-	adds r1, r5, r1
-	movs r0, 0xC
-	ldrsh r2, [r4, r0]
-	movs r0, 0xE
-	ldrsh r3, [r4, r0]
-	adds r0, r6, 0
-	bl sub_805AF14
-_0805B086:
-	movs r2, 0xA
-	ldrsh r1, [r4, r2]
-	movs r2, 0x8
-	ldrsh r0, [r4, r2]
-	lsls r0, 2
-	adds r0, r5
-	ldrb r0, [r0]
-	cmp r1, r0
-	bne _0805B0B4
-	movs r0, 0
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r0, 2
-	adds r0, r5
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0805B0BA
-	movs r0, 0
-	b _0805B0BC
-_0805B0B4:
-	ldrh r0, [r4, 0xA]
-	adds r0, 0x1
-	strh r0, [r4, 0xA]
-_0805B0BA:
-	movs r0, 0x1
-_0805B0BC:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805B060
-
-	thumb_func_start door_find
-door_find: @ 805B0C4
-	push {lr}
-	adds r2, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	b _0805B0DA
-_0805B0CE:
-	ldrh r0, [r2]
-	cmp r0, r1
-	bne _0805B0D8
-	adds r0, r2, 0
-	b _0805B0E2
-_0805B0D8:
-	adds r2, 0xC
-_0805B0DA:
-	ldr r0, [r2, 0x4]
-	cmp r0, 0
-	bne _0805B0CE
-	movs r0, 0
-_0805B0E2:
-	pop {r1}
-	bx r1
-	thumb_func_end door_find
-
-	thumb_func_start task_overworld_door_add_if_inactive
-task_overworld_door_add_if_inactive: @ 805B0E8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	adds r5, r1, 0
-	adds r7, r2, 0
-	mov r8, r3
-	ldr r4, _0805B134 @ =sub_805B028
-	adds r0, r4, 0
-	bl FuncIsActiveTask
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0805B13C
-	adds r0, r4, 0
-	movs r1, 0x50
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r2, _0805B138 @ =gTasks+0x8
-	adds r1, r2
-	strh r7, [r1, 0xC]
-	mov r2, r8
-	strh r2, [r1, 0xE]
-	strh r5, [r1, 0x2]
-	lsrs r2, r5, 16
-	strh r2, [r1]
-	strh r6, [r1, 0x6]
-	lsrs r2, r6, 16
-	strh r2, [r1, 0x4]
-	lsls r0, 24
-	asrs r0, 24
-	b _0805B140
-	.align 2, 0
-_0805B134: .4byte sub_805B028
-_0805B138: .4byte gTasks+0x8
-_0805B13C:
-	movs r0, 0x1
-	negs r0, r0
-_0805B140:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end task_overworld_door_add_if_inactive
-
-	thumb_func_start DrawClosedDoor
-DrawClosedDoor: @ 805B14C
-	push {lr}
-	bl sub_805AF54
-	pop {r0}
-	bx r0
-	thumb_func_end DrawClosedDoor
-
-	thumb_func_start sub_805B158
-sub_805B158: @ 805B158
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridGetMetatileIdAt
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl door_find
-	adds r4, r0, 0
-	cmp r0, 0
-	beq _0805B196
-	ldrb r0, [r0, 0x3]
-	ldr r1, _0805B19C @ =gUnknown_835B49C
-	cmp r0, 0
-	bne _0805B184
-	ldr r1, _0805B1A0 @ =gUnknown_835B488
-_0805B184:
-	adds r0, r1, 0
-	bl sub_805B1A4
-	adds r1, r0, 0
-	adds r0, r4, 0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl sub_805AF14
-_0805B196:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805B19C: .4byte gUnknown_835B49C
-_0805B1A0: .4byte gUnknown_835B488
-	thumb_func_end sub_805B158
-
-	thumb_func_start sub_805B1A4
-sub_805B1A4: @ 805B1A4
-	push {lr}
-	adds r1, r0, 0
-	b _0805B1AC
-_0805B1AA:
-	adds r1, 0x4
-_0805B1AC:
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _0805B1AA
-	subs r0, r1, 0x4
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805B1A4
-
-	thumb_func_start sub_805B1B8
-sub_805B1B8: @ 805B1B8
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridGetMetatileIdAt
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl door_find
-	adds r2, r0, 0
-	adds r4, r2, 0
-	cmp r2, 0
-	bne _0805B1E2
-	movs r0, 0x1
-	negs r0, r0
-	b _0805B204
-_0805B1E2:
-	ldrb r0, [r2, 0x3]
-	cmp r0, 0
-	beq _0805B1F4
-	ldr r1, _0805B1F0 @ =gUnknown_835B49C
-	adds r0, r2, 0
-	b _0805B1F8
-	.align 2, 0
-_0805B1F0: .4byte gUnknown_835B49C
-_0805B1F4:
-	ldr r1, _0805B20C @ =gUnknown_835B488
-	adds r0, r4, 0
-_0805B1F8:
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl task_overworld_door_add_if_inactive
-	lsls r0, 24
-	asrs r0, 24
-_0805B204:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805B20C: .4byte gUnknown_835B488
-	thumb_func_end sub_805B1B8
-
-	thumb_func_start sub_805B210
-sub_805B210: @ 805B210
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridGetMetatileIdAt
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl door_find
-	adds r2, r0, 0
-	adds r4, r2, 0
-	cmp r2, 0
-	bne _0805B23A
-	movs r0, 0x1
-	negs r0, r0
-	b _0805B25C
-_0805B23A:
-	ldrb r0, [r2, 0x3]
-	cmp r0, 0
-	beq _0805B24C
-	ldr r1, _0805B248 @ =gUnknown_835B4C4
-	adds r0, r2, 0
-	b _0805B250
-	.align 2, 0
-_0805B248: .4byte gUnknown_835B4C4
-_0805B24C:
-	ldr r1, _0805B264 @ =gUnknown_835B4B0
-	adds r0, r4, 0
-_0805B250:
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl task_overworld_door_add_if_inactive
-	lsls r0, 24
-	asrs r0, 24
-_0805B25C:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805B264: .4byte gUnknown_835B4B0
-	thumb_func_end sub_805B210
-
-	thumb_func_start FieldSetDoorOpened
-FieldSetDoorOpened: @ 805B268
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r0, r4, 16
-	asrs r0, 16
-	lsls r1, r5, 16
-	asrs r1, 16
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsWarpDoor_2
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805B292
-	ldr r0, _0805B298 @ =gUnknown_835B5D8
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_805B158
-_0805B292:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805B298: .4byte gUnknown_835B5D8
-	thumb_func_end FieldSetDoorOpened
-
-	thumb_func_start FieldSetDoorClosed
-FieldSetDoorClosed: @ 805B29C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r0, r4, 16
-	asrs r0, 16
-	lsls r1, r5, 16
-	asrs r1, 16
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsWarpDoor_2
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805B2C6
-	ldr r0, _0805B2CC @ =gUnknown_835B5D8
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl DrawClosedDoor
-_0805B2C6:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0805B2CC: .4byte gUnknown_835B5D8
-	thumb_func_end FieldSetDoorClosed
-
-	thumb_func_start FieldAnimateDoorClose
-FieldAnimateDoorClose: @ 805B2D0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r0, r4, 16
-	asrs r0, 16
-	lsls r1, r5, 16
-	asrs r1, 16
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsWarpDoor_2
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805B304
-	ldr r0, _0805B300 @ =gUnknown_835B5D8
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_805B210
-	lsls r0, 24
-	asrs r0, 24
-	b _0805B308
-	.align 2, 0
-_0805B300: .4byte gUnknown_835B5D8
-_0805B304:
-	movs r0, 0x1
-	negs r0, r0
-_0805B308:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end FieldAnimateDoorClose
-
-	thumb_func_start FieldAnimateDoorOpen
-FieldAnimateDoorOpen: @ 805B310
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	lsls r0, r4, 16
-	asrs r0, 16
-	lsls r1, r5, 16
-	asrs r1, 16
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsWarpDoor_2
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805B344
-	ldr r0, _0805B340 @ =gUnknown_835B5D8
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_805B1B8
-	lsls r0, 24
-	asrs r0, 24
-	b _0805B348
-	.align 2, 0
-_0805B340: .4byte gUnknown_835B5D8
-_0805B344:
-	movs r0, 0x1
-	negs r0, r0
-_0805B348:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end FieldAnimateDoorOpen
-
-	thumb_func_start FieldIsDoorAnimationRunning
-FieldIsDoorAnimationRunning: @ 805B350
-	push {lr}
-	ldr r0, _0805B360 @ =sub_805B028
-	bl FuncIsActiveTask
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0805B360: .4byte sub_805B028
-	thumb_func_end FieldIsDoorAnimationRunning
-
-	thumb_func_start GetDoorSoundEffect
-GetDoorSoundEffect: @ 805B364
-	push {lr}
-	adds r3, r0, 0
-	adds r2, r1, 0
-	ldr r0, _0805B37C @ =gUnknown_835B5D8
-	adds r1, r3, 0
-	bl sub_805B388
-	lsls r0, 24
-	cmp r0, 0
-	beq _0805B380
-	movs r0, 0x12
-	b _0805B382
-	.align 2, 0
-_0805B37C: .4byte gUnknown_835B5D8
-_0805B380:
-	movs r0, 0xF1
-_0805B382:
-	pop {r1}
-	bx r1
-	thumb_func_end GetDoorSoundEffect
-
-	thumb_func_start sub_805B388
-sub_805B388: @ 805B388
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r0, r1, 0
-	adds r1, r2, 0
-	bl MapGridGetMetatileIdAt
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl door_find
-	cmp r0, 0
-	beq _0805B3AC
-	ldrb r0, [r0, 0x2]
-	lsls r0, 24
-	asrs r0, 24
-	b _0805B3B0
-_0805B3AC:
-	movs r0, 0x1
-	negs r0, r0
-_0805B3B0:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_805B388
-
-	.align 2, 0 @ Don't pad with nop.

asm/item_menu.s

@@ -5826,7 +5826,7 @@ UseRegisteredKeyItemOnField: @ 810AD10
 	movs r0, 0
 	b _0810ADA0
 _0810AD1E:
-	bl sub_80982EC
+	bl DismissMapNamePopup
 	movs r0, 0
 	movs r1, 0
 	movs r2, 0

asm/map_name_popup.s

@@ -1,490 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8098110
-sub_8098110: @ 8098110
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r0, 0x80
-	lsls r0, 7
-	bl FlagGet
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _080981A2
-	ldr r0, _08098178 @ =gUnknown_203ADFA
-	ldrb r0, [r0]
-	subs r0, 0x2
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bls _080981A2
-	ldr r5, _0809817C @ =sub_80981AC
-	adds r0, r5, 0
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xFF
-	bne _08098188
-	adds r0, r5, 0
-	movs r1, 0x5A
-	bl CreateTask
-	lsls r0, 24
-	lsrs r4, r0, 24
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgX
-	ldr r1, _08098180 @ =0xffffef7f
-	movs r0, 0
-	movs r2, 0
-	bl ChangeBgY
-	ldr r1, _08098184 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0
-	strh r1, [r0, 0x8]
-	strh r1, [r0, 0xC]
-	strh r6, [r0, 0x18]
-	b _080981A2
-	.align 2, 0
-_08098178: .4byte gUnknown_203ADFA
-_0809817C: .4byte sub_80981AC
-_08098180: .4byte 0xffffef7f
-_08098184: .4byte gTasks
-_08098188:
-	ldr r0, _080981A8 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r0
-	movs r2, 0x8
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x4
-	beq _0809819E
-	movs r0, 0x4
-	strh r0, [r1, 0x8]
-_0809819E:
-	movs r0, 0x1
-	strh r0, [r1, 0xE]
-_080981A2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080981A8: .4byte gTasks
-	thumb_func_end sub_8098110
-
-	thumb_func_start sub_80981AC
-sub_80981AC: @ 80981AC
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	lsls r0, r2, 2
-	adds r0, r2
-	lsls r0, 3
-	ldr r1, _080981D0 @ =gTasks
-	adds r4, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x8
-	bls _080981C6
-	b _080982DE
-_080981C6:
-	lsls r0, 2
-	ldr r1, _080981D4 @ =_080981D8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080981D0: .4byte gTasks
-_080981D4: .4byte _080981D8
-	.align 2, 0
-_080981D8:
-	.4byte _080981FC
-	.4byte _0809820E
-	.4byte _08098218
-	.4byte _08098234
-	.4byte _0809824C
-	.4byte _080982DE
-	.4byte _0809827E
-	.4byte _080982A6
-	.4byte _080982D6
-_080981FC:
-	movs r1, 0x18
-	ldrsh r0, [r4, r1]
-	bl sub_8098340
-	strh r0, [r4, 0x10]
-	movs r0, 0x1
-	strh r0, [r4, 0x12]
-	strh r0, [r4, 0x8]
-	b _080982DE
-_0809820E:
-	bl IsDma3ManagerBusyWithBgCopy
-	lsls r0, 24
-	cmp r0, 0
-	bne _080982DE
-_08098218:
-	ldrh r0, [r4, 0xC]
-	subs r0, 0x2
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0x18
-	negs r1, r1
-	cmp r0, r1
-	bgt _080982DE
-	movs r0, 0x3
-	strh r0, [r4, 0x8]
-	movs r0, 0
-	strh r0, [r4, 0xA]
-	b _080982DE
-_08098234:
-	ldrh r0, [r4, 0xA]
-	adds r0, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x78
-	ble _080982DE
-	movs r0, 0
-	strh r0, [r4, 0xA]
-	movs r0, 0x4
-	strh r0, [r4, 0x8]
-	b _080982DE
-_0809824C:
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x2
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	cmp r0, 0
-	blt _080982DE
-	movs r1, 0xE
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _08098278
-	ldrh r0, [r4, 0x10]
-	bl sub_8098400
-	ldrb r0, [r4, 0x10]
-	movs r1, 0x2
-	bl CopyWindowToVram
-	movs r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0
-	strh r0, [r4, 0xE]
-	b _080982DE
-_08098278:
-	movs r0, 0x6
-	strh r0, [r4, 0x8]
-	b _080982E6
-_0809827E:
-	movs r1, 0x12
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _080982A0
-	movs r1, 0x14
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080982A0
-	ldrb r0, [r4, 0x10]
-	bl rbox_fill_rectangle
-	ldrb r0, [r4, 0x10]
-	movs r1, 0x1
-	bl CopyWindowToVram
-	movs r0, 0x1
-	strh r0, [r4, 0x14]
-_080982A0:
-	movs r0, 0x7
-	strh r0, [r4, 0x8]
-	b _080982E6
-_080982A6:
-	bl IsDma3ManagerBusyWithBgCopy
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0
-	bne _080982E6
-	movs r1, 0x12
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _080982C6
-	ldrb r0, [r4, 0x10]
-	bl RemoveWindow
-	strh r5, [r4, 0x12]
-	movs r0, 0x1
-	strh r0, [r4, 0x16]
-_080982C6:
-	movs r0, 0x8
-	strh r0, [r4, 0x8]
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	bl ChangeBgY
-	b _080982E6
-_080982D6:
-	adds r0, r2, 0
-	bl DestroyTask
-	b _080982E6
-_080982DE:
-	ldrh r1, [r4, 0xC]
-	movs r0, 0x12
-	bl SetGpuReg
-_080982E6:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80981AC
-
-	thumb_func_start sub_80982EC
-sub_80982EC: @ 80982EC
-	push {lr}
-	ldr r0, _08098318 @ =sub_80981AC
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0xFF
-	beq _08098312
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	ldr r1, _0809831C @ =gTasks+0x8
-	adds r1, r0, r1
-	movs r2, 0
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x5
-	bgt _08098312
-	movs r0, 0x6
-	strh r0, [r1]
-_08098312:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08098318: .4byte sub_80981AC
-_0809831C: .4byte gTasks+0x8
-	thumb_func_end sub_80982EC
-
-	thumb_func_start sub_8098320
-sub_8098320: @ 8098320
-	push {lr}
-	ldr r0, _0809833C @ =sub_80981AC
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0xFF
-	eors r0, r1
-	negs r1, r0
-	orrs r1, r0
-	lsrs r1, 31
-	adds r0, r1, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0809833C: .4byte sub_80981AC
-	thumb_func_end sub_8098320
-
-	thumb_func_start sub_8098340
-sub_8098340: @ 8098340
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r0, _08098378 @ =gUnknown_83D4164
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [sp]
-	str r1, [sp, 0x4]
-	movs r6, 0x1D
-	ldr r0, _0809837C @ =gMapHeader
-	ldrb r0, [r0, 0x1A]
-	lsls r0, 24
-	asrs r0, 24
-	cmp r0, 0
-	beq _08098396
-	cmp r0, 0x7F
-	beq _08098384
-	ldr r2, [sp]
-	lsrs r1, r2, 24
-	adds r1, 0x5
-	lsls r1, 24
-	ldr r0, _08098380 @ =0x00ffffff
-	ands r0, r2
-	orrs r0, r1
-	str r0, [sp]
-	movs r6, 0x27
-	b _08098396
-	.align 2, 0
-_08098378: .4byte gUnknown_83D4164
-_0809837C: .4byte gMapHeader
-_08098380: .4byte 0x00ffffff
-_08098384:
-	ldr r2, [sp]
-	lsrs r1, r2, 24
-	adds r1, 0x8
-	lsls r1, 24
-	ldr r0, _080983B4 @ =0x00ffffff
-	ands r0, r2
-	orrs r0, r1
-	str r0, [sp]
-	movs r6, 0x2D
-_08098396:
-	mov r0, sp
-	bl AddWindow
-	lsls r0, 16
-	lsrs r5, r0, 16
-	cmp r4, 0
-	beq _080983B8
-	movs r0, 0x3
-	bl stdpal_get
-	movs r1, 0xD0
-	movs r2, 0x20
-	bl LoadPalette
-	b _080983C6
-	.align 2, 0
-_080983B4: .4byte 0x00ffffff
-_080983B8:
-	movs r0, 0x3
-	bl stdpal_get
-	ldr r1, _080983FC @ =gPlttBufferUnfaded + 0x1A0
-	movs r2, 0x10
-	bl CpuSet
-_080983C6:
-	lsls r4, r5, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	adds r1, r6, 0
-	bl sub_814FF6C
-	adds r0, r4, 0
-	adds r1, r6, 0
-	movs r2, 0xD
-	bl DrawTextBorderOuter
-	adds r0, r4, 0
-	bl PutWindowTilemap
-	adds r0, r5, 0
-	bl sub_8098400
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl CopyWindowToVram
-	adds r0, r5, 0
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080983FC: .4byte gPlttBufferUnfaded + 0x1A0
-	thumb_func_end sub_8098340
-
-	thumb_func_start sub_8098400
-sub_8098400: @ 8098400
-	push {r4-r6,lr}
-	sub sp, 0x28
-	lsls r0, 16
-	lsrs r6, r0, 16
-	movs r5, 0x70
-	ldr r4, _08098478 @ =gMapHeader
-	ldrb r1, [r4, 0x14]
-	add r0, sp, 0xC
-	movs r2, 0
-	bl GetMapName
-	adds r2, r0, 0
-	movs r0, 0x1A
-	ldrsb r0, [r4, r0]
-	cmp r0, 0
-	beq _08098434
-	adds r1, r0, 0
-	adds r0, r2, 0
-	bl sub_809847C
-	movs r0, 0x1A
-	ldrsb r0, [r4, r0]
-	movs r5, 0xB0
-	cmp r0, 0x7F
-	beq _08098434
-	movs r5, 0x98
-_08098434:
-	movs r2, 0x1
-	negs r2, r2
-	movs r0, 0x2
-	add r1, sp, 0xC
-	bl GetStringWidth
-	adds r4, r0, 0
-	subs r4, r5, r4
-	lsrs r4, 1
-	lsls r5, r6, 24
-	lsrs r5, 24
-	adds r0, r5, 0
-	movs r1, 0x11
-	bl FillWindowPixelBuffer
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x2
-	str r0, [sp]
-	movs r0, 0xFF
-	str r0, [sp, 0x4]
-	movs r0, 0
-	str r0, [sp, 0x8]
-	adds r0, r5, 0
-	movs r1, 0x2
-	add r2, sp, 0xC
-	adds r3, r4, 0
-	bl AddTextPrinterParameterized
-	add sp, 0x28
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08098478: .4byte gMapHeader
-	thumb_func_end sub_8098400
-
-	thumb_func_start sub_809847C
-sub_809847C: @ 809847C
-	push {lr}
-	adds r2, r0, 0
-	lsls r1, 24
-	lsrs r3, r1, 24
-	asrs r1, 24
-	cmp r1, 0
-	beq _080984D2
-	movs r0, 0
-	strb r0, [r2]
-	adds r2, 0x1
-	cmp r1, 0x7F
-	bne _080984A4
-	ldr r1, _080984A0 @ =gUnknown_841D18D
-	adds r0, r2, 0
-	bl StringCopy
-	b _080984D2
-	.align 2, 0
-_080984A0: .4byte gUnknown_841D18D
-_080984A4:
-	cmp r1, 0
-	bge _080984B4
-	movs r0, 0xBC
-	strb r0, [r2]
-	adds r2, 0x1
-	negs r0, r1
-	lsls r0, 24
-	lsrs r3, r0, 24
-_080984B4:
-	lsls r1, r3, 24
-	asrs r1, 24
-	adds r0, r2, 0
-	movs r2, 0
-	movs r3, 0x2
-	bl ConvertIntToDecimalStringN
-	adds r2, r0, 0
-	adds r1, r2, 0
-	movs r0, 0xC0
-	strb r0, [r2]
-	adds r2, 0x1
-	movs r0, 0xFF
-	strb r0, [r1, 0x1]
-	adds r0, r2, 0
-_080984D2:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809847C
-
-	.align 2, 0 @ Don't pad with nop.

asm/overworld.s

@@ -1747,7 +1747,7 @@ _080558D4:
 	cmp r0, r1
 	beq _08055914
 	movs r0, 0x1
-	bl sub_8098110
+	bl CreateMapNamePopupIfNotAlreadyRunning
 _08055914:
 	add sp, 0x4
 	pop {r4,r5}
@@ -3282,7 +3282,7 @@ sub_805644C: @ 805644C
 	bl sub_81127F8
 _0805649E:
 	bl ScriptContext2_Enable
-	bl sub_80982EC
+	bl DismissMapNamePopup
 	b _080564BA
 	.align 2, 0
 _080564A8: .4byte gUnknown_3005E88
@@ -3323,7 +3323,7 @@ sub_80564C8: @ 80564C8
 	cmp r0, 0x1
 	bne _0805650C
 	bl ScriptContext2_Enable
-	bl sub_80982EC
+	bl DismissMapNamePopup
 	b _08056522
 	.align 2, 0
 _08056508: .4byte gUnknown_3005E90
@@ -3824,7 +3824,7 @@ sub_8056918: @ 8056918
 	cmp r0, 0x4
 	bne _0805692C
 	movs r0, 0
-	bl sub_8098110
+	bl CreateMapNamePopupIfNotAlreadyRunning
 _0805692C:
 	bl sub_807DF7C
 	pop {r0}
@@ -4223,7 +4223,7 @@ _08056CA8:
 	cmp r0, 0x4
 	bne _08056CCA
 	movs r0, 0
-	bl sub_8098110
+	bl CreateMapNamePopupIfNotAlreadyRunning
 	b _08056CCA
 	.align 2, 0
 _08056CBC: .4byte gMapHeader

data/box_party_pokemon_dropdown.s

@@ -7,4 +7,12 @@
 	.align 2
 
 gUnknown_841F4B4:: @ 841F4B4
-	.incbin "baserom.gba", 0x41f4b4, 0x20
+	.2byte 0x0100, 0x0100
+	.2byte 0x0200, 0x0100
+	.2byte 0x0100, 0x0200
+	.2byte 0x0200, 0x0200
+
+	.2byte 0x0080, 0x0080
+	.2byte 0x0100, 0x0100
+	.2byte 0x0200, 0x0200
+	.2byte 0x0400, 0x0400

data/clear_save_data_screen.s

@@ -7,10 +7,24 @@
 	.align 2
 
 gUnknown_841EE64:: @ 841EE64
-	.incbin "baserom.gba", 0x41EE64, 0x4
+	.4byte 0x000001f0
+	@ {
+	@ 	.bg = 0,
+	@ 	.charBaseIndex = 0,
+	@ 	.mapBaseIndex = 31,
+	@ 	.screenSize = 0,
+	@ 	.paletteMode = 0,
+	@ 	.priority = 0,
+	@ 	.baseTile = 0x0000
+	@ }
 
 gUnknown_841EE68:: @ 841EE68
-	.incbin "baserom.gba", 0x41EE68, 0x18
+	.byte 0, 3, 5, 6, 4, 15
+	.2byte 0x000a
+	.byte 0, 3, 15, 23, 4, 15
+	.2byte 0x0022
+	.byte 255, 0, 0, 0, 0, 0
+	.2byte 0x0000
 
 gUnknown_841EE80:: @ 841EE80
-	.incbin "baserom.gba", 0x41EE80, 0x44
+	.byte 0x01, 0x02, 0x03

data/evolution_graphics.s

@@ -6,6 +6,9 @@
 	.section .rodata
 	.align 2
 
+gUnknown_841EE84:: @ 841EE84
+	.incbin "baserom.gba", 0x41EE84, 0x40
+
 gUnknown_841EEC4:: @ 841EEC4
 	.incbin "baserom.gba", 0x41EEC4, 0x10
 

data/field_door.s

@@ -1,17 +0,0 @@
-	.section .rodata
-
-	.align 2
-gUnknown_835B488:: @ 835B488
-	.incbin "baserom.gba", 0x35B488, 0x14
-
-gUnknown_835B49C:: @ 835B49C
-	.incbin "baserom.gba", 0x35B49C, 0x14
-
-gUnknown_835B4B0:: @ 835B4B0
-	.incbin "baserom.gba", 0x35B4B0, 0x14
-
-gUnknown_835B4C4:: @ 835B4C4
-	.incbin "baserom.gba", 0x35B4C4, 0x114
-
-gUnknown_835B5D8:: @ 835B5D8
-	.incbin "baserom.gba", 0x35B5D8, 0x18C

data/field_tasks.s

@@ -1,7 +1,22 @@
 	.section .rodata
 	.align 2
 gUnknown_83A7310:: @ 83A7310
-	.incbin "baserom.gba", 0x3A7310, 0x20
+	.4byte nullsub_40
+	.4byte sub_806EB54
+	.4byte nullsub_40
+	.4byte nullsub_40
+	.4byte sub_806E9E0
+	.4byte nullsub_40
+	.4byte nullsub_40
+	.4byte sub_806EC40
 
 gUnknown_83A7330:: @ 83A7330
-	.incbin "baserom.gba", 0x3A7330, 0x14
+	.byte 0x08, 0x03
+	.byte 0x0a, 0x05
+	.byte 0x0f, 0x05
+	.byte 0x08, 0x09
+	.byte 0x09, 0x09
+	.byte 0x10, 0x09
+	.byte 0x08, 0x0a
+	.byte 0x09, 0x0a
+	.byte 0x08, 0x0e

data/item_use.s

@@ -1,15 +0,0 @@
-#include "constants/maps.h"
-#include "constants/species.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-	.incbin "baserom.gba", 0x3E27B4, 0x1A0
-
-gUnknown_83E2954:: @ 83E2954
-	.4byte sub_8124C8C
-	.4byte CB2_ReturnToField
-	.4byte NULL
-	.4byte NULL

data/map_name_popup.s

@@ -1,10 +0,0 @@
-#include "constants/maps.h"
-#include "constants/species.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnknown_83D4164:: @ 83D4164
-	.incbin "baserom.gba", 0x3D4164, 0x8

data/metatile_behavior.s

@@ -1,6 +0,0 @@
-	.section .rodata
-
-	.align 2
-
-gUnknown_8353068:: @ 8353068
-	.incbin "baserom.gba", 0x353068, 0x8420

data/save_failed_screen.s

@@ -7,4 +7,4 @@
 	.align 2
 
 gUnknown_841EE44:: @ 841EE44
-	.incbin "baserom.gba", 0x41EE44, 0x20
+	.incbin "graphics/interface/save_failed_screen.gbapal"