Merge remote-tracking branch 'upstream/master'

Makefile

@@ -90,7 +90,7 @@ C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
 ASM_SRCS := $(wildcard $(ASM_SUBDIR)/*.s)
 ASM_OBJS := $(patsubst $(ASM_SUBDIR)/%.s,$(ASM_BUILDDIR)/%.o,$(ASM_SRCS))
 
-DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s)
+DATA_ASM_SRCS := $(wildcard $(DATA_ASM_SUBDIR)/*.s $(DATA_ASM_SUBDIR)/**/*.s)
 DATA_ASM_OBJS := $(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o,$(DATA_ASM_SRCS))
 
 SONG_SRCS := $(wildcard $(SONG_SUBDIR)/*.s)

asm/beetle.s

@@ -1,812 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Beetle
-Beetle: @ 0x08021758
-	push {lr}
-	ldr r1, _08021764 @ =gUnk_080CB590
-	bl EnemyFunctionHandler
-	pop {pc}
-	.align 2, 0
-_08021764: .4byte gUnk_080CB590
-
-	thumb_func_start sub_08021768
-sub_08021768: @ 0x08021768
-	push {lr}
-	ldr r2, _0802177C @ =gUnk_080CB5A8
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_0802177C: .4byte gUnk_080CB5A8
-
-	thumb_func_start sub_08021780
-sub_08021780: @ 0x08021780
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x41
-	ldrb r0, [r0]
-	cmp r0, #0x80
-	beq _08021792
-	cmp r0, #0x93
-	beq _080217F4
-	b _080217FA
-_08021792:
-	ldr r0, _080217A4 @ =gPlayerState
-	adds r0, #0xa8
-	ldrb r0, [r0]
-	cmp r0, #0x18
-	bne _080217A8
-	adds r0, r4, #0
-	bl sub_08021768
-	b _080217FA
-	.align 2, 0
-_080217A4: .4byte gPlayerState
-_080217A8:
-	movs r1, #0
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	movs r0, #0xb4
-	strb r0, [r4, #0xe]
-	strb r1, [r4, #0xf]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r4, #0x10]
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #3
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r0, _080217EC @ =gPlayerEntity
-	adds r1, r4, #0
-	bl CopyPositionAndSpriteOffset
-	ldr r0, _080217F0 @ =0x0000FFFF
-	strh r0, [r4, #0x36]
-	adds r1, r4, #0
-	adds r1, #0x87
-	movs r0, #1
-	strb r0, [r1]
-	adds r0, r4, #0
-	movs r1, #6
-	bl InitializeAnimation
-	b _080217FA
-	.align 2, 0
-_080217EC: .4byte gPlayerEntity
-_080217F0: .4byte 0x0000FFFF
-_080217F4:
-	adds r0, r4, #0
-	bl sub_08021768
-_080217FA:
-	adds r0, r4, #0
-	adds r0, #0x45
-	ldrb r1, [r0]
-	cmp r1, #0
-	bne _08021808
-	subs r0, #3
-	strb r1, [r0]
-_08021808:
-	ldr r1, _08021814 @ =gUnk_080CB590
-	adds r0, r4, #0
-	bl sub_0804AA30
-	pop {r4, pc}
-	.align 2, 0
-_08021814: .4byte gUnk_080CB590
-
-	thumb_func_start sub_08021818
-sub_08021818: @ 0x08021818
-	push {lr}
-	adds r3, r0, #0
-	ldrb r0, [r3, #0xa]
-	cmp r0, #0
-	bne _0802182A
-	adds r0, r3, #0
-	bl sub_0804A7D4
-	b _08021844
-_0802182A:
-	ldr r2, [r3, #0x50]
-	cmp r2, #0
-	beq _0802183A
-	ldrb r0, [r2, #0xf]
-	subs r0, #1
-	movs r1, #0
-	strb r0, [r2, #0xf]
-	str r1, [r3, #0x50]
-_0802183A:
-	adds r0, r3, #0
-	movs r1, #0xf0
-	movs r2, #0
-	bl CreateDeathFx
-_08021844:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_08021848
-sub_08021848: @ 0x08021848
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0806F520
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _0802186C
-	ldr r0, _08021868 @ =gUnk_080CB5C8
-	ldrb r1, [r4, #0xd]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r4, #0
-	bl _call_via_r1
-	b _0802187A
-	.align 2, 0
-_08021868: .4byte gUnk_080CB5C8
-_0802186C:
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	strh r1, [r4, #0x36]
-	adds r0, r4, #0
-	movs r1, #2
-	bl InitializeAnimation
-_0802187A:
-	pop {r4, pc}
-
-	thumb_func_start sub_0802187C
-sub_0802187C: @ 0x0802187C
-	movs r1, #2
-	strb r1, [r0, #0xd]
-	bx lr
-	.align 2, 0
-
-	thumb_func_start nullsub_130
-nullsub_130: @ 0x08021884
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08021888
-sub_08021888: @ 0x08021888
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0806F3E4
-	cmp r0, #0
-	beq _0802189A
-	adds r0, r4, #0
-	bl sub_08021818
-_0802189A:
-	pop {r4, pc}
-
-	thumb_func_start sub_0802189C
-sub_0802189C: @ 0x0802189C
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0804A720
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	strb r0, [r4, #0x1c]
-	adds r0, r4, #0
-	movs r1, #3
-	bl InitializeAnimation
-	pop {r4, pc}
-
-	thumb_func_start sub_080218B4
-sub_080218B4: @ 0x080218B4
-	push {lr}
-	ldr r2, _080218C8 @ =gUnk_080CB5D4
-	ldrb r1, [r0, #0xb]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_080218C8: .4byte gUnk_080CB5D4
-
-	thumb_func_start sub_080218CC
-sub_080218CC: @ 0x080218CC
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	ldrb r0, [r5, #0xd]
-	cmp r0, #0
-	bne _08021916
-	movs r2, #1
-	movs r0, #1
-	strb r0, [r5, #0xd]
-	ldrb r1, [r5, #0x18]
-	subs r0, #5
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r5, #0x18]
-	adds r0, r5, #0
-	movs r1, #1
-	bl sub_08049F84
-	adds r4, r0, #0
-	bl Random
-	movs r1, #0x10
-	eors r4, r1
-	ldr r2, _08021980 @ =gUnk_080CB5DC
-	movs r1, #7
-	ands r1, r0
-	adds r1, r1, r2
-	ldrb r0, [r1]
-	adds r0, r0, r4
-	movs r1, #0x1f
-	ands r0, r1
-	strb r0, [r5, #0x15]
-	movs r0, #0x80
-	lsls r0, r0, #1
-	strh r0, [r5, #0x24]
-	movs r0, #0x90
-	lsls r0, r0, #9
-	str r0, [r5, #0x20]
-_08021916:
-	adds r0, r5, #0
-	bl GetNextFrame
-	adds r2, r5, #0
-	adds r2, #0x5a
-	ldrb r1, [r2]
-	movs r6, #1
-	adds r0, r6, #0
-	ands r0, r1
-	adds r4, r2, #0
-	cmp r0, #0
-	beq _08021948
-	adds r0, r5, #0
-	bl sub_080AEFE0
-	movs r1, #0xe0
-	lsls r1, r1, #5
-	adds r0, r5, #0
-	bl sub_080044EC
-	cmp r0, #0
-	bne _08021948
-	adds r0, r5, #0
-	adds r0, #0x59
-	strb r6, [r0]
-_08021948:
-	ldrb r1, [r4]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0802197C
-	movs r0, #2
-	strb r0, [r5, #0xc]
-	bl Random
-	movs r1, #0x38
-	ands r0, r1
-	adds r0, #8
-	strb r0, [r5, #0xe]
-	movs r0, #1
-	strb r0, [r5, #0xf]
-	ldrb r1, [r5, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r5, #0x10]
-	movs r0, #0xc0
-	lsls r0, r0, #1
-	strh r0, [r5, #0x24]
-	adds r0, r5, #0
-	movs r1, #0
-	bl InitializeAnimation
-_0802197C:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08021980: .4byte gUnk_080CB5DC
-
-	thumb_func_start sub_08021984
-sub_08021984: @ 0x08021984
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xd]
-	cmp r0, #0
-	bne _080219C2
-	movs r0, #1
-	strb r0, [r4, #0xd]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	ldrb r0, [r4, #0x18]
-	movs r1, #3
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	ldr r0, _08021A08 @ =0x0000FF80
-	strh r0, [r4, #0x36]
-	ldrb r2, [r4, #0x19]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r2
-	movs r2, #0x40
-	orrs r0, r2
-	strb r0, [r4, #0x19]
-	ldrb r0, [r4, #0x1b]
-	ands r1, r0
-	orrs r1, r2
-	strb r1, [r4, #0x1b]
-	ldr r0, _08021A0C @ =0x0000012D
-	bl sub_08004488
-_080219C2:
-	movs r1, #0xc0
-	lsls r1, r1, #5
-	adds r0, r4, #0
-	bl sub_08003FC4
-	cmp r0, #0
-	bne _08021A04
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r0, #0x10
-	strb r0, [r4, #0xe]
-	movs r2, #1
-	movs r0, #1
-	strb r0, [r4, #0xf]
-	ldrb r1, [r4, #0x18]
-	subs r0, #5
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r4, #0x18]
-	movs r0, #0xc0
-	lsls r0, r0, #1
-	strh r0, [r4, #0x24]
-	adds r1, r4, #0
-	adds r1, #0x86
-	movs r0, #0x3c
-	strb r0, [r1]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl UpdateSpriteForCollisionLayer
-_08021A04:
-	pop {r4, pc}
-	.align 2, 0
-_08021A08: .4byte 0x0000FF80
-_08021A0C: .4byte 0x0000012D
-
-	thumb_func_start sub_08021A10
-sub_08021A10: @ 0x08021A10
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	ldr r1, _08021A60 @ =gPlayerEntity
-	adds r0, r4, #0
-	movs r2, #0x78
-	movs r3, #0x50
-	bl sub_080041A0
-	cmp r0, #0
-	beq _08021A5E
-	adds r0, r4, #0
-	bl sub_08021D00
-	cmp r0, #0
-	bne _08021A5E
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08021A5E
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	bl Random
-	movs r1, #0x3f
-	ands r0, r1
-	adds r0, #0x1e
-	strb r0, [r4, #0xe]
-	ldrb r1, [r4, #0x15]
-	adds r0, r4, #0
-	bl sub_08021D44
-	adds r0, r4, #0
-	movs r1, #2
-	bl InitializeAnimation
-_08021A5E:
-	pop {r4, pc}
-	.align 2, 0
-_08021A60: .4byte gPlayerEntity
-
-	thumb_func_start sub_08021A64
-sub_08021A64: @ 0x08021A64
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl sub_08021D00
-	cmp r0, #0
-	bne _08021AD4
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	movs r5, #0xff
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08021A96
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	bl Random
-	movs r1, #0x1f
-	ands r0, r1
-	adds r0, #0x1e
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-_08021A96:
-	ldrb r0, [r4, #0xf]
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	ands r0, r5
-	cmp r0, #0
-	bne _08021AC8
-	movs r0, #8
-	strb r0, [r4, #0xf]
-	adds r0, r4, #0
-	movs r1, #1
-	bl sub_08049F84
-	adds r1, r0, #0
-	cmp r1, #0xff
-	bne _08021AC2
-	movs r0, #7
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #1
-	bl InitializeAnimation
-	b _08021AD4
-_08021AC2:
-	adds r0, r4, #0
-	bl sub_08021D44
-_08021AC8:
-	adds r0, r4, #0
-	bl sub_080AEF88
-	adds r0, r4, #0
-	bl GetNextFrame
-_08021AD4:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08021AD8
-sub_08021AD8: @ 0x08021AD8
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _08021B3A
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0
-	beq _08021B1E
-	movs r0, #0
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	movs r1, #1
-	bl sub_08049F84
-	cmp r0, #0xff
-	bne _08021B16
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r0, #8
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	b _08021B60
-_08021B16:
-	strb r0, [r4, #0x15]
-	movs r0, #0x7c
-	bl sub_08004488
-_08021B1E:
-	adds r0, r4, #0
-	bl sub_080AEFE0
-	movs r1, #0xc0
-	lsls r1, r1, #5
-	adds r0, r4, #0
-	bl sub_08003FC4
-	cmp r0, #0
-	bne _08021B3A
-	adds r1, r4, #0
-	adds r1, #0x59
-	movs r0, #1
-	strb r0, [r1]
-_08021B3A:
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _08021B60
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r0, #0x14
-	strb r0, [r4, #0xe]
-	adds r1, r4, #0
-	adds r1, #0x86
-	movs r0, #0x3c
-	strb r0, [r1]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-_08021B60:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08021B64
-sub_08021B64: @ 0x08021B64
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	ldr r0, _08021B88 @ =gPlayerState
-	ldr r1, [r0, #0x30]
-	movs r2, #4
-	ands r1, r2
-	adds r6, r0, #0
-	cmp r1, #0
-	beq _08021B8C
-	movs r1, #0
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	str r1, [r4, #0x34]
-	adds r0, r4, #0
-	movs r1, #2
-	bl InitializeAnimation
-	b _08021C4E
-	.align 2, 0
-_08021B88: .4byte gPlayerState
-_08021B8C:
-	movs r5, #1
-	adds r0, r6, #0
-	adds r0, #0xa8
-	ldrb r0, [r0]
-	cmp r0, #0xb
-	beq _08021BBA
-	cmp r0, #0x14
-	beq _08021BBA
-	bl sub_0807953C
-	cmp r0, #0
-	beq _08021BAE
-	ldrb r1, [r4, #0xa]
-	lsls r0, r1, #1
-	adds r0, r0, r1
-	adds r5, r0, #0
-	adds r5, #8
-_08021BAE:
-	ldrb r0, [r4, #0xe]
-	subs r5, r0, r5
-	cmp r5, #0
-	bge _08021BB8
-	movs r5, #0
-_08021BB8:
-	strb r5, [r4, #0xe]
-_08021BBA:
-	ldr r0, [r6, #0x30]
-	movs r1, #0x88
-	lsls r1, r1, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _08021BC8
-	movs r5, #0
-_08021BC8:
-	cmp r5, #0
-	bne _08021C04
-	movs r0, #6
-	strb r0, [r4, #0xc]
-	movs r0, #0x80
-	lsls r0, r0, #9
-	str r0, [r4, #0x20]
-	adds r0, r4, #0
-	adds r0, #0x87
-	strb r5, [r0]
-	ldr r2, _08021BEC @ =gPlayerEntity
-	ldrb r1, [r2, #0x15]
-	adds r0, r1, #0
-	cmp r0, #0xff
-	beq _08021BF0
-	movs r0, #0x10
-	b _08021BF6
-	.align 2, 0
-_08021BEC: .4byte gPlayerEntity
-_08021BF0:
-	ldrb r0, [r2, #0x14]
-	lsls r0, r0, #2
-	movs r1, #0x10
-_08021BF6:
-	eors r0, r1
-	strb r0, [r4, #0x15]
-	adds r0, r4, #0
-	movs r1, #5
-	bl InitializeAnimation
-	b _08021C4E
-_08021C04:
-	ldrb r1, [r6, #0x1a]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r6, #0x1a]
-	adds r1, r6, #0
-	adds r1, #0x80
-	ldrh r0, [r1]
-	subs r0, #0x50
-	strh r0, [r1]
-	adds r1, #0x2a
-	ldrb r0, [r1]
-	adds r0, #1
-	strb r0, [r1]
-	ldr r0, _08021C50 @ =gPlayerEntity
-	adds r1, r4, #0
-	bl CopyPositionAndSpriteOffset
-	ldr r2, _08021C54 @ =gUnk_080CB5E4
-	ldrb r1, [r4, #0xf]
-	adds r0, r1, #1
-	strb r0, [r4, #0xf]
-	movs r0, #0xe
-	ands r0, r1
-	lsrs r0, r0, #1
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	ldrh r1, [r4, #0x2e]
-	adds r0, r0, r1
-	strh r0, [r4, #0x2e]
-	ldrh r0, [r4, #0x36]
-	subs r0, #1
-	strh r0, [r4, #0x36]
-	adds r0, r4, #0
-	bl GetNextFrame
-_08021C4E:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08021C50: .4byte gPlayerEntity
-_08021C54: .4byte gUnk_080CB5E4
-
-	thumb_func_start sub_08021C58
-sub_08021C58: @ 0x08021C58
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r5, #1
-	adds r0, r5, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _08021C8A
-	adds r0, r4, #0
-	bl sub_080AEFE0
-	movs r1, #0xc0
-	lsls r1, r1, #5
-	adds r0, r4, #0
-	bl sub_08003FC4
-	cmp r0, #0
-	bne _08021C8A
-	adds r0, r4, #0
-	adds r0, #0x59
-	strb r5, [r0]
-_08021C8A:
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _08021CCC
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r2, #0x3c
-	strb r2, [r4, #0xe]
-	movs r0, #1
-	strb r0, [r4, #0xf]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	adds r3, r4, #0
-	adds r3, #0x29
-	ldrb r1, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #4
-	orrs r0, r1
-	strb r0, [r3]
-	adds r0, r4, #0
-	adds r0, #0x86
-	strb r2, [r0]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-_08021CCC:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08021CD0
-sub_08021CD0: @ 0x08021CD0
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	bne _08021CE6
-	adds r0, r4, #0
-	bl GetNextFrame
-_08021CE6:
-	adds r0, r4, #0
-	movs r1, #1
-	bl sub_08049F84
-	cmp r0, #0xff
-	beq _08021CFE
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #2
-	bl InitializeAnimation
-_08021CFE:
-	pop {r4, pc}
-
-	thumb_func_start sub_08021D00
-sub_08021D00: @ 0x08021D00
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r1, r4, #0
-	adds r1, #0x86
-	ldrb r0, [r1]
-	cmp r0, #0
-	beq _08021D16
-	subs r0, #1
-	strb r0, [r1]
-	movs r0, #0
-	b _08021D40
-_08021D16:
-	adds r0, r4, #0
-	movs r1, #1
-	movs r2, #0x10
-	bl sub_08049F64
-	cmp r0, #0
-	bne _08021D28
-	movs r0, #0
-	b _08021D40
-_08021D28:
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	movs r0, #1
-	strb r0, [r4, #0xe]
-	movs r0, #0xc0
-	lsls r0, r0, #9
-	str r0, [r4, #0x20]
-	adds r0, r4, #0
-	movs r1, #4
-	bl InitializeAnimation
-	movs r0, #1
-_08021D40:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08021D44
-sub_08021D44: @ 0x08021D44
-	push {lr}
-	adds r2, r0, #0
-	adds r1, #4
-	movs r0, #0x18
-	ands r1, r0
-	strb r1, [r2, #0x15]
-	movs r0, #8
-	ands r1, r0
-	cmp r1, #0
-	beq _08021D5E
-	movs r0, #0xc0
-	lsls r0, r0, #1
-	b _08021D60
-_08021D5E:
-	movs r0, #0xc0
-_08021D60:
-	strh r0, [r2, #0x24]
-	pop {pc}

asm/bigGoron.s

@@ -91,7 +91,7 @@ sub_0806D0B0: @ 0x0806D0B0
 	movs r0, #0x30
 	bl LoadGfxGroup
 	bl sub_0806D110
-	ldr r5, _0806D0EC @ =gUnk_02002F00
+	ldr r5, _0806D0EC @ =gMapDataTopSpecial
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r0, r5, #0
@@ -110,7 +110,7 @@ _0806D0DA:
 	pop {r4, r5, pc}
 	.align 2, 0
 _0806D0E8: .4byte gUnk_0200B650
-_0806D0EC: .4byte gUnk_02002F00
+_0806D0EC: .4byte gMapDataTopSpecial
 _0806D0F0: .4byte gScreen
 _0806D0F4: .4byte 0x00001D47
 
@@ -131,7 +131,7 @@ _0806D10C:
 	thumb_func_start sub_0806D110
 sub_0806D110: @ 0x0806D110
 	push {r4, r5, lr}
-	ldr r4, _0806D134 @ =gUnk_02002F00
+	ldr r4, _0806D134 @ =gMapDataTopSpecial
 	movs r0, #0x80
 	lsls r0, r0, #7
 	adds r5, r4, r0
@@ -147,7 +147,7 @@ sub_0806D110: @ 0x0806D110
 	bl sub_0806D138
 	pop {r4, r5, pc}
 	.align 2, 0
-_0806D134: .4byte gUnk_02002F00
+_0806D134: .4byte gMapDataTopSpecial
 
 	thumb_func_start sub_0806D138
 sub_0806D138: @ 0x0806D138

asm/bobomb.s

@@ -409,7 +409,7 @@ _0802C964:
 	cmp r1, #8
 	bne _0802C972
 	adds r0, r4, #0
-	bl sub_080A29FC
+	bl CreateDustSmall
 _0802C972:
 	adds r0, r4, #0
 	bl sub_0802CC18

asm/button.s

@@ -538,7 +538,7 @@ _08081E9A:
 	ldr r2, _08081EF8 @ =gUnk_02019EE0
 	cmp r5, #2
 	bne _08081EB4
-	ldr r2, _08081EFC @ =gUnk_02002F00
+	ldr r2, _08081EFC @ =gMapDataTopSpecial
 _08081EB4:
 	movs r0, #0x3f
 	ands r0, r6
@@ -570,7 +570,7 @@ _08081EEC: .4byte 0x00003FFF
 _08081EF0: .4byte 0x00007004
 _08081EF4: .4byte 0x00006004
 _08081EF8: .4byte gUnk_02019EE0
-_08081EFC: .4byte gUnk_02002F00
+_08081EFC: .4byte gMapDataTopSpecial
 
 	thumb_func_start sub_08081F00
 sub_08081F00: @ 0x08081F00

asm/chestSpawner.s

@@ -532,7 +532,7 @@ _0808424C:
 	movs r0, #0x72
 	bl PlaySFX
 	adds r0, r4, #0
-	bl sub_080A29BC
+	bl CreateDust
 _08084258:
 	movs r0, #3
 	strb r0, [r4, #0xc]
@@ -596,7 +596,7 @@ _080842BA:
 	ldrb r1, [r1]
 	bl sub_0807BA8C
 	adds r0, r4, #0
-	bl sub_080A29BC
+	bl CreateDust
 _080842D4:
 	pop {r4, pc}
 	.align 2, 0

asm/chooseFile.s

@@ -1204,7 +1204,7 @@ sub_08051458: @ 0x08051458
 	ldr r1, _0805147C @ =gUnk_02022030
 	movs r2, #0x80
 	lsls r2, r2, #3
-	bl sub_0801D66C
+	bl _DmaCopy
 	pop {pc}
 	.align 2, 0
 _08051474: .4byte gMenu
@@ -1364,7 +1364,7 @@ sub_08051574: @ 0x08051574
 	muls r1, r2, r1
 	adds r3, #0xc
 	adds r1, r1, r3
-	bl sub_0801D66C
+	bl _DmaCopy
 	bl sub_0805070C
 	pop {pc}
 	.align 2, 0
@@ -1742,7 +1742,7 @@ sub_08051874: @ 0x08051874
 	adds r3, r4, #0
 	adds r3, #0xc
 	adds r1, r1, r3
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r0, #0
 	bl sub_080503BC
 	b _080518DE
@@ -1895,7 +1895,7 @@ sub_080519B0: @ 0x080519B0
 	adds r1, r4, #0
 	adds r1, #0xc
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r0, #4
 	strb r0, [r4, #9]
 	bl sub_08053518

asm/code_08000108.s

@@ -26,7 +26,7 @@ _08000126:
 	ldr r0, [r0]
 	cmp r0, #0
 	beq _08000136
-	ldr r0, _080001FC @ =gUnk_02002F00
+	ldr r0, _080001FC @ =gMapDataTopSpecial
 	ldr r1, _08000200 @ =gUnk_020344F0
 	bl _call_via_r4
 _08000136:
@@ -126,7 +126,7 @@ _080001EC: .4byte gUnk_02025EB0
 _080001F0: .4byte gUnk_02019EE0
 _080001F4: .4byte gUnk_02021F70
 _080001F8: .4byte gUnk_0200B650
-_080001FC: .4byte gUnk_02002F00
+_080001FC: .4byte gMapDataTopSpecial
 _08000200: .4byte gUnk_020344F0
 _08000204: .4byte gUnk_08000248
 _08000208: .4byte gUnk_08000228
@@ -138,14 +138,14 @@ _0800021C: .4byte gUnk_080B3E80
 _08000220: .4byte gUnk_08000278
 _08000224: .4byte gUnk_08000228
 gUnk_08000228::
-	.4byte gUnk_02025EB4
+	.4byte gMapDataBottom
 gUnk_0800022C::
 	.4byte gMetatileTypesBottom
-	.4byte gUnk_02025EB4
+	.4byte gMapDataBottom
 	.4byte gMetatileTypesBottom
-	.4byte gUnk_0200B654
+	.4byte gMapDataTop
 	.4byte gMetatileTypesTop
-	.4byte gUnk_02025EB4
+	.4byte gMapDataBottom
 	.4byte gMetatileTypesBottom
 gUnk_08000248::
 	.4byte gUnk_02027EB4

asm/code_08016DF8.s

@@ -469,7 +469,7 @@ _08017196:
 	cmp r1, #0
 	bne _080171A4
 	adds r0, r5, #0
-	bl sub_080A2B80
+	bl CreateSparkle
 _080171A4:
 	ldr r0, _080171B8 @ =gUnk_02002A40
 	adds r3, r0, #0

asm/code_08018500.s

@@ -884,7 +884,7 @@ sub_08018BB4: @ 0x08018BB4
 	mov r5, sp
 	mov r1, sp
 	movs r2, #8
-	bl sub_0801D66C
+	bl _DmaCopy
 	lsls r0, r4, #2
 	adds r0, r0, r4
 	lsls r0, r0, #2

asm/code_08019444.s

@@ -495,7 +495,7 @@ _08019810:
 _0801981A:
 	adds r0, r1, #0
 	adds r1, r3, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	b _0801982E
 _08019824:
 	ldrh r0, [r4]
@@ -3508,7 +3508,7 @@ _0801AED0:
 	ldr r0, [r1]
 	cmp r0, #0
 	beq _0801AF10
-	ldr r0, _0801AF08 @ =gUnk_02002F00
+	ldr r0, _0801AF08 @ =gMapDataTopSpecial
 	bl sub_0801AB08
 	b _0801AF10
 	.align 2, 0
@@ -3522,7 +3522,7 @@ _0801AEF8: .4byte 0x00000888
 _0801AEFC: .4byte gUnk_02025EB0
 _0801AF00: .4byte gUnk_02019EE0
 _0801AF04: .4byte gUnk_0200B650
-_0801AF08: .4byte gUnk_02002F00
+_0801AF08: .4byte gMapDataTopSpecial
 _0801AF0C:
 	bl sub_0807C4F8
 _0801AF10:
@@ -3815,7 +3815,7 @@ _0801B114:
 	adds r1, r3, r0
 	lsls r2, r2, #5
 	adds r0, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 _0801B122:
 	ldr r0, [r4]
 	cmp r0, #0

asm/code_0801CEC0.s

@@ -730,7 +730,7 @@ _0801D4C8:
 	adds r1, r7, #0
 	movs r2, #0x20
 	str r3, [sp]
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r6, #0x20
 	adds r4, #4
 	adds r7, #0x20

asm/code_0801D79C.s

@@ -2142,11 +2142,11 @@ _0801E86C:
 	adds r0, r6, #0
 	adds r1, r7, #0
 	adds r2, r4, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	mov r0, r8
 	mov r1, sb
 	adds r2, r4, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 _0801E890:
 	movs r3, #1
 	add sb, r3

asm/code_0804AA84.s

@@ -45,7 +45,7 @@ _0804ABA4:
 	lsls r2, r2, #2
 	adds r1, r0, r2
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r2, _0804AC14 @ =gUsedPalettes
 	ldr r0, [r2]
 	movs r1, #0x80

asm/code_0804AEB0.s

@@ -50,7 +50,7 @@ _0804AEF6:
 _0804AF00:
 	adds r0, r6, #0
 	movs r2, #0x10
-	bl sub_0801D66C
+	bl _DmaCopy
 	pop {r4, r5, r6, pc}
 	.align 2, 0
 

asm/code_0804B058.s

@@ -173,7 +173,7 @@ sub_0804B260: @ 0x0804B260
 	adds r0, r0, r1
 	ldr r1, _0804B278 @ =gUnk_02034398
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	pop {pc}
 	.align 2, 0
 _0804B274: .4byte gUnk_080015BC
@@ -211,7 +211,7 @@ _0804B2A4:
 	adds r0, r2, #0
 	adds r1, r4, #0
 	movs r2, #8
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldrb r1, [r4, #6]
 	movs r0, #1
 	ands r0, r1

asm/code_080526F8.s

@@ -161,7 +161,7 @@ sub_080527FC: @ 0x080527FC
 	ldr r1, _08052834 @ =gPaletteBuffer
 	movs r2, #0x80
 	lsls r2, r2, #3
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r1, _08052838 @ =gUsedPalettes
 	movs r0, #1
 	rsbs r0, r0, #0
@@ -939,7 +939,7 @@ sub_08052E10: @ 0x08052E10
 	adds r0, r0, r1
 	ldr r0, [r0]
 	str r0, [r5, #8]
-	ldr r0, _08052E78 @ =gUnk_08107988
+	ldr r0, _08052E78 @ =gAreaRoomMaps
 	adds r0, r2, r0
 	ldr r0, [r0]
 	lsls r3, r3, #2
@@ -972,7 +972,7 @@ _08052E70:
 	pop {r4, r5, pc}
 	.align 2, 0
 _08052E74: .4byte gAreaTilesets
-_08052E78: .4byte gUnk_08107988
+_08052E78: .4byte gAreaRoomMaps
 _08052E7C: .4byte gAreaMetatiles
 _08052E80: .4byte gUnk_080B755C
 _08052E84: .4byte gUnk_0813A7F0
@@ -1204,7 +1204,7 @@ sub_08052FF4: @ 0x08052FF4
 	adds r0, r0, r1
 	ldr r0, [r0]
 	str r0, [r5, #8]
-	ldr r0, _08053080 @ =gUnk_08107988
+	ldr r0, _08053080 @ =gAreaRoomMaps
 	adds r0, r6, r0
 	ldr r0, [r0]
 	adds r2, r2, r0
@@ -1225,7 +1225,7 @@ _08053070: .4byte gScreen
 _08053074: .4byte gUnk_020342CC
 _08053078: .4byte gAreaRoomHeaders
 _0805307C: .4byte gAreaTilesets
-_08053080: .4byte gUnk_08107988
+_08053080: .4byte gAreaRoomMaps
 _08053084: .4byte gAreaMetatiles
 _08053088: .4byte gUnk_080B755C
 
@@ -1258,7 +1258,7 @@ sub_080530B0: @ 0x080530B0
 	ldr r0, _080530C0 @ =gUnk_080FCAF8
 	ldr r1, _080530C4 @ =gUnk_030010EC
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	pop {pc}
 	.align 2, 0
 _080530C0: .4byte gUnk_080FCAF8
@@ -1431,7 +1431,7 @@ sub_080531F8: @ 0x080531F8
 	ldr r1, _08053248 @ =gUnk_02002AC8
 	adds r0, r5, #0
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	bl CheckIsDungeon
 	cmp r0, #0
 	beq _08053238
@@ -1483,7 +1483,7 @@ sub_08053250: @ 0x08053250
 	adds r0, #0xc
 	ldr r1, _08053298 @ =gUnk_02002AC8
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	pop {r4, pc}
 	.align 2, 0
 _0805328C: .4byte gScreenTransition

asm/code_08055FF4.s

@@ -32,7 +32,7 @@ _080560E4:
 	lsls r4, r4, #0x12
 	adds r1, r4, #0
 	movs r2, #0x10
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r0, r4, #0
 	bl sub_0807CF10
 _080560F8:

asm/code_08056418.s

@@ -102,7 +102,7 @@ sub_080564EC: @ 0x080564EC
 	ldr r0, _080565A4 @ =gTextBox
 	adds r1, r4, #0
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldrb r0, [r4, #2]
 	cmp r0, #0x63
 	bne _08056520

asm/code_0805EC04.s

@@ -966,7 +966,7 @@ sub_0805F324: @ 0x0805F324
 	adds r7, r1, #0
 	mov r1, sp
 	movs r2, #0x30
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r0, #0
 	str r0, [sp, #0x34]
 	movs r1, #0
@@ -1142,7 +1142,7 @@ _0805F486:
 	adds r0, r5, #0
 	adds r1, r4, #0
 	movs r2, #0x18
-	bl sub_0801D66C
+	bl _DmaCopy
 	mov r0, sp
 	adds r1, r6, #0
 	bl sub_0805F440
@@ -1372,7 +1372,7 @@ _0805F63A:
 	ldr r0, [r4, #8]
 	ldr r1, [r4, #4]
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r0, [r4, #4]
 	adds r0, r0, r5
 	str r0, [r4, #4]

asm/code_08070698.s

@@ -542,7 +542,7 @@ _08070BC8:
 	cmp r0, #0
 	bne _08070BE4
 	adds r0, r5, #0
-	bl sub_080A2A64
+	bl CreateWaterTrace
 _08070BE4:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0

asm/code_080732D0.s

@@ -3691,14 +3691,14 @@ _08074E54:
 	movs r1, #8
 	movs r2, #0x18
 	rsbs r2, r2, #0
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 	b _08074EF0
 _08074E62:
 	adds r0, r4, #0
 	movs r1, #8
 	movs r2, #0x18
 	rsbs r2, r2, #0
-	bl sub_080A2D0C
+	bl CreateSpeechBubbleQuestionMark
 	b _08074EF0
 _08074E70:
 	ldrb r0, [r4, #0x18]
@@ -4261,7 +4261,7 @@ _08075270:
 	movs r2, #0x1c
 	rsbs r2, r2, #0
 	adds r0, r4, #0
-	bl sub_080A2D1C
+	bl CreateSpeechBubbleSleep
 	str r0, [r4, #0x6c]
 	cmp r0, #0
 	beq _0807528C
@@ -4280,7 +4280,7 @@ sub_0807529C: @ 0x0807529C
 	movs r2, #0x20
 	rsbs r2, r2, #0
 	movs r1, #8
-	bl sub_080A2D0C
+	bl CreateSpeechBubbleQuestionMark
 	pop {pc}
 	.align 2, 0
 

asm/code_08078778.s

@@ -5117,7 +5117,7 @@ _0807AECC:
 	cmp r0, #0
 	bne _0807AEDE
 	adds r0, r4, #0
-	bl sub_080A2A64
+	bl CreateWaterTrace
 _0807AEDE:
 	pop {r4, pc}
 	.align 2, 0
@@ -5517,7 +5517,7 @@ sub_0807B1A8: @ 0x0807B1A8
 	cmp r0, #0
 	bne _0807B1D0
 	adds r0, r4, #0
-	bl sub_080A2B80
+	bl CreateSparkle
 _0807B1D0:
 	pop {r4, pc}
 	.align 2, 0
@@ -5774,7 +5774,7 @@ _0807B3BC: .4byte gUnk_080B37A0
 _0807B3C0: .4byte gUnk_02019EE0
 _0807B3C4:
 	lsls r1, r1, #1
-	ldr r0, _0807B400 @ =gUnk_02002F00
+	ldr r0, _0807B400 @ =gMapDataTopSpecial
 _0807B3C8:
 	adds r3, r1, r0
 	mov r1, ip
@@ -5805,7 +5805,7 @@ _0807B3C8:
 	strb r0, [r1]
 	b _0807B430
 	.align 2, 0
-_0807B400: .4byte gUnk_02002F00
+_0807B400: .4byte gMapDataTopSpecial
 _0807B404: .4byte 0x00007004
 _0807B408: .4byte gRoomControls
 _0807B40C: .4byte gUnk_02000070

asm/code_0807B9B8.s

@@ -70,7 +70,7 @@ _0807BA38: .4byte gRoomControls
 _0807BA3C: .4byte gUnk_02019EE0
 _0807BA40:
 	lsls r1, r1, #1
-	ldr r0, _0807BA7C @ =gUnk_02002F00
+	ldr r0, _0807BA7C @ =gMapDataTopSpecial
 _0807BA44:
 	adds r3, r1, r0
 	lsls r0, r7, #3
@@ -101,7 +101,7 @@ _0807BA44:
 _0807BA78:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0807BA7C: .4byte gUnk_02002F00
+_0807BA7C: .4byte gMapDataTopSpecial
 _0807BA80: .4byte 0x00007004
 _0807BA84: .4byte gRoomControls
 _0807BA88: .4byte gUnk_02000070
@@ -172,7 +172,7 @@ _0807BB14: .4byte gRoomControls
 _0807BB18: .4byte gUnk_02019EE0
 _0807BB1C:
 	lsls r1, r1, #1
-	ldr r0, _0807BB58 @ =gUnk_02002F00
+	ldr r0, _0807BB58 @ =gMapDataTopSpecial
 _0807BB20:
 	adds r3, r1, r0
 	lsls r0, r6, #3
@@ -203,7 +203,7 @@ _0807BB20:
 _0807BB54:
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0807BB58: .4byte gUnk_02002F00
+_0807BB58: .4byte gMapDataTopSpecial
 _0807BB5C: .4byte 0x00007004
 _0807BB60: .4byte gRoomControls
 _0807BB64: .4byte gUnk_02000070
@@ -853,7 +853,7 @@ _0807C01C:
 	lsls r2, r2, #2
 	adds r1, r1, r2
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r2, _0807C0D4 @ =gUsedPalettes
 	ldr r0, [r2]
 	movs r1, #0x80
@@ -943,7 +943,7 @@ sub_0807C0DC: @ 0x0807C0DC
 	movs r0, #0xfc
 	ands r0, r1
 	strb r0, [r7, #0xf]
-	ldr r5, _0807C15C @ =gUnk_0200B654
+	ldr r5, _0807C15C @ =gMapDataTop
 	movs r6, #0x80
 	lsls r6, r6, #6
 	adds r0, r5, #0
@@ -958,7 +958,7 @@ sub_0807C0DC: @ 0x0807C0DC
 	lsls r4, r4, #8
 	adds r1, r4, #0
 	bl _DmaZero
-	ldr r0, _0807C164 @ =gUnk_02002F00
+	ldr r0, _0807C164 @ =gMapDataTopSpecial
 	adds r1, r4, #0
 	bl _DmaZero
 	ldr r0, _0807C168 @ =gArea
@@ -989,9 +989,9 @@ sub_0807C0DC: @ 0x0807C0DC
 	b _0807C184
 	.align 2, 0
 _0807C158: .4byte gRoomControls
-_0807C15C: .4byte gUnk_0200B654
+_0807C15C: .4byte gMapDataTop
 _0807C160: .4byte gUnk_02019EE0
-_0807C164: .4byte gUnk_02002F00
+_0807C164: .4byte gMapDataTopSpecial
 _0807C168: .4byte gArea
 _0807C16C: .4byte 0x0000085C
 _0807C170: .4byte gUnk_02025EB0
@@ -1008,29 +1008,29 @@ _0807C184:
 	ldrb r0, [r0]
 	cmp r0, #0
 	bne _0807C1BC
-	ldr r0, _0807C1B4 @ =gUnk_02025EB4
+	ldr r0, _0807C1B4 @ =gMapDataBottom
 	movs r2, #0xc0
 	lsls r2, r2, #6
 	adds r1, r0, r2
 	movs r4, #0x80
 	lsls r4, r4, #6
 	adds r2, r4, #0
-	bl sub_0801D66C
-	ldr r0, _0807C1B8 @ =gUnk_0200B654
+	bl _DmaCopy
+	ldr r0, _0807C1B8 @ =gMapDataTop
 	movs r3, #0xc0
 	lsls r3, r3, #6
 	adds r1, r0, r3
 	adds r2, r4, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	b _0807C26C
 	.align 2, 0
 _0807C1B0: .4byte gScreenTransition
-_0807C1B4: .4byte gUnk_02025EB4
-_0807C1B8: .4byte gUnk_0200B654
+_0807C1B4: .4byte gMapDataBottom
+_0807C1B8: .4byte gMapDataTop
 _0807C1BC:
 	cmp r0, #2
 	bne _0807C26C
-	ldr r4, _0807C278 @ =gUnk_02025EB4
+	ldr r4, _0807C278 @ =gMapDataBottom
 	movs r0, #0xb0
 	lsls r0, r0, #8
 	adds r0, r0, r4
@@ -1040,35 +1040,35 @@ _0807C1BC:
 	adds r0, r4, #0
 	mov r1, r8
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r1, #0xc0
 	lsls r1, r1, #6
 	adds r6, r4, r1
 	adds r0, r6, #0
 	adds r1, r4, #0
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	mov r0, r8
 	adds r1, r6, #0
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r6, r4, r5
 	adds r0, r6, #0
 	mov r1, r8
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r2, #0x80
 	lsls r2, r2, #7
 	adds r4, r4, r2
 	adds r0, r4, #0
 	adds r1, r6, #0
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	mov r0, r8
 	adds r1, r4, #0
 	adds r2, r5, #0
-	bl sub_0801D66C
-	ldr r4, _0807C27C @ =gUnk_0200B654
+	bl _DmaCopy
+	ldr r4, _0807C27C @ =gMapDataTop
 	movs r3, #0xb0
 	lsls r3, r3, #8
 	adds r3, r3, r4
@@ -1076,34 +1076,34 @@ _0807C1BC:
 	adds r0, r4, #0
 	mov r1, r8
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r0, #0xc0
 	lsls r0, r0, #6
 	adds r6, r4, r0
 	adds r0, r6, #0
 	adds r1, r4, #0
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	mov r0, r8
 	adds r1, r6, #0
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r6, r4, r5
 	adds r0, r6, #0
 	mov r1, r8
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r1, #0x80
 	lsls r1, r1, #7
 	adds r4, r4, r1
 	adds r0, r4, #0
 	adds r1, r6, #0
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	mov r0, r8
 	adds r1, r4, #0
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 _0807C26C:
 	mov r2, sb
 	cmp r2, #0
@@ -1111,8 +1111,8 @@ _0807C26C:
 	bl sub_0807BBE4
 	b _0807C2A0
 	.align 2, 0
-_0807C278: .4byte gUnk_02025EB4
-_0807C27C: .4byte gUnk_0200B654
+_0807C278: .4byte gMapDataBottom
+_0807C27C: .4byte gMapDataTop
 _0807C280:
 	ldr r0, _0807C2CC @ =gUnk_02027EB4
 	ldrh r1, [r7, #0x1e]
@@ -1141,7 +1141,7 @@ _0807C2A0:
 	ldr r0, _0807C2DC @ =gUnk_02019EE0
 	adds r1, r4, #0
 	bl sub_0801AB08
-	ldr r0, _0807C2E0 @ =gUnk_02002F00
+	ldr r0, _0807C2E0 @ =gMapDataTopSpecial
 	adds r1, r5, #0
 	bl sub_0801AB08
 	b _0807C326
@@ -1151,7 +1151,7 @@ _0807C2D0: .4byte gUnk_0200D654
 _0807C2D4: .4byte gUnk_02025EB0
 _0807C2D8: .4byte gUnk_0200B650
 _0807C2DC: .4byte gUnk_02019EE0
-_0807C2E0: .4byte gUnk_02002F00
+_0807C2E0: .4byte gMapDataTopSpecial
 _0807C2E4:
 	ldr r4, _0807C34C @ =gUnk_02019EE0
 	movs r0, #0x80
@@ -1161,19 +1161,19 @@ _0807C2E4:
 	adds r0, r4, #0
 	adds r1, r5, #0
 	adds r2, r6, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r0, r4, #0
 	adds r1, r5, #0
 	bl sub_0807C5F4
 	adds r0, r5, #0
 	adds r1, r6, #0
 	bl _DmaZero
-	ldr r4, _0807C350 @ =gUnk_02002F00
+	ldr r4, _0807C350 @ =gMapDataTopSpecial
 	adds r5, r4, r6
 	adds r0, r4, #0
 	adds r1, r5, #0
 	adds r2, r6, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r0, r4, #0
 	adds r1, r5, #0
 	bl sub_0807C5F4
@@ -1204,7 +1204,7 @@ _0807C33A:
 	mov pc, r0
 	.align 2, 0
 _0807C34C: .4byte gUnk_02019EE0
-_0807C350: .4byte gUnk_02002F00
+_0807C350: .4byte gMapDataTopSpecial
 _0807C354: .4byte _0807C358
 _0807C358: @ jump table
 	.4byte _0807C3BC @ case 0
@@ -1323,8 +1323,8 @@ sub_0807C460: @ 0x0807C460
 	mov r5, r8
 	push {r5, r6, r7}
 	sub sp, #8
-	ldr r7, _0807C4E8 @ =gUnk_02025EB4
-	ldr r6, _0807C4EC @ =gUnk_0200B654
+	ldr r7, _0807C4E8 @ =gMapDataBottom
+	ldr r6, _0807C4EC @ =gMapDataTop
 	ldr r0, _0807C4F0 @ =gRoomControls
 	ldrh r1, [r0, #0x1e]
 	lsrs r3, r1, #4
@@ -1390,8 +1390,8 @@ _0807C4DC:
 	mov sl, r5
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
-_0807C4E8: .4byte gUnk_02025EB4
-_0807C4EC: .4byte gUnk_0200B654
+_0807C4E8: .4byte gMapDataBottom
+_0807C4EC: .4byte gMapDataTop
 _0807C4F0: .4byte gRoomControls
 _0807C4F4: .4byte 0x00003FFF
 
@@ -1407,7 +1407,7 @@ sub_0807C4F8: @ 0x0807C4F8
 	lsls r4, r4, #8
 	adds r1, r4, #0
 	bl _DmaZero
-	ldr r0, _0807C59C @ =gUnk_02002F00
+	ldr r0, _0807C59C @ =gMapDataTopSpecial
 	adds r1, r4, #0
 	bl _DmaZero
 	ldr r5, _0807C5A0 @ =gUnk_02022830
@@ -1423,7 +1423,7 @@ _0807C524:
 	ldr r0, _0807C598 @ =gUnk_02019EE0
 	cmp r1, r0
 	beq _0807C534
-	ldr r0, _0807C59C @ =gUnk_02002F00
+	ldr r0, _0807C59C @ =gMapDataTopSpecial
 	cmp r1, r0
 	bne _0807C54A
 _0807C534:
@@ -1449,19 +1449,19 @@ _0807C54A:
 	adds r0, r4, #0
 	adds r1, r5, #0
 	adds r2, r6, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r0, r4, #0
 	adds r1, r5, #0
 	bl sub_0807C5F4
 	adds r0, r5, #0
 	adds r1, r6, #0
 	bl _DmaZero
-	ldr r4, _0807C59C @ =gUnk_02002F00
+	ldr r4, _0807C59C @ =gMapDataTopSpecial
 	adds r5, r4, r6
 	adds r0, r4, #0
 	adds r1, r5, #0
 	adds r2, r6, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r0, r4, #0
 	adds r1, r5, #0
 	bl sub_0807C5F4
@@ -1473,7 +1473,7 @@ _0807C592:
 	.align 2, 0
 _0807C594: .4byte gRoomControls
 _0807C598: .4byte gUnk_02019EE0
-_0807C59C: .4byte gUnk_02002F00
+_0807C59C: .4byte gMapDataTopSpecial
 _0807C5A0: .4byte gUnk_02022830
 _0807C5A4: .4byte gArea
 _0807C5A8: .4byte 0x0000085C
@@ -1863,25 +1863,25 @@ sub_0807C860: @ 0x0807C860
 	adds r0, #0x2d
 	movs r1, #1
 	strb r1, [r0]
-	ldr r0, _0807C890 @ =gUnk_02025EB4
+	ldr r0, _0807C890 @ =gMapDataBottom
 	movs r2, #0xc0
 	lsls r2, r2, #6
 	adds r1, r0, r2
 	movs r4, #0x80
 	lsls r4, r4, #6
 	adds r2, r4, #0
-	bl sub_0801D66C
-	ldr r0, _0807C894 @ =gUnk_0200B654
+	bl _DmaCopy
+	ldr r0, _0807C894 @ =gMapDataTop
 	movs r2, #0xc0
 	lsls r2, r2, #6
 	adds r1, r0, r2
 	adds r2, r4, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	pop {r4, pc}
 	.align 2, 0
 _0807C88C: .4byte gScreenTransition
-_0807C890: .4byte gUnk_02025EB4
-_0807C894: .4byte gUnk_0200B654
+_0807C890: .4byte gMapDataBottom
+_0807C894: .4byte gMapDataTop
 
 	thumb_func_start sub_0807C898
 sub_0807C898: @ 0x0807C898

asm/code_0807CC3C.s

@@ -1806,14 +1806,14 @@ _0807DC82:
 	movs r1, #8
 	movs r2, #0x18
 	rsbs r2, r2, #0
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 	b _0807DD40
 _0807DC90:
 	adds r0, r5, #0
 	movs r1, #8
 	movs r2, #0x18
 	rsbs r2, r2, #0
-	bl sub_080A2D0C
+	bl CreateSpeechBubbleQuestionMark
 	b _0807DD40
 _0807DC9E:
 	adds r0, r6, #0
@@ -5183,7 +5183,7 @@ sub_0807F3F8: @ 0x0807F3F8
 	movs r2, #0x18
 	rsbs r2, r2, #0
 	movs r1, #8
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 	pop {pc}
 	.align 2, 0
 _0807F408: .4byte gPlayerEntity
@@ -5195,7 +5195,7 @@ sub_0807F40C: @ 0x0807F40C
 	movs r2, #0x18
 	rsbs r2, r2, #0
 	movs r1, #8
-	bl sub_080A2D0C
+	bl CreateSpeechBubbleQuestionMark
 	pop {pc}
 	.align 2, 0
 _0807F41C: .4byte gPlayerEntity
@@ -5936,7 +5936,7 @@ sub_0807F93C: @ 0x0807F93C
 	movs r3, #0xff
 	ands r1, r3
 	ands r2, r3
-	bl sub_080A2D1C
+	bl CreateSpeechBubbleSleep
 	pop {pc}
 	.align 2, 0
 
@@ -6843,14 +6843,14 @@ sub_0807FFE4: @ 0x0807FFE4
 	ldr r0, [r0]
 	ldr r0, [r0]
 	bl sub_080197D4
-	ldr r4, _08080038 @ =gUnk_0200B654
+	ldr r4, _08080038 @ =gMapDataTop
 	ldrh r1, [r5, #0x1e]
 	lsrs r1, r1, #4
 	ldrh r2, [r5, #0x20]
 	lsrs r2, r2, #4
 	adds r0, r4, #0
 	bl sub_0807C8B0
-	ldr r0, _0808003C @ =gUnk_02002F00
+	ldr r0, _0808003C @ =gMapDataTopSpecial
 	subs r4, #4
 	adds r1, r4, #0
 	bl sub_0801AB08
@@ -6859,8 +6859,8 @@ sub_0807FFE4: @ 0x0807FFE4
 _0808002C: .4byte gUnk_0200B640
 _08080030: .4byte gUnk_08109194
 _08080034: .4byte gUnk_03004030
-_08080038: .4byte gUnk_0200B654
-_0808003C: .4byte gUnk_02002F00
+_08080038: .4byte gMapDataTop
+_0808003C: .4byte gMapDataTopSpecial
 
 	thumb_func_start sub_08080040
 sub_08080040: @ 0x08080040
@@ -6970,7 +6970,7 @@ sub_08080108: @ 0x08080108
 	push {r4, r5, r6, lr}
 	movs r1, #4
 	strb r1, [r0, #3]
-	ldr r5, _08080178 @ =gUnk_02025EB4
+	ldr r5, _08080178 @ =gMapDataBottom
 	movs r0, #0xc0
 	lsls r0, r0, #6
 	adds r1, r5, r0
@@ -6978,14 +6978,14 @@ sub_08080108: @ 0x08080108
 	lsls r6, r6, #6
 	adds r0, r5, #0
 	adds r2, r6, #0
-	bl sub_0801D66C
-	ldr r4, _0808017C @ =gUnk_0200B654
+	bl _DmaCopy
+	ldr r4, _0808017C @ =gMapDataTop
 	movs r0, #0xc0
 	lsls r0, r0, #6
 	adds r1, r4, r0
 	adds r0, r4, #0
 	adds r2, r6, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	bl sub_08080368
 	ldr r1, _08080180 @ =gUnk_02034480
 	ldr r0, _08080184 @ =gUnk_0200B640
@@ -6995,7 +6995,7 @@ sub_08080108: @ 0x08080108
 	ldr r1, _0808018C @ =gUnk_020246B0
 	movs r2, #0xc0
 	lsls r2, r2, #5
-	bl sub_0801D66C
+	bl _DmaCopy
 	subs r5, #4
 	adds r0, r5, #0
 	bl sub_08080B60
@@ -7008,19 +7008,19 @@ sub_08080108: @ 0x08080108
 	ldr r0, _08080190 @ =gUnk_02019EE0
 	adds r1, r5, #0
 	bl sub_0801AB08
-	ldr r0, _08080194 @ =gUnk_02002F00
+	ldr r0, _08080194 @ =gMapDataTopSpecial
 	adds r1, r4, #0
 	bl sub_0801AB08
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08080178: .4byte gUnk_02025EB4
-_0808017C: .4byte gUnk_0200B654
+_08080178: .4byte gMapDataBottom
+_0808017C: .4byte gMapDataTop
 _08080180: .4byte gUnk_02034480
 _08080184: .4byte gUnk_0200B640
 _08080188: .4byte gUnk_02022830
 _0808018C: .4byte gUnk_020246B0
 _08080190: .4byte gUnk_02019EE0
-_08080194: .4byte gUnk_02002F00
+_08080194: .4byte gMapDataTopSpecial
 
 	thumb_func_start sub_08080198
 sub_08080198: @ 0x08080198
@@ -7169,11 +7169,11 @@ _080802A2:
 	ldr r0, [sp]
 	cmp r8, r0
 	bhs _08080328
-	ldr r4, _0808034C @ =gUnk_0200B654
+	ldr r4, _0808034C @ =gMapDataTop
 	add r4, sb
 	ldr r7, _08080350 @ =gUnk_0200E654
 	add r7, sb
-	ldr r3, _08080354 @ =gUnk_02025EB4
+	ldr r3, _08080354 @ =gMapDataBottom
 	add r3, sb
 	ldr r6, _08080358 @ =gUnk_02028EB4
 	add r6, sb
@@ -7253,9 +7253,9 @@ _08080336:
 	.align 2, 0
 _08080344: .4byte gUnk_02022830
 _08080348: .4byte gRoomControls
-_0808034C: .4byte gUnk_0200B654
+_0808034C: .4byte gMapDataTop
 _08080350: .4byte gUnk_0200E654
-_08080354: .4byte gUnk_02025EB4
+_08080354: .4byte gMapDataBottom
 _08080358: .4byte gUnk_02028EB4
 _0808035C: .4byte 0x00003FFF
 _08080360: .4byte 0x000005FF
@@ -7673,7 +7673,7 @@ sub_08080668: @ 0x08080668
 	lsls r4, r4, #8
 	adds r1, r4, #0
 	bl _DmaZero
-	ldr r0, _080806B8 @ =gUnk_02002F00
+	ldr r0, _080806B8 @ =gMapDataTopSpecial
 	adds r1, r4, #0
 	bl _DmaZero
 	pop {r4, r5, pc}
@@ -7683,7 +7683,7 @@ _080806A8: .4byte gUnk_03004030
 _080806AC: .4byte 0x0000FFFF
 _080806B0: .4byte gUnk_02034480
 _080806B4: .4byte gUnk_02019EE0
-_080806B8: .4byte gUnk_02002F00
+_080806B8: .4byte gMapDataTopSpecial
 
 	thumb_func_start sub_080806BC
 sub_080806BC: @ 0x080806BC

asm/code_080A29BC.s

@@ -9,7 +9,7 @@
 sub_080A2A84: @ 0x080A2A84
 	push {r4, r5, r6, r7, lr}
 	adds r5, r1, #0
-	bl sub_080A2A64
+	bl CreateWaterTrace
 	adds r6, r0, #0
 	cmp r6, #0
 	beq _080A2AD2
@@ -132,8 +132,8 @@ _080A2B74:
 	.align 2, 0
 _080A2B7C: .4byte gSineTable
 
-	thumb_func_start sub_080A2B80
-sub_080A2B80: @ 0x080A2B80
+	thumb_func_start CreateSparkle
+CreateSparkle: @ 0x080A2B80
 	push {r4, r5, lr}
 	adds r5, r0, #0
 	movs r0, #0xf
@@ -331,38 +331,38 @@ _080A2CF8:
 	pop {r4, r5, pc}
 	.align 2, 0
 
-	thumb_func_start sub_080A2CFC
-sub_080A2CFC: @ 0x080A2CFC
+	thumb_func_start CreateSpeechBubbleExclamationMark
+CreateSpeechBubbleExclamationMark: @ 0x080A2CFC
 	push {r4, lr}
 	adds r4, r1, #0
 	adds r3, r2, #0
 	movs r1, #0
 	adds r2, r4, #0
-	bl sub_080A2D2C
+	bl CreateSpeechBubble
 	pop {r4, pc}
 
-	thumb_func_start sub_080A2D0C
-sub_080A2D0C: @ 0x080A2D0C
+	thumb_func_start CreateSpeechBubbleQuestionMark
+CreateSpeechBubbleQuestionMark: @ 0x080A2D0C
 	push {r4, lr}
 	adds r4, r1, #0
 	adds r3, r2, #0
 	movs r1, #1
 	adds r2, r4, #0
-	bl sub_080A2D2C
+	bl CreateSpeechBubble
 	pop {r4, pc}
 
-	thumb_func_start sub_080A2D1C
-sub_080A2D1C: @ 0x080A2D1C
+	thumb_func_start CreateSpeechBubbleSleep
+CreateSpeechBubbleSleep: @ 0x080A2D1C
 	push {r4, lr}
 	adds r4, r1, #0
 	adds r3, r2, #0
 	movs r1, #2
 	adds r2, r4, #0
-	bl sub_080A2D2C
+	bl CreateSpeechBubble
 	pop {r4, pc}
 
-	thumb_func_start sub_080A2D2C
-sub_080A2D2C: @ 0x080A2D2C
+	thumb_func_start CreateSpeechBubble
+CreateSpeechBubble: @ 0x080A2D2C
 	push {r4, r5, r6, r7, lr}
 	adds r5, r0, #0
 	adds r4, r1, #0

asm/code_080A3BD0.s

@@ -1130,7 +1130,7 @@ sub_080A44E0: @ 0x080A44E0
 	adds r5, r5, r1
 	adds r1, r5, #0
 	mov r2, r8
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r0, r6, #0
 	pop {r3}
 	mov r8, r3
@@ -1980,12 +1980,12 @@ sub_080A4BA0: @ 0x080A4BA0
 	ldr r0, _080A4C08 @ =gUnk_0812816C
 	mov r1, sp
 	movs r2, #0x18
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r0, _080A4C0C @ =gUnk_08128184
 	add r4, sp, #0x48
 	adds r1, r4, #0
 	movs r2, #0xc
-	bl sub_0801D66C
+	bl _DmaCopy
 	lsls r1, r6, #1
 	adds r1, r1, r6
 	lsls r2, r1, #9
@@ -2127,7 +2127,7 @@ sub_080A4CBC: @ 0x080A4CBC
 	ldr r1, _080A4D14 @ =0x0600E000
 	adds r0, r4, #0
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r0, r6, #0
 	bl sub_080A4948
 	cmp r0, #0

asm/code_080A5574.s

@@ -867,7 +867,7 @@ sub_080A5BF0: @ 0x080A5BF0
 	adds r0, r4, #2
 	adds r1, r4, #0
 	movs r2, #0xe
-	bl sub_0801D66C
+	bl _DmaCopy
 	strh r5, [r4, #0xe]
 	ldr r2, _080A5C40 @ =gUsedPalettes
 	ldr r0, [r2]
@@ -3420,7 +3420,7 @@ sub_080A7040: @ 0x080A7040
 	movs r2, #0x80
 	lsls r2, r2, #4
 	adds r0, r4, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r1, _080A70A0 @ =gUnk_08128D70
 	lsls r0, r5, #3
 	adds r4, r0, r1
@@ -3679,42 +3679,42 @@ sub_080A7250: @ 0x080A7250
 	ldr r0, _080A72EC @ =gScreen
 	ldr r1, _080A72F0 @ =gUnk_03001020
 	movs r2, #0x7c
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r0, _080A72F4 @ =gPaletteBuffer
 	ldr r1, _080A72F8 @ =gUnk_02024090
 	movs r2, #0x80
 	lsls r2, r2, #3
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r0, _080A72FC @ =gUnk_02024490
 	ldr r4, _080A7300 @ =gUnk_02032F14
 	movs r2, #0x85
 	lsls r2, r2, #2
 	adds r1, r4, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r0, _080A7304 @ =gUnk_02001A00
 	movs r2, #0x85
 	lsls r2, r2, #2
 	adds r1, r4, r2
 	movs r2, #0x40
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r0, _080A7308 @ =gRoomControls
 	adds r1, r4, #0
 	subs r1, #0x38
 	movs r2, #0x38
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r0, _080A730C @ =gUnk_03000420
 	movs r2, #0x95
 	lsls r2, r2, #2
 	adds r1, r4, r2
 	movs r2, #0x80
 	lsls r2, r2, #1
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r0, _080A7310 @ =gUnk_02033280
 	movs r2, #0xd5
 	lsls r2, r2, #2
 	adds r1, r4, r2
 	movs r2, #0xc
-	bl sub_0801D66C
+	bl _DmaCopy
 	bl sub_0805E958
 	adds r1, r4, #0
 	subs r1, #0x54
@@ -3838,36 +3838,36 @@ _080A73B4:
 	adds r0, r5, r1
 	ldr r1, _080A7480 @ =gUnk_02033280
 	movs r2, #0xc
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r1, #0xaa
 	lsls r1, r1, #2
 	adds r0, r5, r1
 	ldr r1, _080A7484 @ =gUnk_03000420
 	movs r2, #0x80
 	lsls r2, r2, #1
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r1, #0x9a
 	lsls r1, r1, #2
 	adds r0, r5, r1
 	ldr r1, _080A7488 @ =gUnk_02001A00
 	movs r2, #0x40
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r0, r5, #0
 	adds r0, #0x54
 	ldr r1, _080A748C @ =gUnk_02024490
 	movs r2, #0x85
 	lsls r2, r2, #2
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r0, r5, #0
 	adds r0, #0x1c
 	ldr r4, _080A7490 @ =gRoomControls
 	adds r1, r4, #0
 	movs r2, #0x38
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r0, _080A7494 @ =gUnk_03001020
 	ldr r1, _080A7498 @ =gScreen
 	movs r2, #0x7c
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldrb r0, [r4, #4]
 	bl sub_08052D58
 	ldr r4, _080A749C @ =gArea
@@ -8153,7 +8153,7 @@ sub_080A9448: @ 0x080A9448
 	cmp r0, #0
 	bne _080A9464
 	adds r0, r4, #0
-	bl sub_080A29BC
+	bl CreateDust
 	bl DeleteThisEntity
 	b _080A9486
 _080A9464:
@@ -10572,7 +10572,7 @@ sub_080AA654: @ 0x080AA654
 	ldr r0, _080AA688 @ =gUnk_0812A004
 	adds r1, r4, #0
 	movs r2, #0x10
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r1, #0x3f
 	adds r0, r5, #0
 	ands r0, r1
@@ -13189,7 +13189,7 @@ sub_080AB9DC: @ 0x080AB9DC
 	adds r1, r4, #0
 	adds r1, #0x68
 	movs r2, #0x1c
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldrh r1, [r4, #0x2e]
 	adds r0, r4, #0
 	adds r0, #0x84
@@ -13507,7 +13507,7 @@ _080ABC2A:
 	bl ModHealth
 _080ABC32:
 	adds r0, r4, #0
-	bl sub_080A29BC
+	bl CreateDust
 	bl DeleteThisEntity
 	b _080ABC52
 _080ABC3E:

asm/createFx.s

@@ -1,13 +0,0 @@
-	.include "asm/macros.inc"
-	.text
-	.syntax unified
-	
-	thumb_func_start CreateFx
-CreateFx: @ 0x080A29AC
-	push {r4, lr}
-	adds r4, r1, #0
-	adds r3, r2, #0
-	movs r1, #0xf
-	adds r2, r4, #0
-	bl CreateObjectWithParent
-	pop {r4, pc}

asm/crenalBeanSprout.s

@@ -603,7 +603,7 @@ sub_08096780: @ 0x08096780
 	strb r0, [r5, #0xc]
 	strb r1, [r5, #0xd]
 	adds r0, r5, #0
-	bl sub_080A29BC
+	bl CreateDust
 	b _080967E0
 	.align 2, 0
 _080967D4: .4byte gUnk_0812319C

asm/cuccoChickAggr.s

@@ -1,346 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start CuccoChickAggr
-CuccoChickAggr: @ 0x08022918
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldr r4, _08022930 @ =gUnk_080CBB64
-	bl GetNextFunction
-	lsls r0, r0, #2
-	adds r0, r0, r4
-	ldr r1, [r0]
-	adds r0, r5, #0
-	bl _call_via_r1
-	pop {r4, r5, pc}
-	.align 2, 0
-_08022930: .4byte gUnk_080CBB64
-
-	thumb_func_start sub_08022934
-sub_08022934: @ 0x08022934
-	push {lr}
-	ldr r2, _08022948 @ =gUnk_080CBB7C
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08022948: .4byte gUnk_080CBB7C
-
-	thumb_func_start sub_0802294C
-sub_0802294C: @ 0x0802294C
-	push {lr}
-	ldr r1, _08022958 @ =gUnk_080CBB64
-	bl sub_0804AA30
-	pop {pc}
-	.align 2, 0
-_08022958: .4byte gUnk_080CBB64
-
-	thumb_func_start nullsub_132
-nullsub_132: @ 0x0802295C
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08022960
-sub_08022960: @ 0x08022960
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0804A720
-	adds r0, r4, #0
-	bl sub_08022A88
-	pop {r4, pc}
-
-	thumb_func_start sub_08022970
-sub_08022970: @ 0x08022970
-	push {lr}
-	adds r1, r0, #0
-	ldrb r0, [r1, #0xe]
-	subs r0, #1
-	strb r0, [r1, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08022986
-	adds r0, r1, #0
-	bl sub_08022AA4
-_08022986:
-	pop {pc}
-
-	thumb_func_start sub_08022988
-sub_08022988: @ 0x08022988
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, #0
-	bne _080229A6
-	adds r0, r4, #0
-	bl sub_08022B20
-	cmp r0, #0
-	beq _080229A6
-	adds r0, r4, #0
-	bl sub_08022B0C
-	b _080229F6
-_080229A6:
-	ldrb r0, [r4, #0xf]
-	cmp r0, #0
-	beq _080229C6
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080229F6
-	movs r0, #1
-	strb r0, [r4, #0x1e]
-	movs r0, #0x80
-	lsls r0, r0, #9
-	str r0, [r4, #0x20]
-	movs r0, #0xd6
-	bl sub_08004488
-_080229C6:
-	adds r0, r4, #0
-	bl sub_080AEF88
-	movs r1, #0x80
-	lsls r1, r1, #6
-	adds r0, r4, #0
-	bl sub_08003FC4
-	adds r1, r0, #0
-	cmp r1, #0
-	bne _080229F6
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080229F0
-	adds r0, r4, #0
-	bl sub_08022A88
-	b _080229F6
-_080229F0:
-	movs r0, #4
-	strb r0, [r4, #0xf]
-	strb r1, [r4, #0x1e]
-_080229F6:
-	pop {r4, pc}
-
-	thumb_func_start sub_080229F8
-sub_080229F8: @ 0x080229F8
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #0xa0
-	lsls r1, r1, #6
-	bl sub_08003FC4
-	cmp r0, #0
-	bne _08022A3C
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r1, r0, #0x18
-	cmp r1, #0
-	bne _08022A30
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	movs r0, #6
-	strb r0, [r4, #0xe]
-	movs r0, #8
-	strb r0, [r4, #0xf]
-	strb r1, [r4, #0x1e]
-	movs r0, #0xc0
-	strh r0, [r4, #0x24]
-	adds r0, r4, #0
-	bl sub_08022B44
-	b _08022A3C
-_08022A30:
-	movs r0, #0x80
-	lsls r0, r0, #9
-	str r0, [r4, #0x20]
-	movs r0, #0xd6
-	bl sub_08004488
-_08022A3C:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022A40
-sub_08022A40: @ 0x08022A40
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xf]
-	cmp r0, #0
-	beq _08022A58
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08022A86
-	movs r0, #1
-	strb r0, [r4, #0x1e]
-_08022A58:
-	adds r0, r4, #0
-	bl sub_080AEF88
-	movs r1, #0x80
-	lsls r1, r1, #6
-	adds r0, r4, #0
-	bl sub_08003FC4
-	cmp r0, #0
-	bne _08022A86
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08022A80
-	adds r0, r4, #0
-	bl sub_08022A88
-	b _08022A86
-_08022A80:
-	adds r0, r4, #0
-	bl sub_08022B44
-_08022A86:
-	pop {r4, pc}
-
-	thumb_func_start sub_08022A88
-sub_08022A88: @ 0x08022A88
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	movs r5, #0
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	bl Random
-	movs r1, #0xf
-	ands r0, r1
-	adds r0, #8
-	strb r0, [r4, #0xe]
-	strb r5, [r4, #0x1e]
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022AA4
-sub_08022AA4: @ 0x08022AA4
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl Random
-	adds r5, r0, #0
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r1, #3
-	adds r0, r5, #0
-	ands r0, r1
-	adds r0, #1
-	strb r0, [r4, #0xe]
-	movs r0, #1
-	strb r0, [r4, #0xf]
-	movs r0, #0x80
-	strh r0, [r4, #0x24]
-	adds r0, r4, #0
-	bl sub_08049FA0
-	cmp r0, #0
-	bne _08022AE0
-	lsrs r0, r5, #8
-	movs r1, #3
-	ands r0, r1
-	cmp r0, #0
-	beq _08022AE0
-	adds r0, r4, #0
-	bl sub_08049EE4
-	b _08022AE6
-_08022AE0:
-	lsrs r0, r5, #0x10
-	movs r1, #0x1f
-	ands r0, r1
-_08022AE6:
-	strb r0, [r4, #0x15]
-	ldrb r1, [r4, #0x15]
-	movs r0, #0xf
-	ands r0, r1
-	cmp r0, #0
-	beq _08022B08
-	lsrs r1, r1, #4
-	movs r0, #1
-	eors r1, r0
-	ands r1, r0
-	lsls r1, r1, #6
-	ldrb r2, [r4, #0x18]
-	movs r0, #0x41
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-_08022B08:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022B0C
-sub_08022B0C: @ 0x08022B0C
-	push {lr}
-	movs r1, #3
-	strb r1, [r0, #0xc]
-	strb r1, [r0, #0xe]
-	movs r1, #8
-	strb r1, [r0, #0xf]
-	bl sub_08022B44
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022B20
-sub_08022B20: @ 0x08022B20
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #2
-	bl sub_08049DF4
-	cmp r0, #0
-	beq _08022B40
-	ldr r1, _08022B3C @ =gPlayerEntity
-	adds r0, r4, #0
-	movs r2, #0x24
-	movs r3, #0x24
-	bl sub_080041A0
-	b _08022B42
-	.align 2, 0
-_08022B3C: .4byte gPlayerEntity
-_08022B40:
-	movs r0, #0
-_08022B42:
-	pop {r4, pc}
-
-	thumb_func_start sub_08022B44
-sub_08022B44: @ 0x08022B44
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #0xc0
-	lsls r0, r0, #8
-	str r0, [r4, #0x20]
-	ldr r1, _08022B84 @ =gPlayerEntity
-	adds r0, r4, #0
-	bl GetFacingDirection
-	adds r1, r0, #0
-	strb r1, [r4, #0x15]
-	movs r0, #0xf
-	ands r0, r1
-	cmp r0, #0
-	beq _08022B7A
-	lsls r1, r1, #0x18
-	lsrs r1, r1, #0x1c
-	movs r0, #1
-	eors r1, r0
-	ands r1, r0
-	lsls r1, r1, #6
-	ldrb r2, [r4, #0x18]
-	movs r0, #0x41
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-_08022B7A:
-	movs r0, #0xd6
-	bl sub_08004488
-	pop {r4, pc}
-	.align 2, 0
-_08022B84: .4byte gPlayerEntity

asm/doorMimic.s

@@ -1,343 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start DoorMimic
-DoorMimic: @ 0x08021FA8
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldr r5, _08021FD4 @ =gUnk_080CB734
-	bl GetNextFunction
-	lsls r0, r0, #2
-	adds r0, r0, r5
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl _call_via_r1
-	ldr r1, _08021FD8 @ =gUnk_080CB8A4
-	ldrb r0, [r4, #0xb]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldrb r1, [r4, #0x1e]
-	ldr r0, [r0]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r0, [r1]
-	str r0, [r4, #0x48]
-	pop {r4, r5, pc}
-	.align 2, 0
-_08021FD4: .4byte gUnk_080CB734
-_08021FD8: .4byte gUnk_080CB8A4
-
-	thumb_func_start sub_08021FDC
-sub_08021FDC: @ 0x08021FDC
-	push {lr}
-	ldr r2, _08021FF0 @ =gUnk_080CB74C
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08021FF0: .4byte gUnk_080CB74C
-
-	thumb_func_start sub_08021FF4
-sub_08021FF4: @ 0x08021FF4
-	push {lr}
-	ldr r1, _08022000 @ =gUnk_080CB734
-	bl sub_0804AA30
-	pop {pc}
-	.align 2, 0
-_08022000: .4byte gUnk_080CB734
-
-	thumb_func_start sub_08022004
-sub_08022004: @ 0x08022004
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x7c
-	ldrh r0, [r0]
-	adds r1, r4, #0
-	adds r1, #0x7e
-	ldrh r1, [r1]
-	adds r2, r4, #0
-	adds r2, #0x38
-	ldrb r2, [r2]
-	bl SetTile
-	adds r0, r4, #0
-	movs r1, #5
-	movs r2, #0
-	bl CreateFx
-	adds r0, r4, #0
-	bl sub_08049CF4
-	bl DeleteThisEntity
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022034
-sub_08022034: @ 0x08022034
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0xa]
-	movs r0, #3
-	ands r0, r1
-	strb r0, [r4, #0xb]
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #5
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r2, _08022098 @ =gUnk_080CB764
-	ldrb r0, [r4, #0xb]
-	lsls r0, r0, #1
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	ldrh r1, [r4, #0x2e]
-	adds r0, r0, r1
-	adds r1, r4, #0
-	adds r1, #0x78
-	strh r0, [r1]
-	ldrb r0, [r4, #0xb]
-	lsls r0, r0, #1
-	adds r0, #1
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	ldrh r1, [r4, #0x32]
-	adds r0, r0, r1
-	adds r1, r4, #0
-	adds r1, #0x7a
-	strh r0, [r1]
-	ldrb r1, [r4, #0xb]
-	adds r0, r4, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl sub_080221C0
-	pop {r4, pc}
-	.align 2, 0
-_08022098: .4byte gUnk_080CB764
-
-	thumb_func_start sub_0802209C
-sub_0802209C: @ 0x0802209C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0
-	bne _080220D2
-	adds r0, r4, #0
-	adds r0, #0x78
-	ldrh r0, [r0]
-	adds r1, r4, #0
-	adds r1, #0x7a
-	ldrh r1, [r1]
-	movs r2, #0x10
-	movs r3, #0x10
-	bl sub_0806FBFC
-	cmp r0, #0
-	beq _080220D6
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r0, #0x12
-	strb r0, [r4, #0xe]
-	ldrb r1, [r4, #0xb]
-	adds r1, #4
-	adds r0, r4, #0
-	bl InitializeAnimation
-	b _080220D6
-_080220D2:
-	subs r0, #1
-	strb r0, [r4, #0xe]
-_080220D6:
-	pop {r4, pc}
-
-	thumb_func_start sub_080220D8
-sub_080220D8: @ 0x080220D8
-	push {lr}
-	adds r1, r0, #0
-	ldrb r0, [r1, #0xe]
-	subs r0, #1
-	strb r0, [r1, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080220EC
-	movs r0, #3
-	strb r0, [r1, #0xc]
-_080220EC:
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_080220F0
-sub_080220F0: @ 0x080220F0
-	push {r4, r5, r6, lr}
-	adds r5, r0, #0
-	bl GetNextFrame
-	adds r0, r5, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _08022160
-	movs r1, #0
-	movs r0, #4
-	strb r0, [r5, #0xc]
-	movs r0, #0x78
-	strb r0, [r5, #0xe]
-	adds r0, r5, #0
-	adds r0, #0x44
-	strb r1, [r0]
-	ldrb r1, [r5, #0xb]
-	lsls r0, r1, #1
-	adds r0, r0, r1
-	lsls r0, r0, #2
-	ldr r1, _0802215C @ =gUnk_080CB76C
-	adds r4, r0, r1
-	movs r6, #0
-_08022124:
-	adds r0, r5, #0
-	movs r1, #0x11
-	movs r2, #0
-	bl CreateFx
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _08022148
-	movs r0, #0
-	ldrsb r0, [r4, r0]
-	ldrh r2, [r1, #0x2e]
-	adds r0, r0, r2
-	strh r0, [r1, #0x2e]
-	movs r0, #1
-	ldrsb r0, [r4, r0]
-	ldrh r2, [r1, #0x32]
-	adds r0, r0, r2
-	strh r0, [r1, #0x32]
-_08022148:
-	adds r6, #1
-	adds r4, #2
-	cmp r6, #5
-	bls _08022124
-	movs r0, #0x82
-	lsls r0, r0, #1
-	bl sub_08004488
-	b _08022170
-	.align 2, 0
-_0802215C: .4byte gUnk_080CB76C
-_08022160:
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _08022170
-	adds r1, r5, #0
-	adds r1, #0x44
-	movs r0, #4
-	strb r0, [r1]
-_08022170:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022174
-sub_08022174: @ 0x08022174
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0800445C
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08022196
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0xb]
-	adds r1, #8
-	adds r0, r4, #0
-	bl InitializeAnimation
-_08022196:
-	pop {r4, pc}
-
-	thumb_func_start sub_08022198
-sub_08022198: @ 0x08022198
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0800445C
-	adds r0, r4, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080221BC
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	movs r0, #0x5a
-	strb r0, [r4, #0xe]
-_080221BC:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080221C0
-sub_080221C0: @ 0x080221C0
-	push {r4, r5, r6, lr}
-	adds r6, r0, #0
-	movs r0, #0x2e
-	ldrsh r4, [r6, r0]
-	ldr r1, _08022220 @ =gRoomControls
-	ldrh r0, [r1, #6]
-	subs r4, r4, r0
-	asrs r4, r4, #4
-	movs r2, #0x3f
-	ands r4, r2
-	movs r3, #0x32
-	ldrsh r0, [r6, r3]
-	ldrh r1, [r1, #8]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	ands r0, r2
-	lsls r0, r0, #6
-	orrs r4, r0
-	ldr r1, _08022224 @ =gUnk_080B4488
-	ldrb r0, [r6, #0xb]
-	lsls r0, r0, #1
-	adds r0, r0, r1
-	movs r1, #0
-	ldrsh r0, [r0, r1]
-	adds r4, r4, r0
-	adds r0, r6, #0
-	adds r0, #0x7e
-	strh r4, [r0]
-	adds r5, r6, #0
-	adds r5, #0x38
-	ldrb r1, [r5]
-	adds r0, r4, #0
-	bl sub_080001DA
-	adds r1, r6, #0
-	adds r1, #0x7c
-	strh r0, [r1]
-	ldr r1, _08022228 @ =gUnk_080CB79C
-	ldrb r0, [r6, #0xb]
-	lsls r0, r0, #1
-	adds r0, r0, r1
-	ldrh r0, [r0]
-	ldrb r2, [r5]
-	adds r1, r4, #0
-	bl SetTile
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08022220: .4byte gRoomControls
-_08022224: .4byte gUnk_080B4488
-_08022228: .4byte gUnk_080CB79C

asm/dust.s

@@ -146,7 +146,7 @@ _080441F2:
 	beq _0804429A
 	adds r0, r6, #0
 	adds r2, r5, #0
-	bl sub_0801D66C
+	bl _DmaCopy
 	adds r1, r4, #0
 	adds r1, #0x28
 	movs r0, #0xff

asm/enemyE.s

@@ -1,100 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start EnemyE
-EnemyE: @ 0x08022FA4
-	push {lr}
-	ldr r1, _08022FB0 @ =gUnk_080CBBC8
-	bl EnemyFunctionHandler
-	pop {pc}
-	.align 2, 0
-_08022FB0: .4byte gUnk_080CBBC8
-
-	thumb_func_start sub_08022FB4
-sub_08022FB4: @ 0x08022FB4
-	push {lr}
-	ldr r2, _08022FC8 @ =gUnk_080CBBDC
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08022FC8: .4byte gUnk_080CBBDC
-
-	thumb_func_start nullsub_133
-nullsub_133: @ 0x08022FCC
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08022FD0
-sub_08022FD0: @ 0x08022FD0
-	push {lr}
-	movs r3, #1
-	movs r1, #1
-	strb r1, [r0, #0xc]
-	ldrb r2, [r0, #0x18]
-	subs r1, #5
-	ands r1, r2
-	orrs r1, r3
-	strb r1, [r0, #0x18]
-	movs r1, #0
-	bl sub_08023000
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022FEC
-sub_08022FEC: @ 0x08022FEC
-	push {lr}
-	movs r1, #0x80
-	bl sub_08023000
-	pop {pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022FF8
-sub_08022FF8: @ 0x08022FF8
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08022FFC
-sub_08022FFC: @ 0x08022FFC
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08023000
-sub_08023000: @ 0x08023000
-	push {r4, lr}
-	adds r4, r0, #0
-	cmp r1, #0x80
-	bne _0802300E
-	bl UpdateAnimationSingleFrame
-	b _08023014
-_0802300E:
-	adds r0, r4, #0
-	bl InitAnimationForceUpdate
-_08023014:
-	movs r2, #0x80
-	adds r0, r4, #0
-	adds r0, #0x5b
-	ldrb r0, [r0]
-	cmp r0, #0x40
-	bne _08023022
-	rsbs r2, r2, #0
-_08023022:
-	ldrb r0, [r4, #0x19]
-	movs r1, #3
-	orrs r0, r1
-	strb r0, [r4, #0x19]
-	adds r0, r4, #0
-	adds r1, r2, #0
-	movs r2, #0x80
-	movs r3, #0
-	bl sub_0805EC9C
-	pop {r4, pc}

asm/gleerok.s

@@ -857,7 +857,7 @@ _0802D6C4:
 	rsbs r2, r2, #0
 	adds r0, r5, #0
 	movs r1, #0xc
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 _0802D6D8:
 	strb r6, [r5, #0x14]
 	b _0802D6EC

asm/guardWithSpear.s

@@ -234,7 +234,7 @@ _080641E6:
 	cmp r0, #0
 	bne _08064222
 	adds r0, r5, #0
-	bl sub_080A29FC
+	bl CreateDustSmall
 _08064222:
 	adds r4, r5, #0
 	adds r4, #0x71
@@ -299,7 +299,7 @@ _0806428C:
 	cmp r0, #0
 	bne _080642AC
 	adds r0, r5, #0
-	bl sub_080A29FC
+	bl CreateDustSmall
 _080642AC:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
@@ -379,7 +379,7 @@ _08064306:
 	cmp r0, #0
 	bne _08064342
 	adds r0, r5, #0
-	bl sub_080A29FC
+	bl CreateDustSmall
 _08064342:
 	adds r4, r5, #0
 	adds r4, #0x71
@@ -444,7 +444,7 @@ _080643AC:
 	cmp r0, #0
 	bne _080643CC
 	adds r0, r5, #0
-	bl sub_080A29FC
+	bl CreateDustSmall
 _080643CC:
 	pop {r4, r5, r6, pc}
 	.align 2, 0

asm/gyorgFemale.s

@@ -113,7 +113,7 @@ sub_0804614C: @ 0x0804614C
 	lsls r4, r4, #8
 	adds r1, r4, #0
 	bl _DmaZero
-	ldr r0, _08046250 @ =gUnk_02002F00
+	ldr r0, _08046250 @ =gMapDataTopSpecial
 	adds r1, r4, #0
 	bl _DmaZero
 	adds r0, r6, #0
@@ -135,7 +135,7 @@ _08046244:
 	.align 2, 0
 _08046248: .4byte gEntCount
 _0804624C: .4byte gUnk_02019EE0
-_08046250: .4byte gUnk_02002F00
+_08046250: .4byte gMapDataTopSpecial
 _08046254: .4byte gPlayerEntity
 _08046258: .4byte sub_08046498
 
@@ -446,7 +446,7 @@ sub_08046498: @ 0x08046498
 	lsls r4, r4, #8
 	adds r1, r4, #0
 	bl _DmaZero
-	ldr r0, _080464BC @ =gUnk_02002F00
+	ldr r0, _080464BC @ =gMapDataTopSpecial
 	adds r1, r4, #0
 	bl _DmaZero
 	adds r0, r5, #0
@@ -454,7 +454,7 @@ sub_08046498: @ 0x08046498
 	pop {r4, r5, pc}
 	.align 2, 0
 _080464B8: .4byte gUnk_02019EE0
-_080464BC: .4byte gUnk_02002F00
+_080464BC: .4byte gMapDataTopSpecial
 
 	thumb_func_start sub_080464C0
 sub_080464C0: @ 0x080464C0
@@ -475,7 +475,7 @@ _080464DE:
 	adds r0, r4, #0
 	adds r1, r5, #0
 	movs r2, #0x40
-	bl sub_0801D66C
+	bl _DmaCopy
 	movs r0, #0x80
 	lsls r0, r0, #1
 	adds r5, r5, r0

asm/itemOnGround.s

@@ -395,14 +395,14 @@ _08080C7C: .4byte gUnk_0200B650
 sub_08080C80: @ 0x08080C80
 	push {r4, lr}
 	bl sub_080197D4
-	ldr r0, _08080CA8 @ =gUnk_02025EB4
+	ldr r0, _08080CA8 @ =gMapDataBottom
 	ldr r4, _08080CAC @ =gRoomControls
 	ldrh r1, [r4, #0x1e]
 	lsrs r1, r1, #4
 	ldrh r2, [r4, #0x20]
 	lsrs r2, r2, #4
 	bl sub_0807C8B0
-	ldr r0, _08080CB0 @ =gUnk_0200B654
+	ldr r0, _08080CB0 @ =gMapDataTop
 	ldrh r1, [r4, #0x1e]
 	lsrs r1, r1, #4
 	ldrh r2, [r4, #0x20]
@@ -410,9 +410,9 @@ sub_08080C80: @ 0x08080C80
 	bl sub_0807C8B0
 	pop {r4, pc}
 	.align 2, 0
-_08080CA8: .4byte gUnk_02025EB4
+_08080CA8: .4byte gMapDataBottom
 _08080CAC: .4byte gRoomControls
-_08080CB0: .4byte gUnk_0200B654
+_08080CB0: .4byte gMapDataTop
 
 	thumb_func_start sub_08080CB4
 sub_08080CB4: @ 0x08080CB4
@@ -545,7 +545,7 @@ _08080DEE:
 	cmp r0, #0
 	bne _08080E00
 	adds r0, r4, #0
-	bl sub_080A2B80
+	bl CreateSparkle
 _08080E00:
 	pop {r4, r5, pc}
 	.align 2, 0

asm/likeLike.s

@@ -312,7 +312,7 @@ sub_08027F84: @ 0x08027F84
 	movs r1, #0
 	bl InitializeAnimation
 	adds r0, r4, #0
-	bl sub_080A29BC
+	bl CreateDust
 _08027FB0:
 	pop {r4, pc}
 	.align 2, 0
@@ -403,7 +403,7 @@ sub_0802802C: @ 0x0802802C
 	strb r2, [r4, #0x15]
 	strb r2, [r4, #0xe]
 	adds r0, r4, #0
-	bl sub_080A29BC
+	bl CreateDust
 _0802805A:
 	pop {r4, pc}
 

asm/macros/map.inc

@@ -9,16 +9,56 @@
 	.2byte \tileset_id
 	.endm
 
-	.macro tileset_tiles src_offset, dest, size, compressed, terminator=0
+	.macro map_data src_offset, dest, size, compressed, terminator=0
 	.4byte (!(\terminator) << 0x1F) | (\src_offset)
 	.4byte \dest
 	.4byte (\compressed << 0x1F) | (\size)
 	.endm
 
+	.macro tileset_tiles src_offset, dest, size, compressed, terminator=0
+	map_data \src_offset, \dest, \size, \compressed, \terminator
+	.endm
+
 	.macro tileset_palette_set id, terminator=0
 	.4byte (!(\terminator) << 0x1F) | (\id)
 	.4byte 0x0
 	.4byte 0x0
 	.endm
 
+	.macro metatiles_bottom src_offset, size, compressed, terminator=0
+	map_data \src_offset, gMetatilesBottom, \size, \compressed, \terminator
+	.endm
+
+	.macro metatiles_top src_offset, size, compressed, terminator=0
+	map_data \src_offset, gMetatilesTop, \size, \compressed, \terminator
+	.endm
+
+	.macro metatile_types_bottom src_offset, size, compressed, terminator=0
+	map_data \src_offset, gMetatileTypesBottom, \size, \compressed, \terminator
+	.endm
+
+	.macro metatile_types_top src_offset, size, compressed, terminator=0
+	map_data \src_offset, gMetatileTypesTop, \size, \compressed, \terminator
+	.endm
+
+	.macro map_bottom src_offset, size, compressed, terminator=0
+	map_data \src_offset, gMapDataBottom, \size, \compressed, \terminator
+	.endm
+
+	.macro map_top src_offset, size, compressed, terminator=0
+	map_data \src_offset, gMapDataTop, \size, \compressed, \terminator
+	.endm
+
+	.macro map_top_special src_offset, size, compressed, terminator=0
+	map_data \src_offset, gMapDataTopSpecial, \size, \compressed, \terminator
+	.endm
+
+	.macro map_unknown src_offset, size, compressed, terminator=0
+	map_data \src_offset, gUnk_02027EB4, \size, \compressed, \terminator
+	.endm
+
+	.macro map_unknown_2 src_offset, size, compressed, terminator=0
+	map_data \src_offset, gUnk_02019EE0, \size, \compressed, \terminator
+	.endm
+
 	.endif @ GUARD_ASM_MACROS_MAP_INC

asm/manager10.s

@@ -440,7 +440,7 @@ _080598AA:
 	lsls r2, r2, #2
 	adds r1, r0, r2
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r2, _080598F0 @ =gUsedPalettes
 	ldr r0, [r2]
 	ldr r1, _080598F4 @ =0x00207FFC

asm/manager2.s

@@ -29,7 +29,7 @@ sub_0805754C: @ 0x0805754C
 _08057570:
 	asrs r0, r0, #6
 	lsls r0, r0, #9
-	ldr r5, _080575C4 @ =gUnk_02002F00
+	ldr r5, _080575C4 @ =gMapDataTopSpecial
 	adds r1, r0, r5
 	str r1, [r4, #0x34]
 	ldr r0, [r2, #0x38]
@@ -71,7 +71,7 @@ _080575BA:
 	.align 2, 0
 _080575BC: .4byte gRoomControls
 _080575C0: .4byte gScreen
-_080575C4: .4byte gUnk_02002F00
+_080575C4: .4byte gMapDataTopSpecial
 
 	thumb_func_start sub_080575C8
 sub_080575C8: @ 0x080575C8
@@ -107,7 +107,7 @@ sub_080575C8: @ 0x080575C8
 _08057604:
 	asrs r0, r0, #6
 	lsls r0, r0, #9
-	ldr r4, _08057674 @ =gUnk_02002F00
+	ldr r4, _08057674 @ =gMapDataTopSpecial
 	adds r0, r0, r4
 	str r0, [r2, #0x34]
 	ldr r0, _08057678 @ =0x00001D49
@@ -158,7 +158,7 @@ _08057664: .4byte gUnk_0200B650
 _08057668: .4byte gRoomVars
 _0805766C: .4byte gRoomControls
 _08057670: .4byte gScreen
-_08057674: .4byte gUnk_02002F00
+_08057674: .4byte gMapDataTopSpecial
 _08057678: .4byte 0x00001D49
 _0805767C: .4byte 0x00001E49
 _08057680: .4byte 0x00003C48

asm/manager23.s

@@ -188,7 +188,7 @@ sub_0805BDB4: @ 0x0805BDB4
 	movs r2, #0x3a
 	ldrsh r1, [r4, r2]
 	ldrb r2, [r4, #0xb]
-	bl sub_080A29C8
+	bl CreateDustAt
 	ldrh r0, [r4, #0x3e]
 	bl ClearFlag
 	ldrh r0, [r4, #0x20]

asm/manager30.s

@@ -1,204 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_0805D4AC
-sub_0805D4AC: @ 0x0805D4AC
-	push {r4, r5, r6, r7, lr}
-	mov r7, sb
-	mov r6, r8
-	push {r6, r7}
-	adds r6, r0, #0
-	ldrb r0, [r6, #0xc]
-	cmp r0, #1
-	beq _0805D520
-	cmp r0, #1
-	bgt _0805D4C6
-	cmp r0, #0
-	beq _0805D4D2
-	b _0805D628
-_0805D4C6:
-	cmp r0, #2
-	beq _0805D5A4
-	cmp r0, #3
-	bne _0805D4D0
-	b _0805D604
-_0805D4D0:
-	b _0805D628
-_0805D4D2:
-	movs r0, #1
-	strb r0, [r6, #0xc]
-	ldrb r0, [r6, #0xe]
-	strb r0, [r6, #0xf]
-	ldrh r1, [r6, #0x38]
-	lsls r1, r1, #0x10
-	asrs r1, r1, #0x14
-	movs r3, #0x3f
-	ands r1, r3
-	ldrh r0, [r6, #0x3a]
-	lsls r0, r0, #0x10
-	asrs r0, r0, #0x14
-	ands r0, r3
-	lsls r0, r0, #6
-	orrs r1, r0
-	strh r1, [r6, #0x28]
-	ldr r4, _0805D518 @ =gPlayerEntity
-	movs r0, #0x2e
-	ldrsh r1, [r4, r0]
-	ldr r2, _0805D51C @ =gRoomControls
-	ldrh r0, [r2, #6]
-	subs r1, r1, r0
-	asrs r1, r1, #4
-	ands r1, r3
-	movs r5, #0x32
-	ldrsh r0, [r4, r5]
-	ldrh r2, [r2, #8]
-	subs r0, r0, r2
-	asrs r0, r0, #4
-	ands r0, r3
-	lsls r0, r0, #6
-	orrs r1, r0
-	strh r1, [r6, #0x2e]
-	strh r1, [r6, #0x2c]
-	b _0805D628
-	.align 2, 0
-_0805D518: .4byte gPlayerEntity
-_0805D51C: .4byte gRoomControls
-_0805D520:
-	ldr r4, _0805D568 @ =gPlayerEntity
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	ldr r3, _0805D56C @ =gRoomControls
-	ldrh r1, [r3, #6]
-	subs r0, r0, r1
-	asrs r5, r0, #4
-	movs r2, #0x3f
-	ands r5, r2
-	movs r1, #0x32
-	ldrsh r0, [r4, r1]
-	ldrh r1, [r3, #8]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	ands r0, r2
-	lsls r0, r0, #6
-	orrs r5, r0
-	strh r5, [r6, #0x2e]
-	ldrh r2, [r6, #0x2c]
-	cmp r5, r2
-	beq _0805D5A4
-	strh r5, [r6, #0x2c]
-	ldrh r0, [r6, #0x2e]
-	ldrb r1, [r6, #0xb]
-	bl GetTileType
-	adds r1, r0, #0
-	ldr r3, _0805D570 @ =0x00000317
-	cmp r1, r3
-	beq _0805D574
-	movs r0, #0xc6
-	lsls r0, r0, #2
-	cmp r1, r0
-	beq _0805D580
-	b _0805D5A4
-	.align 2, 0
-_0805D568: .4byte gPlayerEntity
-_0805D56C: .4byte gRoomControls
-_0805D570: .4byte 0x00000317
-_0805D574:
-	movs r0, #2
-	strb r0, [r6, #0xc]
-	movs r0, #0x6d
-	bl PlaySFX
-	b _0805D5A4
-_0805D580:
-	ldrh r1, [r6, #0x2e]
-	ldrb r2, [r6, #0xb]
-	adds r0, r3, #0
-	bl sub_0807B7D8
-	movs r0, #0x6b
-	bl PlaySFX
-	ldrb r0, [r6, #0xe]
-	subs r0, #1
-	strb r0, [r6, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0805D5A4
-	movs r0, #3
-	strb r0, [r6, #0xc]
-	movs r0, #0x40
-	strb r0, [r6, #0xe]
-_0805D5A4:
-	ldrh r0, [r6, #0x3e]
-	cmp r0, #0
-	beq _0805D628
-	bl CheckFlags
-	cmp r0, #0
-	beq _0805D628
-	ldrh r0, [r6, #0x3e]
-	bl ClearFlag
-	movs r0, #1
-	strb r0, [r6, #0xc]
-	ldrb r0, [r6, #0xf]
-	strb r0, [r6, #0xe]
-	movs r1, #0
-	adds r0, r6, #0
-	adds r0, #0x37
-	mov sb, r0
-	ldrb r5, [r0]
-	cmp r1, r5
-	bhs _0805D628
-	movs r0, #0x36
-	adds r0, r0, r6
-	mov r8, r0
-_0805D5D4:
-	lsls r0, r1, #6
-	ldrh r2, [r6, #0x28]
-	adds r5, r0, r2
-	movs r4, #0
-	adds r7, r1, #1
-	mov r0, r8
-	ldrb r0, [r0]
-	cmp r4, r0
-	bhs _0805D5F8
-_0805D5E6:
-	adds r0, r5, r4
-	ldrb r1, [r6, #0xb]
-	bl sub_0807BA8C
-	adds r4, #1
-	mov r1, r8
-	ldrb r1, [r1]
-	cmp r4, r1
-	blo _0805D5E6
-_0805D5F8:
-	adds r1, r7, #0
-	mov r2, sb
-	ldrb r2, [r2]
-	cmp r1, r2
-	blo _0805D5D4
-	b _0805D628
-_0805D604:
-	ldrb r0, [r6, #0xe]
-	cmp r0, #0
-	beq _0805D628
-	subs r0, #1
-	strb r0, [r6, #0xe]
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0
-	beq _0805D622
-	cmp r0, #0x20
-	bne _0805D628
-	ldrh r0, [r6, #0x3c]
-	bl SetFlag
-	b _0805D628
-_0805D622:
-	movs r0, #0x72
-	bl PlaySFX
-_0805D628:
-	pop {r3, r4}
-	mov r8, r3
-	mov sb, r4
-	pop {r4, r5, r6, r7, pc}

asm/manager37.s

@@ -124,7 +124,7 @@ _0805DF1A:
 	rsbs r2, r2, #0
 	adds r0, r5, #0
 	movs r1, #8
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 	adds r2, r0, #0
 	cmp r2, #0
 	beq _0805DF3C

asm/manager39.s

@@ -142,7 +142,7 @@ sub_0805E1F8: @ 0x0805E1F8
 	ldr r0, _0805E238 @ =gUnk_08108E60
 	mov r1, sp
 	movs r2, #9
-	bl sub_0801D66C
+	bl _DmaCopy
 	mov r1, sp
 	lsrs r0, r4, #8
 	strb r0, [r1, #4]

asm/manager8.s

@@ -188,7 +188,7 @@ _08058030: .4byte 0x80000020
 	thumb_func_start sub_08058034
 sub_08058034: @ 0x08058034
 	push {r4, r5, r6, lr}
-	ldr r6, _08058080 @ =gUnk_02002F00
+	ldr r6, _08058080 @ =gMapDataTopSpecial
 	movs r0, #0x80
 	lsls r0, r0, #7
 	adds r5, r6, r0
@@ -204,7 +204,7 @@ _08058040:
 	adds r4, #1
 	cmp r4, #3
 	bls _08058040
-	ldr r0, _08058080 @ =gUnk_02002F00
+	ldr r0, _08058080 @ =gMapDataTopSpecial
 	movs r1, #0x80
 	lsls r1, r1, #6
 	adds r6, r0, r1
@@ -225,7 +225,7 @@ _08058066:
 	bls _08058066
 	pop {r4, r5, r6, pc}
 	.align 2, 0
-_08058080: .4byte gUnk_02002F00
+_08058080: .4byte gMapDataTopSpecial
 
 	thumb_func_start sub_08058084
 sub_08058084: @ 0x08058084

asm/manager9.s

@@ -134,7 +134,7 @@ _080582CC: .4byte 0x80000020
 	thumb_func_start sub_080582D0
 sub_080582D0: @ 0x080582D0
 	push {r4, r5, lr}
-	ldr r4, _080582F4 @ =gUnk_02002F00
+	ldr r4, _080582F4 @ =gMapDataTopSpecial
 	movs r0, #0x80
 	lsls r0, r0, #7
 	adds r5, r4, r0
@@ -150,7 +150,7 @@ sub_080582D0: @ 0x080582D0
 	bl sub_080582F8
 	pop {r4, r5, pc}
 	.align 2, 0
-_080582F4: .4byte gUnk_02002F00
+_080582F4: .4byte gMapDataTopSpecial
 
 	thumb_func_start sub_080582F8
 sub_080582F8: @ 0x080582F8

asm/managerC.s

@@ -653,7 +653,7 @@ sub_08058D34: @ 0x08058D34
 	lsls r2, r2, #2
 	adds r1, r0, r2
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldr r2, _08058DB0 @ =gUsedPalettes
 	ldr r0, [r2]
 	movs r1, #0x80

asm/managerF.s

@@ -333,7 +333,7 @@ sub_08059124: @ 0x08059124
 	movs r2, #0x3a
 	ldrsh r1, [r4, r2]
 	ldrb r2, [r4, #0xb]
-	bl sub_080A29C8
+	bl CreateDustAt
 	ldrh r0, [r4, #0x38]
 	lsls r0, r0, #0x10
 	asrs r0, r0, #0x14

asm/moldorm.s

@@ -1,558 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Moldorm
-Moldorm: @ 0x08022B88
-	push {lr}
-	ldr r2, _08022B9C @ =gUnk_080CBB90
-	ldrb r1, [r0, #0xa]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08022B9C: .4byte gUnk_080CBB90
-
-	thumb_func_start sub_08022BA0
-sub_08022BA0: @ 0x08022BA0
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r1, r4, #0
-	adds r1, #0x79
-	ldrb r0, [r1]
-	adds r0, #1
-	strb r0, [r1]
-	ldrh r1, [r4, #0x2e]
-	adds r0, r4, #0
-	adds r0, #0x74
-	strh r1, [r0]
-	ldrh r0, [r4, #0x32]
-	adds r1, r4, #0
-	adds r1, #0x76
-	strh r0, [r1]
-	ldr r1, _08022BD0 @ =gUnk_080CBBA0
-	adds r0, r4, #0
-	bl EnemyFunctionHandler
-	adds r0, r4, #0
-	bl sub_08022EAC
-	pop {r4, pc}
-	.align 2, 0
-_08022BD0: .4byte gUnk_080CBBA0
-
-	thumb_func_start sub_08022BD4
-sub_08022BD4: @ 0x08022BD4
-	push {lr}
-	ldr r2, _08022BE8 @ =gUnk_080CBBB4
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08022BE8: .4byte gUnk_080CBBB4
-
-	thumb_func_start sub_08022BEC
-sub_08022BEC: @ 0x08022BEC
-	push {lr}
-	adds r2, r0, #0
-	movs r0, #0x7a
-	adds r0, r0, r2
-	mov ip, r0
-	adds r3, r2, #0
-	adds r3, #0x45
-	ldrb r0, [r0]
-	ldrb r1, [r3]
-	cmp r0, r1
-	beq _08022C0A
-	adds r1, r2, #0
-	adds r1, #0x7b
-	movs r0, #0x1e
-	strb r0, [r1]
-_08022C0A:
-	ldrb r0, [r3]
-	mov r1, ip
-	strb r0, [r1]
-	movs r0, #1
-	strb r0, [r2, #0xe]
-	adds r0, r2, #0
-	adds r0, #0x3e
-	ldrb r0, [r0]
-	strb r0, [r2, #0x15]
-	ldrb r0, [r2, #0x15]
-	adds r0, #2
-	movs r1, #0x1c
-	ands r0, r1
-	asrs r0, r0, #2
-	strb r0, [r2, #0x14]
-	strb r0, [r2, #0x1e]
-	ldr r0, [r2, #0x54]
-	adds r3, r2, #0
-	adds r3, #0x3d
-	ldrb r1, [r3]
-	adds r0, #0x3d
-	strb r1, [r0]
-	ldr r0, [r2, #0x7c]
-	ldrb r1, [r3]
-	adds r0, #0x3d
-	strb r1, [r0]
-	adds r0, r2, #0
-	adds r0, #0x80
-	ldr r0, [r0]
-	ldrb r1, [r3]
-	adds r0, #0x3d
-	strb r1, [r0]
-	ldr r1, _08022C54 @ =gUnk_080CBBA0
-	adds r0, r2, #0
-	bl sub_0804AA30
-	pop {pc}
-	.align 2, 0
-_08022C54: .4byte gUnk_080CBBA0
-
-	thumb_func_start sub_08022C58
-sub_08022C58: @ 0x08022C58
-	push {r4, r5, r6, r7, lr}
-	mov r7, sb
-	mov r6, r8
-	push {r6, r7}
-	adds r7, r0, #0
-	ldrb r1, [r7, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r7, #0x10]
-	ldr r0, _08022D3C @ =gEntCount
-	ldrb r0, [r0]
-	cmp r0, #0x44
-	bhi _08022D34
-	movs r0, #0xd
-	movs r1, #1
-	bl CreateEnemy
-	mov sb, r0
-	str r0, [r7, #0x54]
-	mov r2, sb
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r4, #8
-	rsbs r4, r4, #0
-	adds r0, r4, #0
-	ands r0, r1
-	movs r1, #5
-	mov r8, r1
-	mov r1, r8
-	orrs r0, r1
-	strb r0, [r2]
-	mov r0, sb
-	str r7, [r0, #0x50]
-	adds r0, r7, #0
-	mov r1, sb
-	bl CopyPosition
-	movs r0, #0xd
-	movs r1, #2
-	bl CreateEnemy
-	adds r6, r0, #0
-	mov r1, sb
-	str r6, [r1, #0x54]
-	adds r2, r6, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	adds r0, r4, #0
-	ands r0, r1
-	mov r1, r8
-	orrs r0, r1
-	strb r0, [r2]
-	str r7, [r6, #0x50]
-	adds r0, r7, #0
-	adds r1, r6, #0
-	bl CopyPosition
-	movs r0, #0xd
-	movs r1, #3
-	bl CreateEnemy
-	adds r5, r0, #0
-	str r5, [r6, #0x54]
-	adds r1, r5, #0
-	adds r1, #0x29
-	ldrb r0, [r1]
-	ands r4, r0
-	mov r0, r8
-	orrs r4, r0
-	strb r4, [r1]
-	str r7, [r5, #0x50]
-	adds r0, r7, #0
-	adds r1, r5, #0
-	bl CopyPosition
-	adds r0, r7, #0
-	bl sub_0804A720
-	movs r0, #1
-	strb r0, [r7, #0xc]
-	strb r0, [r7, #0xe]
-	strb r0, [r7, #0xf]
-	ldrb r0, [r7, #0x10]
-	movs r1, #0x80
-	orrs r0, r1
-	strb r0, [r7, #0x10]
-	str r7, [r7, #0x50]
-	mov r1, sb
-	str r1, [r7, #0x54]
-	str r6, [r7, #0x7c]
-	adds r0, r7, #0
-	adds r0, #0x80
-	str r5, [r0]
-	bl Random
-	movs r1, #0x1f
-	ands r0, r1
-	strb r0, [r7, #0x15]
-	ldrb r0, [r7, #0x15]
-	adds r0, #2
-	movs r1, #0x1c
-	ands r0, r1
-	asrs r0, r0, #2
-	strb r0, [r7, #0x14]
-	strb r0, [r7, #0x1e]
-	adds r0, r7, #0
-	adds r0, #0x45
-	ldrb r1, [r0]
-	adds r0, #0x35
-	strb r1, [r0]
-_08022D34:
-	pop {r3, r4}
-	mov r8, r3
-	mov sb, r4
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_08022D3C: .4byte gEntCount
-
-	thumb_func_start sub_08022D40
-sub_08022D40: @ 0x08022D40
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r2, r4, #0
-	adds r2, #0x7b
-	ldrb r1, [r2]
-	cmp r1, #0
-	beq _08022D66
-	adds r0, r1, #0
-	adds r0, #0xff
-	strb r0, [r2]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _08022D8E
-	ldrb r0, [r4, #0x14]
-	adds r0, #1
-	movs r1, #7
-	ands r0, r1
-	b _08022D8A
-_08022D66:
-	adds r0, r4, #0
-	bl sub_08022F14
-	adds r0, r4, #0
-	bl sub_080AEF88
-	ldrh r0, [r4, #0x2a]
-	cmp r0, #0
-	beq _08022D8E
-	adds r1, r0, #0
-	adds r0, r4, #0
-	bl sub_0800417E
-	ldrb r0, [r4, #0x15]
-	adds r0, #2
-	movs r1, #0x1c
-	ands r0, r1
-	asrs r0, r0, #2
-_08022D8A:
-	strb r0, [r4, #0x14]
-	strb r0, [r4, #0x1e]
-_08022D8E:
-	pop {r4, pc}
-
-	thumb_func_start sub_08022D90
-sub_08022D90: @ 0x08022D90
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldr r0, [r5, #0x50]
-	ldr r0, [r0, #4]
-	cmp r0, #0
-	beq _08022DE0
-	ldr r1, _08022DDC @ =gUnk_080CBBBC
-	ldrb r0, [r5, #0xc]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	adds r0, r5, #0
-	bl _call_via_r1
-	ldr r4, [r5, #0x50]
-	ldrb r2, [r4, #0x1b]
-	lsrs r2, r2, #6
-	lsls r2, r2, #6
-	ldrb r3, [r5, #0x1b]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r3
-	orrs r0, r2
-	strb r0, [r5, #0x1b]
-	ldrb r0, [r4, #0x19]
-	lsrs r0, r0, #6
-	lsls r0, r0, #6
-	ldrb r2, [r5, #0x19]
-	ands r1, r2
-	orrs r1, r0
-	strb r1, [r5, #0x19]
-	adds r4, #0x38
-	ldrb r1, [r4]
-	adds r0, r5, #0
-	adds r0, #0x38
-	strb r1, [r0]
-	b _08022DE6
-	.align 2, 0
-_08022DDC: .4byte gUnk_080CBBBC
-_08022DE0:
-	adds r0, r5, #0
-	bl DeleteEntity
-_08022DE6:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_08022DE8
-sub_08022DE8: @ 0x08022DE8
-	push {lr}
-	adds r3, r0, #0
-	movs r0, #1
-	strb r0, [r3, #0xc]
-	adds r0, r3, #0
-	adds r0, #0x7c
-	movs r1, #0x88
-	strb r1, [r0]
-	adds r0, #1
-	strb r1, [r0]
-	adds r0, #1
-	strb r1, [r0]
-	adds r0, #1
-	strb r1, [r0]
-	adds r0, #1
-	strb r1, [r0]
-	adds r0, #1
-	strb r1, [r0]
-	adds r0, #1
-	strb r1, [r0]
-	adds r0, #1
-	strb r1, [r0]
-	ldr r0, [r3, #0x50]
-	ldrb r0, [r0, #0x14]
-	strb r0, [r3, #0x14]
-	adds r2, r3, #0
-	adds r2, #0x84
-	ldrb r1, [r3, #0x14]
-	lsls r0, r1, #4
-	adds r0, r0, r1
-	lsls r1, r0, #8
-	adds r0, r0, r1
-	lsls r1, r0, #0x10
-	adds r0, r0, r1
-	str r0, [r2]
-	ldrb r0, [r3, #0xa]
-	cmp r0, #3
-	beq _08022E38
-	adds r0, #7
-	b _08022E3C
-_08022E38:
-	ldrb r0, [r3, #0x14]
-	adds r0, #0xa
-_08022E3C:
-	strb r0, [r3, #0x1e]
-	pop {pc}
-
-	thumb_func_start sub_08022E40
-sub_08022E40: @ 0x08022E40
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldrh r1, [r4, #0x2e]
-	adds r0, #0x74
-	strh r1, [r0]
-	ldrh r0, [r4, #0x32]
-	adds r1, r4, #0
-	adds r1, #0x76
-	strh r0, [r1]
-	ldr r2, [r4, #0x50]
-	adds r2, #0x79
-	ldrb r0, [r2]
-	adds r0, #1
-	movs r3, #7
-	ands r0, r3
-	adds r0, #0x7c
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	movs r0, #0xf
-	ands r0, r1
-	subs r0, #8
-	lsrs r1, r1, #4
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	ldrh r5, [r4, #0x2e]
-	adds r0, r0, r5
-	strh r0, [r4, #0x2e]
-	subs r1, #8
-	ldrh r0, [r4, #0x32]
-	adds r1, r1, r0
-	strh r1, [r4, #0x32]
-	adds r1, r4, #0
-	adds r1, #0x84
-	ldrb r0, [r2]
-	adds r0, #1
-	ands r0, r3
-	lsls r0, r0, #2
-	ldr r1, [r1]
-	lsrs r1, r0
-	movs r0, #7
-	ands r1, r0
-	strb r1, [r4, #0x14]
-	ldrb r0, [r4, #0xa]
-	cmp r0, #3
-	bne _08022EA2
-	adds r0, r1, #0
-	adds r0, #0xa
-	strb r0, [r4, #0x1e]
-	b _08022EA8
-_08022EA2:
-	adds r0, r4, #0
-	bl sub_08022EAC
-_08022EA8:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022EAC
-sub_08022EAC: @ 0x08022EAC
-	push {r4, r5, lr}
-	mov ip, r0
-	ldr r1, [r0, #0x54]
-	cmp r1, #0
-	beq _08022F12
-	ldr r0, [r0, #0x50]
-	adds r0, #0x79
-	ldrb r0, [r0]
-	movs r4, #7
-	adds r3, r4, #0
-	ands r3, r0
-	adds r3, r3, r1
-	adds r3, #0x7c
-	mov r0, ip
-	ldrh r1, [r0, #0x2e]
-	adds r0, #0x74
-	ldrb r0, [r0]
-	subs r1, r1, r0
-	adds r1, #8
-	movs r5, #0xf
-	ands r1, r5
-	mov r2, ip
-	ldrh r0, [r2, #0x32]
-	adds r2, #0x76
-	ldrb r2, [r2]
-	subs r0, r0, r2
-	adds r0, #8
-	ands r0, r5
-	lsls r0, r0, #4
-	adds r1, r1, r0
-	strb r1, [r3]
-	mov r1, ip
-	ldr r0, [r1, #0x50]
-	adds r0, #0x79
-	ldrb r1, [r0]
-	adds r0, r4, #0
-	ands r0, r1
-	lsls r0, r0, #2
-	mov r2, ip
-	ldrb r1, [r2, #0x14]
-	ands r4, r1
-	lsls r4, r0
-	movs r2, #0xf
-	lsls r2, r0
-	mov r0, ip
-	ldr r1, [r0, #0x54]
-	adds r1, #0x84
-	ldr r0, [r1]
-	bics r0, r2
-	orrs r4, r0
-	str r4, [r1]
-_08022F12:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_08022F14
-sub_08022F14: @ 0x08022F14
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl sub_08049FA0
-	cmp r0, #0
-	bne _08022F4E
-	adds r0, r4, #0
-	bl sub_08049EE4
-	ldrb r1, [r4, #0x15]
-	subs r2, r0, r1
-	movs r1, #0x1f
-	ands r2, r1
-	adds r0, r2, #4
-	ands r0, r1
-	cmp r0, #8
-	bls _08022F4E
-	movs r0, #8
-	strb r0, [r4, #0xf]
-	cmp r2, #0xf
-	bhi _08022F46
-	adds r1, r4, #0
-	adds r1, #0x78
-	movs r0, #1
-	b _08022F4C
-_08022F46:
-	adds r1, r4, #0
-	adds r1, #0x78
-	movs r0, #0xff
-_08022F4C:
-	strb r0, [r1]
-_08022F4E:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	movs r1, #0xff
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08022F9E
-	movs r0, #4
-	strb r0, [r4, #0xe]
-	ldrb r0, [r4, #0xf]
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	ands r0, r1
-	adds r5, r4, #0
-	adds r5, #0x78
-	cmp r0, #0
-	bne _08022F84
-	movs r0, #8
-	strb r0, [r4, #0xf]
-	bl Random
-	ldr r2, _08022FA0 @ =gUnk_080CBBC4
-	movs r1, #1
-	ands r1, r0
-	adds r1, r1, r2
-	ldrb r0, [r1]
-	strb r0, [r5]
-_08022F84:
-	ldrb r0, [r5]
-	ldrb r1, [r4, #0x15]
-	adds r0, r0, r1
-	movs r1, #0x1f
-	ands r0, r1
-	strb r0, [r4, #0x15]
-	ldrb r0, [r4, #0x15]
-	adds r0, #2
-	movs r1, #0x1c
-	ands r0, r1
-	asrs r0, r0, #2
-	strb r0, [r4, #0x14]
-	strb r0, [r4, #0x1e]
-_08022F9E:
-	pop {r4, r5, pc}
-	.align 2, 0
-_08022FA0: .4byte gUnk_080CBBC4

asm/non_matching/acroBandits/sub_08031C58.inc

@@ -1,136 +0,0 @@
-
-	.syntax unified
-
-	.text
-
-	push {r4, r5, r6, r7, lr}
-	mov r7, sb
-	mov r6, r8
-	push {r6, r7}
-	adds r7, r0, #0
-	bl GetNextFrame
-	adds r3, r7, #0
-	adds r3, #0x5a
-	ldrb r1, [r3]
-	movs r0, #0x80
-	ands r0, r1
-	lsls r0, r0, #0x18
-	lsrs r2, r0, #0x18
-	cmp r2, #0
-	beq _08031D54
-	ldr r0, _08031D50 @ =gEntCount
-	ldrb r0, [r0]
-	cmp r0, #0x42
-	bhi _08031D66
-	bl Random
-	adds r6, r0, #0
-	movs r0, #3
-	mov sb, r0
-	ands r6, r0
-	movs r0, #0x2e
-	movs r1, #1
-	bl CreateEnemy
-	adds r4, r0, #0
-	movs r0, #0
-	mov r8, r0
-	mov r0, r8
-	strb r0, [r4, #0xb]
-	mov r0, r8
-	str r0, [r4, #0x50]
-	adds r0, r4, #0
-	adds r0, #0x74
-	strb r6, [r0]
-	adds r0, r7, #0
-	adds r1, r4, #0
-	bl sub_08031E48
-	movs r0, #0x2e
-	movs r1, #1
-	bl CreateEnemy
-	adds r5, r0, #0
-	str r5, [r4, #0x54]
-	movs r0, #1
-	strb r0, [r5, #0xb]
-	str r4, [r5, #0x50]
-	adds r0, r5, #0
-	adds r0, #0x74
-	strb r6, [r0]
-	adds r0, r7, #0
-	adds r1, r5, #0
-	bl sub_08031E48
-	movs r0, #0x2e
-	movs r1, #1
-	bl CreateEnemy
-	adds r4, r0, #0
-	str r4, [r5, #0x54]
-	movs r0, #2
-	strb r0, [r4, #0xb]
-	str r5, [r4, #0x50]
-	adds r0, r4, #0
-	adds r0, #0x74
-	strb r6, [r0]
-	adds r0, r7, #0
-	adds r1, r4, #0
-	bl sub_08031E48
-	movs r0, #0x2e
-	movs r1, #1
-	bl CreateEnemy
-	adds r5, r0, #0
-	str r5, [r4, #0x54]
-	mov r0, sb
-	strb r0, [r5, #0xb]
-	str r4, [r5, #0x50]
-	adds r0, r5, #0
-	adds r0, #0x74
-	strb r6, [r0]
-	adds r0, r7, #0
-	adds r1, r5, #0
-	bl sub_08031E48
-	movs r0, #0x2e
-	movs r1, #1
-	bl CreateEnemy
-	adds r1, r0, #0
-	str r1, [r5, #0x54]
-	movs r0, #4
-	strb r0, [r1, #0xb]
-	str r5, [r1, #0x50]
-	mov r0, r8
-	str r0, [r1, #0x54]
-	adds r0, r1, #0
-	adds r0, #0x74
-	strb r6, [r0]
-	adds r0, r7, #0
-	bl sub_08031E48
-	movs r0, #6
-	strb r0, [r7, #0xc]
-	movs r0, #0x14
-	strb r0, [r7, #0xe]
-	adds r2, r7, #0
-	adds r2, #0x29
-	ldrb r0, [r2]
-	movs r1, #7
-	orrs r0, r1
-	strb r0, [r2]
-	adds r0, r7, #0
-	movs r1, #7
-	bl InitializeAnimation
-	b _08031D66
-	.align 2, 0
-_08031D50: .4byte gEntCount
-_08031D54:
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _08031D66
-	strb r2, [r3]
-	ldrb r1, [r7, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r7, #0x10]
-_08031D66:
-	pop {r3, r4}
-	mov r8, r3
-	mov sb, r4
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-    .syntax divided
-	

asm/non_matching/acroBandits/sub_08031E04.inc

@@ -1,41 +0,0 @@
-
-	.syntax unified
-
-	.text
-
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	bl sub_08049DF4
-	adds r2, r0, #0
-	cmp r2, #0
-	beq _08031E44
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r0, [r0]
-	movs r3, #6
-	ands r3, r0
-	ldr r0, _08031E40 @ =gUnk_080CE5C0
-	adds r3, r3, r0
-	movs r0, #0x2e
-	ldrsh r1, [r2, r0]
-	movs r0, #0
-	ldrsb r0, [r3, r0]
-	adds r1, r1, r0
-	movs r0, #0x32
-	ldrsh r2, [r2, r0]
-	movs r0, #1
-	ldrsb r0, [r3, r0]
-	adds r2, r2, r0
-	adds r0, r4, #0
-	movs r3, #0x50
-	bl sub_0806FCB8
-	b _08031E46
-	.align 2, 0
-_08031E40: .4byte gUnk_080CE5C0
-_08031E44:
-	movs r0, #0
-_08031E46:
-	pop {r4, pc}
-    .syntax divided
-	

asm/non_matching/darkNut/sub_08021274.inc

@@ -0,0 +1,43 @@
+	.include "asm/macros.inc"
+
+	.include "constants/constants.inc"
+
+	.syntax unified
+
+	.text
+
+	push {lr}
+	adds r2, r0, #0
+	movs r0, #7
+	ands r0, r1
+	subs r0, #3
+	cmp r0, #2
+	bhi _0802129A
+	movs r3, #0x18
+	adds r0, r1, #0
+	ands r0, r3
+	lsrs r0, r0, #3
+	cmp r0, r2
+	beq _080212AA
+	adds r0, r1, #0
+	adds r0, #8
+	ands r0, r3
+	lsrs r0, r0, #3
+	cmp r0, r2
+	beq _080212AA
+_0802129A:
+	adds r0, r1, #4
+	movs r1, #0x18
+	ands r0, r1
+	lsrs r1, r0, #3
+	cmp r2, r1
+	beq _080212AA
+	adds r0, r1, #0
+	b _080212AC
+_080212AA:
+	movs r0, #0xff
+_080212AC:
+	pop {pc}
+	.align 2, 0
+
+	.syntax divided

asm/non_matching/forestMinish/sub_08060158.inc

@@ -1,72 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	push {r4, r5, r6, r7, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	adds r7, r0, #0
-	cmp r7, #0
-	beq _0806016A
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	b _080601CC
-_0806016A:
-	movs r0, #2
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	movs r1, #0x20
-	movs r2, #0x20
-	bl sub_0806EDD8
-	adds r3, r0, #0
-	cmp r3, #0
-	bge _08060188
-	adds r0, r4, #0
-	adds r0, #0x69
-	ldrb r0, [r0]
-	strb r0, [r4, #0x14]
-	lsls r3, r0, #2
-_08060188:
-	ldrb r0, [r4, #0x14]
-	lsrs r0, r0, #1
-	lsls r0, r0, #5
-	asrs r1, r3, #1
-	lsls r1, r1, #1
-	ldr r2, _080601D0 @ =gUnk_08109C98
-	adds r1, r1, r2
-	adds r0, r0, r1
-	ldrb r6, [r0]
-	ldrb r5, [r0, #1]
-	movs r0, #0x80
-	ands r0, r5
-	cmp r0, #0
-	beq _080601AC
-	adds r0, r3, #0
-	bl sub_0806F5B0
-	strb r0, [r4, #0x14]
-_080601AC:
-	movs r0, #0x7f
-	ands r5, r0
-	adds r0, r4, #0
-	adds r0, #0x5a
-	strb r6, [r0]
-	strb r5, [r4, #0x1e]
-	adds r1, r4, #0
-	adds r1, #0x5b
-	movs r0, #1
-	strb r0, [r1]
-	adds r0, r4, #0
-	adds r0, #0x58
-	strb r7, [r0]
-	subs r1, #2
-	movs r0, #0xf0
-	strb r0, [r1]
-_080601CC:
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080601D0: .4byte gUnk_08109C98
-    .syntax divided

asm/non_matching/manager15/sub_0805A9CC.inc

@@ -0,0 +1,75 @@
+sub_0805A9CC: @ 0x0805A9CC
+	push {r4, r5, lr}
+	add r4, r0, #0
+	ldr r3, _0805AA4C @ =gScreen
+	ldr r5, _0805AA50 @ =gRoomControls
+	ldrh r0, [r5, #0xa]
+	ldrh r1, [r4, #0x24]
+	sub r0, r0, r1
+	ldrh r1, [r4, #0x34]
+	add r0, r0, r1
+	strh r0, [r3, #0x2e]
+	mov r2, #0x2e
+	ldrsh r0, [r3, r2]
+	neg r2, r0
+	mov r0, #0x80
+	lsl r0, r0, #1
+	add r1, r2, r0
+	cmp r2, #0
+	bge _0805A9F2
+	mov r2, #0
+_0805A9F2:
+	cmp r2, #0xf0
+	ble _0805A9F8
+	mov r2, #0xf0
+_0805A9F8:
+	cmp r1, #0
+	bge _0805A9FE
+	mov r1, #0
+_0805A9FE:
+	cmp r1, #0xf0
+	ble _0805AA04
+	mov r1, #0xf0
+_0805AA04:
+	lsl r0, r2, #8
+	orr r0, r1
+	add r1, r3, #0
+	add r1, #0x5a
+	strh r0, [r1]
+	mov r1, #0xc
+	ldrsh r0, [r5, r1]
+	ldrh r1, [r4, #0x26]
+	sub r0, r0, r1
+	mov r2, #0x36
+	ldrsh r1, [r4, r2]
+	add r2, r0, r1
+	mov r1, #0x3f
+	add r0, r2, #0
+	and r0, r1
+	strh r0, [r3, #0x30]
+	add r0, r2, #0
+	cmp r0, #0
+	bge _0805AA2C
+	add r0, #0x3f
+_0805AA2C:
+	asr r0, r0, #6
+	lsl r0, r0, #9
+	ldr r1, _0805AA54 @ =gUnk_02001A40
+	add r1, r0, r1
+	str r1, [r3, #0x34]
+	add r2, r3, #0
+	add r2, #0x5e
+	mov r0, #0xa0
+	strh r0, [r2]
+	ldr r0, [r4, #0x28]
+	cmp r0, r1
+	beq _0805AA4A
+	str r1, [r4, #0x28]
+	mov r0, #1
+	strh r0, [r3, #0x32]
+_0805AA4A:
+	pop {r4, r5, pc}
+	.align 2, 0
+_0805AA4C: .4byte gScreen
+_0805AA50: .4byte gRoomControls
+_0805AA54: .4byte gUnk_02001A40

asm/non_matching/moldorm/sub_08022E40.inc

@@ -0,0 +1,62 @@
+
+	.syntax unified
+
+	.text
+
+	push {r4, r5, lr}
+	adds r4, r0, #0
+	ldrh r1, [r4, #0x2e]
+	adds r0, #0x74
+	strh r1, [r0]
+	ldrh r0, [r4, #0x32]
+	adds r1, r4, #0
+	adds r1, #0x76
+	strh r0, [r1]
+	ldr r2, [r4, #0x50]
+	adds r2, #0x79
+	ldrb r0, [r2]
+	adds r0, #1
+	movs r3, #7
+	ands r0, r3
+	adds r0, #0x7c
+	adds r0, r4, r0
+	ldrb r1, [r0]
+	movs r0, #0xf
+	ands r0, r1
+	subs r0, #8
+	lsrs r1, r1, #4
+	lsls r0, r0, #0x18
+	asrs r0, r0, #0x18
+	ldrh r5, [r4, #0x2e]
+	adds r0, r0, r5
+	strh r0, [r4, #0x2e]
+	subs r1, #8
+	ldrh r0, [r4, #0x32]
+	adds r1, r1, r0
+	strh r1, [r4, #0x32]
+	adds r1, r4, #0
+	adds r1, #0x84
+	ldrb r0, [r2]
+	adds r0, #1
+	ands r0, r3
+	lsls r0, r0, #2
+	ldr r1, [r1]
+	lsrs r1, r0
+	movs r0, #7
+	ands r1, r0
+	strb r1, [r4, #0x14]
+	ldrb r0, [r4, #0xa]
+	cmp r0, #3
+	bne _08022EA2
+	adds r0, r1, #0
+	adds r0, #0xa
+	strb r0, [r4, #0x1e]
+	b _08022EA8
+_08022EA2:
+	adds r0, r4, #0
+	bl sub_08022EAC
+_08022EA8:
+	pop {r4, r5, pc}
+	.align 2, 0
+
+	.syntax divided

asm/non_matching/moldorm/sub_08022EAC.inc

@@ -0,0 +1,60 @@
+
+	.syntax unified
+
+	.text
+
+	push {r4, r5, lr}
+	mov ip, r0
+	ldr r1, [r0, #0x54]
+	cmp r1, #0
+	beq _08022F12
+	ldr r0, [r0, #0x50]
+	adds r0, #0x79
+	ldrb r0, [r0]
+	movs r4, #7
+	adds r3, r4, #0
+	ands r3, r0
+	adds r3, r3, r1
+	adds r3, #0x7c
+	mov r0, ip
+	ldrh r1, [r0, #0x2e]
+	adds r0, #0x74
+	ldrb r0, [r0]
+	subs r1, r1, r0
+	adds r1, #8
+	movs r5, #0xf
+	ands r1, r5
+	mov r2, ip
+	ldrh r0, [r2, #0x32]
+	adds r2, #0x76
+	ldrb r2, [r2]
+	subs r0, r0, r2
+	adds r0, #8
+	ands r0, r5
+	lsls r0, r0, #4
+	adds r1, r1, r0
+	strb r1, [r3]
+	mov r1, ip
+	ldr r0, [r1, #0x50]
+	adds r0, #0x79
+	ldrb r1, [r0]
+	adds r0, r4, #0
+	ands r0, r1
+	lsls r0, r0, #2
+	mov r2, ip
+	ldrb r1, [r2, #0x14]
+	ands r4, r1
+	lsls r4, r0
+	movs r2, #0xf
+	lsls r2, r0
+	mov r0, ip
+	ldr r1, [r0, #0x54]
+	adds r1, #0x84
+	ldr r0, [r1]
+	bics r0, r2
+	orrs r4, r0
+	str r4, [r1]
+_08022F12:
+	pop {r4, r5, pc}
+
+	.syntax divided

asm/non_matching/railtrack/sub_08085394.inc

@@ -1,87 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	push {r4, r5, r6, r7, lr}
-	mov r7, sl
-	mov r6, sb
-	mov r5, r8
-	push {r5, r6, r7}
-	adds r7, r0, #0
-	ldr r0, _08085430 @ =gUnk_081205E0
-	ldrb r2, [r7, #0x14]
-	lsrs r2, r2, #1
-	lsls r2, r2, #1
-	adds r0, r2, r0
-	ldrh r0, [r0]
-	mov sl, r0
-	ldr r0, _08085434 @ =gUnk_080B4488
-	adds r2, r2, r0
-	ldr r0, [r7, #0x70]
-	mov sb, r0
-	movs r1, #0x2e
-	ldrsh r4, [r7, r1]
-	ldr r1, _08085438 @ =gRoomControls
-	ldrh r0, [r1, #6]
-	subs r4, r4, r0
-	asrs r4, r4, #4
-	movs r3, #0x3f
-	ands r4, r3
-	movs r5, #0x32
-	ldrsh r0, [r7, r5]
-	ldrh r1, [r1, #8]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	ands r0, r3
-	lsls r0, r0, #6
-	orrs r4, r0
-	ldrb r2, [r2]
-	lsls r2, r2, #0x18
-	asrs r2, r2, #0x18
-	mov r8, r2
-	lsls r5, r2, #1
-	mov r1, sb
-	subs r0, r1, r5
-	ldrh r1, [r0]
-	adds r0, r7, #0
-	adds r0, #0x74
-	strh r1, [r0]
-	subs r1, r4, r2
-	adds r6, r7, #0
-	adds r6, #0x38
-	ldrb r2, [r6]
-	mov r0, sl
-	bl SetTile
-	mov r1, sb
-	ldrh r0, [r1]
-	adds r1, r7, #0
-	adds r1, #0x76
-	strh r0, [r1]
-	ldrb r2, [r6]
-	mov r0, sl
-	adds r1, r4, #0
-	bl SetTile
-	add r5, sb
-	ldrh r1, [r5]
-	adds r0, r7, #0
-	adds r0, #0x78
-	strh r1, [r0]
-	add r4, r8
-	ldrb r2, [r6]
-	mov r0, sl
-	adds r1, r4, #0
-	bl SetTile
-	pop {r3, r4, r5}
-	mov r8, r3
-	mov sb, r4
-	mov sl, r5
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_08085430: .4byte gUnk_081205E0
-_08085434: .4byte gUnk_080B4488
-_08085438: .4byte gRoomControls
-    .syntax divided

asm/non_matching/smith/smith.inc

@@ -1,119 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	ldrb r1, [r4, #0x10]
-	movs r0, #2
-	ands r0, r1
-	cmp r0, #0
-	beq _08066028
-	adds r2, r4, #0
-	adds r2, #0x39
-	movs r0, #0
-	ldrsb r0, [r2, r0]
-	adds r6, r4, #0
-	adds r6, #0x58
-	cmp r0, #2
-	bne _0806600C
-	movs r0, #0
-	movs r1, #4
-	strb r1, [r4, #0xc]
-	strb r0, [r2]
-	ldrb r0, [r6]
-	movs r5, #0
-	cmp r0, #0xc
-	bne _08065FF0
-	movs r5, #8
-_08065FF0:
-	ldr r1, _08066020 @ =gPlayerEntity
-	adds r0, r4, #0
-	bl GetFacingDirection
-	bl sub_0806F5A4
-	adds r5, r5, r0
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl InitAnimationForceUpdate
-	adds r0, r4, #0
-	bl sub_0806F118
-_0806600C:
-	ldr r0, _08066024 @ =gUnk_0811036C
-	ldrb r1, [r4, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r4, #0
-	bl _call_via_r1
-	b _08066042
-	.align 2, 0
-_08066020: .4byte gPlayerEntity
-_08066024: .4byte gUnk_0811036C
-_08066028:
-	ldr r0, _08066058 @ =gUnk_08110360
-	ldrb r1, [r4, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r4, #0
-	bl _call_via_r1
-	adds r0, r4, #0
-	bl sub_0806ED78
-	adds r6, r4, #0
-	adds r6, #0x58
-_08066042:
-	ldrb r0, [r6]
-	cmp r0, #0xc
-	bne _0806605C
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #0x39
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r2]
-	b _0806606E
-	.align 2, 0
-_08066058: .4byte gUnk_08110360
-_0806605C:
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r0, [r2]
-	movs r1, #0x39
-	rsbs r1, r1, #0
-	ands r1, r0
-	movs r0, #8
-	orrs r1, r0
-	strb r1, [r2]
-_0806606E:
-	adds r2, r4, #0
-	adds r2, #0x5a
-	ldrb r1, [r2]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _080660A0
-	movs r0, #0xfe
-	ands r0, r1
-	strb r0, [r2]
-	adds r0, r4, #0
-	movs r1, #0x3d
-	movs r2, #0x20
-	bl CreateFx
-	ldr r4, _080660A4 @ =gUnk_08110380
-	bl Random
-	movs r1, #7
-	ands r1, r0
-	lsls r1, r1, #1
-	adds r1, r1, r4
-	ldrh r0, [r1]
-	bl PlaySFX
-_080660A0:
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080660A4: .4byte gUnk_08110380
-    .syntax divided

asm/non_matching/sub_08054524.inc

@@ -20,7 +20,7 @@ _0805453A:
 	adds r0, r0, r1
 	ldr r1, _08054560 @ =gUnk_02034398
 	movs r2, #0x20
-	bl sub_0801D66C
+	bl _DmaCopy
 	pop {pc}
 	.align 2, 0
 _08054550: .4byte gArea

asm/object35.s

@@ -356,7 +356,7 @@ _0808BAEA:
 	strb r4, [r2, #0x1e]
 _0808BAFC:
 	adds r0, r2, #0
-	bl sub_080A29BC
+	bl CreateDust
 	pop {r4, pc}
 
 	thumb_func_start sub_0808BB04

asm/object6A.s

@@ -211,7 +211,7 @@ sub_08094B94: @ 0x08094B94
 	adds r1, #0x84
 	str r0, [r1]
 	adds r0, r4, #0
-	bl sub_080A29BC
+	bl CreateDust
 	ldrh r0, [r4, #0x36]
 	adds r0, #0x10
 	strh r0, [r4, #0x36]
@@ -1692,7 +1692,7 @@ _0809572C:
 	adds r0, #0x6c
 	adds r1, r4, #0
 	movs r2, #0x1c
-	bl sub_0801D66C
+	bl _DmaCopy
 	ldrh r0, [r4, #0x14]
 	strh r0, [r5, #0x2e]
 	ldrh r0, [r4, #0x16]

asm/object91.s

@@ -470,7 +470,7 @@ _0809C74A:
 	cmp r0, #0
 	bne _0809C772
 	ldr r0, [r5, #0x54]
-	bl sub_080A2B80
+	bl CreateSparkle
 _0809C772:
 	adds r3, r5, #0
 	adds r3, #0x7e

asm/objectB2.s

@@ -1,79 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start ObjectB2
-ObjectB2: @ 0x080A09A4
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	bne _080A09D4
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	movs r0, #0x10
-	strb r0, [r4, #0xe]
-	ldrb r0, [r4, #0xa]
-	lsls r0, r0, #3
-	strb r0, [r4, #0x15]
-	adds r0, r4, #0
-	adds r0, #0x38
-	ldrb r0, [r0]
-	ldr r1, _080A0A2C @ =gUnk_02027EB4
-	cmp r0, #2
-	bne _080A09CA
-	ldr r1, _080A0A30 @ =gUnk_0200D654
-_080A09CA:
-	str r1, [r4, #0x54]
-	ldrb r1, [r4, #0xa]
-	adds r0, r4, #0
-	bl InitializeAnimation
-_080A09D4:
-	ldr r0, [r4, #0x50]
-	ldrh r0, [r0, #0x24]
-	strh r0, [r4, #0x24]
-	adds r0, r4, #0
-	bl sub_0806F69C
-	ldr r0, [r4, #0x54]
-	movs r2, #0x2e
-	ldrsh r1, [r4, r2]
-	movs r3, #0x32
-	ldrsh r2, [r4, r3]
-	movs r3, #9
-	bl sub_080AE4CC
-	cmp r0, #0
-	beq _080A09F8
-	bl DeleteThisEntity
-_080A09F8:
-	movs r1, #0x24
-	ldrsh r0, [r4, r1]
-	cmp r0, #0x40
-	bgt _080A0A22
-	ldrb r2, [r4, #0x18]
-	lsls r1, r2, #0x1e
-	lsrs r1, r1, #0x1e
-	movs r0, #1
-	eors r1, r0
-	subs r0, #5
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080A0A22
-	bl DeleteThisEntity
-_080A0A22:
-	adds r0, r4, #0
-	bl GetNextFrame
-	pop {r4, pc}
-	.align 2, 0
-_080A0A2C: .4byte gUnk_02027EB4
-_080A0A30: .4byte gUnk_0200D654

asm/octorok.s

@@ -1,246 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_0801EC2C
-sub_0801EC2C: @ 0x0801EC2C
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	bl sub_080AEF88
-	adds r0, r5, #0
-	bl GetNextFrame
-	ldrb r0, [r5, #0xe]
-	subs r0, #1
-	strb r0, [r5, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0801EC7E
-	adds r0, r5, #0
-	bl sub_0801EDEC
-	cmp r0, #0
-	beq _0801EC78
-	ldr r1, _0801EC74 @ =gUnk_080CA174
-	ldrb r0, [r5, #0xa]
-	adds r0, r0, r1
-	ldrb r4, [r0]
-	bl Random
-	movs r1, #3
-	ands r0, r1
-	cmp r4, r0
-	bhi _0801EC78
-	strb r1, [r5, #0xc]
-	ldrb r1, [r5, #0x14]
-	adds r1, #4
-	adds r0, r5, #0
-	bl InitializeAnimation
-	b _0801EC7E
-	.align 2, 0
-_0801EC74: .4byte gUnk_080CA174
-_0801EC78:
-	adds r0, r5, #0
-	bl sub_0801ECFC
-_0801EC7E:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_0801EC80
-sub_0801EC80: @ 0x0801EC80
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r5, r4, #0
-	adds r5, #0x5a
-	ldrb r1, [r5]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _0801ECD8
-	adds r0, r4, #0
-	movs r1, #1
-	movs r2, #0
-	bl sub_0804A98C
-	adds r2, r0, #0
-	cmp r2, #0
-	beq _0801ECD8
-	ldrb r0, [r4, #0x15]
-	strb r0, [r2, #0x15]
-	ldrb r1, [r4, #0x15]
-	lsrs r1, r1, #2
-	ldr r0, _0801ECF0 @ =gUnk_080CA176
-	adds r1, r1, r0
-	movs r0, #0
-	ldrsb r0, [r1, r0]
-	ldrh r3, [r2, #0x2e]
-	adds r0, r0, r3
-	strh r0, [r2, #0x2e]
-	movs r0, #1
-	ldrsb r0, [r1, r0]
-	ldrh r1, [r2, #0x32]
-	adds r0, r0, r1
-	strh r0, [r2, #0x32]
-	ldr r0, _0801ECF4 @ =0x0000FFFD
-	strh r0, [r2, #0x36]
-	ldrb r1, [r5]
-	movs r0, #0xfe
-	ands r0, r1
-	strb r0, [r5]
-	ldr r0, _0801ECF8 @ =0x0000018D
-	bl sub_08004488
-_0801ECD8:
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0801ECEC
-	adds r0, r4, #0
-	bl sub_0801ECFC
-_0801ECEC:
-	pop {r4, r5, pc}
-	.align 2, 0
-_0801ECF0: .4byte gUnk_080CA176
-_0801ECF4: .4byte 0x0000FFFD
-_0801ECF8: .4byte 0x0000018D
-
-	thumb_func_start sub_0801ECFC
-sub_0801ECFC: @ 0x0801ECFC
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	bl Random
-	movs r1, #0x38
-	ands r0, r1
-	adds r0, #0x18
-	strb r0, [r4, #0xe]
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0801ED14
-sub_0801ED14: @ 0x0801ED14
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	ldrb r0, [r5, #0xa]
-	cmp r0, #2
-	beq _0801ED7E
-	adds r0, r5, #0
-	bl sub_08049FA0
-	cmp r0, #0
-	beq _0801ED4C
-	ldrb r0, [r5, #0xa]
-	cmp r0, #1
-	bne _0801ED46
-	bl Random
-	movs r1, #3
-	ands r1, r0
-	cmp r1, #0
-	bne _0801ED46
-	adds r0, r5, #0
-	movs r1, #1
-	bl sub_08049FDC
-	cmp r0, #0
-	bne _0801EDC4
-_0801ED46:
-	bl Random
-	b _0801EDD0
-_0801ED4C:
-	bl Random
-	movs r1, #3
-	ands r1, r0
-	cmp r1, #0
-	beq _0801ED78
-	adds r0, r5, #0
-	bl sub_08049EE4
-	adds r4, r0, #0
-	bl Random
-	ldr r2, _0801ED74 @ =gUnk_080CA17E
-	movs r1, #1
-	ands r1, r0
-	adds r1, r1, r2
-	ldrb r0, [r1]
-	adds r0, r0, r4
-	b _0801EDD0
-	.align 2, 0
-_0801ED74: .4byte gUnk_080CA17E
-_0801ED78:
-	bl Random
-	b _0801EDD0
-_0801ED7E:
-	adds r0, r5, #0
-	movs r1, #1
-	bl sub_08049FDC
-	cmp r0, #0
-	bne _0801EDC4
-	adds r0, r5, #0
-	bl sub_08049FA0
-	cmp r0, #0
-	beq _0801ED9A
-	bl Random
-	b _0801EDD0
-_0801ED9A:
-	bl Random
-	movs r1, #3
-	ands r1, r0
-	cmp r1, #0
-	beq _0801EDC4
-	adds r0, r5, #0
-	bl sub_08049EE4
-	adds r4, r0, #0
-	bl Random
-	ldr r2, _0801EDC0 @ =gUnk_080CA17E
-	movs r1, #1
-	ands r1, r0
-	adds r1, r1, r2
-	ldrb r0, [r1]
-	adds r0, r0, r4
-	b _0801EDD0
-	.align 2, 0
-_0801EDC0: .4byte gUnk_080CA17E
-_0801EDC4:
-	ldr r0, _0801EDE8 @ =gUnk_020000B0
-	ldr r1, [r0]
-	adds r0, r5, #0
-	bl GetFacingDirection
-	adds r0, #4
-_0801EDD0:
-	movs r1, #0x18
-	ands r0, r1
-	strb r0, [r5, #0x15]
-	ldrb r0, [r5, #0x15]
-	lsrs r0, r0, #3
-	strb r0, [r5, #0x14]
-	ldrb r1, [r5, #0x14]
-	adds r0, r5, #0
-	bl InitializeAnimation
-	pop {r4, r5, pc}
-	.align 2, 0
-_0801EDE8: .4byte gUnk_020000B0
-
-	thumb_func_start sub_0801EDEC
-sub_0801EDEC: @ 0x0801EDEC
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r0, #1
-	bl sub_08049DF4
-	adds r1, r0, #0
-	cmp r1, #0
-	beq _0801EE12
-	adds r0, r4, #0
-	bl GetFacingDirection
-	adds r0, #4
-	movs r1, #0x18
-	ands r0, r1
-	ldrb r4, [r4, #0x15]
-	cmp r0, r4
-	bne _0801EE12
-	movs r0, #1
-	b _0801EE14
-_0801EE12:
-	movs r0, #0
-_0801EE14:
-	pop {r4, pc}
-	.align 2, 0

asm/octorok/sub_0801EBC8.inc

@@ -1,28 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-	
-	.text
-	
-	.syntax unified
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0804A720
-	ldrb r0, [r4, #0xa]
-	cmp r0, #2
-	beq _0801EBDE
-	bl Random
-	movs r1, #3
-	ands r0, r1
-_0801EBDE:
-	strb r0, [r4, #0x14]
-	movs r0, #0x12
-	strb r0, [r4, #0x1c]
-	adds r0, r4, #0
-	bl sub_0801ECFC
-	ldrb r1, [r4, #0x14]
-	adds r0, r4, #0
-	bl InitializeAnimation
-	pop {r4, pc}
-	.syntax divided
-	

asm/octorokBoss.s

@@ -1233,7 +1233,7 @@ _08035B18:
 	movs r2, #0x18
 	rsbs r2, r2, #0
 	movs r1, #0xc
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 _08035B2C:
 	pop {pc}
 	.align 2, 0

asm/peahat.s

@@ -1,928 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Peahat
-Peahat: @ 0x0801FF5C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xa]
-	cmp r0, #0
-	bne _0801FF84
-	ldr r1, _0801FF80 @ =gUnk_080CA570
-	adds r0, r4, #0
-	bl EnemyFunctionHandler
-	movs r3, #0x10
-	rsbs r3, r3, #0
-	adds r0, r4, #0
-	movs r1, #0
-	movs r2, #1
-	bl SetChildOffset
-	b _0801FF94
-	.align 2, 0
-_0801FF80: .4byte gUnk_080CA570
-_0801FF84:
-	ldr r0, _0801FF98 @ =gUnk_080CA588
-	ldrb r1, [r4, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r4, #0
-	bl _call_via_r1
-_0801FF94:
-	pop {r4, pc}
-	.align 2, 0
-_0801FF98: .4byte gUnk_080CA588
-
-	thumb_func_start sub_0801FF9C
-sub_0801FF9C: @ 0x0801FF9C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r1, _0801FFD4 @ =gUnk_080CA590
-	ldrb r0, [r4, #0xc]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl _call_via_r1
-	adds r0, r4, #0
-	adds r0, #0x81
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0801FFD2
-	ldr r2, _0801FFD8 @ =gUnk_080CA5B8
-	ldrb r1, [r4, #0xf]
-	adds r0, r1, #1
-	strb r0, [r4, #0xf]
-	movs r0, #0x30
-	ands r0, r1
-	lsrs r0, r0, #4
-	adds r0, r0, r2
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	strh r0, [r4, #0x36]
-_0801FFD2:
-	pop {r4, pc}
-	.align 2, 0
-_0801FFD4: .4byte gUnk_080CA590
-_0801FFD8: .4byte gUnk_080CA5B8
-
-	thumb_func_start sub_0801FFDC
-sub_0801FFDC: @ 0x0801FFDC
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	adds r6, r4, #0
-	adds r6, #0x82
-	ldrb r0, [r6]
-	cmp r0, #0
-	beq _08020068
-	adds r0, r4, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	cmp r1, #0x94
-	bne _08020018
-	movs r0, #3
-	movs r1, #1
-	bl CreateEnemy
-	adds r5, r0, #0
-	cmp r5, #0
-	beq _08020010
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl CopyPosition
-	ldrh r0, [r5, #0x36]
-	subs r0, #8
-	strh r0, [r5, #0x36]
-_08020010:
-	movs r0, #0
-	strb r0, [r6]
-	movs r0, #2
-	b _0802001E
-_08020018:
-	cmp r1, #0x9b
-	bne _08020042
-	movs r0, #1
-_0802001E:
-	strb r0, [r4, #0x14]
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	movs r1, #0
-	movs r0, #0x80
-	strh r0, [r4, #0x24]
-	adds r2, r4, #0
-	adds r2, #0x3d
-	movs r0, #0xe2
-	strb r0, [r2]
-	adds r0, r4, #0
-	adds r0, #0x81
-	strb r1, [r0]
-	ldrb r1, [r4, #0x14]
-	adds r0, r4, #0
-	bl InitializeAnimation
-	b _08020068
-_08020042:
-	cmp r1, #0x80
-	bne _08020068
-	ldrb r0, [r4, #0x14]
-	cmp r0, #0
-	bne _08020068
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	movs r0, #0x1e
-	strb r0, [r4, #0xe]
-	strh r1, [r4, #0x24]
-	movs r0, #0xff
-	strb r0, [r4, #0x15]
-	adds r1, r4, #0
-	adds r1, #0x83
-	movs r0, #0x78
-	strb r0, [r1]
-	adds r0, r4, #0
-	bl GetNextFrame
-_08020068:
-	adds r0, r4, #0
-	adds r0, #0x43
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _0802007A
-	adds r0, r4, #0
-	movs r1, #0x1c
-	bl sub_0804A9FC
-_0802007A:
-	ldr r1, _08020084 @ =gUnk_080CA570
-	adds r0, r4, #0
-	bl sub_0804AA30
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08020084: .4byte gUnk_080CA570
-
-	thumb_func_start sub_08020088
-sub_08020088: @ 0x08020088
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xd]
-	cmp r0, #2
-	bhi _0802009C
-	adds r0, r4, #0
-	bl sub_0806F520
-	cmp r0, #0
-	beq _080200AC
-_0802009C:
-	ldr r0, _080200B0 @ =gUnk_080CA5BC
-	ldrb r1, [r4, #0xd]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r4, #0
-	bl _call_via_r1
-_080200AC:
-	pop {r4, pc}
-	.align 2, 0
-_080200B0: .4byte gUnk_080CA5BC
-
-	thumb_func_start sub_080200B4
-sub_080200B4: @ 0x080200B4
-	push {lr}
-	adds r2, r0, #0
-	movs r1, #1
-	strb r1, [r2, #0xd]
-	movs r0, #0x3c
-	strb r0, [r2, #0x1d]
-	ldrb r3, [r2, #0x14]
-	cmp r3, #0
-	bne _080200E2
-	strb r1, [r2, #0x14]
-	movs r0, #5
-	strb r0, [r2, #0xc]
-	adds r1, r2, #0
-	adds r1, #0x3f
-	movs r0, #0x71
-	strb r0, [r1]
-	adds r0, r2, #0
-	adds r0, #0x81
-	strb r3, [r0]
-	ldrb r1, [r2, #0x14]
-	adds r0, r2, #0
-	bl InitializeAnimation
-_080200E2:
-	pop {pc}
-
-	thumb_func_start sub_080200E4
-sub_080200E4: @ 0x080200E4
-	push {lr}
-	bl sub_0806F4E8
-	pop {pc}
-
-	thumb_func_start sub_080200EC
-sub_080200EC: @ 0x080200EC
-	push {lr}
-	bl sub_0806F3E4
-	pop {pc}
-
-	thumb_func_start sub_080200F4
-sub_080200F4: @ 0x080200F4
-	ldrb r2, [r0, #0x10]
-	movs r1, #0x7f
-	ands r1, r2
-	strb r1, [r0, #0x10]
-	bx lr
-	.align 2, 0
-
-	thumb_func_start nullsub_5
-nullsub_5: @ 0x08020100
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08020104
-sub_08020104: @ 0x08020104
-	push {lr}
-	adds r2, r0, #0
-	ldrb r3, [r2, #0x10]
-	movs r0, #0x80
-	ands r0, r3
-	lsls r0, r0, #0x18
-	lsrs r1, r0, #0x18
-	cmp r1, #0
-	beq _08020128
-	movs r0, #0x80
-	orrs r0, r3
-	strb r0, [r2, #0x10]
-	adds r2, #0x3a
-	ldrb r1, [r2]
-	movs r0, #0xfb
-	ands r0, r1
-	strb r0, [r2]
-	b _0802012E
-_08020128:
-	adds r0, r2, #0
-	adds r0, #0x45
-	strb r1, [r0]
-_0802012E:
-	pop {pc}
-
-	thumb_func_start sub_08020130
-sub_08020130: @ 0x08020130
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl sub_0804A720
-	movs r5, #1
-	strb r5, [r4, #0xc]
-	movs r0, #0x10
-	strb r0, [r4, #0xe]
-	bl Random
-	strb r0, [r4, #0xf]
-	bl Random
-	movs r1, #0x1f
-	ands r0, r1
-	strb r0, [r4, #0x15]
-	movs r0, #0x12
-	strb r0, [r4, #0x1c]
-	bl Random
-	ands r0, r5
-	movs r1, #0xfe
-	cmp r0, #0
-	beq _08020162
-	movs r1, #2
-_08020162:
-	adds r0, r4, #0
-	adds r0, #0x80
-	strb r1, [r0]
-	adds r0, #1
-	strb r5, [r0]
-	adds r0, #1
-	strb r5, [r0]
-	movs r0, #0
-	strb r0, [r4, #0x14]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08020180
-sub_08020180: @ 0x08020180
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r5, r4, #0
-	adds r5, #0x83
-	ldrb r0, [r5]
-	cmp r0, #0
-	beq _08020192
-	subs r0, #1
-	strb r0, [r5]
-_08020192:
-	adds r0, r4, #0
-	movs r1, #1
-	bl sub_08049FDC
-	cmp r0, #0
-	beq _080201D4
-	ldrb r0, [r5]
-	cmp r0, #0
-	bne _080201D4
-	ldrb r1, [r4, #0xf]
-	movs r0, #0xf
-	ands r0, r1
-	cmp r0, #0
-	bne _080201D4
-	ldr r0, _0802021C @ =gUnk_020000B0
-	ldr r1, [r0]
-	adds r0, r4, #0
-	movs r2, #0x30
-	bl sub_08049F1C
-	cmp r0, #0
-	beq _080201D4
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	bl Random
-	movs r1, #3
-	ands r0, r1
-	strb r0, [r4, #0xd]
-	movs r0, #0x3c
-	strb r0, [r4, #0xe]
-	movs r0, #0xa0
-	strh r0, [r4, #0x24]
-_080201D4:
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _0802020C
-	movs r0, #0x10
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	bl sub_08020604
-	bl Random
-	movs r1, #3
-	ands r1, r0
-	cmp r1, #0
-	bne _0802020C
-	bl Random
-	movs r1, #1
-	ands r1, r0
-	movs r2, #0xfe
-	cmp r1, #0
-	beq _08020206
-	movs r2, #2
-_08020206:
-	adds r0, r4, #0
-	adds r0, #0x80
-	strb r2, [r0]
-_0802020C:
-	adds r0, r4, #0
-	bl sub_080AEFE0
-	adds r0, r4, #0
-	bl GetNextFrame
-	pop {r4, r5, pc}
-	.align 2, 0
-_0802021C: .4byte gUnk_020000B0
-
-	thumb_func_start sub_08020220
-sub_08020220: @ 0x08020220
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	movs r1, #1
-	bl sub_08049FDC
-	cmp r0, #0
-	beq _08020284
-	ldrb r0, [r5, #0xe]
-	subs r1, r0, #1
-	strb r1, [r5, #0xe]
-	lsls r0, r1, #0x18
-	cmp r0, #0
-	beq _0802024C
-	lsrs r0, r0, #0x1c
-	movs r1, #3
-	ands r0, r1
-	movs r1, #4
-	subs r1, r1, r0
-	adds r0, r5, #0
-	bl UpdateAnimationVariableFrames
-	b _08020292
-_0802024C:
-	movs r0, #3
-	strb r0, [r5, #0xc]
-	movs r0, #0x78
-	strb r0, [r5, #0xe]
-	movs r0, #0xc0
-	strh r0, [r5, #0x24]
-	ldr r0, _0802027C @ =gUnk_020000B0
-	ldr r1, [r0]
-	adds r0, r5, #0
-	bl GetFacingDirection
-	adds r4, r0, #0
-	bl Random
-	ldr r2, _08020280 @ =gUnk_080CA5D4
-	movs r1, #1
-	ands r1, r0
-	adds r1, r1, r2
-	ldrb r0, [r1]
-	adds r0, r0, r4
-	movs r1, #0x1f
-	ands r0, r1
-	strb r0, [r5, #0x15]
-	b _0802028A
-	.align 2, 0
-_0802027C: .4byte gUnk_020000B0
-_08020280: .4byte gUnk_080CA5D4
-_08020284:
-	adds r0, r5, #0
-	bl sub_080205F8
-_0802028A:
-	adds r0, r5, #0
-	movs r1, #4
-	bl UpdateAnimationVariableFrames
-_08020292:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_08020294
-sub_08020294: @ 0x08020294
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #1
-	bl sub_08049FDC
-	cmp r0, #0
-	beq _080202F8
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080202B4
-	adds r0, r4, #0
-	bl sub_080205F8
-_080202B4:
-	ldrb r1, [r4, #0xe]
-	cmp r1, #0x3c
-	bls _080202E6
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _080202C8
-	ldrh r0, [r4, #0x24]
-	adds r0, #4
-	strh r0, [r4, #0x24]
-_080202C8:
-	ldr r0, _080202F0 @ =gScreenTransition
-	ldr r0, [r0]
-	movs r1, #3
-	ands r0, r1
-	cmp r0, #0
-	bne _080202E6
-	ldr r0, _080202F4 @ =gUnk_020000B0
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl GetFacingDirection
-	adds r1, r0, #0
-	adds r0, r4, #0
-	bl sub_08004596
-_080202E6:
-	adds r0, r4, #0
-	bl sub_080AEFE0
-	b _080202FE
-	.align 2, 0
-_080202F0: .4byte gScreenTransition
-_080202F4: .4byte gUnk_020000B0
-_080202F8:
-	adds r0, r4, #0
-	bl sub_080205F8
-_080202FE:
-	adds r0, r4, #0
-	movs r1, #4
-	bl UpdateAnimationVariableFrames
-	pop {r4, pc}
-
-	thumb_func_start sub_08020308
-sub_08020308: @ 0x08020308
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xe]
-	subs r1, r0, #1
-	strb r1, [r4, #0xe]
-	lsls r0, r1, #0x18
-	cmp r0, #0
-	bne _08020332
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	strb r0, [r4, #0xe]
-	movs r0, #0x80
-	strh r0, [r4, #0x24]
-	adds r1, r4, #0
-	adds r1, #0x83
-	movs r0, #0x78
-	strb r0, [r1]
-	adds r0, r4, #0
-	bl GetNextFrame
-	b _0802034E
-_08020332:
-	movs r0, #1
-	ands r1, r0
-	cmp r1, #0
-	beq _08020340
-	ldrh r0, [r4, #0x24]
-	subs r0, #8
-	strh r0, [r4, #0x24]
-_08020340:
-	adds r0, r4, #0
-	bl sub_080AEFE0
-	adds r0, r4, #0
-	movs r1, #4
-	bl UpdateAnimationVariableFrames
-_0802034E:
-	pop {r4, pc}
-
-	thumb_func_start sub_08020350
-sub_08020350: @ 0x08020350
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0x14]
-	cmp r0, #2
-	beq _08020398
-	movs r1, #0xc0
-	lsls r1, r1, #5
-	adds r0, r4, #0
-	bl sub_080044EC
-	cmp r0, #0
-	bne _0802037C
-	movs r0, #6
-	strb r0, [r4, #0xc]
-	movs r0, #0xf0
-	strb r0, [r4, #0xe]
-	movs r0, #0xa
-	strb r0, [r4, #0xf]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x71
-	strb r0, [r1]
-_0802037C:
-	ldrb r0, [r4, #0x15]
-	cmp r0, #0xff
-	bne _0802038A
-	adds r0, r4, #0
-	adds r0, #0x3e
-	ldrb r0, [r0]
-	strb r0, [r4, #0x15]
-_0802038A:
-	adds r0, r4, #0
-	bl sub_080AEF88
-	adds r0, r4, #0
-	bl GetNextFrame
-	b _080203BE
-_08020398:
-	movs r1, #0xe0
-	lsls r1, r1, #5
-	adds r0, r4, #0
-	bl sub_08003FC4
-	movs r1, #0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, #0
-	bne _080203BE
-	movs r0, #7
-	strb r0, [r4, #0xc]
-	movs r0, #0x96
-	strb r0, [r4, #0xe]
-	movs r0, #0xa
-	strb r0, [r4, #0xf]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x71
-	strb r0, [r1]
-_080203BE:
-	pop {r4, pc}
-
-	thumb_func_start sub_080203C0
-sub_080203C0: @ 0x080203C0
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xf]
-	cmp r0, #0
-	beq _080203DC
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080203DC
-	adds r0, r4, #0
-	movs r1, #0x1c
-	bl sub_0804A9FC
-_080203DC:
-	adds r0, r4, #0
-	bl sub_0800442E
-	cmp r0, #0
-	bne _080203F2
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08020418
-_080203F2:
-	movs r0, #9
-	strb r0, [r4, #0xc]
-	movs r0, #0xc0
-	lsls r0, r0, #9
-	str r0, [r4, #0x20]
-	bl Random
-	movs r1, #0x1f
-	ands r0, r1
-	strb r0, [r4, #0x15]
-	adds r0, r4, #0
-	bl sub_0804AA1C
-	movs r0, #5
-	strb r0, [r4, #0x14]
-	adds r0, r4, #0
-	movs r1, #5
-	bl InitializeAnimation
-_08020418:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0802041C
-sub_0802041C: @ 0x0802041C
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xf]
-	cmp r0, #0
-	beq _08020438
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08020438
-	adds r0, r4, #0
-	movs r1, #0x1c
-	bl sub_0804A9FC
-_08020438:
-	adds r0, r4, #0
-	bl sub_0800442E
-	cmp r0, #0
-	bne _0802044E
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08020466
-_0802044E:
-	movs r0, #8
-	strb r0, [r4, #0xc]
-	movs r0, #0xf0
-	strb r0, [r4, #0xe]
-	bl Random
-	movs r1, #0x1f
-	ands r0, r1
-	strb r0, [r4, #0x15]
-	adds r0, r4, #0
-	bl sub_0804AA1C
-_08020466:
-	pop {r4, pc}
-
-	thumb_func_start sub_08020468
-sub_08020468: @ 0x08020468
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080204A6
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080204A2
-	movs r0, #9
-	strb r0, [r4, #0xc]
-	movs r0, #0xc0
-	lsls r0, r0, #9
-	str r0, [r4, #0x20]
-	movs r0, #4
-	strb r0, [r4, #0x14]
-	adds r0, r4, #0
-	movs r1, #4
-	bl InitializeAnimation
-	b _080204A6
-_080204A2:
-	movs r0, #1
-	strb r0, [r4, #0xe]
-_080204A6:
-	adds r5, r4, #0
-	adds r5, #0x5a
-	ldrb r1, [r5]
-	movs r0, #2
-	ands r0, r1
-	cmp r0, #0
-	beq _080204C4
-	movs r0, #0xfd
-	ands r0, r1
-	strb r0, [r5]
-	bl Random
-	movs r1, #0x1f
-	ands r0, r1
-	strb r0, [r4, #0x15]
-_080204C4:
-	ldrb r1, [r5]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _080204D6
-	adds r0, r4, #0
-	bl sub_0800442E
-	b _080204DC
-_080204D6:
-	adds r0, r4, #0
-	bl sub_080AEF88
-_080204DC:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080204E0
-sub_080204E0: @ 0x080204E0
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _0802051A
-	movs r2, #0
-	movs r1, #1
-	strb r1, [r4, #0xc]
-	adds r3, r4, #0
-	adds r3, #0x3f
-	movs r0, #0x70
-	strb r0, [r3]
-	adds r0, r4, #0
-	adds r0, #0x82
-	strb r1, [r0]
-	subs r0, #1
-	strb r1, [r0]
-	strb r2, [r4, #0x14]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	b _0802053A
-_0802051A:
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _0802052A
-	adds r0, r4, #0
-	bl sub_0800442E
-	b _0802053A
-_0802052A:
-	movs r1, #0xe0
-	lsls r1, r1, #5
-	adds r0, r4, #0
-	bl sub_08003FC4
-	adds r0, r4, #0
-	bl sub_080AEF88
-_0802053A:
-	pop {r4, pc}
-
-	thumb_func_start sub_0802053C
-sub_0802053C: @ 0x0802053C
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #1
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	movs r0, #0xf0
-	strb r0, [r4, #0xe]
-	movs r0, #0x28
-	strb r0, [r4, #0xf]
-	ldrb r0, [r4, #0x18]
-	movs r2, #4
-	rsbs r2, r2, #0
-	ands r2, r0
-	orrs r2, r1
-	ldrb r3, [r4, #0x19]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r3
-	movs r3, #0x40
-	orrs r0, r3
-	strb r0, [r4, #0x19]
-	ldrb r0, [r4, #0x1b]
-	ands r1, r0
-	orrs r1, r3
-	strb r1, [r4, #0x1b]
-	movs r0, #0x31
-	rsbs r0, r0, #0
-	ands r2, r0
-	strb r2, [r4, #0x18]
-	movs r0, #0x20
-	strh r0, [r4, #0x24]
-	bl Random
-	movs r1, #0x10
-	ands r0, r1
-	adds r0, #8
-	strb r0, [r4, #0x15]
-	adds r0, r4, #0
-	movs r1, #3
-	bl InitializeAnimation
-	pop {r4, pc}
-
-	thumb_func_start sub_08020590
-sub_08020590: @ 0x08020590
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	ldrb r0, [r4, #0xe]
-	subs r1, r0, #1
-	strb r1, [r4, #0xe]
-	movs r5, #0xff
-	lsls r0, r1, #0x18
-	cmp r0, #0
-	bne _080205AE
-	adds r0, r4, #0
-	bl DeleteEntity
-	b _080205F2
-_080205AE:
-	lsls r0, r1, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0x3b
-	bhi _080205C8
-	ldrb r2, [r4, #0x18]
-	lsls r1, r2, #0x1e
-	lsrs r1, r1, #0x1e
-	movs r0, #1
-	eors r1, r0
-	subs r0, #5
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-_080205C8:
-	ldr r0, [r4, #0x34]
-	ldr r1, _080205F4 @ =0xFFFF4000
-	adds r0, r0, r1
-	str r0, [r4, #0x34]
-	adds r0, r4, #0
-	bl sub_0806F69C
-	ldrb r0, [r4, #0xf]
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	ands r0, r5
-	cmp r0, #0
-	bne _080205F2
-	movs r0, #0x28
-	strb r0, [r4, #0xf]
-	bl Random
-	movs r1, #0x10
-	ands r0, r1
-	adds r0, #8
-	strb r0, [r4, #0x15]
-_080205F2:
-	pop {r4, r5, pc}
-	.align 2, 0
-_080205F4: .4byte 0xFFFF4000
-
-	thumb_func_start sub_080205F8
-sub_080205F8: @ 0x080205F8
-	movs r1, #4
-	strb r1, [r0, #0xc]
-	movs r1, #0x3c
-	strb r1, [r0, #0xe]
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08020604
-sub_08020604: @ 0x08020604
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08049FA0
-	cmp r0, #0
-	bne _08020624
-	bl Random
-	movs r1, #3
-	ands r1, r0
-	cmp r1, #0
-	beq _08020624
-	adds r0, r4, #0
-	bl sub_08049EE4
-	b _08020632
-_08020624:
-	adds r0, r4, #0
-	adds r0, #0x80
-	ldrb r0, [r0]
-	ldrb r1, [r4, #0x15]
-	adds r0, r0, r1
-	movs r1, #0x1f
-	ands r0, r1
-_08020632:
-	strb r0, [r4, #0x15]
-	pop {r4, pc}
-	.align 2, 0

asm/pesto.s

@@ -229,7 +229,7 @@ sub_0802409C: @ 0x0802409C
 	adds r0, r4, #0
 	bl InitializeAnimation
 	adds r0, r4, #0
-	bl sub_080A29BC
+	bl CreateDust
 	pop {r4, pc}
 
 	thumb_func_start sub_080240B8

asm/pina.s

@@ -297,7 +297,7 @@ sub_08063C74: @ 0x08063C74
 	movs r2, #0x18
 	rsbs r2, r2, #0
 	movs r1, #8
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 _08063C8C:
 	pop {pc}
 	.align 2, 0

asm/pinwheel.s

@@ -84,7 +84,7 @@ sub_080A2420: @ 0x080A2420
 	movs r0, #2
 	strb r0, [r4, #0xc]
 	adds r0, r4, #0
-	bl sub_080A29BC
+	bl CreateDust
 _080A243A:
 	pop {r4, pc}
 

asm/rockChuchu.s

@@ -1,237 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start RockChuchu
-RockChuchu: @ 0x0802222C
-	push {lr}
-	ldr r1, _08022238 @ =gUnk_080CB948
-	bl EnemyFunctionHandler
-	pop {pc}
-	.align 2, 0
-_08022238: .4byte gUnk_080CB948
-
-	thumb_func_start sub_0802223C
-sub_0802223C: @ 0x0802223C
-	push {lr}
-	ldr r2, _08022250 @ =gUnk_080CB960
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08022250: .4byte gUnk_080CB960
-
-	thumb_func_start sub_08022254
-sub_08022254: @ 0x08022254
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r0, #0x45
-	ldrb r0, [r0]
-	cmp r0, #0
-	beq _08022344
-	adds r0, r4, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	movs r0, #0x7f
-	ands r0, r1
-	subs r0, #4
-	cmp r0, #0x18
-	bhi _08022356
-	lsls r0, r0, #2
-	ldr r1, _0802227C @ =_08022280
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_0802227C: .4byte _08022280
-_08022280: @ jump table
-	.4byte _080222E4 @ case 0
-	.4byte _080222E4 @ case 1
-	.4byte _080222E4 @ case 2
-	.4byte _08022356 @ case 3
-	.4byte _080222E4 @ case 4
-	.4byte _080222E4 @ case 5
-	.4byte _080222E4 @ case 6
-	.4byte _080222E4 @ case 7
-	.4byte _080222E4 @ case 8
-	.4byte _080222E4 @ case 9
-	.4byte _08022356 @ case 10
-	.4byte _08022356 @ case 11
-	.4byte _080222E4 @ case 12
-	.4byte _080222E4 @ case 13
-	.4byte _080222E4 @ case 14
-	.4byte _08022356 @ case 15
-	.4byte _08022356 @ case 16
-	.4byte _08022356 @ case 17
-	.4byte _080222F2 @ case 18
-	.4byte _08022356 @ case 19
-	.4byte _080222E4 @ case 20
-	.4byte _080222E4 @ case 21
-	.4byte _080222E4 @ case 22
-	.4byte _08022356 @ case 23
-	.4byte _080222F2 @ case 24
-_080222E4:
-	ldr r0, _08022340 @ =gPlayerState
-	adds r0, #0xac
-	ldrh r1, [r0]
-	movs r0, #8
-	ands r0, r1
-	cmp r0, #0
-	beq _08022356
-_080222F2:
-	adds r0, r4, #0
-	movs r1, #4
-	movs r2, #0
-	bl CreateFx
-	movs r0, #1
-	movs r1, #1
-	bl CreateEnemy
-	adds r5, r0, #0
-	cmp r5, #0
-	beq _08022356
-	movs r0, #1
-	strb r0, [r5, #0xb]
-	adds r1, r5, #0
-	adds r1, #0x3d
-	movs r0, #0xf8
-	strb r0, [r1]
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl sub_0804A4E4
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r4, #0x10]
-	ldrb r1, [r4, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	adds r0, #0x3e
-	ldrb r0, [r0]
-	strb r0, [r4, #0x15]
-	str r5, [r4, #0x54]
-	b _08022356
-	.align 2, 0
-_08022340: .4byte gPlayerState
-_08022344:
-	adds r0, r4, #0
-	adds r0, #0x3f
-	ldrb r0, [r0]
-	cmp r0, #0x94
-	beq _08022356
-	adds r0, r4, #0
-	movs r1, #2
-	bl InitializeAnimation
-_08022356:
-	ldr r1, _08022360 @ =gUnk_080CB948
-	adds r0, r4, #0
-	bl sub_0804AA30
-	pop {r4, r5, pc}
-	.align 2, 0
-_08022360: .4byte gUnk_080CB948
-
-	thumb_func_start nullsub_131
-nullsub_131: @ 0x08022364
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08022368
-sub_08022368: @ 0x08022368
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0804A720
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	bl Random
-	strb r0, [r4, #0xe]
-	adds r0, r4, #0
-	movs r1, #1
-	bl sub_08049F84
-	strb r0, [r4, #0x15]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022390
-sub_08022390: @ 0x08022390
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #1
-	bl sub_08049FDC
-	cmp r0, #0
-	beq _080223D4
-	ldrb r1, [r4, #0xe]
-	adds r0, r1, #1
-	strb r0, [r4, #0xe]
-	movs r0, #0xf
-	ands r0, r1
-	cmp r0, #0
-	bne _080223C0
-	adds r0, r4, #0
-	movs r1, #1
-	bl sub_08049F84
-	strb r0, [r4, #0x15]
-	bl Random
-	movs r1, #4
-	ands r0, r1
-	strb r0, [r4, #0xf]
-_080223C0:
-	ldrb r0, [r4, #0xf]
-	cmp r0, #0
-	bne _080223CE
-	adds r0, r4, #0
-	bl sub_080AEF88
-	b _080223DA
-_080223CE:
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	b _080223DA
-_080223D4:
-	bl Random
-	strb r0, [r4, #0xe]
-_080223DA:
-	adds r0, r4, #0
-	bl GetNextFrame
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080223E4
-sub_080223E4: @ 0x080223E4
-	push {lr}
-	adds r3, r0, #0
-	ldr r2, [r3, #0x54]
-	cmp r2, #0
-	beq _0802240A
-	adds r1, r2, #0
-	adds r1, #0x41
-	movs r0, #0x94
-	strb r0, [r1]
-	subs r1, #4
-	movs r0, #0x10
-	strb r0, [r1]
-	adds r1, #5
-	movs r0, #0xc
-	strb r0, [r1]
-	ldrb r1, [r3, #0x15]
-	adds r0, r2, #0
-	adds r0, #0x3e
-	strb r1, [r0]
-_0802240A:
-	adds r0, r3, #0
-	bl DeleteEntity
-	pop {pc}
-	.align 2, 0

asm/rollobite.s

@@ -1,735 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Rollobite
-Rollobite: @ 0x08020638
-	push {lr}
-	ldr r1, _08020644 @ =gUnk_080CA66C
-	bl EnemyFunctionHandler
-	pop {pc}
-	.align 2, 0
-_08020644: .4byte gUnk_080CA66C
-
-	thumb_func_start sub_08020648
-sub_08020648: @ 0x08020648
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_08020AD0
-	ldr r1, _08020664 @ =gUnk_080CA684
-	ldrb r0, [r4, #0xc]
-	lsls r0, r0, #2
-	adds r0, r0, r1
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl _call_via_r1
-	pop {r4, pc}
-	.align 2, 0
-_08020664: .4byte gUnk_080CA684
-
-	thumb_func_start sub_08020668
-sub_08020668: @ 0x08020668
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r2, r4, #0
-	adds r2, #0x3f
-	ldrb r0, [r2]
-	cmp r0, #0x22
-	bne _080206A2
-	adds r1, r4, #0
-	adds r1, #0x45
-	ldrb r0, [r1]
-	cmp r0, #0xff
-	beq _080206A2
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	movs r0, #0x80
-	lsls r0, r0, #0xa
-	str r0, [r4, #0x20]
-	movs r0, #0xff
-	strb r0, [r4, #0x15]
-	movs r0, #1
-	rsbs r0, r0, #0
-	strb r0, [r1]
-	movs r0, #0x23
-	strb r0, [r2]
-	ldrb r1, [r4, #0x14]
-	adds r1, #8
-	adds r0, r4, #0
-	bl InitializeAnimation
-_080206A2:
-	adds r0, r4, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	adds r5, r0, #0
-	cmp r1, #0x80
-	beq _080206D0
-	ldrb r0, [r4, #0xc]
-	subs r0, #4
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #1
-	bhi _080206D0
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	movs r0, #0xb4
-	strb r0, [r4, #0xe]
-	movs r0, #0xff
-	strb r0, [r4, #0x15]
-	ldrb r1, [r4, #0x14]
-	adds r1, #0x10
-	adds r0, r4, #0
-	bl InitializeAnimation
-_080206D0:
-	ldrb r0, [r5]
-	cmp r0, #0x93
-	bne _080206DC
-	adds r0, r4, #0
-	bl sub_08020648
-_080206DC:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080206E0
-sub_080206E0: @ 0x080206E0
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl sub_08020AD0
-	cmp r0, #0
-	beq _080206F6
-	adds r1, r4, #0
-	adds r1, #0x42
-	movs r0, #0
-	strb r0, [r1]
-	b _08020730
-_080206F6:
-	adds r0, r4, #0
-	bl sub_08020B6C
-	cmp r0, #0
-	beq _0802072A
-	adds r1, r4, #0
-	adds r1, #0x42
-	ldrb r0, [r1]
-	subs r0, #1
-	strb r0, [r1]
-	adds r5, r4, #0
-	adds r5, #0x3e
-	ldrb r1, [r5]
-	adds r0, r4, #0
-	movs r2, #0xa
-	bl sub_080AE58C
-	adds r0, r4, #0
-	adds r0, #0x46
-	ldrh r1, [r0]
-	ldrb r2, [r5]
-	adds r0, r4, #0
-	movs r3, #0xa
-	bl sub_080AE7E8
-	b _08020730
-_0802072A:
-	adds r0, r4, #0
-	bl sub_08001324
-_08020730:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08020734
-sub_08020734: @ 0x08020734
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xd]
-	cmp r0, #2
-	bhi _08020764
-	adds r0, r4, #0
-	bl sub_0806F520
-	cmp r0, #0
-	bne _08020764
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	movs r0, #0xff
-	strb r0, [r4, #0x15]
-	ldrb r1, [r4, #0x14]
-	adds r1, #0x10
-	adds r0, r4, #0
-	bl InitializeAnimation
-	b _08020774
-_08020764:
-	ldr r0, _08020778 @ =gUnk_080CA6A4
-	ldrb r1, [r4, #0xd]
-	lsls r1, r1, #2
-	adds r1, r1, r0
-	ldr r1, [r1]
-	adds r0, r4, #0
-	bl _call_via_r1
-_08020774:
-	pop {r4, pc}
-	.align 2, 0
-_08020778: .4byte gUnk_080CA6A4
-
-	thumb_func_start sub_0802077C
-sub_0802077C: @ 0x0802077C
-	movs r1, #1
-	strb r1, [r0, #0xd]
-	movs r1, #0x3c
-	strb r1, [r0, #0x1d]
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08020788
-sub_08020788: @ 0x08020788
-	push {lr}
-	bl sub_0806F4E8
-	pop {pc}
-
-	thumb_func_start sub_08020790
-sub_08020790: @ 0x08020790
-	push {lr}
-	bl sub_0806F3E4
-	pop {pc}
-
-	thumb_func_start sub_08020798
-sub_08020798: @ 0x08020798
-	ldrb r2, [r0, #0x10]
-	movs r1, #0x7f
-	ands r1, r2
-	strb r1, [r0, #0x10]
-	bx lr
-	.align 2, 0
-
-	thumb_func_start nullsub_6
-nullsub_6: @ 0x080207A4
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_080207A8
-sub_080207A8: @ 0x080207A8
-	push {lr}
-	movs r3, #4
-	movs r1, #4
-	strb r1, [r0, #0xc]
-	ldrb r2, [r0, #0x10]
-	movs r1, #0x80
-	orrs r1, r2
-	strb r1, [r0, #0x10]
-	movs r1, #0x29
-	adds r1, r1, r0
-	mov ip, r1
-	ldrb r2, [r1]
-	movs r1, #8
-	rsbs r1, r1, #0
-	ands r1, r2
-	orrs r1, r3
-	mov r2, ip
-	strb r1, [r2]
-	adds r3, r0, #0
-	adds r3, #0x3a
-	ldrb r2, [r3]
-	movs r1, #0xfb
-	ands r1, r2
-	strb r1, [r3]
-	ldrb r1, [r0, #0x15]
-	movs r2, #0x10
-	eors r1, r2
-	strb r1, [r0, #0x15]
-	movs r1, #0xc0
-	lsls r1, r1, #9
-	str r1, [r0, #0x20]
-	movs r1, #0x80
-	strh r1, [r0, #0x24]
-	ldrb r1, [r0, #0x14]
-	adds r1, #0x10
-	bl InitializeAnimation
-	pop {pc}
-
-	thumb_func_start sub_080207F4
-sub_080207F4: @ 0x080207F4
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0804A720
-	movs r1, #0
-	movs r0, #0x30
-	strb r0, [r4, #0x16]
-	movs r0, #0x12
-	strb r0, [r4, #0x1c]
-	adds r0, r4, #0
-	adds r0, #0x84
-	strb r1, [r0]
-	bl Random
-	movs r1, #0x18
-	ands r0, r1
-	strb r0, [r4, #0x15]
-	adds r0, r4, #0
-	bl sub_08020A30
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08020820
-sub_08020820: @ 0x08020820
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r2, r4, #0
-	adds r2, #0x5a
-	ldrb r1, [r2]
-	movs r5, #1
-	adds r0, r5, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _0802084A
-	movs r0, #0xfe
-	ands r0, r1
-	strb r0, [r2]
-	adds r0, r4, #0
-	bl sub_080AEF88
-	cmp r0, #0
-	bne _0802084A
-	strb r5, [r4, #0xe]
-_0802084A:
-	adds r2, r4, #0
-	adds r2, #0x5a
-	ldrb r1, [r2]
-	movs r0, #0x10
-	ands r0, r1
-	cmp r0, #0
-	beq _08020872
-	movs r0, #0xef
-	ands r0, r1
-	strb r0, [r2]
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08020872
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	movs r0, #0x3c
-	strb r0, [r4, #0xe]
-_08020872:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_08020874
-sub_08020874: @ 0x08020874
-	push {lr}
-	ldr r2, _08020888 @ =gUnk_080CA6BC
-	ldrb r1, [r0, #0xd]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08020888: .4byte gUnk_080CA6BC
-
-	thumb_func_start sub_0802088C
-sub_0802088C: @ 0x0802088C
-	movs r1, #1
-	strb r1, [r0, #0xd]
-	ldrb r2, [r0, #0x10]
-	movs r1, #0x7f
-	ands r1, r2
-	strb r1, [r0, #0x10]
-	ldr r1, _080208B0 @ =gPlayerEntity
-	ldrb r1, [r1, #0x14]
-	adds r2, r0, #0
-	adds r2, #0x85
-	strb r1, [r2]
-	adds r0, #0x29
-	ldrb r2, [r0]
-	movs r1, #0x39
-	rsbs r1, r1, #0
-	ands r1, r2
-	strb r1, [r0]
-	bx lr
-	.align 2, 0
-_080208B0: .4byte gPlayerEntity
-
-	thumb_func_start sub_080208B4
-sub_080208B4: @ 0x080208B4
-	push {r4, r5, lr}
-	adds r2, r0, #0
-	adds r4, r2, #0
-	adds r4, #0x85
-	ldrb r0, [r4]
-	ldr r5, _080208EC @ =gPlayerEntity
-	ldrb r1, [r5, #0x14]
-	subs r0, r0, r1
-	lsrs r1, r0, #0x1f
-	adds r0, r0, r1
-	asrs r0, r0, #1
-	lsls r0, r0, #0x18
-	lsrs r1, r0, #0x18
-	cmp r0, #0
-	beq _080208E6
-	ldrb r0, [r2, #0x14]
-	adds r0, r0, r1
-	movs r1, #3
-	ands r0, r1
-	strb r0, [r2, #0x14]
-	ldrb r1, [r2, #0x14]
-	adds r1, #0x10
-	adds r0, r2, #0
-	bl InitializeAnimation
-_080208E6:
-	ldrb r0, [r5, #0x14]
-	strb r0, [r4]
-	pop {r4, r5, pc}
-	.align 2, 0
-_080208EC: .4byte gPlayerEntity
-
-	thumb_func_start sub_080208F0
-sub_080208F0: @ 0x080208F0
-	adds r0, #0x29
-	ldrb r2, [r0]
-	movs r1, #0x39
-	rsbs r1, r1, #0
-	ands r1, r2
-	movs r2, #0x18
-	orrs r1, r2
-	strb r1, [r0]
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_08020904
-sub_08020904: @ 0x08020904
-	push {lr}
-	movs r1, #4
-	strb r1, [r0, #0xc]
-	ldrb r2, [r0, #0x10]
-	movs r1, #0x80
-	orrs r1, r2
-	strb r1, [r0, #0x10]
-	movs r1, #0xff
-	strb r1, [r0, #0x15]
-	ldrb r1, [r0, #0x14]
-	adds r1, #0x10
-	bl InitializeAnimation
-	pop {pc}
-
-	thumb_func_start sub_08020920
-sub_08020920: @ 0x08020920
-	push {lr}
-	adds r1, r0, #0
-	ldrb r0, [r1, #0xe]
-	subs r0, #1
-	strb r0, [r1, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08020936
-	adds r0, r1, #0
-	bl sub_08020A30
-_08020936:
-	pop {pc}
-
-	thumb_func_start sub_08020938
-sub_08020938: @ 0x08020938
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r5, #0x80
-	adds r0, r5, #0
-	ands r0, r1
-	cmp r0, #0
-	bne _08020950
-	adds r0, r4, #0
-	bl GetNextFrame
-_08020950:
-	movs r1, #0xa0
-	lsls r1, r1, #6
-	adds r0, r4, #0
-	bl sub_080044EC
-	cmp r0, #0
-	bne _08020980
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _08020978
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x14]
-	adds r1, #0xc
-	adds r0, r4, #0
-	bl InitializeAnimation
-_08020978:
-	adds r0, r4, #0
-	bl sub_08078930
-	b _0802099C
-_08020980:
-	cmp r0, #1
-	bne _0802098C
-	movs r0, #0x82
-	lsls r0, r0, #1
-	bl sub_08004488
-_0802098C:
-	ldrb r1, [r4, #0x15]
-	adds r0, r5, #0
-	ands r0, r1
-	cmp r0, #0
-	bne _0802099C
-	adds r0, r4, #0
-	bl sub_080AEFE0
-_0802099C:
-	pop {r4, r5, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080209A0
-sub_080209A0: @ 0x080209A0
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080209E2
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	movs r0, #0x80
-	lsls r0, r0, #1
-	strh r0, [r4, #0x24]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x22
-	strb r0, [r1]
-	adds r0, r4, #0
-	bl sub_08020A30
-	ldrb r0, [r4, #0x14]
-	lsls r0, r0, #3
-	strb r0, [r4, #0x15]
-	ldrb r1, [r4, #0x14]
-	adds r0, r4, #0
-	bl InitializeAnimation
-	b _080209F0
-_080209E2:
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	bne _080209F0
-	adds r0, r4, #0
-	bl sub_08078930
-_080209F0:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080209F4
-sub_080209F4: @ 0x080209F4
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #0xe0
-	lsls r1, r1, #5
-	bl sub_08003FC4
-	cmp r0, #0
-	bne _08020A14
-	movs r1, #7
-	movs r0, #7
-	strb r0, [r4, #0xc]
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r0, [r2]
-	orrs r0, r1
-	strb r0, [r2]
-_08020A14:
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r0, [r0]
-	cmp r0, #0
-	bne _08020A24
-	adds r0, r4, #0
-	bl GetNextFrame
-_08020A24:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08020A28
-sub_08020A28: @ 0x08020A28
-	push {lr}
-	bl GetNextFrame
-	pop {pc}
-
-	thumb_func_start sub_08020A30
-sub_08020A30: @ 0x08020A30
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r5, r4, #0
-	adds r5, #0x84
-	ldrb r0, [r5]
-	cmp r0, #1
-	bhi _08020A68
-	bl Random
-	ldr r2, _08020A64 @ =gUnk_080CA6CC
-	movs r1, #7
-	ands r1, r0
-	adds r1, r1, r2
-	ldrb r0, [r1]
-	strb r0, [r4, #0xe]
-	cmp r0, #0
-	bne _08020A68
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	movs r0, #0x3c
-	strb r0, [r4, #0xe]
-	ldrb r0, [r5]
-	adds r0, #1
-	strb r0, [r5]
-	b _08020A7A
-	.align 2, 0
-_08020A64: .4byte gUnk_080CA6CC
-_08020A68:
-	movs r0, #0
-	movs r1, #1
-	strb r1, [r4, #0xc]
-	adds r1, r4, #0
-	adds r1, #0x84
-	strb r0, [r1]
-	adds r0, r4, #0
-	bl sub_08020A7C
-_08020A7A:
-	pop {r4, r5, pc}
-
-	thumb_func_start sub_08020A7C
-sub_08020A7C: @ 0x08020A7C
-	push {r4, r5, r6, lr}
-	adds r6, r0, #0
-	bl Random
-	ldrb r5, [r6, #0x15]
-	ldr r4, _08020ACC @ =gUnk_080CA6D4
-	movs r1, #3
-	bl __modsi3
-	adds r0, r0, r4
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	adds r5, r5, r0
-	movs r4, #0x18
-	ands r5, r4
-	adds r0, r6, #0
-	bl sub_08049FA0
-	cmp r0, #0
-	bne _08020ABA
-	adds r0, r6, #0
-	bl sub_08049EE4
-	adds r0, #4
-	ands r0, r4
-	movs r1, #0x10
-	eors r1, r5
-	cmp r1, r0
-	bne _08020ABA
-	adds r5, r1, #0
-_08020ABA:
-	strb r5, [r6, #0x15]
-	lsrs r0, r5, #3
-	strb r0, [r6, #0x14]
-	ldrb r1, [r6, #0x14]
-	adds r0, r6, #0
-	bl InitializeAnimation
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08020ACC: .4byte gUnk_080CA6D4
-
-	thumb_func_start sub_08020AD0
-sub_08020AD0: @ 0x08020AD0
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	bl sub_08020B6C
-	cmp r0, #0
-	beq _08020B68
-	movs r1, #0x36
-	ldrsh r0, [r4, r1]
-	cmp r0, #0
-	bne _08020B68
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	ldr r3, _08020B5C @ =gRoomControls
-	ldrh r1, [r3, #6]
-	subs r0, r0, r1
-	asrs r5, r0, #4
-	movs r2, #0x3f
-	ands r5, r2
-	movs r1, #0x32
-	ldrsh r0, [r4, r1]
-	ldrh r1, [r3, #8]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	ands r0, r2
-	lsls r0, r0, #6
-	orrs r5, r0
-	adds r6, r4, #0
-	adds r6, #0x38
-	ldrb r1, [r6]
-	adds r0, r5, #0
-	bl GetTileType
-	lsls r0, r0, #0x10
-	ldr r1, _08020B60 @ =0xFF8F0000
-	adds r0, r0, r1
-	lsrs r0, r0, #0x10
-	cmp r0, #1
-	bhi _08020B68
-	movs r0, #6
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0x7f
-	ands r0, r1
-	strb r0, [r4, #0x10]
-	ldrh r2, [r4, #0x2e]
-	movs r1, #0x10
-	rsbs r1, r1, #0
-	adds r0, r1, #0
-	ands r0, r2
-	adds r0, #8
-	strh r0, [r4, #0x2e]
-	ldrh r0, [r4, #0x32]
-	ands r1, r0
-	adds r1, #0xd
-	strh r1, [r4, #0x32]
-	movs r0, #0x80
-	lsls r0, r0, #0xa
-	str r0, [r4, #0x20]
-	ldrb r1, [r4, #0x14]
-	adds r1, #0x14
-	adds r0, r4, #0
-	bl InitializeAnimation
-	ldr r0, _08020B64 @ =0x00004034
-	ldrb r2, [r6]
-	adds r1, r5, #0
-	bl SetTile
-	movs r0, #1
-	b _08020B6A
-	.align 2, 0
-_08020B5C: .4byte gRoomControls
-_08020B60: .4byte 0xFF8F0000
-_08020B64: .4byte 0x00004034
-_08020B68:
-	movs r0, #0
-_08020B6A:
-	pop {r4, r5, r6, pc}
-
-	thumb_func_start sub_08020B6C
-sub_08020B6C: @ 0x08020B6C
-	push {lr}
-	adds r0, #0x58
-	ldrb r0, [r0]
-	subs r0, #0x10
-	cmp r0, #3
-	bls _08020B7C
-	movs r0, #0
-	b _08020B7E
-_08020B7C:
-	movs r0, #1
-_08020B7E:
-	pop {pc}

asm/spinyBeetle.s

@@ -933,7 +933,7 @@ sub_08033E1C: @ 0x08033E1C
 	rsbs r2, r2, #0
 	adds r0, r4, #0
 	movs r1, #0xa
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 	pop {r4, pc}
 	.align 2, 0
 _08033EA4: .4byte 0xFFF00000

asm/spinyChuchu.s

@@ -1,646 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start SpinyChuchu
-SpinyChuchu: @ 0x08022414
-	push {r4, lr}
-	adds r4, r0, #0
-	ldr r1, _08022430 @ =gUnk_080CBA28
-	bl EnemyFunctionHandler
-	movs r3, #0x10
-	rsbs r3, r3, #0
-	adds r0, r4, #0
-	movs r1, #0
-	movs r2, #1
-	bl SetChildOffset
-	pop {r4, pc}
-	.align 2, 0
-_08022430: .4byte gUnk_080CBA28
-
-	thumb_func_start sub_08022434
-sub_08022434: @ 0x08022434
-	push {lr}
-	ldr r2, _08022448 @ =gUnk_080CBA40
-	ldrb r1, [r0, #0xc]
-	lsls r1, r1, #2
-	adds r1, r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {pc}
-	.align 2, 0
-_08022448: .4byte gUnk_080CBA40
-
-	thumb_func_start sub_0802244C
-sub_0802244C: @ 0x0802244C
-	push {r4, r5, r6, r7, lr}
-	adds r4, r0, #0
-	adds r5, r4, #0
-	adds r5, #0x45
-	ldrb r0, [r5]
-	cmp r0, #0
-	bne _0802245C
-	b _08022582
-_0802245C:
-	adds r0, r4, #0
-	adds r0, #0x3f
-	ldrb r1, [r0]
-	adds r6, r0, #0
-	cmp r1, #0x65
-	bne _08022522
-	adds r0, #2
-	ldrb r1, [r0]
-	movs r0, #0x7f
-	ands r0, r1
-	subs r0, #2
-	cmp r0, #0x18
-	bhi _08022540
-	lsls r0, r0, #2
-	ldr r1, _08022480 @ =_08022484
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08022480: .4byte _08022484
-_08022484: @ jump table
-	.4byte _080224E8 @ case 0
-	.4byte _080224E8 @ case 1
-	.4byte _08022540 @ case 2
-	.4byte _08022540 @ case 3
-	.4byte _08022540 @ case 4
-	.4byte _08022540 @ case 5
-	.4byte _08022508 @ case 6
-	.4byte _08022508 @ case 7
-	.4byte _08022508 @ case 8
-	.4byte _08022508 @ case 9
-	.4byte _08022508 @ case 10
-	.4byte _08022540 @ case 11
-	.4byte _08022540 @ case 12
-	.4byte _08022540 @ case 13
-	.4byte _08022540 @ case 14
-	.4byte _08022540 @ case 15
-	.4byte _08022540 @ case 16
-	.4byte _08022540 @ case 17
-	.4byte _08022540 @ case 18
-	.4byte _08022540 @ case 19
-	.4byte _08022508 @ case 20
-	.4byte _08022540 @ case 21
-	.4byte _08022508 @ case 22
-	.4byte _08022508 @ case 23
-	.4byte _08022508 @ case 24
-_080224E8:
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r0, #0x3c
-	strb r0, [r4, #0xf]
-	movs r0, #0x5c
-	strb r0, [r6]
-	ldr r0, _08022504 @ =gUnk_080FD468
-	str r0, [r4, #0x48]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	b _08022540
-	.align 2, 0
-_08022504: .4byte gUnk_080FD468
-_08022508:
-	adds r0, r4, #0
-	movs r1, #0x1c
-	bl sub_0804A9FC
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	movs r0, #0x5c
-	strb r0, [r6]
-	adds r0, r4, #0
-	movs r1, #1
-	bl InitializeAnimation
-	b _08022540
-_08022522:
-	adds r0, r4, #0
-	adds r0, #0x41
-	ldrb r0, [r0]
-	cmp r0, #0x94
-	bne _08022540
-	adds r0, r4, #0
-	movs r1, #0x1c
-	bl sub_0804A9FC
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #1
-	bl InitializeAnimation
-_08022540:
-	adds r0, r4, #0
-	adds r0, #0x80
-	adds r1, r4, #0
-	adds r1, #0x45
-	ldrb r2, [r0]
-	adds r5, r1, #0
-	adds r7, r0, #0
-	ldrb r0, [r5]
-	cmp r2, r0
-	beq _08022566
-	movs r0, #5
-	strb r0, [r4, #0xc]
-	movs r0, #0x5c
-	strb r0, [r6]
-	adds r0, r4, #0
-	movs r1, #1
-	bl InitializeAnimation
-	b _0802258E
-_08022566:
-	ldrb r0, [r4, #0xc]
-	cmp r0, #3
-	bne _0802258E
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #3
-	bl InitializeAnimation
-	movs r0, #0xca
-	lsls r0, r0, #1
-	bl sub_08004488
-	b _0802258E
-_08022582:
-	adds r0, r4, #0
-	movs r1, #1
-	bl InitializeAnimation
-	adds r7, r4, #0
-	adds r7, #0x80
-_0802258E:
-	ldrb r0, [r5]
-	strb r0, [r7]
-	ldr r1, _0802259C @ =gUnk_080CBA28
-	adds r0, r4, #0
-	bl sub_0804AA30
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_0802259C: .4byte gUnk_080CBA28
-
-	thumb_func_start sub_080225A0
-sub_080225A0: @ 0x080225A0
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r0, #0x58
-	ldrb r0, [r0]
-	cmp r0, #1
-	bne _080225B2
-	adds r0, r4, #0
-	bl GetNextFrame
-_080225B2:
-	adds r0, r4, #0
-	bl sub_08001318
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_080225BC
-sub_080225BC: @ 0x080225BC
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #0xc0
-	lsls r1, r1, #5
-	bl sub_08003FC4
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _080225DE
-	adds r0, r4, #0
-	bl sub_0804A7D4
-	b _080225E4
-_080225DE:
-	adds r0, r4, #0
-	bl GetNextFrame
-_080225E4:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start nullsub_9
-nullsub_9: @ 0x080225E8
-	bx lr
-	.align 2, 0
-
-	thumb_func_start sub_080225EC
-sub_080225EC: @ 0x080225EC
-	push {r4, lr}
-	adds r4, r0, #0
-	bl sub_0804A720
-	adds r0, r4, #0
-	adds r0, #0x45
-	ldrb r1, [r0]
-	adds r0, #0x3b
-	strb r1, [r0]
-	adds r1, r4, #0
-	adds r1, #0x81
-	movs r0, #0x5a
-	strb r0, [r1]
-	ldrb r0, [r4, #0xe]
-	cmp r0, #0
-	bne _0802261A
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	b _0802264C
-_0802261A:
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	movs r0, #0x3c
-	strb r0, [r4, #0xf]
-	ldrb r0, [r4, #0x18]
-	movs r1, #3
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	ldrb r2, [r4, #0x19]
-	movs r1, #0x3f
-	adds r0, r1, #0
-	ands r0, r2
-	movs r2, #0x40
-	orrs r0, r2
-	strb r0, [r4, #0x19]
-	ldrb r0, [r4, #0x1b]
-	ands r1, r0
-	orrs r1, r2
-	strb r1, [r4, #0x1b]
-	ldr r0, _08022650 @ =0x0000FF80
-	strh r0, [r4, #0x36]
-	adds r0, r4, #0
-	movs r1, #6
-	bl InitializeAnimation
-_0802264C:
-	pop {r4, pc}
-	.align 2, 0
-_08022650: .4byte 0x0000FF80
-
-	thumb_func_start sub_08022654
-sub_08022654: @ 0x08022654
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xd]
-	cmp r0, #1
-	beq _0802268C
-	cmp r0, #1
-	bgt _08022668
-	cmp r0, #0
-	beq _0802266E
-	b _080226E4
-_08022668:
-	cmp r0, #2
-	beq _080226BE
-	b _080226E4
-_0802266E:
-	ldrb r0, [r4, #0xf]
-	subs r0, #1
-	strb r0, [r4, #0xf]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080226E4
-	movs r0, #1
-	strb r0, [r4, #0xd]
-	ldr r0, _080226E8 @ =0x0000012D
-	bl PlaySFX
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-_0802268C:
-	movs r1, #0xc0
-	lsls r1, r1, #5
-	adds r0, r4, #0
-	bl sub_08003FC4
-	cmp r0, #0
-	bne _080226E4
-	movs r0, #2
-	strb r0, [r4, #0xd]
-	ldrb r1, [r4, #0x18]
-	subs r0, #6
-	ands r0, r1
-	movs r1, #1
-	orrs r0, r1
-	strb r0, [r4, #0x18]
-	adds r0, r4, #0
-	movs r1, #5
-	bl InitializeAnimation
-	movs r0, #0x7d
-	bl sub_08004488
-	adds r0, r4, #0
-	bl UpdateSpriteForCollisionLayer
-_080226BE:
-	adds r0, r4, #0
-	bl GetNextFrame
-	ldrb r0, [r4, #0xe]
-	subs r0, #1
-	strb r0, [r4, #0xe]
-	lsls r0, r0, #0x18
-	cmp r0, #0
-	bne _080226E4
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x65
-	strb r0, [r1]
-	adds r0, r4, #0
-	movs r1, #2
-	bl InitializeAnimation
-_080226E4:
-	pop {r4, pc}
-	.align 2, 0
-_080226E8: .4byte 0x0000012D
-
-	thumb_func_start sub_080226EC
-sub_080226EC: @ 0x080226EC
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #1
-	bl sub_08049FDC
-	cmp r0, #0
-	beq _08022776
-	adds r0, r4, #0
-	bl sub_080228CC
-	cmp r0, #0
-	beq _0802271A
-	movs r0, #3
-	strb r0, [r4, #0xc]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x65
-	strb r0, [r1]
-	adds r0, r4, #0
-	movs r1, #2
-	bl InitializeAnimation
-	b _0802277C
-_0802271A:
-	adds r0, r4, #0
-	bl sub_080228F0
-	cmp r0, #0
-	beq _08022758
-	movs r0, #6
-	strb r0, [r4, #0xc]
-	movs r0, #0x90
-	lsls r0, r0, #9
-	str r0, [r4, #0x20]
-	movs r0, #0xa0
-	lsls r0, r0, #1
-	strh r0, [r4, #0x24]
-	ldr r0, _08022754 @ =gUnk_020000B0
-	ldr r1, [r0]
-	adds r0, r4, #0
-	bl GetFacingDirection
-	strb r0, [r4, #0x15]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x5a
-	strb r0, [r1]
-	adds r0, r4, #0
-	movs r1, #4
-	bl InitializeAnimation
-	b _0802277C
-	.align 2, 0
-_08022754: .4byte gUnk_020000B0
-_08022758:
-	ldrb r1, [r4, #0xe]
-	adds r0, r1, #1
-	strb r0, [r4, #0xe]
-	movs r0, #7
-	ands r0, r1
-	cmp r0, #0
-	bne _08022770
-	adds r0, r4, #0
-	movs r1, #1
-	bl sub_08049F84
-	strb r0, [r4, #0x15]
-_08022770:
-	adds r0, r4, #0
-	bl sub_080AEF88
-_08022776:
-	adds r0, r4, #0
-	bl GetNextFrame
-_0802277C:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_08022780
-sub_08022780: @ 0x08022780
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080227AA
-	movs r0, #4
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #3
-	bl InitializeAnimation
-	movs r0, #0xca
-	lsls r0, r0, #1
-	bl sub_08004488
-_080227AA:
-	pop {r4, pc}
-
-	thumb_func_start sub_080227AC
-sub_080227AC: @ 0x080227AC
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _080227CC
-	ldr r0, _080227C8 @ =gUnk_080FD470
-	b _080227CE
-	.align 2, 0
-_080227C8: .4byte gUnk_080FD470
-_080227CC:
-	ldr r0, _08022814 @ =gUnk_080FD468
-_080227CE:
-	str r0, [r4, #0x48]
-	adds r2, r4, #0
-	adds r2, #0x5a
-	ldrb r1, [r2]
-	movs r3, #2
-	adds r0, r3, #0
-	ands r0, r1
-	cmp r0, #0
-	beq _080227EE
-	movs r0, #0xfd
-	ands r0, r1
-	strb r0, [r2]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x5c
-	strb r0, [r1]
-_080227EE:
-	ldrb r1, [r2]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _08022812
-	strb r3, [r4, #0xc]
-	bl Random
-	ldr r2, _08022818 @ =gUnk_080CBA60
-	movs r1, #3
-	ands r1, r0
-	adds r1, r1, r2
-	ldrb r0, [r1]
-	strb r0, [r4, #0xf]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-_08022812:
-	pop {r4, pc}
-	.align 2, 0
-_08022814: .4byte gUnk_080FD468
-_08022818: .4byte gUnk_080CBA60
-
-	thumb_func_start sub_0802281C
-sub_0802281C: @ 0x0802281C
-	push {r4, lr}
-	adds r4, r0, #0
-	movs r1, #0xc0
-	lsls r1, r1, #5
-	bl sub_08003FC4
-	adds r0, r4, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _08022852
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r0, #0x20
-	strh r0, [r4, #0x24]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-	adds r0, r4, #0
-	bl sub_0804AA1C
-_08022852:
-	pop {r4, pc}
-
-	thumb_func_start sub_08022854
-sub_08022854: @ 0x08022854
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	beq _08022898
-	adds r0, r4, #0
-	bl sub_080AEFE0
-	movs r1, #0xc0
-	lsls r1, r1, #5
-	adds r0, r4, #0
-	bl sub_08003FC4
-	cmp r0, #0
-	bne _08022898
-	movs r0, #7
-	strb r0, [r4, #0xc]
-	adds r1, r4, #0
-	adds r1, #0x3f
-	movs r0, #0x5c
-	strb r0, [r1]
-	adds r0, r4, #0
-	movs r1, #5
-	bl InitializeAnimation
-	movs r0, #0x7d
-	bl sub_08004488
-_08022898:
-	pop {r4, pc}
-	.align 2, 0
-
-	thumb_func_start sub_0802289C
-sub_0802289C: @ 0x0802289C
-	push {r4, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	adds r0, r4, #0
-	adds r0, #0x5a
-	ldrb r1, [r0]
-	movs r0, #0x80
-	ands r0, r1
-	cmp r0, #0
-	beq _080228CA
-	movs r0, #2
-	strb r0, [r4, #0xc]
-	movs r0, #0x20
-	strh r0, [r4, #0x24]
-	adds r1, r4, #0
-	adds r1, #0x81
-	movs r0, #0x78
-	strb r0, [r1]
-	adds r0, r4, #0
-	movs r1, #0
-	bl InitializeAnimation
-_080228CA:
-	pop {r4, pc}
-
-	thumb_func_start sub_080228CC
-sub_080228CC: @ 0x080228CC
-	push {lr}
-	adds r1, r0, #0
-	ldrb r0, [r1, #0xf]
-	cmp r0, #0
-	bne _080228E8
-	adds r0, r1, #0
-	movs r1, #1
-	movs r2, #0x28
-	bl sub_08049F64
-	cmp r0, #0
-	beq _080228EC
-	movs r0, #1
-	b _080228EE
-_080228E8:
-	subs r0, #1
-	strb r0, [r1, #0xf]
-_080228EC:
-	movs r0, #0
-_080228EE:
-	pop {pc}
-
-	thumb_func_start sub_080228F0
-sub_080228F0: @ 0x080228F0
-	push {lr}
-	adds r1, r0, #0
-	adds r2, r1, #0
-	adds r2, #0x81
-	ldrb r0, [r2]
-	cmp r0, #0
-	bne _08022910
-	adds r0, r1, #0
-	movs r1, #1
-	movs r2, #0x40
-	bl sub_08049F64
-	cmp r0, #0
-	beq _08022914
-	movs r0, #1
-	b _08022916
-_08022910:
-	subs r0, #1
-	strb r0, [r2]
-_08022914:
-	movs r0, #0
-_08022916:
-	pop {pc}

asm/stockwell.s

@@ -233,7 +233,7 @@ sub_080651F8: @ 0x080651F8
 	rsbs r2, r2, #0
 	adds r0, r4, #0
 	movs r1, #8
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 	movs r0, #1
 	bl sub_08078A90
 _0806522A:
@@ -281,7 +281,7 @@ _08065264:
 	rsbs r2, r2, #0
 	adds r0, r4, #0
 	movs r1, #8
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 	b _0806528A
 _0806527E:
 	movs r0, #0
@@ -612,7 +612,7 @@ sub_080654DC: @ 0x080654DC
 	movs r2, #0x18
 	rsbs r2, r2, #0
 	movs r1, #8
-	bl sub_080A2D0C
+	bl CreateSpeechBubbleQuestionMark
 	pop {pc}
 	.align 2, 0
 
@@ -622,7 +622,7 @@ sub_080654EC: @ 0x080654EC
 	movs r2, #0x18
 	rsbs r2, r2, #0
 	movs r1, #8
-	bl sub_080A2CFC
+	bl CreateSpeechBubbleExclamationMark
 	pop {pc}
 	.align 2, 0
 

asm/sturgeon.s

@@ -282,7 +282,7 @@ sub_08064C9C: @ 0x08064C9C
 	cmp r0, #0
 	bne _08064CB8
 	adds r0, r2, #0
-	bl sub_080A29BC
+	bl CreateDust
 _08064CB8:
 	pop {pc}
 	.align 2, 0

asm/sub_0801D66C.s

@@ -1,56 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-	
-	thumb_func_start sub_0801D66C
-sub_0801D66C: @ 0x0801D66C
-	push {r4, lr}
-	adds r3, r0, #0
-	adds r4, r2, #0
-	adds r2, r3, #0
-	orrs r2, r1
-	orrs r2, r4
-	movs r0, #3
-	ands r2, r0
-	cmp r2, #0
-	beq _0801D686
-	cmp r2, #2
-	beq _0801D698
-	b _0801D6B0
-_0801D686:
-	ldr r2, _0801D694 @ =0x040000D4
-	str r3, [r2]
-	str r1, [r2, #4]
-	lsrs r0, r4, #2
-	movs r1, #0x84
-	lsls r1, r1, #0x18
-	b _0801D6A4
-	.align 2, 0
-_0801D694: .4byte 0x040000D4
-_0801D698:
-	ldr r2, _0801D6AC @ =0x040000D4
-	str r3, [r2]
-	str r1, [r2, #4]
-	lsrs r0, r4, #1
-	movs r1, #0x80
-	lsls r1, r1, #0x18
-_0801D6A4:
-	orrs r0, r1
-	str r0, [r2, #8]
-	ldr r0, [r2, #8]
-	b _0801D6BE
-	.align 2, 0
-_0801D6AC: .4byte 0x040000D4
-_0801D6B0:
-	ldrb r0, [r3]
-	strb r0, [r1]
-	adds r3, #1
-	adds r1, #1
-	subs r4, #1
-	cmp r4, #0
-	bne _0801D6B0
-_0801D6BE:
-	pop {r4, pc}	

asm/sub_08052418.s

@@ -30,7 +30,7 @@ sub_08052418: @ 0x08052418
 	adds r0, r4, #0
 	mov r1, sp
 	movs r2, #0x18
-	bl sub_0801D66C
+	bl _DmaCopy
 	lsls r2, r6, #1
 	adds r2, r2, r6
 	lsls r2, r2, #2

asm/sub_0807CA18.s

@@ -54,7 +54,7 @@ _0807CA66:
 	bne _0807CA78
 	ldr r0, _0807CA80 @ =gUnk_0811E470
 	movs r2, #5
-	bl sub_0801D66C
+	bl _DmaCopy
 _0807CA78:
 	movs r0, #1
 	pop {pc}

data/animations/beetle.s

@@ -0,0 +1,28 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CB5EC:: @ 080CB5EC
+	.incbin "baserom.gba", 0x0CB5EC, 0x0000014
+
+gUnk_080CB600:: @ 080CB600
+	.incbin "baserom.gba", 0x0CB600, 0x000001C
+
+gUnk_080CB61C:: @ 080CB61C
+	.incbin "baserom.gba", 0x0CB61C, 0x0000011
+
+gUnk_080CB62D:: @ 080CB62D
+	.incbin "baserom.gba", 0x0CB62D, 0x0000018
+
+gUnk_080CB645:: @ 080CB645
+	.incbin "baserom.gba", 0x0CB645, 0x0000018
+
+gUnk_080CB65D:: @ 080CB65D
+	.incbin "baserom.gba", 0x0CB65D, 0x0000014
+
+gUnk_080CB671:: @ 080CB671
+	.incbin "baserom.gba", 0x0CB671, 0x000000B
+
+gUnk_080CB67C:: @ 080CB67C
+	.incbin "baserom.gba", 0x0CB67C, 0x0000020

data/animations/chuchu.s

@@ -0,0 +1,41 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2
+
+gUnk_080CA2B4:: @ 080CA2B4
+	.incbin "baserom.gba", 0x0CA2B4, 0x000000A
+
+gUnk_080CA2BE:: @ 080CA2BE
+	.incbin "baserom.gba", 0x0CA2BE, 0x000002C
+
+gUnk_080CA2EA:: @ 080CA2EA
+	.incbin "baserom.gba", 0x0CA2EA, 0x0000011
+
+gUnk_080CA2FB:: @ 080CA2FB
+	.incbin "baserom.gba", 0x0CA2FB, 0x0000041
+
+gUnk_080CA33C:: @ 080CA33C
+	.incbin "baserom.gba", 0x0CA33C, 0x000001C
+
+gUnk_080CA358:: @ 080CA358
+	.incbin "baserom.gba", 0x0CA358, 0x000000C
+
+gUnk_080CA364:: @ 080CA364
+	.incbin "baserom.gba", 0x0CA364, 0x000000C
+
+gUnk_080CA370:: @ 080CA370
+	.incbin "baserom.gba", 0x0CA370, 0x0000041
+
+gUnk_080CA3B1:: @ 080CA3B1
+	.incbin "baserom.gba", 0x0CA3B1, 0x0000014
+
+gUnk_080CA3C5:: @ 080CA3C5
+	.incbin "baserom.gba", 0x0CA3C5, 0x0000069
+
+gUnk_080CA42E:: @ 080CA42E
+	.incbin "baserom.gba", 0x0CA42E, 0x0000042
+
+gUnk_080CA470:: @ 080CA470
+	.incbin "baserom.gba", 0x0CA470, 0x000002C

data/animations/darkNut.s

@@ -0,0 +1,239 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2
+
+gUnk_080CAB6C:: @ 080CAB6C
+	.incbin "baserom.gba", 0x0CAB6C, 0x0000004
+
+gUnk_080CAB70:: @ 080CAB70
+	.incbin "baserom.gba", 0x0CAB70, 0x0000004
+
+gUnk_080CAB74:: @ 080CAB74
+	.incbin "baserom.gba", 0x0CAB74, 0x0000004
+
+gUnk_080CAB78:: @ 080CAB78
+	.incbin "baserom.gba", 0x0CAB78, 0x0000004
+
+gUnk_080CAB7C:: @ 080CAB7C
+	.incbin "baserom.gba", 0x0CAB7C, 0x0000010
+
+gUnk_080CAB8C:: @ 080CAB8C
+	.incbin "baserom.gba", 0x0CAB8C, 0x0000010
+
+gUnk_080CAB9C:: @ 080CAB9C
+	.incbin "baserom.gba", 0x0CAB9C, 0x0000010
+
+gUnk_080CABAC:: @ 080CABAC
+	.incbin "baserom.gba", 0x0CABAC, 0x0000010
+
+gUnk_080CABBC:: @ 080CABBC
+	.incbin "baserom.gba", 0x0CABBC, 0x0000004
+
+gUnk_080CABC0:: @ 080CABC0
+	.incbin "baserom.gba", 0x0CABC0, 0x0000004
+
+gUnk_080CABC4:: @ 080CABC4
+	.incbin "baserom.gba", 0x0CABC4, 0x0000004
+
+gUnk_080CABC8:: @ 080CABC8
+	.incbin "baserom.gba", 0x0CABC8, 0x0000004
+
+gUnk_080CABCC:: @ 080CABCC
+	.incbin "baserom.gba", 0x0CABCC, 0x0000019
+
+gUnk_080CABE5:: @ 080CABE5
+	.incbin "baserom.gba", 0x0CABE5, 0x0000019
+
+gUnk_080CABFE:: @ 080CABFE
+	.incbin "baserom.gba", 0x0CABFE, 0x0000019
+
+gUnk_080CAC17:: @ 080CAC17
+	.incbin "baserom.gba", 0x0CAC17, 0x0000019
+
+gUnk_080CAC30:: @ 080CAC30
+	.incbin "baserom.gba", 0x0CAC30, 0x000000C
+
+gUnk_080CAC3C:: @ 080CAC3C
+	.incbin "baserom.gba", 0x0CAC3C, 0x000000C
+
+gUnk_080CAC48:: @ 080CAC48
+	.incbin "baserom.gba", 0x0CAC48, 0x000000C
+
+gUnk_080CAC54:: @ 080CAC54
+	.incbin "baserom.gba", 0x0CAC54, 0x000000C
+
+gUnk_080CAC60:: @ 080CAC60
+	.incbin "baserom.gba", 0x0CAC60, 0x0000028
+
+gUnk_080CAC88:: @ 080CAC88
+	.incbin "baserom.gba", 0x0CAC88, 0x0000028
+
+gUnk_080CACB0:: @ 080CACB0
+	.incbin "baserom.gba", 0x0CACB0, 0x0000028
+
+gUnk_080CACD8:: @ 080CACD8
+	.incbin "baserom.gba", 0x0CACD8, 0x0000028
+
+gUnk_080CAD00:: @ 080CAD00
+	.incbin "baserom.gba", 0x0CAD00, 0x0000019
+
+gUnk_080CAD19:: @ 080CAD19
+	.incbin "baserom.gba", 0x0CAD19, 0x0000019
+
+gUnk_080CAD32:: @ 080CAD32
+	.incbin "baserom.gba", 0x0CAD32, 0x0000019
+
+gUnk_080CAD4B:: @ 080CAD4B
+	.incbin "baserom.gba", 0x0CAD4B, 0x0000019
+
+gUnk_080CAD64:: @ 080CAD64
+	.incbin "baserom.gba", 0x0CAD64, 0x000000C
+
+gUnk_080CAD70:: @ 080CAD70
+	.incbin "baserom.gba", 0x0CAD70, 0x000000C
+
+gUnk_080CAD7C:: @ 080CAD7C
+	.incbin "baserom.gba", 0x0CAD7C, 0x000000C
+
+gUnk_080CAD88:: @ 080CAD88
+	.incbin "baserom.gba", 0x0CAD88, 0x000000C
+
+gUnk_080CAD94:: @ 080CAD94
+	.incbin "baserom.gba", 0x0CAD94, 0x0000015
+
+gUnk_080CADA9:: @ 080CADA9
+	.incbin "baserom.gba", 0x0CADA9, 0x0000015
+
+gUnk_080CADBE:: @ 080CADBE
+	.incbin "baserom.gba", 0x0CADBE, 0x0000015
+
+gUnk_080CADD3:: @ 080CADD3
+	.incbin "baserom.gba", 0x0CADD3, 0x0000015
+
+gUnk_080CADE8:: @ 080CADE8
+	.incbin "baserom.gba", 0x0CADE8, 0x0000019
+
+gUnk_080CAE01:: @ 080CAE01
+	.incbin "baserom.gba", 0x0CAE01, 0x0000019
+
+gUnk_080CAE1A:: @ 080CAE1A
+	.incbin "baserom.gba", 0x0CAE1A, 0x0000019
+
+gUnk_080CAE33:: @ 080CAE33
+	.incbin "baserom.gba", 0x0CAE33, 0x0000019
+
+gUnk_080CAE4C:: @ 080CAE4C
+	.incbin "baserom.gba", 0x0CAE4C, 0x0000019
+
+gUnk_080CAE65:: @ 080CAE65
+	.incbin "baserom.gba", 0x0CAE65, 0x0000019
+
+gUnk_080CAE7E:: @ 080CAE7E
+	.incbin "baserom.gba", 0x0CAE7E, 0x0000019
+
+gUnk_080CAE97:: @ 080CAE97
+	.incbin "baserom.gba", 0x0CAE97, 0x0000019
+
+gUnk_080CAEB0:: @ 080CAEB0
+	.incbin "baserom.gba", 0x0CAEB0, 0x0000010
+
+gUnk_080CAEC0:: @ 080CAEC0
+	.incbin "baserom.gba", 0x0CAEC0, 0x0000010
+
+gUnk_080CAED0:: @ 080CAED0
+	.incbin "baserom.gba", 0x0CAED0, 0x0000010
+
+gUnk_080CAEE0:: @ 080CAEE0
+	.incbin "baserom.gba", 0x0CAEE0, 0x0000010
+
+gUnk_080CAEF0:: @ 080CAEF0
+	.incbin "baserom.gba", 0x0CAEF0, 0x0000030
+
+gUnk_080CAF20:: @ 080CAF20
+	.incbin "baserom.gba", 0x0CAF20, 0x0000030
+
+gUnk_080CAF50:: @ 080CAF50
+	.incbin "baserom.gba", 0x0CAF50, 0x0000030
+
+gUnk_080CAF80:: @ 080CAF80
+	.incbin "baserom.gba", 0x0CAF80, 0x0000030
+
+gUnk_080CAFB0:: @ 080CAFB0
+	.incbin "baserom.gba", 0x0CAFB0, 0x0000018
+
+gUnk_080CAFC8:: @ 080CAFC8
+	.incbin "baserom.gba", 0x0CAFC8, 0x0000018
+
+gUnk_080CAFE0:: @ 080CAFE0
+	.incbin "baserom.gba", 0x0CAFE0, 0x0000018
+
+gUnk_080CAFF8:: @ 080CAFF8
+	.incbin "baserom.gba", 0x0CAFF8, 0x0000018
+
+gUnk_080CB010:: @ 080CB010
+	.incbin "baserom.gba", 0x0CB010, 0x0000035
+
+gUnk_080CB045:: @ 080CB045
+	.incbin "baserom.gba", 0x0CB045, 0x0000035
+
+gUnk_080CB07A:: @ 080CB07A
+	.incbin "baserom.gba", 0x0CB07A, 0x0000035
+
+gUnk_080CB0AF:: @ 080CB0AF
+	.incbin "baserom.gba", 0x0CB0AF, 0x0000035
+
+gUnk_080CB0E4:: @ 080CB0E4
+	.incbin "baserom.gba", 0x0CB0E4, 0x0000008
+
+gUnk_080CB0EC:: @ 080CB0EC
+	.incbin "baserom.gba", 0x0CB0EC, 0x0000008
+
+gUnk_080CB0F4:: @ 080CB0F4
+	.incbin "baserom.gba", 0x0CB0F4, 0x0000008
+
+gUnk_080CB0FC:: @ 080CB0FC
+	.incbin "baserom.gba", 0x0CB0FC, 0x0000008
+
+gUnk_080CB104:: @ 080CB104
+	.incbin "baserom.gba", 0x0CB104, 0x0000070
+
+gUnk_080CB174:: @ 080CB174
+	.incbin "baserom.gba", 0x0CB174, 0x0000070
+
+gUnk_080CB1E4:: @ 080CB1E4
+	.incbin "baserom.gba", 0x0CB1E4, 0x0000070
+
+gUnk_080CB254:: @ 080CB254
+	.incbin "baserom.gba", 0x0CB254, 0x0000070
+
+gUnk_080CB2C4:: @ 080CB2C4
+	.incbin "baserom.gba", 0x0CB2C4, 0x0000034
+
+gUnk_080CB2F8:: @ 080CB2F8
+	.incbin "baserom.gba", 0x0CB2F8, 0x0000034
+
+gUnk_080CB32C:: @ 080CB32C
+	.incbin "baserom.gba", 0x0CB32C, 0x0000034
+
+gUnk_080CB360:: @ 080CB360
+	.incbin "baserom.gba", 0x0CB360, 0x0000034
+
+gUnk_080CB394:: @ 080CB394
+	.incbin "baserom.gba", 0x0CB394, 0x0000029
+
+gUnk_080CB3BD:: @ 080CB3BD
+	.incbin "baserom.gba", 0x0CB3BD, 0x0000029
+
+gUnk_080CB3E6:: @ 080CB3E6
+	.incbin "baserom.gba", 0x0CB3E6, 0x0000029
+
+gUnk_080CB40F:: @ 080CB40F
+	.incbin "baserom.gba", 0x0CB40F, 0x0000029
+
+gUnk_080CB438:: @ 080CB438
+	.incbin "baserom.gba", 0x0CB438, 0x00000C4
+
+gUnk_080CB4FC:: @ 080CB4FC
+	.incbin "baserom.gba", 0x0CB4FC, 0x0000074

data/animations/doorMimic.s

@@ -0,0 +1,25 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CB8B4:: @ 080CB8B4
+	.incbin "baserom.gba", 0x0CB8B4, 0x0000005
+
+gUnk_080CB8B9:: @ 080CB8B9
+	.incbin "baserom.gba", 0x0CB8B9, 0x0000005
+
+gUnk_080CB8BE:: @ 080CB8BE
+	.incbin "baserom.gba", 0x0CB8BE, 0x0000019
+
+gUnk_080CB8D7:: @ 080CB8D7
+	.incbin "baserom.gba", 0x0CB8D7, 0x0000019
+
+gUnk_080CB8F0:: @ 080CB8F0
+	.incbin "baserom.gba", 0x0CB8F0, 0x0000011
+
+gUnk_080CB901:: @ 080CB901
+	.incbin "baserom.gba", 0x0CB901, 0x0000013
+
+gUnk_080CB914:: @ 080CB914
+	.incbin "baserom.gba", 0x0CB914, 0x0000034

data/animations/enemyE.s

@@ -0,0 +1,7 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CBBEC:: @ 080CBBEC
+	.incbin "baserom.gba", 0x0CBBEC, 0x000004C

data/animations/keese.s

@@ -0,0 +1,13 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CB706:: @ 080CB706
+	.incbin "baserom.gba", 0x0CB706, 0x0000018
+
+gUnk_080CB71E:: @ 080CB71E
+	.incbin "baserom.gba", 0x0CB71E, 0x000000A
+
+gUnk_080CB728:: @ 080CB728
+	.incbin "baserom.gba", 0x0CB728, 0x000000C

data/animations/leever.s

@@ -0,0 +1,17 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2
+
+gUnk_080CA4D4:: @ 080CA4D4
+	.incbin "baserom.gba", 0x0CA4D4, 0x000002C
+
+gUnk_080CA500:: @ 080CA500
+	.incbin "baserom.gba", 0x0CA500, 0x000001C
+
+gUnk_080CA51C:: @ 080CA51C
+	.incbin "baserom.gba", 0x0CA51C, 0x0000044
+
+gUnk_080CA560:: @ 080CA560
+	.incbin "baserom.gba", 0x0CA560, 0x0000010

data/animations/octorok.s

@@ -0,0 +1,32 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2
+
+gUnk_080CA180:: @ 080CA180
+	.incbin "baserom.gba", 0x0CA180, 0x0000009
+
+gUnk_080CA189:: @ 080CA189
+	.incbin "baserom.gba", 0x0CA189, 0x0000009
+
+gUnk_080CA192:: @ 080CA192
+	.incbin "baserom.gba", 0x0CA192, 0x0000009
+
+gUnk_080CA19B:: @ 080CA19B
+	.incbin "baserom.gba", 0x0CA19B, 0x0000009
+
+gUnk_080CA1A4:: @ 080CA1A4
+	.incbin "baserom.gba", 0x0CA1A4, 0x0000015
+
+gUnk_080CA1B9:: @ 080CA1B9
+	.incbin "baserom.gba", 0x0CA1B9, 0x0000015
+
+gUnk_080CA1CE:: @ 080CA1CE
+	.incbin "baserom.gba", 0x0CA1CE, 0x0000015
+
+gUnk_080CA1E3:: @ 080CA1E3
+	.incbin "baserom.gba", 0x0CA1E3, 0x0000015
+
+gUnk_080CA1F8:: @ 080CA1F8
+	.incbin "baserom.gba", 0x0CA1F8, 0x0000024

data/animations/peahat.s

@@ -0,0 +1,29 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2
+
+gUnk_080CA5D4:: @ 080CA5D4
+	.incbin "baserom.gba", 0x0CA5D4, 0x0000002
+
+gUnk_080CA5D6:: @ 080CA5D6
+	.incbin "baserom.gba", 0x0CA5D6, 0x0000011
+
+gUnk_080CA5E7:: @ 080CA5E7
+	.incbin "baserom.gba", 0x0CA5E7, 0x0000011
+
+gUnk_080CA5F8:: @ 080CA5F8
+	.incbin "baserom.gba", 0x0CA5F8, 0x000001D
+
+gUnk_080CA615:: @ 080CA615
+	.incbin "baserom.gba", 0x0CA615, 0x0000011
+
+gUnk_080CA626:: @ 080CA626
+	.incbin "baserom.gba", 0x0CA626, 0x0000014
+
+gUnk_080CA63A:: @ 080CA63A
+	.incbin "baserom.gba", 0x0CA63A, 0x0000016
+
+gUnk_080CA650:: @ 080CA650
+	.incbin "baserom.gba", 0x0CA650, 0x000001C

data/animations/rockChuchu.s

@@ -0,0 +1,16 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CB96C:: @ 080CB96C
+	.incbin "baserom.gba", 0x0CB96C, 0x0000029
+
+gUnk_080CB995:: @ 080CB995
+	.incbin "baserom.gba", 0x0CB995, 0x0000041
+
+gUnk_080CB9D6:: @ 080CB9D6
+	.incbin "baserom.gba", 0x0CB9D6, 0x0000042
+
+gUnk_080CBA18:: @ 080CBA18
+	.incbin "baserom.gba", 0x0CBA18, 0x0000010

data/animations/rollobite.s

@@ -0,0 +1,83 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	.align 2
+
+gUnk_080CA6D4:: @ 080CA6D4
+	.incbin "baserom.gba", 0x0CA6D4, 0x0000003
+
+gUnk_080CA6D7:: @ 080CA6D7
+	.incbin "baserom.gba", 0x0CA6D7, 0x0000021
+
+gUnk_080CA6F8:: @ 080CA6F8
+	.incbin "baserom.gba", 0x0CA6F8, 0x0000021
+
+gUnk_080CA719:: @ 080CA719
+	.incbin "baserom.gba", 0x0CA719, 0x0000021
+
+gUnk_080CA73A:: @ 080CA73A
+	.incbin "baserom.gba", 0x0CA73A, 0x0000021
+
+gUnk_080CA75B:: @ 080CA75B
+	.incbin "baserom.gba", 0x0CA75B, 0x0000011
+
+gUnk_080CA76C:: @ 080CA76C
+	.incbin "baserom.gba", 0x0CA76C, 0x0000011
+
+gUnk_080CA77D:: @ 080CA77D
+	.incbin "baserom.gba", 0x0CA77D, 0x0000011
+
+gUnk_080CA78E:: @ 080CA78E
+	.incbin "baserom.gba", 0x0CA78E, 0x0000011
+
+gUnk_080CA79F:: @ 080CA79F
+	.incbin "baserom.gba", 0x0CA79F, 0x0000058
+
+gUnk_080CA7F7:: @ 080CA7F7
+	.incbin "baserom.gba", 0x0CA7F7, 0x0000058
+
+gUnk_080CA84F:: @ 080CA84F
+	.incbin "baserom.gba", 0x0CA84F, 0x0000058
+
+gUnk_080CA8A7:: @ 080CA8A7
+	.incbin "baserom.gba", 0x0CA8A7, 0x0000058
+
+gUnk_080CA8FF:: @ 080CA8FF
+	.incbin "baserom.gba", 0x0CA8FF, 0x0000008
+
+gUnk_080CA907:: @ 080CA907
+	.incbin "baserom.gba", 0x0CA907, 0x0000008
+
+gUnk_080CA90F:: @ 080CA90F
+	.incbin "baserom.gba", 0x0CA90F, 0x0000008
+
+gUnk_080CA917:: @ 080CA917
+	.incbin "baserom.gba", 0x0CA917, 0x0000008
+
+gUnk_080CA91F:: @ 080CA91F
+	.incbin "baserom.gba", 0x0CA91F, 0x0000004
+
+gUnk_080CA923:: @ 080CA923
+	.incbin "baserom.gba", 0x0CA923, 0x0000004
+
+gUnk_080CA927:: @ 080CA927
+	.incbin "baserom.gba", 0x0CA927, 0x0000004
+
+gUnk_080CA92B:: @ 080CA92B
+	.incbin "baserom.gba", 0x0CA92B, 0x0000004
+
+gUnk_080CA92F:: @ 080CA92F
+	.incbin "baserom.gba", 0x0CA92F, 0x0000041
+
+gUnk_080CA970:: @ 080CA970
+	.incbin "baserom.gba", 0x0CA970, 0x0000041
+
+gUnk_080CA9B1:: @ 080CA9B1
+	.incbin "baserom.gba", 0x0CA9B1, 0x0000041
+
+gUnk_080CA9F2:: @ 080CA9F2
+	.incbin "baserom.gba", 0x0CA9F2, 0x0000042
+
+gUnk_080CAA34:: @ 080CAA34
+	.incbin "baserom.gba", 0x0CAA34, 0x0000064

data/animations/spinyChuchu.s

@@ -0,0 +1,28 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnk_080CBA64:: @ 080CBA64
+	.incbin "baserom.gba", 0x0CBA64, 0x0000041
+
+gUnk_080CBAA5:: @ 080CBAA5
+	.incbin "baserom.gba", 0x0CBAA5, 0x0000040
+
+gUnk_080CBAE5:: @ 080CBAE5
+	.incbin "baserom.gba", 0x0CBAE5, 0x0000018
+
+gUnk_080CBAFD:: @ 080CBAFD
+	.incbin "baserom.gba", 0x0CBAFD, 0x0000024
+
+gUnk_080CBB21:: @ 080CBB21
+	.incbin "baserom.gba", 0x0CBB21, 0x0000011
+
+gUnk_080CBB32:: @ 080CBB32
+	.incbin "baserom.gba", 0x0CBB32, 0x000000D
+
+gUnk_080CBB3F:: @ 080CBB3F
+	.incbin "baserom.gba", 0x0CBB3F, 0x0000005
+
+gUnk_080CBB44:: @ 080CBB44
+	.incbin "baserom.gba", 0x0CBB44, 0x0000020