Merge branch 'master' into battle_refactor

asm/battle_anim_80FE840.s

@@ -12802,7 +12802,7 @@ _08104EDC:
 	lsls r0, 16
 	cmp r2, r0
 	bgt _08104F1A
-	ldr r4, =gUnknown_02038C28
+	ldr r4, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r4, r0
@@ -12839,7 +12839,7 @@ _08104F1A:
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	ldr r0, =sub_8104F54
 	str r0, [r5]
 	add sp, 0xC
@@ -12919,7 +12919,7 @@ _08104FCC:
 	ldrsh r0, [r3, r1]
 	cmp r0, 0
 	blt _08104FF0
-	ldr r2, =gUnknown_02038C28
+	ldr r2, =gScanlineEffectRegBuffers
 	lsls r0, 1
 	adds r0, r2
 	ldrh r1, [r3, 0x14]
@@ -12943,7 +12943,7 @@ _08104FF0:
 	ldrsh r1, [r3, r2]
 	cmp r0, r1
 	blt _0810500E
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 	adds r0, r4, 0
@@ -18518,7 +18518,7 @@ _08107D8C:
 	movs r3, 0
 	movs r2, 0x10
 	ldrsh r0, [r4, r2]
-	ldr r1, =gUnknown_02038C28
+	ldr r1, =gScanlineEffectRegBuffers
 	mov r12, r1
 	cmp r3, r0
 	bge _08107DCA
@@ -18555,7 +18555,7 @@ _08107DCA:
 	ldrsh r0, [r4, r3]
 	cmp r1, r0
 	bge _08107E04
-	ldr r5, =gUnknown_02038C28
+	ldr r5, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r5, r0
@@ -18584,7 +18584,7 @@ _08107E04:
 	asrs r0, r2, 16
 	cmp r0, 0x9F
 	bgt _08107E3A
-	ldr r5, =gUnknown_02038C28
+	ldr r5, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r5, r0
@@ -18652,7 +18652,7 @@ _08107E7A:
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -18689,8 +18689,8 @@ _08107ED8:
 	ldrsh r0, [r4, r1]
 	cmp r3, r0
 	bge _08107F0C
-	ldr r6, =gUnknown_02038C28
-	ldr r5, =gUnknown_02039B28
+	ldr r6, =gScanlineEffectRegBuffers
+	ldr r5, =gScanlineEffect
 _08107EE6:
 	lsls r1, r3, 16
 	asrs r1, 16
@@ -18719,8 +18719,8 @@ _08107F0C:
 	ldrsh r0, [r4, r3]
 	cmp r1, r0
 	bge _08107F40
-	ldr r6, =gUnknown_02038C28
-	ldr r5, =gUnknown_02039B28
+	ldr r6, =gScanlineEffectRegBuffers
+	ldr r5, =gScanlineEffect
 _08107F1E:
 	asrs r3, r2, 16
 	lsls r2, r3, 1
@@ -18745,8 +18745,8 @@ _08107F40:
 	asrs r0, r1, 16
 	cmp r0, 0x9F
 	bgt _08108022
-	ldr r6, =gUnknown_02038C28
-	ldr r5, =gUnknown_02039B28
+	ldr r6, =gScanlineEffectRegBuffers
+	ldr r5, =gScanlineEffect
 _08107F4E:
 	asrs r3, r1, 16
 	lsls r2, r3, 1
@@ -18771,8 +18771,8 @@ _08107F78:
 	ldrsh r0, [r4, r1]
 	cmp r3, r0
 	bge _08107FAC
-	ldr r6, =gUnknown_02038C28
-	ldr r5, =gUnknown_02039B28
+	ldr r6, =gScanlineEffectRegBuffers
+	ldr r5, =gScanlineEffect
 _08107F86:
 	lsls r1, r3, 16
 	asrs r1, 16
@@ -18801,8 +18801,8 @@ _08107FAC:
 	ldrsh r0, [r4, r3]
 	cmp r1, r0
 	bge _08107FE0
-	ldr r6, =gUnknown_02038C28
-	ldr r5, =gUnknown_02039B28
+	ldr r6, =gScanlineEffectRegBuffers
+	ldr r5, =gScanlineEffect
 _08107FBE:
 	asrs r3, r2, 16
 	lsls r2, r3, 1
@@ -18827,8 +18827,8 @@ _08107FE0:
 	asrs r0, r1, 16
 	cmp r0, 0x9F
 	bgt _0810800C
-	ldr r6, =gUnknown_02038C28
-	ldr r5, =gUnknown_02039B28
+	ldr r6, =gScanlineEffectRegBuffers
+	ldr r5, =gScanlineEffect
 _08107FEE:
 	asrs r3, r1, 16
 	lsls r2, r3, 1
@@ -34618,7 +34618,7 @@ _0810FEC0:
 	adds r0, 0x40
 	cmp r1, r0
 	bgt _0810FEFA
-	ldr r5, =gUnknown_02038C28
+	ldr r5, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r5, r0
@@ -34651,7 +34651,7 @@ _0810FEFA:
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	ldr r0, =sub_810FF34
 	str r0, [r4]
 	add sp, 0xC
@@ -34700,7 +34700,7 @@ _0810FF66:
 	ldr r0, =gSineTable
 	mov r9, r0
 	movs r7, 0x3
-	ldr r1, =gUnknown_02038C28
+	ldr r1, =gScanlineEffectRegBuffers
 	mov r12, r1
 	movs r2, 0xF0
 	lsls r2, 3
@@ -34775,7 +34775,7 @@ _0810FFFE:
 	ble _08110026
 	b _08110014
 _0811000E:
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 _08110014:
@@ -38728,7 +38728,7 @@ _08112054:
 _0811206C:
 	movs r2, 0x2
 	movs r3, 0x6
-	bl sub_80BA384
+	bl ScanlineEffect_InitWave
 	lsls r0, 24
 	lsrs r0, 24
 	strh r0, [r5, 0x1C]
@@ -38884,7 +38884,7 @@ _081121A8:
 	beq _081121F0
 	b _08112258
 _081121AE:
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 	movs r0, 0x1
@@ -41152,7 +41152,7 @@ _0811345A:
 	ldrsh r0, [r4, r1]
 	cmp r3, r0
 	bgt _08113488
-	ldr r5, =gUnknown_02038C28
+	ldr r5, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r5, r0
@@ -41175,7 +41175,7 @@ _08113488:
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	ldr r0, =sub_81134B8
 	str r0, [r4]
 	add sp, 0xC
@@ -41264,7 +41264,7 @@ _0811354E:
 	bl sub_8113574
 	b _0811356E
 _08113556:
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 	ldrh r0, [r2, 0x8]
@@ -41292,11 +41292,11 @@ sub_8113574: @ 8113574
 	ldrsh r0, [r5, r1]
 	cmp r4, r0
 	bgt _081135CA
-	ldr r7, =gUnknown_02038C28
+	ldr r7, =gScanlineEffectRegBuffers
 	mov r12, r7
 	ldr r0, =gSineTable
 	mov r8, r0
-	ldr r6, =gUnknown_02039B28
+	ldr r6, =gScanlineEffect
 _08113592:
 	lsls r2, r4, 1
 	ldrb r1, [r6, 0x14]
@@ -42169,7 +42169,7 @@ _08113CB0:
 	movs r0, 0x3
 	bl sub_8114374
 	movs r3, 0
-	ldr r4, =gUnknown_02038C28
+	ldr r4, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r4, r0
@@ -42189,7 +42189,7 @@ _08113CDC:
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	movs r0, 0x3F
 	eors r7, r0
 	movs r1, 0xFC
@@ -42344,7 +42344,7 @@ _08113E3E:
 	b _08113E5E
 	.pool
 _08113E58:
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 _08113E5E:
@@ -42534,7 +42534,7 @@ _08114002:
 	str r0, [sp, 0x10]
 	movs r3, 0
 	add r4, sp, 0x10
-	ldr r6, =gUnknown_02038C28
+	ldr r6, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r7, r6, r0
@@ -42563,7 +42563,7 @@ _08114010:
 	strb r2, [r4, 0x9]
 	ldr r0, [sp, 0x10]
 	ldr r2, [r4, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 _08114044:
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
@@ -42772,7 +42772,7 @@ _081141DA:
 	bne _08114232
 	b _08114204
 _081141FE:
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 _08114204:
@@ -42827,9 +42827,9 @@ sub_8114244: @ 8114244
 	movs r4, 0
 	cmp r0, 0
 	ble _081142A4
-	ldr r0, =gUnknown_02038C28
+	ldr r0, =gScanlineEffectRegBuffers
 	mov r12, r0
-	ldr r7, =gUnknown_02039B28
+	ldr r7, =gScanlineEffect
 _08114278:
 	lsls r2, r4, 16
 	asrs r2, 16
@@ -42861,9 +42861,9 @@ _081142A4:
 	ldrsh r0, [r6, r2]
 	cmp r1, r0
 	bgt _081142EE
-	ldr r0, =gUnknown_02038C28
+	ldr r0, =gScanlineEffectRegBuffers
 	mov r12, r0
-	ldr r7, =gUnknown_02039B28
+	ldr r7, =gScanlineEffect
 _081142B8:
 	asrs r4, r3, 16
 	cmp r4, 0
@@ -42904,8 +42904,8 @@ _081142EE:
 	ldrsh r0, [r6, r3]
 	cmp r1, r0
 	bge _08114366
-	ldr r7, =gUnknown_02038C28
-	ldr r4, =gUnknown_02039B28
+	ldr r7, =gScanlineEffectRegBuffers
+	ldr r4, =gScanlineEffect
 _08114306:
 	asrs r3, r2, 16
 	cmp r3, 0
@@ -42935,7 +42935,7 @@ _08114338:
 	adds r5, r0, 0
 	adds r5, 0x9F
 	movs r4, 0
-	ldr r3, =gUnknown_02038C28
+	ldr r3, =gScanlineEffectRegBuffers
 	movs r2, 0xF0
 	lsls r2, 3
 	adds r6, r3, r2
@@ -44235,7 +44235,7 @@ _08114E4E:
 	b _08114E7E
 	.pool
 _08114E78:
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 _08114E7E:
@@ -44510,7 +44510,7 @@ _08115094:
 	ldrsh r0, [r0, r1]
 	cmp r0, 0
 	bne _081150DA
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 _081150C2:
@@ -44561,7 +44561,7 @@ _08115114:
 	asrs r4, r0, 16
 	cmp r2, r0
 	bge _08115140
-	ldr r5, =gUnknown_02038C28
+	ldr r5, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r5, r0
@@ -44584,7 +44584,7 @@ _08115140:
 	asrs r0, r1, 16
 	cmp r0, 0x9F
 	bgt _0811516E
-	ldr r4, =gUnknown_02038C28
+	ldr r4, =gScanlineEffectRegBuffers
 	lsls r0, r3, 16
 	asrs r0, 16
 	adds r3, r0, 0
@@ -44616,7 +44616,7 @@ _0811516E:
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	add sp, 0xC
 	pop {r4-r6}
 	pop {r0}
@@ -50740,9 +50740,9 @@ _08118442:
 	strh r0, [r1, 0xC]
 _0811845A:
 	movs r3, 0
-	ldr r5, =gUnknown_02039B28
+	ldr r5, =gScanlineEffect
 	mov r9, r5
-	ldr r7, =gUnknown_02038C28
+	ldr r7, =gScanlineEffectRegBuffers
 	mov r6, r9
 	adds r5, r1, 0
 _08118466:
@@ -50760,8 +50760,8 @@ _08118466:
 	ble _08118466
 	cmp r3, 0x9F
 	bgt _081184AA
-	ldr r7, =gUnknown_02038C28
-	ldr r6, =gUnknown_02039B28
+	ldr r7, =gScanlineEffectRegBuffers
+	ldr r6, =gScanlineEffect
 	ldr r1, =gTasks
 	mov r2, r12
 	adds r0, r2, r4
@@ -51089,9 +51089,9 @@ _0811873C:
 	strh r0, [r1, 0xC]
 _08118752:
 	movs r3, 0
-	ldr r0, =gUnknown_02039B28
+	ldr r0, =gScanlineEffect
 	mov r8, r0
-	ldr r2, =gUnknown_02038C28
+	ldr r2, =gScanlineEffectRegBuffers
 	mov r12, r2
 	mov r7, r8
 	adds r4, r1, 0
@@ -51110,9 +51110,9 @@ _08118760:
 	ble _08118760
 	cmp r3, 0x9F
 	bgt _081187A4
-	ldr r0, =gUnknown_02038C28
+	ldr r0, =gScanlineEffectRegBuffers
 	mov r12, r0
-	ldr r7, =gUnknown_02039B28
+	ldr r7, =gScanlineEffect
 	ldr r1, =gTasks
 	adds r0, r6, r5
 	lsls r0, 3
@@ -51378,9 +51378,9 @@ _081189BA:
 	strh r0, [r1, 0xC]
 _081189D0:
 	movs r3, 0
-	ldr r6, =gUnknown_02039B28
+	ldr r6, =gScanlineEffect
 	mov r8, r6
-	ldr r7, =gUnknown_02038C28
+	ldr r7, =gScanlineEffectRegBuffers
 	adds r4, r1, 0
 _081189DA:
 	lsls r2, r3, 1
@@ -51397,8 +51397,8 @@ _081189DA:
 	ble _081189DA
 	cmp r3, 0x9F
 	bgt _08118A1E
-	ldr r7, =gUnknown_02038C28
-	ldr r6, =gUnknown_02039B28
+	ldr r7, =gScanlineEffectRegBuffers
+	ldr r6, =gScanlineEffect
 	ldr r1, =gTasks
 	mov r2, r12
 	adds r0, r2, r5
@@ -51707,9 +51707,9 @@ _08118C90:
 	strh r0, [r1, 0xC]
 _08118CA6:
 	movs r3, 0
-	ldr r0, =gUnknown_02039B28
+	ldr r0, =gScanlineEffect
 	mov r12, r0
-	ldr r2, =gUnknown_02038C28
+	ldr r2, =gScanlineEffectRegBuffers
 	mov r8, r2
 	mov r7, r12
 	adds r4, r1, 0
@@ -51728,9 +51728,9 @@ _08118CB4:
 	ble _08118CB4
 	cmp r3, 0x9F
 	bgt _08118CF8
-	ldr r0, =gUnknown_02038C28
+	ldr r0, =gScanlineEffectRegBuffers
 	mov r8, r0
-	ldr r7, =gUnknown_02039B28
+	ldr r7, =gScanlineEffect
 	ldr r1, =gTasks
 	adds r0, r5, r6
 	lsls r0, 3
@@ -52025,7 +52025,7 @@ _08118F28:
 	lsls r1, 7
 	movs r0, 0xC
 	bl SetGpuReg
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 	ldr r1, =gTasks

asm/battle_anim_815A0D4.s

@@ -1689,7 +1689,7 @@ _0815AE58:
 	ldrsh r0, [r5, r6]
 	cmp r1, r0
 	bgt _0815AE8E
-	ldr r4, =gUnknown_02038C28
+	ldr r4, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r0, r4
@@ -1729,7 +1729,7 @@ _0815AEA2:
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	ldr r0, =sub_815AED8
 	str r0, [r5]
 	add sp, 0xC
@@ -1820,7 +1820,7 @@ _0815AF5C:
 	ldrsh r0, [r4, r2]
 	cmp r1, r0
 	bge _0815AF90
-	ldr r5, =gUnknown_02038C28
+	ldr r5, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r5, r0
@@ -1848,7 +1848,7 @@ _0815AF90:
 	ldrsh r0, [r4, r2]
 	cmp r1, r0
 	bgt _0815AFC4
-	ldr r5, =gUnknown_02038C28
+	ldr r5, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r5, r0
@@ -1877,7 +1877,7 @@ _0815AFC4:
 	ldrsh r0, [r4, r1]
 	cmp r0, 0
 	beq _0815AFDA
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 _0815AFDA:
@@ -6151,7 +6151,7 @@ _0815D316:
 	ldrh r3, [r0]
 	movs r7, 0
 	movs r2, 0
-	ldr r6, =gUnknown_02038C28
+	ldr r6, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r0, r6
@@ -6192,7 +6192,7 @@ _0815D326:
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	ldr r0, =sub_815D398
 	str r0, [r4]
 	add sp, 0xC
@@ -6304,7 +6304,7 @@ _0815D40E:
 	ldrsh r0, [r6, r3]
 	cmp r1, r0
 	ble _0815D52E
-	ldr r0, =gUnknown_02039B28
+	ldr r0, =gScanlineEffect
 	mov r10, r0
 	ldr r1, [sp, 0x4]
 	lsls r0, r1, 16
@@ -6325,7 +6325,7 @@ _0815D47E:
 	subs r0, r1
 	lsls r0, 7
 	adds r2, r0
-	ldr r0, =gUnknown_02038C28
+	ldr r0, =gScanlineEffectRegBuffers
 	adds r2, r0
 	lsls r4, 16
 	asrs r4, 16
@@ -6343,7 +6343,7 @@ _0815D47E:
 	subs r0, r1
 	lsls r0, 7
 	adds r3, r0
-	ldr r1, =gUnknown_02038C28
+	ldr r1, =gScanlineEffectRegBuffers
 	adds r3, r1
 	lsls r1, r7, 16
 	asrs r1, 16
@@ -6407,7 +6407,7 @@ _0815D52E:
 	lsls r1, r2, 17
 	cmp r1, 0
 	blt _0815D55A
-	ldr r4, =gUnknown_02038C28
+	ldr r4, =gScanlineEffectRegBuffers
 	ldr r7, [sp, 0x4]
 	lsls r0, r7, 16
 	asrs r0, 16
@@ -6487,7 +6487,7 @@ _0815D5CC:
 	asrs r0, 16
 	cmp r0, 0xC
 	ble _0815D63C
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 	movs r0, 0

asm/battle_frontier_1.s

@@ -7096,7 +7096,7 @@ _081926B0:
 	movs r1, 0x1
 	str r1, [sp, 0x8]
 	ldr r1, =sub_8190938
-	bl sub_80D2CC4
+	bl CreateMonIcon
 	ldr r1, [r6]
 	adds r1, r4
 	strb r0, [r1]
@@ -8779,7 +8779,7 @@ _081934B0:
 	mov r1, r10
 	str r1, [sp, 0x8]
 	ldr r1, =sub_8190938
-	bl sub_80D2CC4
+	bl CreateMonIcon
 	ldr r1, [r6]
 	adds r1, r4
 	strb r0, [r1]
@@ -8927,7 +8927,7 @@ _081935FA:
 	movs r1, 0x1
 	str r1, [sp, 0x8]
 	ldr r1, =sub_8190938
-	bl sub_80D2CC4
+	bl CreateMonIcon
 	ldr r1, [r6]
 	adds r1, r4
 	strb r0, [r1]
@@ -11000,8 +11000,8 @@ _0819486C:
 	movs r1, 0
 	strh r1, [r0, 0x8]
 _08194878:
-	bl dp12_8087EA4
-	ldr r0, =gUnknown_02038C28
+	bl ScanlineEffect_Clear
+	ldr r0, =gScanlineEffectRegBuffers
 	ldr r2, =0x00001f0a
 	movs r4, 0xF0
 	lsls r4, 3
@@ -11017,7 +11017,7 @@ _08194888:
 	bge _08194888
 	movs r5, 0x5B
 	ldr r3, =gUnknown_0860CF44
-	ldr r0, =gUnknown_02038C28
+	ldr r0, =gScanlineEffectRegBuffers
 	ldr r2, =0x00001f09
 	ldr r4, =0x00000836
 	adds r1, r0, r4
@@ -11033,7 +11033,7 @@ _081948A4:
 	ldr r0, [r3]
 	ldr r1, [r3, 0x4]
 	ldr r2, [r3, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	mov r0, r8
 	bl DestroyTask
 _081948C2:
@@ -11513,7 +11513,7 @@ sub_8194CE4: @ 8194CE4
 	bl LoadOam
 	bl ProcessSpriteCopyRequests
 	bl TransferPlttBuffer
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 	pop {r0}
 	bx r0
 	.pool

asm/berry_tag_screen.s

@@ -486,7 +486,7 @@ sub_817804C: @ 817804C
 	str r6, [sp, 0xC]
 	str r1, [sp, 0x10]
 	movs r1, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x14
 	pop {r4-r6}
 	pop {r0}

asm/cable_club.s

@@ -178,7 +178,7 @@ _080B24C8:
 	b _080B24F2
 _080B24CC:
 	ldr r4, =gStringVar1
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -239,7 +239,7 @@ sub_80B252C: @ 80B252C
 	ands r0, r1
 	cmp r0, 0
 	beq _080B2570
-	bl sub_800B320
+	bl IsLinkConnectionEstablished
 	lsls r0, 24
 	lsrs r1, r0, 24
 	cmp r1, 0
@@ -269,7 +269,7 @@ sub_80B2578: @ 80B2578
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_800B320
+	bl IsLinkConnectionEstablished
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B258E
@@ -404,7 +404,7 @@ sub_80B2688: @ 80B2688
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0
@@ -426,7 +426,7 @@ sub_80B2688: @ 80B2688
 	adds r4, r0, r1
 	movs r0, 0
 	strh r0, [r4, 0xE]
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -506,7 +506,7 @@ sub_80B275C: @ 80B275C
 	mov r9, r0
 	mov r7, r8
 	add r7, r9
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r5, r0, 24
 	adds r0, r4, 0
@@ -585,7 +585,7 @@ sub_80B2804: @ 80B2804
 	bne _080B2898
 	bl sub_800AA48
 	adds r4, r0, 0
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r4, 24
 	lsls r0, 24
 	cmp r4, r0
@@ -652,7 +652,7 @@ sub_80B28A8: @ 80B28A8
 	lsrs r0, 24
 	cmp r0, 0x1
 	beq _080B290A
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	adds r4, r0, 0
 	bl sub_800AA48
 	lsls r4, 24
@@ -729,13 +729,13 @@ _080B297C:
 	cmp r2, 0x9
 	bne _080B2994
 _080B2984:
-	bl sub_80097E8
+	bl CloseLink
 	bl HideFieldMessageBox
 	ldr r0, =sub_80B2CB0
 	b _080B29E4
 	.pool
 _080B2994:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	ldr r4, =gUnknown_03005DB8
 	strb r0, [r4]
 	bl GetMultiplayerId
@@ -812,7 +812,7 @@ _080B2A42:
 	cmp r0, 0x9
 	bne _080B2A6C
 _080B2A4A:
-	bl sub_80097E8
+	bl CloseLink
 _080B2A4E:
 	bl HideFieldMessageBox
 	ldr r0, =gTasks
@@ -825,7 +825,7 @@ _080B2A4E:
 	b _080B2ACE
 	.pool
 _080B2A6C:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	ldr r4, =gUnknown_03005DB8
 	strb r0, [r4]
 	bl GetMultiplayerId
@@ -1610,7 +1610,7 @@ sub_80B3144: @ 80B3144
 	ldrsh r2, [r4, r3]
 	cmp r2, 0
 	bne _080B3178
-	bl sub_8009734
+	bl OpenLink
 	bl sub_800A2BC
 	ldr r0, =task00_08081A90
 	movs r1, 0x50
@@ -1640,12 +1640,12 @@ sub_80B3194: @ 80B3194
 	lsls r0, 24
 	lsrs r4, r0, 24
 	adds r5, r4, 0
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	bls _080B31DA
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -1681,7 +1681,7 @@ sub_80B31E8: @ 80B31E8
 	lsrs r5, r0, 24
 	bl sub_800AA48
 	adds r4, r0, 0
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r4, 24
 	lsls r0, 24
 	cmp r4, r0
@@ -1808,7 +1808,7 @@ _080B32E0:
 _080B32F8:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r1, =gLinkType
 	ldr r2, =0x00002211
 	adds r0, r2, 0
@@ -1921,7 +1921,7 @@ _080B33E8:
 _080B3408:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =gLinkType
 	ldr r2, =0x00002211
 	adds r1, r2, 0
@@ -2399,7 +2399,7 @@ _080B382E:
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	bl sub_8009FAC
 	b _080B3864
 _080B3840:
@@ -2470,7 +2470,7 @@ _080B38C6:
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	bl Rfu_set_zero
 	b _080B38FC
 _080B38D8:
@@ -2651,7 +2651,7 @@ task00_08081A90: @ 80B3A30
 	lsls r0, 17
 	cmp r1, r0
 	ble _080B3A62
-	bl sub_80097E8
+	bl CloseLink
 	ldr r0, =c2_800ACD4
 	bl SetMainCallback2
 	adds r0, r4, 0
@@ -2669,7 +2669,7 @@ _080B3A62:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080B3A86
-	bl sub_80097E8
+	bl CloseLink
 	ldr r0, =c2_800ACD4
 	bl SetMainCallback2
 _080B3A86:
@@ -2761,7 +2761,7 @@ _080B3B2A:
 	b _080B3BB8
 	.pool
 _080B3B40:
-	bl sub_8009734
+	bl OpenLink
 	ldr r0, =task00_08081A90
 	movs r1, 0x1
 	bl CreateTask
@@ -2779,14 +2779,14 @@ _080B3B54:
 	strh r0, [r5, 0x2]
 	b _080B3B96
 _080B3B68:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	adds r4, r0, 0
 	bl sub_800AA48
 	lsls r4, 24
 	lsls r0, 24
 	cmp r4, r0
 	bcc _080B3BB8
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	cmp r0, 0
 	beq _080B3B96

asm/contest.s

@@ -563,7 +563,7 @@ _080D7B4E:
 	bl sub_80D779C
 	bl sub_80D77E4
 	bl sub_80D7678
-	bl dp12_8087EA4
+	bl ScanlineEffect_Clear
 	bl ResetPaletteFade
 	ldr r2, =gPaletteFade
 	ldrb r0, [r2, 0x8]
@@ -1367,7 +1367,7 @@ vblank_cb_battle: @ 80D827C
 	bl TransferPlttBuffer
 	bl LoadOam
 	bl ProcessSpriteCopyRequests
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 	pop {r0}
 	bx r0
 	.pool

asm/contest_link_80F57C4.s

@@ -344,7 +344,7 @@ sub_80F5B00: @ 80F5B00
 	bl SetVBlankCallback
 	bl sub_80F7DF4
 	bl sub_80F57C4
-	bl dp12_8087EA4
+	bl ScanlineEffect_Clear
 	bl ResetPaletteFade
 	bl ResetSpriteData
 	bl ResetTasks
@@ -492,7 +492,7 @@ sub_80F5C24: @ 80F5C24
 	bl LoadOam
 	bl ProcessSpriteCopyRequests
 	bl TransferPlttBuffer
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 	pop {r0}
 	bx r0
 	.pool

asm/coord_event_weather.s

@@ -1,156 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_809D7BC
-sub_809D7BC: @ 809D7BC
-	push {lr}
-	movs r0, 0x1
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7BC
-
-	thumb_func_start sub_809D7C8
-sub_809D7C8: @ 809D7C8
-	push {lr}
-	movs r0, 0x2
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7C8
-
-	thumb_func_start sub_809D7D4
-sub_809D7D4: @ 809D7D4
-	push {lr}
-	movs r0, 0x3
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7D4
-
-	thumb_func_start sub_809D7E0
-sub_809D7E0: @ 809D7E0
-	push {lr}
-	movs r0, 0x4
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7E0
-
-	thumb_func_start sub_809D7EC
-sub_809D7EC: @ 809D7EC
-	push {lr}
-	movs r0, 0x5
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7EC
-
-	thumb_func_start sub_809D7F8
-sub_809D7F8: @ 809D7F8
-	push {lr}
-	movs r0, 0x6
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D7F8
-
-	thumb_func_start sub_809D804
-sub_809D804: @ 809D804
-	push {lr}
-	movs r0, 0x9
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D804
-
-	thumb_func_start sub_809D810
-sub_809D810: @ 809D810
-	push {lr}
-	movs r0, 0x7
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D810
-
-	thumb_func_start sub_809D81C
-sub_809D81C: @ 809D81C
-	push {lr}
-	movs r0, 0x8
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D81C
-
-	thumb_func_start sub_809D828
-sub_809D828: @ 809D828
-	push {lr}
-	movs r0, 0xB
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D828
-
-	thumb_func_start sub_809D834
-sub_809D834: @ 809D834
-	push {lr}
-	movs r0, 0xC
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D834
-
-	thumb_func_start sub_809D840
-sub_809D840: @ 809D840
-	push {lr}
-	movs r0, 0x14
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D840
-
-	thumb_func_start sub_809D84C
-sub_809D84C: @ 809D84C
-	push {lr}
-	movs r0, 0x15
-	bl sub_80AEDF0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809D84C
-
-	thumb_func_start trigger_activate_weather
-trigger_activate_weather: @ 809D858
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	movs r2, 0
-	ldr r3, =gUnknown_085102E0
-_0809D862:
-	lsls r1, r2, 3
-	adds r0, r1, r3
-	ldrb r0, [r0]
-	cmp r0, r4
-	bne _0809D87C
-	adds r0, r3, 0x4
-	adds r0, r1, r0
-	ldr r0, [r0]
-	bl _call_via_r0
-	b _0809D886
-	.pool
-_0809D87C:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0xC
-	bls _0809D862
-_0809D886:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end trigger_activate_weather
-
-	.align 2, 0 @ Don't pad with nop.

asm/credits.s

@@ -149,7 +149,7 @@ _081755E4:
 	movs r0, 0
 	movs r1, 0x1
 	adds r3, r5, 0
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x18
 	pop {r4,r5}
 	pop {r0}

asm/easy_chat.s

@@ -652,7 +652,7 @@ sub_811A7E4: @ 811A7E4
 _0811A804:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	b _0811A840
 _0811A80E:
 	ldr r0, =gPaletteFade

asm/field_control_avatar.s

@@ -2155,7 +2155,7 @@ trigger_activate: @ 809D04C
 	cmp r1, 0
 	bne _0809D062
 	ldrb r0, [r4, 0x6]
-	bl trigger_activate_weather
+	bl DoCoordEventWeather
 	b _0809D082
 _0809D062:
 	ldrh r0, [r4, 0x6]

asm/field_effect.s

@@ -764,8 +764,8 @@ _080B608E:
 	bx r0
 	thumb_func_end sub_80B6070
 
-	thumb_func_start sub_80B609C
-sub_80B609C: @ 80B609C
+	thumb_func_start MultiplyInvertedPaletteRGBComponents
+MultiplyInvertedPaletteRGBComponents: @ 80B609C
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -832,7 +832,7 @@ sub_80B609C: @ 80B609C
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80B609C
+	thumb_func_end MultiplyInvertedPaletteRGBComponents
 
 	thumb_func_start sub_80B6128
 sub_80B6128: @ 80B6128
@@ -1469,7 +1469,7 @@ _080B65D8:
 	mov r9, r3
 	add r4, r9
 	ldrb r3, [r4]
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	ldrh r4, [r7, 0x32]
 	adds r4, 0x2
 	mov r0, r8
@@ -1488,7 +1488,7 @@ _080B65D8:
 	ldrb r2, [r2]
 	add r4, r9
 	ldrb r3, [r4]
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	ldrh r4, [r7, 0x32]
 	adds r4, 0x1
 	mov r3, r8
@@ -1507,7 +1507,7 @@ _080B65D8:
 	ldrb r2, [r2]
 	add r4, r9
 	ldrb r3, [r4]
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	ldrh r4, [r7, 0x32]
 	lsls r4, 24
 	lsrs r4, 24
@@ -1527,7 +1527,7 @@ _080B65D8:
 	adds r1, r6, 0
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	mov r0, r10
 	bl IndexOfSpritePaletteTag
 	lsls r0, 24
@@ -1538,7 +1538,7 @@ _080B65D8:
 	adds r1, r6, 0
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	movs r3, 0x34
 	ldrsh r0, [r7, r3]
 	cmp r0, 0x2
@@ -1612,7 +1612,7 @@ _080B6718:
 	adds r1, r6, 0
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	mov r0, r8
 	bl IndexOfSpritePaletteTag
 	lsls r0, 24
@@ -1624,7 +1624,7 @@ _080B6718:
 	adds r1, r6, 0
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	mov r0, r8
 	bl IndexOfSpritePaletteTag
 	lsls r0, 24
@@ -1636,7 +1636,7 @@ _080B6718:
 	adds r1, r6, 0
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	mov r0, r8
 	bl IndexOfSpritePaletteTag
 	lsls r0, 24
@@ -1647,7 +1647,7 @@ _080B6718:
 	adds r1, r6, 0
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	mov r0, r8
 	bl IndexOfSpritePaletteTag
 	lsls r0, 24
@@ -1658,7 +1658,7 @@ _080B6718:
 	adds r1, r6, 0
 	adds r2, r5, 0
 	adds r3, r4, 0
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	pop {r3}
 	mov r8, r3
 	pop {r4-r6}

asm/field_message_box.s

@@ -1,337 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8098128
-sub_8098128: @ 8098128
-	ldr r1, =gUnknown_020375BC
-	movs r0, 0
-	strb r0, [r1]
-	ldr r2, =gTextFlags
-	ldrb r1, [r2]
-	movs r0, 0x2
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x3
-	negs r1, r1
-	ands r0, r1
-	subs r1, 0x2
-	ands r0, r1
-	subs r1, 0x4
-	ands r0, r1
-	strb r0, [r2]
-	bx lr
-	.pool
-	thumb_func_end sub_8098128
-
-	thumb_func_start sub_8098154
-sub_8098154: @ 8098154
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, =gTasks
-	adds r4, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x1
-	beq _08098188
-	cmp r0, 0x1
-	bgt _0809817C
-	cmp r0, 0
-	beq _08098182
-	b _080981B0
-	.pool
-_0809817C:
-	cmp r0, 0x2
-	beq _08098198
-	b _080981B0
-_08098182:
-	bl sub_81973A4
-	b _08098190
-_08098188:
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_81973C4
-_08098190:
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	b _080981B0
-_08098198:
-	bl sub_8197224
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x1
-	beq _080981B0
-	ldr r1, =gUnknown_020375BC
-	movs r0, 0
-	strb r0, [r1]
-	adds r0, r5, 0
-	bl DestroyTask
-_080981B0:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098154
-
-	thumb_func_start task_add_textbox
-task_add_textbox: @ 80981BC
-	push {lr}
-	ldr r0, =sub_8098154
-	movs r1, 0x50
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end task_add_textbox
-
-	thumb_func_start task_del_textbox
-task_del_textbox: @ 80981D0
-	push {lr}
-	ldr r0, =sub_8098154
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0xFF
-	beq _080981E4
-	bl DestroyTask
-_080981E4:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end task_del_textbox
-
-	thumb_func_start ShowFieldMessage
-ShowFieldMessage: @ 80981EC
-	push {r4,lr}
-	adds r1, r0, 0
-	ldr r4, =gUnknown_020375BC
-	ldrb r0, [r4]
-	cmp r0, 0
-	bne _0809820C
-	adds r0, r1, 0
-	movs r1, 0x1
-	bl textbox_fdecode_auto_and_task_add
-	movs r0, 0x2
-	strb r0, [r4]
-	movs r0, 0x1
-	b _0809820E
-	.pool
-_0809820C:
-	movs r0, 0
-_0809820E:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end ShowFieldMessage
-
-	thumb_func_start sub_8098214
-sub_8098214: @ 8098214
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl sub_8196094
-	adds r1, r0, 0
-	cmp r1, 0
-	bne _0809822E
-	ldr r0, =gUnknown_020375BC
-	strb r1, [r0]
-	adds r0, r4, 0
-	bl DestroyTask
-_0809822E:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098214
-
-	thumb_func_start sub_8098238
-sub_8098238: @ 8098238
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r5, =gUnknown_020375BC
-	ldrb r0, [r5]
-	cmp r0, 0
-	bne _08098270
-	ldr r0, =gStringVar4
-	adds r1, r4, 0
-	bl StringExpandPlaceholders
-	ldr r0, =sub_8098214
-	movs r1, 0
-	bl CreateTask
-	adds r0, r4, 0
-	bl sub_8196080
-	movs r0, 0x2
-	strb r0, [r5]
-	movs r0, 0x1
-	b _08098272
-	.pool
-_08098270:
-	movs r0, 0
-_08098272:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8098238
-
-	thumb_func_start ShowFieldAutoScrollMessage
-ShowFieldAutoScrollMessage: @ 8098278
-	push {lr}
-	adds r1, r0, 0
-	ldr r2, =gUnknown_020375BC
-	ldrb r0, [r2]
-	cmp r0, 0
-	bne _08098298
-	movs r0, 0x3
-	strb r0, [r2]
-	adds r0, r1, 0
-	movs r1, 0
-	bl textbox_fdecode_auto_and_task_add
-	movs r0, 0x1
-	b _0809829A
-	.pool
-_08098298:
-	movs r0, 0
-_0809829A:
-	pop {r1}
-	bx r1
-	thumb_func_end ShowFieldAutoScrollMessage
-
-	thumb_func_start sub_80982A0
-sub_80982A0: @ 80982A0
-	push {lr}
-	ldr r2, =gUnknown_020375BC
-	movs r1, 0x3
-	strb r1, [r2]
-	movs r1, 0x1
-	bl textbox_fdecode_auto_and_task_add
-	movs r0, 0x1
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80982A0
-
-	thumb_func_start sub_80982B8
-sub_80982B8: @ 80982B8
-	push {lr}
-	ldr r1, =gUnknown_020375BC
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _080982D4
-	movs r0, 0x2
-	strb r0, [r1]
-	bl textbox_auto_and_task_add
-	movs r0, 0x1
-	b _080982D6
-	.pool
-_080982D4:
-	movs r0, 0
-_080982D6:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80982B8
-
-	thumb_func_start textbox_fdecode_auto_and_task_add
-textbox_fdecode_auto_and_task_add: @ 80982DC
-	push {r4,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	ldr r0, =gStringVar4
-	adds r1, r2, 0
-	bl StringExpandPlaceholders
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl AddTextPrinterForMessage
-	bl task_add_textbox
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end textbox_fdecode_auto_and_task_add
-
-	thumb_func_start textbox_auto_and_task_add
-textbox_auto_and_task_add: @ 8098304
-	push {lr}
-	movs r0, 0x1
-	bl AddTextPrinterForMessage
-	bl task_add_textbox
-	pop {r0}
-	bx r0
-	thumb_func_end textbox_auto_and_task_add
-
-	thumb_func_start HideFieldMessageBox
-HideFieldMessageBox: @ 8098314
-	push {lr}
-	bl task_del_textbox
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_8197434
-	ldr r1, =gUnknown_020375BC
-	movs r0, 0
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end HideFieldMessageBox
-
-	thumb_func_start textbox_any_visible
-textbox_any_visible: @ 8098330
-	ldr r0, =gUnknown_020375BC
-	ldrb r0, [r0]
-	bx lr
-	.pool
-	thumb_func_end textbox_any_visible
-
-	thumb_func_start IsFieldMessageBoxHidden
-IsFieldMessageBoxHidden: @ 809833C
-	push {lr}
-	ldr r0, =gUnknown_020375BC
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08098350
-	movs r0, 0
-	b _08098352
-	.pool
-_08098350:
-	movs r0, 0x1
-_08098352:
-	pop {r1}
-	bx r1
-	thumb_func_end IsFieldMessageBoxHidden
-
-	thumb_func_start sub_8098358
-sub_8098358: @ 8098358
-	push {lr}
-	bl task_del_textbox
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_81973FC
-	ldr r1, =gUnknown_020375BC
-	movs r0, 0
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098358
-
-	thumb_func_start sub_8098374
-sub_8098374: @ 8098374
-	push {lr}
-	bl task_del_textbox
-	ldr r1, =gUnknown_020375BC
-	movs r0, 0
-	strb r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8098374
-
-	.align 2, 0 @ Don't pad with nop.

asm/field_player_avatar.s

@@ -2602,8 +2602,8 @@ _0808BD2C:
 	.pool
 	thumb_func_end sub_808BCF4
 
-	thumb_func_start sub_808BD3C
-sub_808BD3C: @ 808BD3C
+	thumb_func_start GetRivalAvatarGraphicsIdByStateIdAndGender
+GetRivalAvatarGraphicsIdByStateIdAndGender: @ 808BD3C
 	lsls r0, 24
 	lsls r1, 24
 	lsrs r1, 24
@@ -2614,7 +2614,7 @@ sub_808BD3C: @ 808BD3C
 	ldrb r0, [r1]
 	bx lr
 	.pool
-	thumb_func_end sub_808BD3C
+	thumb_func_end GetRivalAvatarGraphicsIdByStateIdAndGender
 
 	thumb_func_start GetPlayerAvatarGraphicsIdByStateIdAndGender
 @ u8 GetPlayerAvatarGraphicsIdByStateIdAndGender(u8 stateId, u8 gender)
@@ -4538,7 +4538,7 @@ fish9: @ 808CC64
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -4695,7 +4695,7 @@ fishB: @ 808CD94
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	movs r0, 0xD
 	strh r0, [r5, 0x8]
 	movs r0, 0x1
@@ -4743,7 +4743,7 @@ fishC: @ 808CE04
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	ldrh r0, [r5, 0x8]
 	adds r0, 0x1
 	strh r0, [r5, 0x8]

asm/field_screen.s

@@ -1625,8 +1625,8 @@ _080ABCBC:
 	.pool
 	thumb_func_end sub_80ABC7C
 
-	thumb_func_start fade_screen
-fade_screen: @ 80ABCD0
+	thumb_func_start FadeScreen
+FadeScreen: @ 80ABCD0
 	push {r4,r5,lr}
 	sub sp, 0x4
 	lsls r0, 24
@@ -1762,7 +1762,7 @@ _080ABDE4:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end fade_screen
+	thumb_func_end FadeScreen
 
 	thumb_func_start sub_80ABDFC
 sub_80ABDFC: @ 80ABDFC
@@ -2339,43 +2339,43 @@ _080AC290:
 	.4byte _080AC300
 _080AC2B8:
 	movs r0, 0x1
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2C0:
 	movs r0, 0x2
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2C8:
 	movs r0, 0x3
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2D0:
 	movs r0, 0x4
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2D8:
 	movs r0, 0x5
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2E0:
 	movs r0, 0x6
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2E8:
 	movs r0, 0x9
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2F0:
 	movs r0, 0x7
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC2F8:
 	movs r0, 0x8
-	bl sub_80AEDF0
+	bl SetWeather
 	b _080AC306
 _080AC300:
 	movs r0, 0xB
-	bl sub_80AEDF0
+	bl SetWeather
 _080AC306:
 	pop {r0}
 	bx r0
@@ -2472,15 +2472,15 @@ _080AC3B6:
 	bx r0
 	thumb_func_end play_some_sound
 
-	thumb_func_start sub_80AC3BC
-sub_80AC3BC: @ 80AC3BC
+	thumb_func_start IsWeatherChangeComplete
+IsWeatherChangeComplete: @ 80AC3BC
 	ldr r0, =gUnknown_02038454
 	ldr r1, =0x000006d3
 	adds r0, r1
 	ldrb r0, [r0]
 	bx lr
 	.pool
-	thumb_func_end sub_80AC3BC
+	thumb_func_end IsWeatherChangeComplete
 
 	thumb_func_start sub_80AC3D0
 sub_80AC3D0: @ 80AC3D0
@@ -7537,8 +7537,8 @@ GetSav1Weather: @ 80AEDAC
 	.pool
 	thumb_func_end GetSav1Weather
 
-	thumb_func_start sub_80AEDBC
-sub_80AEDBC: @ 80AEDBC
+	thumb_func_start SetSav1WeatherFromCurrMapHeader
+SetSav1WeatherFromCurrMapHeader: @ 80AEDBC
 	push {r4,r5,lr}
 	ldr r4, =gSaveBlock1Ptr
 	ldr r0, [r4]
@@ -7559,10 +7559,10 @@ sub_80AEDBC: @ 80AEDBC
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80AEDBC
+	thumb_func_end SetSav1WeatherFromCurrMapHeader
 
-	thumb_func_start sub_80AEDF0
-sub_80AEDF0: @ 80AEDF0
+	thumb_func_start SetWeather
+SetWeather: @ 80AEDF0
 	push {lr}
 	bl SetSav1Weather
 	bl GetSav1Weather
@@ -7571,7 +7571,7 @@ sub_80AEDF0: @ 80AEDF0
 	bl weather_set
 	pop {r0}
 	bx r0
-	thumb_func_end sub_80AEDF0
+	thumb_func_end SetWeather
 
 	thumb_func_start sub_80AEE08
 sub_80AEE08: @ 80AEE08
@@ -7872,13 +7872,13 @@ _080AF06A:
 	bl palette_bg_faded_fill_black
 	movs r0, 0
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	b _080AF084
 _080AF078:
 	bl palette_bg_faded_fill_white
 	movs r0, 0x2
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 _080AF084:
 	pop {r4}
 	pop {r0}
@@ -7891,7 +7891,7 @@ sub_80AF08C: @ 80AF08C
 	bl palette_bg_faded_fill_white
 	movs r0, 0x2
 	movs r1, 0x8
-	bl fade_screen
+	bl FadeScreen
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80AF08C
@@ -7902,7 +7902,7 @@ pal_fill_black: @ 80AF0A0
 	bl palette_bg_faded_fill_black
 	movs r0, 0
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	pop {r0}
 	bx r0
 	thumb_func_end pal_fill_black
@@ -7928,12 +7928,12 @@ sub_80AF0B4: @ 80AF0B4
 _080AF0DA:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	b _080AF0EC
 _080AF0E4:
 	movs r0, 0x3
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 _080AF0EC:
 	pop {r4}
 	pop {r0}
@@ -8761,7 +8761,7 @@ sub_80AF79C: @ 80AF79C
 	bl music_something
 	movs r0, 0x3
 	movs r1, 0x8
-	bl fade_screen
+	bl FadeScreen
 	bl play_some_sound
 	ldr r0, =gFieldCallback
 	ldr r1, =sub_80AF3B0
@@ -8990,7 +8990,7 @@ _080AF99A:
 	bl sub_8009FAC
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	bl music_something
 	movs r0, 0x9
 	bl PlaySE
@@ -9572,12 +9572,12 @@ _080AFE30:
 	beq _080AFEBC
 	b _080AFEC6
 _080AFE36:
-	ldr r0, =gUnknown_02039B28
+	ldr r0, =gScanlineEffect
 	ldrb r1, [r0, 0x14]
 	lsls r0, r1, 4
 	subs r0, r1
 	lsls r0, 7
-	ldr r1, =gUnknown_02038C28
+	ldr r1, =gScanlineEffectRegBuffers
 	adds r0, r1
 	movs r2, 0x2
 	ldrsh r1, [r4, r2]
@@ -9591,12 +9591,12 @@ _080AFE36:
 	b _080AFEC6
 	.pool
 _080AFE64:
-	ldr r0, =gUnknown_02039B28
+	ldr r0, =gScanlineEffect
 	ldrb r1, [r0, 0x14]
 	lsls r0, r1, 4
 	subs r0, r1
 	lsls r0, 7
-	ldr r1, =gUnknown_02038C28
+	ldr r1, =gScanlineEffectRegBuffers
 	adds r0, r1
 	movs r6, 0x2
 	ldrsh r1, [r4, r6]
@@ -9631,7 +9631,7 @@ _080AFEB4:
 	bl DestroyTask
 	b _080AFEC6
 _080AFEBC:
-	bl dp12_8087EA4
+	bl ScanlineEffect_Clear
 	adds r0, r5, 0
 	bl DestroyTask
 _080AFEC6:
@@ -9665,12 +9665,12 @@ _080AFEF4:
 	beq _080AFF80
 	b _080AFF8A
 _080AFEFA:
-	ldr r0, =gUnknown_02039B28
+	ldr r0, =gScanlineEffect
 	ldrb r1, [r0, 0x14]
 	lsls r0, r1, 4
 	subs r0, r1
 	lsls r0, 7
-	ldr r1, =gUnknown_02038C28
+	ldr r1, =gScanlineEffectRegBuffers
 	adds r0, r1
 	movs r2, 0x2
 	ldrsh r1, [r4, r2]
@@ -9684,12 +9684,12 @@ _080AFEFA:
 	b _080AFF8A
 	.pool
 _080AFF28:
-	ldr r0, =gUnknown_02039B28
+	ldr r0, =gScanlineEffect
 	ldrb r1, [r0, 0x14]
 	lsls r0, r1, 4
 	subs r0, r1
 	lsls r0, 7
-	ldr r1, =gUnknown_02038C28
+	ldr r1, =gScanlineEffectRegBuffers
 	adds r0, r1
 	movs r6, 0x2
 	ldrsh r1, [r4, r6]
@@ -9724,7 +9724,7 @@ _080AFF78:
 	bl DestroyTask
 	b _080AFF8A
 _080AFF80:
-	bl dp12_8087EA4
+	bl ScanlineEffect_Clear
 	adds r0, r5, 0
 	bl DestroyTask
 _080AFF8A:
@@ -9914,7 +9914,7 @@ sub_80B00E8: @ 80B00E8
 	lsrs r0, 24
 	cmp r0, 0
 	beq _080B0116
-	ldr r4, =gUnknown_02038C28
+	ldr r4, =gScanlineEffectRegBuffers
 	ldr r1, =gUnknown_0854FE64
 	lsls r0, 1
 	adds r0, r1
@@ -9940,7 +9940,7 @@ _080B0116:
 	thumb_func_start door_upload_tiles
 door_upload_tiles: @ 80B0124
 	push {r4,lr}
-	ldr r4, =gUnknown_02038C28
+	ldr r4, =gScanlineEffectRegBuffers
 	ldr r0, =gSaveBlock2Ptr
 	ldr r0, [r0]
 	ldr r1, =0x00000e68
@@ -10261,7 +10261,7 @@ _080B0368:
 	bl sub_8199C30
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
-	ldr r4, =gUnknown_02038C28
+	ldr r4, =gScanlineEffectRegBuffers
 	movs r2, 0x4
 	ldrsh r1, [r5, r2]
 	movs r0, 0x6
@@ -10280,7 +10280,7 @@ _080B0368:
 	ldr r0, [r2]
 	ldr r1, [r2, 0x4]
 	ldr r2, [r2, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	movs r0, 0x1
 	strh r0, [r5]
 	b _080B052C

asm/field_specials.s

@@ -5639,7 +5639,7 @@ _0813AAAA:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	ldr r1, =gUnknown_085B312C
 	lsls r0, r5, 1
 	adds r1, r0, r1
@@ -5665,7 +5665,7 @@ _0813AAE8:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	ldr r1, =gUnknown_085B3142
 	lsls r0, r5, 1
 	adds r1, r0, r1
@@ -5712,7 +5712,7 @@ _0813AB5C:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	ldr r1, =gUnknown_085B314E
 	lsls r0, r5, 1
 	adds r0, r1
@@ -5736,7 +5736,7 @@ _0813AB94:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	ldr r1, =gUnknown_085B315C
 	lsls r0, r5, 1
 	adds r0, r1

asm/intro.s

@@ -11,7 +11,7 @@ sub_816CBE8: @ 816CBE8
 	bl LoadOam
 	bl ProcessSpriteCopyRequests
 	bl TransferPlttBuffer
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 	pop {r0}
 	bx r0
 	thumb_func_end sub_816CBE8
@@ -2124,7 +2124,7 @@ task_intro_17: @ 816DEEC
 	movs r1, 0xA0
 	movs r2, 0x4
 	movs r3, 0x4
-	bl sub_80BA384
+	bl ScanlineEffect_InitWave
 	add sp, 0xC
 	pop {r0}
 	bx r0
@@ -2411,7 +2411,7 @@ _0816E156:
 	adds r0, r1
 	ldr r1, =task_intro_19
 	str r1, [r0]
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 _0816E176:
@@ -2623,7 +2623,7 @@ task_intro_19: @ 816E2A0
 	movs r1, 0xA0
 	movs r2, 0x4
 	movs r3, 0x4
-	bl sub_80BA384
+	bl ScanlineEffect_InitWave
 	add sp, 0xC
 	pop {r4}
 	pop {r0}
@@ -3038,7 +3038,7 @@ _0816E69C:
 	adds r0, r1
 	ldr r1, =task_intro_21
 	str r1, [r0]
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 _0816E6BC:

asm/item_menu.s

@@ -6043,7 +6043,7 @@ bag_menu_print: @ 81AE0BC
 	str r4, [sp, 0xC]
 	str r2, [sp, 0x10]
 	mov r2, r9
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x14
 	pop {r3,r4}
 	mov r8, r3

asm/link.s

@@ -15,7 +15,7 @@ sub_80093CC: @ 80093CC
 	cmp r0, r1
 	beq _080093F4
 	bl sub_800B4A4
-	bl sub_80097E8
+	bl CloseLink
 	bl RestoreSerialTimer3IntrHandlers
 	movs r0, 0
 	b _080093FE
@@ -29,15 +29,15 @@ _080093FE:
 	bx r1
 	thumb_func_end sub_80093CC
 
-	thumb_func_start sub_8009404
-sub_8009404: @ 8009404
+	thumb_func_start Task_DestroySelf
+Task_DestroySelf: @ 8009404
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
 	bl DestroyTask
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8009404
+	thumb_func_end Task_DestroySelf
 
 	thumb_func_start sub_8009414
 sub_8009414: @ 8009414
@@ -210,7 +210,7 @@ sub_8009570: @ 8009570
 	ldr r2, =0x00001111
 	adds r0, r2, 0
 	strh r0, [r1]
-	bl sub_8009734
+	bl OpenLink
 	ldr r0, =gMain
 	ldrh r0, [r0, 0x24]
 	bl SeedRng
@@ -236,7 +236,7 @@ _080095A0:
 	lsls r1, 5
 	movs r0, 0
 	bl SetGpuReg
-	ldr r0, =sub_8009404
+	ldr r0, =Task_DestroySelf
 	movs r1, 0
 	bl CreateTask
 	bl RunTasks
@@ -384,8 +384,8 @@ _08009726:
 	.pool
 	thumb_func_end task02_080097CC
 
-	thumb_func_start sub_8009734
-sub_8009734: @ 8009734
+	thumb_func_start OpenLink
+OpenLink: @ 8009734
 	push {r4-r6,lr}
 	ldr r0, =gLinkVSyncDisabled
 	ldrb r4, [r0]
@@ -443,10 +443,10 @@ _080097BE:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8009734
+	thumb_func_end OpenLink
 
-	thumb_func_start sub_80097E8
-sub_80097E8: @ 80097E8
+	thumb_func_start CloseLink
+CloseLink: @ 80097E8
 	push {r4,lr}
 	ldr r0, =gReceivedRemoteLinkPlayers
 	movs r4, 0
@@ -464,7 +464,7 @@ _080097FC:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80097E8
+	thumb_func_end CloseLink
 
 	thumb_func_start sub_8009818
 sub_8009818: @ 8009818
@@ -698,7 +698,7 @@ _080099FC:
 	bls _080099FC
 	ldrh r0, [r4]
 	strh r0, [r5]
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	movs r1, 0x40
 	ands r0, r1
@@ -717,7 +717,7 @@ _080099FC:
 _08009A34:
 	bl sub_800AEB4
 _08009A38:
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldrh r0, [r0]
 _08009A3C:
 	pop {r4,r5}
@@ -745,7 +745,7 @@ _08009A70:
 	adds r5, r0
 	adds r4, 0x1
 _08009A78:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r4, r0
@@ -1378,7 +1378,7 @@ GetLinkPlayerCount: @ 8009FCC
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _08009FEC
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	movs r1, 0x1C
 	ands r0, r1
@@ -1514,7 +1514,7 @@ sub_800A0AC: @ 800A0AC
 	str r1, [r0]
 	ldr r0, =gUnknown_020229C8
 	strh r1, [r0]
-	bl sub_8009734
+	bl OpenLink
 	pop {r0}
 	bx r0
 	.pool
@@ -1532,7 +1532,7 @@ sub_800A0C8: @ 800A0C8
 	beq _0800A0DA
 	b _0800A214
 _0800A0DA:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r5, r0
@@ -1552,7 +1552,7 @@ _0800A0FC:
 	bne _0800A10E
 	ldr r0, =gUnknown_0300306C
 	strb r4, [r0]
-	bl sub_80097E8
+	bl CloseLink
 _0800A10E:
 	movs r6, 0
 	ldr r4, =gLinkPlayers
@@ -2211,7 +2211,7 @@ _0800A616:
 	thumb_func_start sub_800A620
 sub_800A620: @ 800A620
 	push {lr}
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r1, [r0]
 	movs r0, 0x20
 	ands r0, r1
@@ -2499,7 +2499,7 @@ _0800A81C:
 	thumb_func_start sub_800A824
 sub_800A824: @ 800A824
 	push {lr}
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	movs r1, 0x20
 	ands r0, r1
@@ -2534,7 +2534,7 @@ task00_link_test: @ 800A850
 	movs r2, 0x1
 	movs r3, 0x2
 	bl sub_800A6E8
-	ldr r4, =gUnknown_030030E0
+	ldr r4, =gLinkStatus
 	ldr r0, [r4]
 	movs r1, 0xF
 	movs r2, 0x1
@@ -2606,7 +2606,7 @@ task00_link_test: @ 800A850
 	movs r2, 0x6
 	movs r3, 0x1
 	bl sub_800A6E8
-	bl sub_800B320
+	bl IsLinkConnectionEstablished
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x19
@@ -2807,7 +2807,7 @@ _0800AAB4:
 	ldrb r0, [r0]
 	cmp r3, r0
 	bne _0800AAE4
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	mov r1, r9
@@ -2887,7 +2887,7 @@ _0800AB5A:
 	ldr r1, =gUnknown_0300306C
 	movs r0, 0x1
 	strb r0, [r1]
-	bl sub_80097E8
+	bl CloseLink
 	ldr r0, =c2_800ACD4
 	bl SetMainCallback2
 _0800AB6A:
@@ -2918,25 +2918,25 @@ sub_800AB98: @ 800AB98
 	.pool
 	thumb_func_end sub_800AB98
 
-	thumb_func_start sub_800ABAC
-sub_800ABAC: @ 800ABAC
-	ldr r0, =gUnknown_030030E0
+	thumb_func_start GetLinkPlayerCount_2
+GetLinkPlayerCount_2: @ 800ABAC
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	movs r1, 0x1C
 	ands r0, r1
 	lsrs r0, 2
 	bx lr
 	.pool
-	thumb_func_end sub_800ABAC
+	thumb_func_end GetLinkPlayerCount_2
 
-	thumb_func_start sub_800ABBC
-sub_800ABBC: @ 800ABBC
+	thumb_func_start IsLinkMaster
+IsLinkMaster: @ 800ABBC
 	push {lr}
 	ldr r0, =gLinkVSyncDisabled
 	ldrb r0, [r0]
 	cmp r0, 0
 	bne _0800ABDC
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	lsrs r0, 5
 	movs r1, 0x1
@@ -2950,7 +2950,7 @@ _0800ABDC:
 _0800ABE4:
 	pop {r1}
 	bx r1
-	thumb_func_end sub_800ABBC
+	thumb_func_end IsLinkMaster
 
 	thumb_func_start sub_800ABE8
 sub_800ABE8: @ 800ABE8
@@ -3074,7 +3074,7 @@ _0800ACD0:
 	ldr r0, =gUnknown_03002748
 	movs r4, 0x1
 	strb r4, [r0]
-	bl sub_80097E8
+	bl CloseLink
 	ldr r1, =gUnknown_03003140
 	movs r0, 0
 	str r0, [r1]
@@ -3178,7 +3178,7 @@ _0800ADB6:
 	ldr r0, =gUnknown_03002748
 	movs r4, 0x1
 	strb r4, [r0]
-	bl sub_80097E8
+	bl CloseLink
 	ldr r1, =gUnknown_03003140
 	movs r0, 0
 	str r0, [r1]
@@ -3290,7 +3290,7 @@ sub_800AEB4: @ 800AEB4
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _0800AEF4
-	ldr r0, =gUnknown_030030E0
+	ldr r0, =gLinkStatus
 	ldr r2, [r0]
 	movs r0, 0xFE
 	lsls r0, 11
@@ -3315,7 +3315,7 @@ _0800AEEA:
 	ldr r1, =gUnknown_0300306C
 	movs r0, 0x1
 	strb r0, [r1]
-	bl sub_80097E8
+	bl CloseLink
 _0800AEF4:
 	pop {r0}
 	bx r0
@@ -3426,7 +3426,7 @@ _0800AF8C:
 	ldr r1, =gSoftResetDisabled
 	movs r0, 0
 	strb r0, [r1]
-	ldr r0, =sub_8009404
+	ldr r0, =Task_DestroySelf
 	movs r1, 0
 	bl CreateTask
 	bl StopMapMusic
@@ -3740,16 +3740,16 @@ _0800B314:
 	.pool
 	thumb_func_end sub_800B2F8
 
-	thumb_func_start sub_800B320
-sub_800B320: @ 800B320
-	ldr r0, =gUnknown_030030E0
+	thumb_func_start IsLinkConnectionEstablished
+IsLinkConnectionEstablished: @ 800B320
+	ldr r0, =gLinkStatus
 	ldr r0, [r0]
 	lsrs r0, 6
 	movs r1, 0x1
 	ands r0, r1
 	bx lr
 	.pool
-	thumb_func_end sub_800B320
+	thumb_func_end IsLinkConnectionEstablished
 
 	thumb_func_start sub_800B330
 sub_800B330: @ 800B330
@@ -3864,7 +3864,7 @@ HandleLinkConnection: @ 800B40C
 	ldr r1, =gSendCmd
 	ldr r2, =gRecvCmds
 	bl sub_800B638
-	ldr r4, =gUnknown_030030E0
+	ldr r4, =gLinkStatus
 	str r0, [r4]
 	ldr r0, =gUnknown_030022EC
 	bl sub_80099E0
@@ -15025,7 +15025,7 @@ _08010E20:
 	ldrb r1, [r0]
 	movs r1, 0x2
 	strb r1, [r0]
-	bl sub_80097E8
+	bl CloseLink
 	b _08010E8E
 	.pool
 _08010E5C:
@@ -16613,7 +16613,7 @@ sub_8011AFC: @ 8011AFC
 	adds r0, r2, 0
 	strh r0, [r1]
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	ldr r0, =gMain
 	ldrh r0, [r0, 0x24]
 	bl SeedRng
@@ -18142,7 +18142,7 @@ _08012848:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	ldrb r1, [r4]
 	movs r0, 0xF
 	ands r0, r1
@@ -19650,7 +19650,7 @@ _08013590:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C5C
 	movs r0, 0x70
 	bl AllocZeroed
@@ -20398,7 +20398,7 @@ _08013CD0:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C5C
 	movs r0, 0x1
 	bl sub_80111B0
@@ -21684,7 +21684,7 @@ _080148CC:
 	bne _080149B2
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	movs r0, 0x2
 	strh r0, [r7]
 	b _080149B2
@@ -21897,7 +21897,7 @@ _08014AB0:
 	movs r1, 0
 	bl sub_8010FA0
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	movs r0, 0x2
 	bl sub_8011C10
 	movs r0, 0x1
@@ -22435,7 +22435,7 @@ _08014FA4:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C5C
 	movs r0, 0x70
 	bl AllocZeroed
@@ -22823,7 +22823,7 @@ _08015358:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C5C
 	movs r0, 0x70
 	bl AllocZeroed
@@ -23373,7 +23373,7 @@ _08015878:
 	ldrh r2, [r2, 0xC]
 	bl sub_8010FCC
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C84
 	ldr r0, [r6, 0x8]
 	movs r1, 0x1
@@ -25223,7 +25223,7 @@ _080169BE:
 	movs r2, 0
 	bl sub_8010F84
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011C84
 	movs r0, 0x1
 	bl sub_80111B0
@@ -28911,7 +28911,7 @@ _08018720:
 	movs r1, 0x1
 	movs r2, 0x4
 	movs r3, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	movs r0, 0
 	adds r1, r7, 0
 	movs r2, 0xDE
@@ -28927,7 +28927,7 @@ _08018720:
 	movs r0, 0
 	movs r1, 0
 	movs r3, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	movs r0, 0
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -29099,7 +29099,7 @@ sub_8018884: @ 8018884
 	movs r1, 0x1
 	movs r2, 0
 	movs r3, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	movs r0, 0x1
 	movs r1, 0x1
 	movs r2, 0xF
@@ -29452,7 +29452,7 @@ _08018B4A:
 	str r1, [sp, 0x10]
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	ldrb r0, [r4]
 	movs r1, 0x1
 	movs r2, 0xF
@@ -29598,7 +29598,7 @@ _08018C8C:
 	str r1, [sp, 0x10]
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	ldrb r0, [r5]
 	movs r1, 0x1
 	movs r2, 0xF
@@ -31098,7 +31098,7 @@ _080198FE:
 	b _08019922
 	.pool
 _0801990C:
-	bl sub_80097E8
+	bl CloseLink
 	ldr r0, [r5, 0x10]
 	bl Free
 	adds r0, r4, 0
@@ -31433,7 +31433,7 @@ _08019B84:
 	b _08019B9C
 _08019B96:
 	adds r0, r4, 0
-	bl sub_8097404
+	bl FreezeMapObject
 _08019B9C:
 	movs r0, 0x1
 _08019B9E:
@@ -33150,7 +33150,7 @@ _0801A93A:
 	adds r0, r7, 0
 	adds r1, r6, 0
 	adds r2, r5, 0
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x18
 	pop {r4-r7}
 	pop {r0}
@@ -33471,7 +33471,7 @@ sub_801AB68: @ 801AB68
 	movs r1, 0x1
 	adds r2, r6, 0
 	ldr r3, [sp, 0x14]
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x18
 	pop {r3-r5}
 	mov r8, r3
@@ -39837,7 +39837,7 @@ sub_801DF20: @ 801DF20
 	bl TransferPlttBuffer
 	bl LoadOam
 	bl ProcessSpriteCopyRequests
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 	pop {r0}
 	bx r0
 	thumb_func_end sub_801DF20
@@ -42568,7 +42568,7 @@ sub_801F544: @ 801F544
 	str r0, [r4]
 _0801F55A:
 	bl FreeAllWindowBuffers
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
 	pop {r4}
@@ -44875,13 +44875,13 @@ sub_8020770: @ 8020770
 	strh r1, [r0, 0x20]
 	str r1, [sp, 0xC]
 	add r0, sp, 0xC
-	ldr r1, =gUnknown_02038C28
+	ldr r1, =gScanlineEffectRegBuffers
 	ldr r2, =0x010003c0
 	bl CpuFastSet
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	add sp, 0x10
 	pop {r0}
 	bx r0
@@ -44896,12 +44896,12 @@ sub_80207C0: @ 80207C0
 	lsrs r0, 16
 	mov r1, sp
 	strh r0, [r1]
-	ldr r5, =gUnknown_02039B28
+	ldr r5, =gScanlineEffect
 	ldrb r0, [r5, 0x14]
 	lsls r1, r0, 4
 	subs r1, r0
 	lsls r1, 7
-	ldr r4, =gUnknown_02038C28
+	ldr r4, =gScanlineEffectRegBuffers
 	adds r1, r4
 	ldr r2, =0x01000090
 	mov r0, sp
@@ -44939,7 +44939,7 @@ sub_8020818: @ 8020818
 	lsrs r4, 16
 	mov r0, sp
 	strh r4, [r0]
-	ldr r5, =gUnknown_02038C28
+	ldr r5, =gScanlineEffectRegBuffers
 	ldr r0, =0x01000090
 	mov r9, r0
 	mov r0, sp
@@ -48548,7 +48548,7 @@ _08022616:
 	str r4, [sp, 0x10]
 	movs r1, 0x2
 	movs r3, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	b _0802269C
 	.pool
 _08022668:
@@ -48575,7 +48575,7 @@ _08022668:
 	str r4, [sp, 0x10]
 	movs r1, 0x2
 	movs r3, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 _0802269C:
 	ldr r1, =0x000001bb
 	adds r0, r6, r1
@@ -49451,7 +49451,7 @@ _08022D42:
 	movs r0, 0
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	b _08022DB2
 	.pool
 _08022D90:
@@ -49470,7 +49470,7 @@ _08022D90:
 	str r0, [sp, 0xC]
 	movs r0, 0
 	movs r1, 0x1
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 _08022DB2:
 	movs r0, 0
 	movs r1, 0x3
@@ -52034,7 +52034,7 @@ _080241A6:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -52393,7 +52393,7 @@ _08024460:
 	str r1, [sp, 0xC]
 	movs r0, 0
 	movs r1, 0x1
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	b _080244AC
 	.pool
 _08024490:
@@ -52409,7 +52409,7 @@ _08024490:
 	str r0, [sp, 0xC]
 	movs r0, 0
 	movs r1, 0x1
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 _080244AC:
 	movs r0, 0
 	movs r1, 0x3
@@ -64123,7 +64123,7 @@ _0802A3AE:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	b _0802A410
 	.pool
 _0802A3D8:

asm/list_menu.s

@@ -773,7 +773,7 @@ ListMenuPrint: @ 81AE9B4
 	str r6, [sp, 0x10]
 	adds r2, r7, 0
 	mov r3, r12
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	ldrb r1, [r5, 0x3]
 	movs r0, 0x7F
 	ands r0, r1
@@ -810,7 +810,7 @@ _081AEA20:
 	str r6, [sp, 0x10]
 	adds r2, r7, 0
 	mov r3, r12
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 _081AEA5E:
 	add sp, 0x18
 	pop {r4-r7}

asm/main_menu.s

@@ -1495,7 +1495,7 @@ _08030478:
 	b _0803048A
 	.pool
 _08030480:
-	ldr r0, =sub_8178974
+	ldr r0, =CB2_InitMysteryEventMenu
 	b _0803048A
 	.pool
 _08030488:

asm/map_obj_lock.s

@@ -109,7 +109,7 @@ _0809842A:
 	cmp r0, 0
 	blt _08098452
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	movs r0, 0x1
 	strh r0, [r5, 0xA]
 _08098452:
@@ -154,7 +154,7 @@ LockSelectedMapObject: @ 80984A0
 	push {r4,r5,lr}
 	ldr r4, =gSelectedMapObject
 	ldrb r0, [r4]
-	bl sub_80974D0
+	bl FreezeMapObjectsExceptOne
 	ldr r0, =sub_8098400
 	movs r1, 0x50
 	bl CreateTask
@@ -171,7 +171,7 @@ LockSelectedMapObject: @ 80984A0
 	cmp r0, 0
 	blt _080984DE
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	ldr r0, =gTasks
 	lsls r1, r5, 2
 	adds r1, r5
@@ -317,7 +317,7 @@ _080985E8:
 	cmp r0, 0
 	blt _0809860C
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	movs r0, 0x1
 	strh r0, [r5, 0xA]
 _0809860C:
@@ -385,7 +385,7 @@ sub_8098630: @ 8098630
 	cmp r0, 0
 	blt _0809869A
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	movs r0, 0x1
 	strh r0, [r6, 0xA]
 _0809869A:
@@ -410,14 +410,14 @@ _0809869A:
 	cmp r0, 0
 	blt _0809871A
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	movs r0, 0x1
 	strh r0, [r4, 0xA]
 	b _0809871A
 	.pool
 _080986E0:
 	adds r0, r4, 0
-	bl sub_80974D0
+	bl FreezeMapObjectsExceptOne
 	ldr r0, =sub_80985BC
 	movs r1, 0x50
 	bl CreateTask
@@ -439,7 +439,7 @@ _080986E0:
 	cmp r0, 0
 	blt _0809871A
 	adds r0, r1, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	movs r0, 0x1
 	strh r0, [r5, 0xA]
 _0809871A:

asm/menu.s

@@ -35,7 +35,7 @@ AddTextPrinterWithCallbackForMessage: @ 8197A9C
 	str r0, [sp, 0xC]
 	movs r0, 0
 	movs r1, 0x1
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r4,r5}
 	pop {r0}
@@ -992,7 +992,7 @@ _0819829E:
 	movs r1, 0x1
 	movs r2, 0x4
 	movs r3, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	mov r2, r9
 	cmp r2, 0
 	beq _081982C8
@@ -4736,9 +4736,9 @@ box_print: @ 8199E64
 	bx r0
 	thumb_func_end box_print
 
-	thumb_func_start AddTextPrinterParametrized2
-@ void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, u8 speed, u8 *str)
-AddTextPrinterParametrized2: @ 8199EEC
+	thumb_func_start AddTextPrinterParameterized2
+@ void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, u8 speed, u8 *str)
+AddTextPrinterParameterized2: @ 8199EEC
 	push {r4-r6,lr}
 	mov r6, r9
 	mov r5, r8
@@ -4806,7 +4806,7 @@ AddTextPrinterParametrized2: @ 8199EEC
 	pop {r4-r6}
 	pop {r0}
 	bx r0
-	thumb_func_end AddTextPrinterParametrized2
+	thumb_func_end AddTextPrinterParameterized2
 
 	thumb_func_start sub_8199F74
 sub_8199F74: @ 8199F74

asm/menu_helpers.s

@@ -156,7 +156,7 @@ _08121EC0:
 	adds r1, r7, 0
 	adds r2, r4, 0
 	adds r3, r5, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	ldr r1, =gUnknown_0300117C
 	ldr r0, [sp, 0x34]
 	str r0, [r1]

asm/mystery_event_menu.s

@@ -1,669 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_8178944
-sub_8178944: @ 8178944
-	push {lr}
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8178944
-
-	thumb_func_start sub_8178958
-sub_8178958: @ 8178958
-	push {lr}
-	movs r2, 0
-	ldr r1, =gLinkPlayers
-	ldrh r0, [r1, 0x1A]
-	ldrh r1, [r1, 0x36]
-	cmp r0, r1
-	bne _08178968
-	movs r2, 0x1
-_08178968:
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8178958
-
-	thumb_func_start sub_8178974
-sub_8178974: @ 8178974
-	push {r4,lr}
-	sub sp, 0x8
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	bl ResetTasks
-	ldr r0, =sub_8178944
-	bl SetVBlankCallback
-	movs r0, 0
-	bl ResetBgsAndClearDma3BusyFlags
-	ldr r1, =gUnknown_085EFD64
-	movs r0, 0
-	movs r2, 0x1
-	bl InitBgsFromTemplates
-	ldr r0, =gUnknown_085EFD68
-	bl InitWindows
-	lsls r0, 16
-	cmp r0, 0
-	beq _08178A22
-	bl DeactivateAllTextPrinters
-	movs r4, 0
-_081789AC:
-	lsls r0, r4, 24
-	lsrs r0, 24
-	movs r1, 0
-	bl FillWindowPixelBuffer
-	adds r4, 0x1
-	cmp r4, 0x1
-	ble _081789AC
-	movs r0, 0x1E
-	str r0, [sp]
-	movs r0, 0x14
-	str r0, [sp, 0x4]
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0
-	bl FillBgTilemapBufferRect_Palette0
-	movs r0, 0
-	movs r1, 0x1
-	movs r2, 0xD0
-	bl sub_809882C
-	movs r0, 0xE0
-	bl sub_81978B0
-	movs r1, 0xA0
-	lsls r1, 1
-	movs r0, 0
-	bl SetGpuReg
-	movs r0, 0x50
-	movs r1, 0
-	bl SetGpuReg
-	ldr r0, =sub_8009404
-	movs r1, 0
-	bl CreateTask
-	bl StopMapMusic
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl RunTextPrinters
-	bl UpdatePaletteFade
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0x2
-	bl FillPalette
-	ldr r0, =sub_8178A78
-	bl SetMainCallback2
-_08178A22:
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8178974
-
-	thumb_func_start sub_8178A40
-sub_8178A40: @ 8178A40
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	adds r4, r1, 0
-	movs r5, 0x1
-	cmp r4, 0
-	bne _08178A54
-	ldr r1, =gText_EventSafelyLoaded
-	bl StringCopy
-	movs r5, 0
-_08178A54:
-	cmp r4, 0x2
-	bne _08178A5A
-	movs r5, 0
-_08178A5A:
-	cmp r4, 0x1
-	bne _08178A66
-	ldr r1, =gText_LoadErrorEndingSession
-	adds r0, r6, 0
-	bl StringCopy
-_08178A66:
-	adds r0, r5, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8178A40
-
-	thumb_func_start sub_8178A78
-sub_8178A78: @ 8178A78
-	push {r4-r6,lr}
-	sub sp, 0x8
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r0, r1, r2
-	ldrb r0, [r0]
-	adds r4, r1, 0
-	cmp r0, 0x10
-	bls _08178A8E
-	b _08178E58
-_08178A8E:
-	lsls r0, 2
-	ldr r1, =_08178AA0
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_08178AA0:
-	.4byte _08178AE4
-	.4byte _08178B12
-	.4byte _08178B48
-	.4byte _08178B80
-	.4byte _08178BCC
-	.4byte _08178BDC
-	.4byte _08178C54
-	.4byte _08178D28
-	.4byte _08178D38
-	.4byte _08178D58
-	.4byte _08178D60
-	.4byte _08178D74
-	.4byte _08178DBC
-	.4byte _08178DE0
-	.4byte _08178E0C
-	.4byte _08178E24
-	.4byte _08178E48
-_08178AE4:
-	movs r0, 0
-	movs r1, 0x1
-	movs r2, 0x1
-	movs r3, 0xD
-	bl SetWindowBorderStyle
-	movs r0, 0
-	bl PutWindowTilemap
-	movs r0, 0
-	movs r1, 0x3
-	bl CopyWindowToVram
-	movs r0, 0
-	bl ShowBg
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	b _08178E30
-_08178B12:
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _08178B20
-	b _08178E58
-_08178B20:
-	ldr r1, =gText_LinkStandby2
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r2
-	b _08178E3C
-	.pool
-_08178B48:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	cmp r0, 0
-	beq _08178B56
-	b _08178E58
-_08178B56:
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	ldr r1, =gLinkType
-	ldr r2, =0x00005501
-	adds r0, r2, 0
-	strh r0, [r1]
-	bl sub_8009734
-	b _08178E58
-	.pool
-_08178B80:
-	ldr r0, =gUnknown_030030E0
-	ldr r1, [r0]
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	bne _08178B8E
-	b _08178D00
-_08178B8E:
-	movs r0, 0x1C
-	ands r1, r0
-	cmp r1, 0x4
-	bhi _08178B98
-	b _08178D00
-_08178B98:
-	movs r0, 0x15
-	bl PlaySE
-	ldr r1, =gText_PressAToLoadEvent
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _08178D00
-	.pool
-_08178BCC:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	cmp r0, 0
-	beq _08178BDA
-	b _08178E58
-_08178BDA:
-	b _08178E34
-_08178BDC:
-	bl sub_800ABAC
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x2
-	bne _08178CD0
-	ldr r4, =gMain
-	ldrh r1, [r4, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08178C38
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_800A620
-	movs r0, 0x1
-	movs r1, 0x1
-	movs r2, 0x1
-	movs r3, 0xD
-	bl SetWindowBorderStyle
-	ldr r1, =gText_LoadingEvent
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0x1
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	movs r0, 0x1
-	bl PutWindowTilemap
-	movs r0, 0x1
-	movs r1, 0x3
-	bl CopyWindowToVram
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r4, r2
-	b _08178E3C
-	.pool
-_08178C38:
-	adds r0, r2, 0
-	ands r0, r1
-	cmp r0, 0
-	bne _08178C42
-	b _08178E58
-_08178C42:
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_80097E8
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r4, r0
-	b _08178D1E
-_08178C54:
-	bl sub_800B320
-	lsls r0, 24
-	cmp r0, 0
-	beq _08178D00
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08178C68
-	b _08178E58
-_08178C68:
-	movs r0, 0x2
-	movs r1, 0x2
-	bl sub_800A0C8
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bne _08178CAC
-	bl sub_800AC34
-	ldr r4, =gStringVar4
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8178A40
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	adds r1, r4, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r0, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r0, r2
-	b _08178CF2
-	.pool
-_08178CAC:
-	bl sub_8178958
-	lsls r0, 24
-	cmp r0, 0
-	beq _08178CCC
-	ldr r1, =gText_DontRemoveCableTurnOff
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	b _08178E34
-	.pool
-_08178CCC:
-	bl sub_80097E8
-_08178CD0:
-	ldr r4, =gStringVar4
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8178A40
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	adds r1, r4, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r0, =gMain
-	movs r1, 0x87
-	lsls r1, 3
-	adds r0, r1
-_08178CF2:
-	movs r1, 0xD
-	strb r1, [r0]
-	b _08178E58
-	.pool
-_08178D00:
-	ldr r4, =gMain
-	ldrh r1, [r4, 0x2E]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	bne _08178D0E
-	b _08178E58
-_08178D0E:
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_80097E8
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r4, r2
-_08178D1E:
-	movs r0, 0xF
-	strb r0, [r1]
-	b _08178E58
-	.pool
-_08178D28:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	cmp r0, 0
-	beq _08178D36
-	b _08178E58
-_08178D36:
-	b _08178E34
-_08178D38:
-	bl GetBlockReceivedStatus
-	lsls r0, 24
-	cmp r0, 0
-	bne _08178D44
-	b _08178E58
-_08178D44:
-	bl ResetBlockReceivedFlags
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r2
-	b _08178E3C
-	.pool
-_08178D58:
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r4, r0
-	b _08178E3C
-_08178D60:
-	bl sub_800AC34
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r2
-	b _08178E3C
-	.pool
-_08178D74:
-	ldr r0, =gReceivedRemoteLinkPlayers
-	ldrb r6, [r0]
-	cmp r6, 0
-	bne _08178E58
-	ldr r5, =0x0201c000
-	adds r0, r5, 0
-	bl RunMysteryEventScript
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	str r6, [sp, 0x4]
-	ldr r2, =0x050001f5
-	add r0, sp, 0x4
-	adds r1, r5, 0
-	bl CpuSet
-	ldr r0, =gStringVar4
-	adds r1, r4, 0
-	bl sub_8178A40
-	lsls r0, 24
-	cmp r0, 0
-	bne _08178E34
-	movs r0, 0
-	bl TrySavingData
-	b _08178E34
-	.pool
-_08178DBC:
-	ldr r1, =gStringVar4
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r1, =gMain
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r2
-	b _08178E3C
-	.pool
-_08178DE0:
-	movs r0, 0
-	bl IsTextPrinterActive
-	lsls r0, 16
-	lsrs r2, r0, 16
-	cmp r2, 0
-	bne _08178E58
-	ldr r0, =gMain
-	movs r1, 0x87
-	lsls r1, 3
-	adds r0, r1
-	ldrb r1, [r0]
-	adds r1, 0x1
-	strb r1, [r0]
-	ldr r0, =gUnknown_0203BCF8
-	strb r2, [r0]
-	b _08178E58
-	.pool
-_08178E0C:
-	ldrh r1, [r4, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08178E58
-	movs r0, 0x5
-	bl PlaySE
-	movs r2, 0x87
-	lsls r2, 3
-	adds r1, r4, r2
-	b _08178E3C
-_08178E24:
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0
-	movs r3, 0x10
-_08178E30:
-	bl BeginNormalPaletteFade
-_08178E34:
-	ldr r1, =gMain
-	movs r0, 0x87
-	lsls r0, 3
-	adds r1, r0
-_08178E3C:
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _08178E58
-	.pool
-_08178E48:
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08178E58
-	bl DoSoftReset
-_08178E58:
-	ldr r0, =gUnknown_030030E0
-	ldr r0, [r0]
-	movs r1, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _08178E98
-	bl sub_800ABBC
-	lsls r0, 24
-	cmp r0, 0
-	bne _08178E98
-	bl sub_80097E8
-	ldr r4, =gStringVar4
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl sub_8178A40
-	movs r0, 0x1
-	str r0, [sp]
-	movs r0, 0
-	adds r1, r4, 0
-	movs r2, 0x1
-	movs r3, 0x2
-	bl sub_8178EC4
-	ldr r0, =gMain
-	movs r1, 0x87
-	lsls r1, 3
-	adds r0, r1
-	movs r1, 0xD
-	strb r1, [r0]
-_08178E98:
-	bl RunTasks
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl RunTextPrinters
-	bl UpdatePaletteFade
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8178A78
-
-	thumb_func_start sub_8178EC4
-sub_8178EC4: @ 8178EC4
-	push {r4-r6,lr}
-	mov r6, r10
-	mov r5, r9
-	mov r4, r8
-	push {r4-r6}
-	sub sp, 0x1C
-	adds r5, r0, 0
-	mov r10, r1
-	adds r6, r2, 0
-	ldr r4, [sp, 0x38]
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r6, 24
-	lsrs r6, 24
-	lsls r3, 24
-	lsrs r3, 24
-	movs r0, 0
-	mov r9, r0
-	movs r1, 0x1
-	mov r8, r1
-	add r0, sp, 0x14
-	mov r1, r8
-	strb r1, [r0]
-	adds r1, r0, 0
-	movs r0, 0x2
-	strb r0, [r1, 0x1]
-	movs r0, 0x3
-	strb r0, [r1, 0x2]
-	adds r0, r1, 0
-	ldrb r0, [r0]
-	lsls r1, r0, 4
-	orrs r1, r0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	str r3, [sp, 0x18]
-	bl FillWindowPixelBuffer
-	mov r0, r9
-	str r0, [sp]
-	mov r1, r8
-	str r1, [sp, 0x4]
-	add r0, sp, 0x14
-	str r0, [sp, 0x8]
-	lsls r4, 24
-	asrs r4, 24
-	str r4, [sp, 0xC]
-	mov r1, r10
-	str r1, [sp, 0x10]
-	adds r0, r5, 0
-	movs r1, 0x1
-	adds r2, r6, 0
-	ldr r3, [sp, 0x18]
-	bl AddTextPrinterParametrized2
-	add sp, 0x1C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8178EC4
-
-	.align 2, 0 @ Don't pad with nop.

asm/new_menu_helpers.s

@@ -95,9 +95,9 @@ sub_8197224: @ 8197224
 	bx r1
 	thumb_func_end sub_8197224
 
-	thumb_func_start AddTextPrinterParametrized
-@ u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor)
-AddTextPrinterParametrized: @ 8197238
+	thumb_func_start AddTextPrinterParameterized
+@ u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor)
+AddTextPrinterParameterized: @ 8197238
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
@@ -166,7 +166,7 @@ AddTextPrinterParametrized: @ 8197238
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end AddTextPrinterParametrized
+	thumb_func_end AddTextPrinterParameterized
 
 	thumb_func_start AddTextPrinterForMessage
 @ void AddTextPrinterForMessage(u8 allowSkippingDelayWithButtonPress)
@@ -198,7 +198,7 @@ AddTextPrinterForMessage: @ 81972C4
 	str r0, [sp, 0xC]
 	movs r0, 0
 	movs r1, 0x1
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r4,r5}
 	pop {r0}
@@ -236,7 +236,7 @@ AddTextPrinterForMessage_2: @ 8197310
 	str r0, [sp, 0xC]
 	movs r0, 0
 	movs r1, 0x1
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r4}
 	pop {r0}
@@ -273,7 +273,7 @@ AddTextPrinterWithCustomSpeedForMessage: @ 819735C
 	str r0, [sp, 0xC]
 	movs r0, 0
 	movs r1, 0x1
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r4,r5}
 	pop {r0}

asm/option_menu.s

@@ -1,10 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-
-	.align 2, 0 @ Don't pad with nop.

asm/overworld.s

@@ -1383,7 +1383,7 @@ _080850C8:
 	adds r1, r5, 0
 	bl TryUpdateRandomTrainerRematches
 	bl DoTimeBasedEvents
-	bl sub_80AEDBC
+	bl SetSav1WeatherFromCurrMapHeader
 	bl sub_8085B2C
 	bl update_sav1_flash_used_on_map
 	bl Overworld_ClearSavedMusic
@@ -1483,7 +1483,7 @@ _080851A2:
 	beq _080851EE
 	bl DoTimeBasedEvents
 _080851EE:
-	bl sub_80AEDBC
+	bl SetSav1WeatherFromCurrMapHeader
 	bl sub_8085B2C
 	cmp r5, 0
 	beq _08085200
@@ -3584,7 +3584,7 @@ sub_808631C: @ 808631C
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _0808632E
-	bl sub_80097E8
+	bl CloseLink
 _0808632E:
 	ldr r0, =gLinkVSyncDisabled
 	ldrb r0, [r0]
@@ -3637,7 +3637,7 @@ VBlankCB_Field: @ 8086390
 	push {lr}
 	bl LoadOam
 	bl ProcessSpriteCopyRequests
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 	bl FieldUpdateBgTilemapScroll
 	bl TransferPlttBuffer
 	bl TransferTilesetAnimsBuffer
@@ -3657,7 +3657,7 @@ sub_80863B0: @ 80863B0
 	ldr r0, [r2]
 	ldr r1, [r2, 0x4]
 	ldr r2, [r2, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	b _080863F0
 	.pool
 _080863D4:
@@ -3671,7 +3671,7 @@ _080863D4:
 	ldr r0, [r2]
 	ldr r1, [r2, 0x4]
 	ldr r2, [r2, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 _080863F0:
 	pop {r0}
 	bx r0
@@ -4294,7 +4294,7 @@ sub_8086988: @ 8086988
 	bl ResetTasks
 	bl ResetSpriteData
 	bl ResetPaletteFade
-	bl dp12_8087EA4
+	bl ScanlineEffect_Clear
 	bl dp13_810BB8C
 	bl ResetCameraUpdateInfo
 	bl InstallCameraPanAheadCallback
@@ -6698,7 +6698,7 @@ _08087C38:
 	lsls r1, 30
 	lsrs r1, 31
 	movs r0, 0
-	bl sub_808BD3C
+	bl GetRivalAvatarGraphicsIdByStateIdAndGender
 _08087C44:
 	lsls r0, 24
 	lsrs r0, 24

asm/party_menu.s

@@ -4268,7 +4268,7 @@ _081B243E:
 	adds r0, r4, 0
 	movs r1, 0
 	movs r3, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	adds r0, r4, 0
 	bl PutWindowTilemap
 	adds r0, r4, 0
@@ -5946,7 +5946,7 @@ _081B328C:
 	str r1, [sp, 0x10]
 	movs r1, 0x1
 	mov r2, r9
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	adds r0, r5, 0x1
 	lsls r0, 24
 	lsrs r5, r0, 24
@@ -6007,7 +6007,7 @@ sub_81B3300: @ 81B3300
 	movs r0, 0x6
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r4}
 	pop {r0}
@@ -10415,7 +10415,7 @@ party_menu_link_mon_icon_anim: @ 81B5A2C
 	ldr r0, [sp, 0x20]
 	str r0, [sp, 0x8]
 	adds r0, r5, 0
-	bl sub_80D2CC4
+	bl CreateMonIcon
 	strb r0, [r4, 0x9]
 	ldr r2, =gSprites
 	ldrb r0, [r4, 0x9]
@@ -17171,7 +17171,7 @@ sub_81B9404: @ 81B9404
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_81B9424
 	movs r1, 0xA
 	bl CreateTask
@@ -17247,7 +17247,7 @@ sub_81B94B0: @ 81B94B0
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_81B94D0
 	movs r1, 0xA
 	bl CreateTask
@@ -17297,7 +17297,7 @@ sub_81B951C: @ 81B951C
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_81B953C
 	movs r1, 0xA
 	bl CreateTask
@@ -17418,7 +17418,7 @@ sub_81B9620: @ 81B9620
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_81B9640
 	movs r1, 0xA
 	bl CreateTask

asm/player_pc.s

@@ -552,7 +552,7 @@ sub_816B2C8: @ 816B2C8
 	str r0, [r1]
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	pop {r0}
 	bx r0
 	.pool
@@ -1221,7 +1221,7 @@ sub_816B878: @ 816B878
 	lsrs r4, 24
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r1, =gTasks
 	lsls r0, r4, 2
 	adds r0, r4
@@ -1494,7 +1494,7 @@ sub_816BABC: @ 816BABC
 _0816BAD4:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =gTasks
 	lsls r1, r4, 2
 	adds r1, r4
@@ -2150,7 +2150,7 @@ _0816C030:
 	movs r1, 0x1
 	movs r2, 0
 	adds r3, r6, 0
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 _0816C050:
 	add sp, 0x14
 	pop {r4-r6}

asm/pokedex.s

@@ -3035,7 +3035,7 @@ sub_80BCE2C: @ 80BCE2C
 	str r4, [sp, 0xC]
 	str r2, [sp, 0x10]
 	mov r2, r8
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x18
 	pop {r3}
 	mov r8, r3
@@ -6163,7 +6163,7 @@ sub_80BE8DC: @ 80BE8DC
 	movs r0, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x18
 	pop {r4,r5}
 	pop {r0}
@@ -9974,7 +9974,7 @@ sub_80C0A88: @ 80C0A88
 	str r4, [sp, 0xC]
 	str r1, [sp, 0x10]
 	movs r1, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x18
 	pop {r4-r6}
 	pop {r0}
@@ -11022,7 +11022,7 @@ sub_80C1270: @ 80C1270
 	movs r0, 0
 	movs r1, 0x1
 	adds r2, r5, 0
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x18
 	pop {r4,r5}
 	pop {r0}

asm/pokemon_icon.s

@@ -5,9 +5,9 @@
 
 	.text
 
-	thumb_func_start sub_80D2CC4
-@ int sub_80D2CC4(u16 speciesId, int a2, u16 a3, u16 a4, u8 a5, u32 personality, int a7)
-sub_80D2CC4: @ 80D2CC4
+	thumb_func_start CreateMonIcon
+@ int CreateMonIcon(u16 speciesId, int a2, u16 a3, u16 a4, u8 a5, u32 personality, int a7)
+CreateMonIcon: @ 80D2CC4
 	push {r4-r7,lr}
 	mov r7, r9
 	mov r6, r8
@@ -84,7 +84,7 @@ _080D2D2A:
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sub_80D2CC4
+	thumb_func_end CreateMonIcon
 
 	thumb_func_start sub_80D2D78
 sub_80D2D78: @ 80D2D78

asm/pokemon_storage_system.s

@@ -233,7 +233,7 @@ _080C72AC:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0xFF
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	movs r0, 0
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -339,7 +339,7 @@ _080C7392:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	b _080C756A
 	.pool
 _080C73D0:
@@ -406,7 +406,7 @@ _080C7428:
 _080C745C:
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	movs r0, 0x4
 	strh r0, [r5, 0x8]
 	b _080C756A
@@ -509,7 +509,7 @@ _080C7532:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	strh r4, [r5, 0x8]
 	b _080C756A
 	.pool

asm/pokemon_summary_screen.s

@@ -2049,7 +2049,7 @@ sub_81C4F24: @ 81C4F24
 	bl ScriptContext2_Enable
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	ldr r0, =sub_81C4F44
 	movs r1, 0xA
 	bl CreateTask
@@ -5362,7 +5362,7 @@ sub_81C6C3C: @ 81C6C3C
 	str r4, [sp, 0xC]
 	str r1, [sp, 0x10]
 	movs r1, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x14
 	pop {r3}
 	mov r8, r3
@@ -5408,7 +5408,7 @@ sub_81C6C94: @ 81C6C94
 	str r4, [sp, 0xC]
 	str r1, [sp, 0x10]
 	movs r1, 0x7
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x14
 	pop {r3}
 	mov r8, r3

asm/pokenav.s

@@ -44,7 +44,7 @@ sub_81C72A4: @ 81C72A4
 	bl SetMainCallback2
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	pop {r0}
 	bx r0
 	.pool
@@ -7068,7 +7068,7 @@ sub_81CA914: @ 81CA914
 	bl TransferPlttBuffer
 	bl LoadOam
 	bl ProcessSpriteCopyRequests
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 	pop {r0}
 	bx r0
 	thumb_func_end sub_81CA914
@@ -7101,7 +7101,7 @@ titlescreen_0: @ 81CA92C
 	ldr r0, [r2]
 	ldr r1, [r2, 0x4]
 	ldr r2, [r2, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	ldr r0, =sub_81CA914
 	bl c3args_set_0toR1_1to0
 	ldr r0, =sub_81CA9EC
@@ -7220,7 +7220,7 @@ sub_81CAA3C: @ 81CAA3C
 	mov r0, sp
 	movs r6, 0
 	strh r6, [r0]
-	ldr r5, =gUnknown_02038C28
+	ldr r5, =gScanlineEffectRegBuffers
 	ldr r0, =0x010000a0
 	mov r8, r0
 	mov r0, sp
@@ -15647,7 +15647,7 @@ sub_81CEE44: @ 81CEE44
 	bl TransferPlttBuffer
 	adds r0, r4, 0
 	bl sub_81D2108
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -21900,7 +21900,7 @@ _081D1D8C:
 	movs r1, 0x1
 	movs r2, 0x8
 	adds r3, r5, 0
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 _081D1DAC:
 	add sp, 0x34
 	pop {r4,r5}
@@ -22318,7 +22318,7 @@ sub_81D20BC: @ 81D20BC
 	b _081D20FA
 	.pool
 _081D20D4:
-	bl dp12_8087EA4
+	bl ScanlineEffect_Clear
 	ldrb r0, [r4]
 	adds r0, 0x1
 	strb r0, [r4]
@@ -22332,7 +22332,7 @@ _081D20E2:
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	ldrb r0, [r4]
 	adds r0, 0x1
 	strb r0, [r4]
@@ -22366,7 +22366,7 @@ sub_81D2108: @ 81D2108
 	adds r0, r6, 0
 	bl sub_81D2634
 	movs r7, 0
-	ldr r5, =gUnknown_02038C28
+	ldr r5, =gScanlineEffectRegBuffers
 	mov r12, r5
 	movs r0, 0xF0
 	lsls r0, 3
@@ -23765,7 +23765,7 @@ sub_81D2BF4: @ 81D2BF4
 	str r0, [sp, 0xC]
 	movs r1, 0x1
 	adds r2, r4, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r4}
 	pop {r0}
@@ -28072,7 +28072,7 @@ sub_81D4E30: @ 81D4E30
 	ldr r2, =0x00005503
 	adds r0, r2, 0
 	strh r0, [r1]
-	bl sub_8009734
+	bl OpenLink
 	movs r0, 0x1
 	bl sub_800B330
 	pop {r0}
@@ -28128,11 +28128,11 @@ _081D4EBA:
 	thumb_func_start sub_81D4EC0
 sub_81D4EC0: @ 81D4EC0
 	push {lr}
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	cmp r0, 0
 	beq _081D4EDC
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -28186,11 +28186,11 @@ _081D4F20:
 	.4byte _081D4FEC
 	.4byte _081D4FF8
 _081D4F38:
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	cmp r0, 0
 	beq _081D4F88
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -28212,7 +28212,7 @@ _081D4F54:
 	strb r0, [r4]
 	b _081D500C
 _081D4F6C:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x2
@@ -28248,7 +28248,7 @@ _081D4FA0:
 	movs r0, 0x5
 	b _081D500E
 _081D4FB6:
-	bl sub_800B320
+	bl IsLinkConnectionEstablished
 	lsls r0, 24
 	cmp r0, 0
 	beq _081D500C
@@ -28447,7 +28447,7 @@ _081D515C:
 	beq _081D5166
 	b _081D52FC
 _081D5166:
-	bl sub_80097E8
+	bl CloseLink
 	b _081D525C
 _081D516C:
 	adds r0, r4, 0
@@ -28500,20 +28500,20 @@ _081D51D0:
 	beq _081D51F4
 	movs r0, 0x5
 	bl PlaySE
-	bl sub_80097E8
+	bl CloseLink
 	adds r0, r4, 0
 	bl sub_81D505C
 	b _081D535A
 	.pool
 _081D51F4:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	bls _081D5210
 	adds r0, r4, 0
 	bl sub_81D505C
-	bl sub_80097E8
+	bl CloseLink
 	movs r0, 0x7
 	strb r0, [r4, 0x8]
 	b _081D548A
@@ -28523,7 +28523,7 @@ _081D5210:
 	beq _081D522E
 	movs r0, 0x5
 	bl PlaySE
-	bl sub_80097E8
+	bl CloseLink
 	adds r0, r4, 0
 	bl sub_81D505C
 	movs r0, 0x8
@@ -28537,7 +28537,7 @@ _081D522E:
 	bne _081D523C
 	b _081D548A
 _081D523C:
-	bl sub_80097E8
+	bl CloseLink
 	bl sub_81D4E30
 	adds r0, r4, 0
 	bl sub_81D505C
@@ -28654,13 +28654,13 @@ _081D5340:
 _081D5350:
 	movs r0, 0x5
 	bl PlaySE
-	bl sub_80097E8
+	bl CloseLink
 _081D535A:
 	movs r0, 0x17
 	strb r0, [r4, 0x8]
 	b _081D548A
 _081D5360:
-	bl sub_80097E8
+	bl CloseLink
 	movs r0, 0x15
 	strb r0, [r4, 0x8]
 	b _081D548A
@@ -28670,7 +28670,7 @@ _081D536A:
 	cmp r0, 0
 	beq _081D537A
 _081D5374:
-	bl sub_80097E8
+	bl CloseLink
 	b _081D53C0
 _081D537A:
 	bl GetBlockReceivedStatus

asm/rayquaza_scene.s

@@ -1058,7 +1058,7 @@ _081D6FC8:
 sub_81D6FD0: @ 81D6FD0
 	push {lr}
 	bl sub_81D67EC
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 	pop {r0}
 	bx r0
 	thumb_func_end sub_81D6FD0
@@ -1183,12 +1183,12 @@ sub_81D7134: @ 81D7134
 	lsls r6, r1, 3
 	ldr r7, =gTasks + 0x8
 	adds r5, r6, r7
-	bl dp12_8087EA4
+	bl ScanlineEffect_Clear
 	bl sub_81D6FE0
 	bl sub_81D706C
 	movs r4, 0
 	str r4, [sp, 0x4]
-	ldr r1, =gUnknown_02038C28
+	ldr r1, =gScanlineEffectRegBuffers
 	ldr r2, =0x010003c0
 	add r0, sp, 0x4
 	bl CpuFastSet
@@ -1196,7 +1196,7 @@ sub_81D7134: @ 81D7134
 	ldr r0, [r2]
 	ldr r1, [r2, 0x4]
 	ldr r2, [r2, 0x8]
-	bl sub_80BA038
+	bl ScanlineEffect_SetParams
 	strh r4, [r5]
 	ldr r0, =sub_81D7228
 	movs r1, 0
@@ -1278,7 +1278,7 @@ sub_81D7228: @ 81D7228
 	adds r3, r1, r0
 	movs r1, 0x18
 	ldr r7, =gUnknown_0203CF60
-	ldr r4, =gUnknown_02038C28
+	ldr r4, =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r5, r4, r0

asm/record_mixing.s

@@ -765,10 +765,10 @@ _080E73B0:
 	movs r0, 0x65
 	b _080E7564
 _080E73B8:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -796,7 +796,7 @@ _080E73EA:
 _080E73F8:
 	bl sub_800AA48
 	adds r4, r0, 0
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r4, 24
 	lsls r0, 24
 	cmp r4, r0
@@ -808,7 +808,7 @@ _080E740C:
 	strh r4, [r5, 0x20]
 	lsls r4, 16
 	asrs r4, 16
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	lsls r1, r0, 4
@@ -824,7 +824,7 @@ _080E742A:
 _080E7432:
 	bl sub_800AA48
 	adds r4, r0, 0
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r4, 24
 	lsls r0, 24
 	cmp r4, r0
@@ -868,7 +868,7 @@ _080E746E:
 	b _080E7564
 	.pool
 _080E7490:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0

asm/reset_rtc_screen.s

@@ -888,7 +888,7 @@ _0809EFCA:
 	bl ResetOamRange
 	bl LoadOam
 	bl ScanlineEffect_Stop
-	bl dp12_8087EA4
+	bl ScanlineEffect_Clear
 	bl ResetSpriteData
 	bl ResetTasks
 	bl ResetPaletteFade

asm/script_menu.s

@@ -877,7 +877,7 @@ ScriptMenu_DisplayPCStartupPrompt: @ 80E2514
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	add sp, 0x10
 	pop {r0}
 	bx r0
@@ -1606,7 +1606,7 @@ _080E2B12:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	b _080E2B70
 	.pool
 _080E2B40:
@@ -1630,7 +1630,7 @@ _080E2B40:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 _080E2B70:
 	add sp, 0x10
 	pop {r4}

asm/script_movement.s

@@ -553,7 +553,7 @@ _080D36DC:
 	adds r1, r6, 0
 	bl sub_80D355C
 	adds r0, r4, 0
-	bl sub_8097404
+	bl FreezeMapObject
 	b _080D370E
 	.pool
 _080D36F8:

asm/shop.s

@@ -188,7 +188,7 @@ HandleShopMenuBuy: @ 80DFBD0
 	str r0, [r1]
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -216,7 +216,7 @@ HandleShopMenuSell: @ 80DFC0C
 	str r0, [r1]
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -839,7 +839,7 @@ _080E0176:
 	adds r0, r6, 0
 	movs r1, 0x7
 	adds r3, r7, 0
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 _080E01AC:
 	add sp, 0x14
 	pop {r4-r7}
@@ -1201,7 +1201,7 @@ BuyMenuPrint: @ 80E04A4
 	str r6, [sp, 0xC]
 	str r1, [sp, 0x10]
 	movs r1, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	add sp, 0x14
 	pop {r4-r6}
 	pop {r0}

asm/slot_machine.s

@@ -8934,7 +8934,7 @@ sub_812EB48: @ 812EB48
 	ldrb r3, [r1]
 	adds r1, r3, 0
 	adds r2, r3, 0
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	ldrh r0, [r4, 0x38]
 	adds r0, 0x1
 	movs r1, 0x1
@@ -8979,7 +8979,7 @@ sub_812EBCC: @ 812EBCC
 	movs r1, 0
 	movs r2, 0
 	movs r3, 0
-	bl sub_80B609C
+	bl MultiplyInvertedPaletteRGBComponents
 	movs r4, 0
 _0812EBEA:
 	ldr r0, =gUnknown_0203AB34

asm/start_menu.s

@@ -449,7 +449,7 @@ _0809FB34:
 	beq _0809FBA0
 	movs r0, 0x1
 	movs r1, 0
-	bl fade_screen
+	bl FadeScreen
 	b _0809FBA0
 	.pool
 _0809FB98:
@@ -1561,7 +1561,7 @@ _080A0490:
 	bl ResetSpriteData
 	bl ResetTasks
 	bl ResetPaletteFade
-	bl dp12_8087EA4
+	bl ScanlineEffect_Clear
 	b _080A04FC
 _080A04A2:
 	movs r0, 0
@@ -1695,7 +1695,7 @@ _080A05AC:
 	movs r0, 0
 	movs r1, 0x1
 	movs r3, 0xFF
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized
 	movs r0, 0
 	movs r1, 0x8
 	movs r2, 0xE

asm/time_events.s

@@ -1,225 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start GetMirageRnd
-GetMirageRnd: @ 8137890
-	push {r4,lr}
-	ldr r0, =0x00004024
-	bl VarGet
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	ldr r0, =0x00004025
-	bl VarGet
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r4, 16
-	orrs r4, r0
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end GetMirageRnd
-
-	thumb_func_start SetMirageRnd
-SetMirageRnd: @ 81378BC
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, =0x00004024
-	lsrs r1, r4, 16
-	bl VarSet
-	ldr r0, =0x00004025
-	lsls r4, 16
-	lsrs r4, 16
-	adds r1, r4, 0
-	bl VarSet
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end SetMirageRnd
-
-	thumb_func_start InitMirageRnd
-InitMirageRnd: @ 81378E4
-	push {r4,lr}
-	bl Random
-	adds r4, r0, 0
-	bl Random
-	lsls r4, 16
-	lsls r0, 16
-	lsrs r0, 16
-	orrs r4, r0
-	adds r0, r4, 0
-	bl SetMirageRnd
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end InitMirageRnd
-
-	thumb_func_start UpdateMirageRnd
-UpdateMirageRnd: @ 8137904
-	push {r4,lr}
-	lsls r0, 16
-	lsrs r4, r0, 16
-	bl GetMirageRnd
-	adds r1, r0, 0
-	cmp r4, 0
-	beq _08137928
-	ldr r3, =0x41c64e6d
-	ldr r2, =0x00003039
-_08137918:
-	adds r0, r1, 0
-	muls r0, r3
-	adds r1, r0, r2
-	subs r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0
-	bne _08137918
-_08137928:
-	adds r0, r1, 0
-	bl SetMirageRnd
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end UpdateMirageRnd
-
-	thumb_func_start IsMirageIslandPresent
-IsMirageIslandPresent: @ 813793C
-	push {r4-r6,lr}
-	bl GetMirageRnd
-	lsrs r6, r0, 16
-	movs r5, 0
-_08137946:
-	movs r0, 0x64
-	adds r1, r5, 0
-	muls r1, r0
-	ldr r0, =gPlayerParty
-	adds r4, r1, r0
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetMonData
-	cmp r0, 0
-	beq _08137978
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	ldr r1, =0x0000ffff
-	ands r1, r0
-	cmp r1, r6
-	bne _08137978
-	movs r0, 0x1
-	b _08137980
-	.pool
-_08137978:
-	adds r5, 0x1
-	cmp r5, 0x5
-	ble _08137946
-	movs r0, 0
-_08137980:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end IsMirageIslandPresent
-
-	thumb_func_start UpdateShoalTideFlag
-UpdateShoalTideFlag: @ 8137988
-	push {lr}
-	bl get_map_light_from_warp0
-	lsls r0, 24
-	lsrs r0, 24
-	bl is_light_level_1_2_3_5_or_6
-	lsls r0, 24
-	cmp r0, 0
-	beq _081379CE
-	bl RtcCalcLocalTime
-	ldr r1, =gUnknown_085B2B44
-	ldr r0, =gLocalTime
-	ldrb r0, [r0, 0x2]
-	lsls r0, 24
-	asrs r0, 24
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _081379C8
-	ldr r0, =0x0000089a
-	bl FlagSet
-	b _081379CE
-	.pool
-_081379C8:
-	ldr r0, =0x0000089a
-	bl FlagClear
-_081379CE:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end UpdateShoalTideFlag
-
-	thumb_func_start Task_WaitWeather
-Task_WaitWeather: @ 81379D8
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	bl sub_80AC3BC
-	lsls r0, 24
-	cmp r0, 0
-	beq _081379F2
-	bl EnableBothScriptContexts
-	adds r0, r4, 0
-	bl DestroyTask
-_081379F2:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end Task_WaitWeather
-
-	thumb_func_start WaitWeather
-WaitWeather: @ 81379F8
-	push {lr}
-	ldr r0, =Task_WaitWeather
-	movs r1, 0x50
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end WaitWeather
-
-	thumb_func_start InitBirchState
-InitBirchState: @ 8137A0C
-	push {lr}
-	ldr r0, =0x00004049
-	bl GetVarPointer
-	movs r1, 0
-	strh r1, [r0]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end InitBirchState
-
-	thumb_func_start UpdateBirchState
-UpdateBirchState: @ 8137A20
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	ldr r0, =0x00004049
-	bl GetVarPointer
-	adds r5, r0, 0
-	ldrh r0, [r5]
-	adds r4, r0
-	strh r4, [r5]
-	ldrh r0, [r5]
-	movs r1, 0x7
-	bl __umodsi3
-	strh r0, [r5]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end UpdateBirchState

asm/title_screen.s

@@ -464,7 +464,7 @@ _080AA766:
 @ void title_screen_vblank_callback()
 title_screen_vblank_callback: @ 80AA780
 	push {lr}
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 	bl LoadOam
 	bl ProcessSpriteCopyRequests
 	bl TransferPlttBuffer
@@ -779,7 +779,7 @@ _080AAAF0:
 	movs r1, 0xA0
 	movs r2, 0x4
 	movs r3, 0x4
-	bl sub_80BA384
+	bl ScanlineEffect_InitWave
 	ldr r0, =c2_title_screen_2
 	bl SetMainCallback2
 _080AAB1E:

asm/trade.s

@@ -416,12 +416,12 @@ _080774B2:
 	cmp r0, 0
 	beq _08077528
 	bl sub_800B488
-	bl sub_8009734
+	bl OpenLink
 	bl sub_8011BA4
 	b _08077B46
 	.pool
 _08077528:
-	bl sub_8009734
+	bl OpenLink
 	ldr r0, =gMain
 	movs r7, 0x87
 	lsls r7, 3
@@ -466,7 +466,7 @@ _0807757A:
 	b _08077B22
 	.pool
 _0807758C:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	adds r4, r0, 0
 	bl sub_800AA48
 	lsls r4, 24
@@ -475,7 +475,7 @@ _0807758C:
 	bcs _080775A0
 	b _08077B46
 _080775A0:
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	cmp r0, 0
 	beq _080775D8
@@ -646,7 +646,7 @@ _080776E2:
 	str r1, [sp, 0x8]
 	adds r0, r5, 0
 	ldr r1, =sub_80D3014
-	bl sub_80D2CC4
+	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
 	adds r1, 0x28
@@ -705,7 +705,7 @@ _08077756:
 	str r0, [sp, 0x8]
 	adds r0, r5, 0
 	ldr r1, =sub_80D3014
-	bl sub_80D2CC4
+	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
 	adds r1, 0x2E
@@ -1264,7 +1264,7 @@ _08077CA8:
 	str r1, [sp, 0x8]
 	adds r0, r5, 0
 	ldr r1, =sub_80D3014
-	bl sub_80D2CC4
+	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
 	adds r1, 0x28
@@ -1323,7 +1323,7 @@ _08077D1E:
 	str r0, [sp, 0x8]
 	adds r0, r5, 0
 	ldr r1, =sub_80D3014
-	bl sub_80D2CC4
+	bl CreateMonIcon
 	mov r2, r8
 	ldr r1, [r2]
 	adds r1, 0x2E
@@ -4609,7 +4609,7 @@ _080798BC:
 	movs r1, 0x1
 	movs r2, 0
 	movs r3, 0
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	adds r0, r5, 0
 	bl PutWindowTilemap
 	adds r0, r5, 0
@@ -7026,7 +7026,7 @@ _0807AC92:
 	lsls r0, 1
 	cmp r1, r0
 	bls _0807ACC4
-	bl sub_80097E8
+	bl CloseLink
 	ldr r0, =c2_800ACD4
 	bl SetMainCallback2
 	ldr r1, [r4]
@@ -7264,7 +7264,7 @@ _0807AEAC:
 	ldr r2, =0x00001144
 	adds r0, r2, 0
 	strh r0, [r1]
-	bl sub_80097E8
+	bl CloseLink
 _0807AEC0:
 	ldr r4, =gUnknown_020322A0
 	movs r5, 0x80
@@ -7332,7 +7332,7 @@ _0807AF58:
 	adds r0, 0xFA
 	movs r1, 0x1
 	strb r1, [r0]
-	bl sub_8009734
+	bl OpenLink
 	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3
@@ -7369,13 +7369,13 @@ _0807AFAC:
 	b _0807B0E4
 	.pool
 _0807AFBC:
-	bl sub_800ABBC
+	bl IsLinkMaster
 	lsls r0, 24
 	cmp r0, 0
 	bne _0807AFC8
 	b _0807B0DC
 _0807AFC8:
-	bl sub_800ABAC
+	bl GetLinkPlayerCount_2
 	adds r4, r0, 0
 	bl sub_800AA48
 	lsls r4, 24
@@ -14296,7 +14296,7 @@ sub_807F1A8: @ 807F1A8
 	movs r1, 0x1
 	movs r2, 0
 	movs r3, 0x2
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	adds r0, r5, 0
 	movs r1, 0x3
 	bl CopyWindowToVram

asm/trainer_card.s

@@ -18,7 +18,7 @@ sub_80C2690: @ 80C2690
 	cmp r0, 0
 	beq _080C26C0
 	ldr r1, =0x040000d4
-	ldr r0, =gUnknown_02038C28
+	ldr r0, =gScanlineEffectRegBuffers
 	str r0, [r1]
 	movs r2, 0xF0
 	lsls r2, 3
@@ -40,7 +40,7 @@ sub_80C26D4: @ 80C26D4
 	ldrh r3, [r4]
 	movs r0, 0
 	strh r0, [r4]
-	ldr r1, =gUnknown_02038C28
+	ldr r1, =gScanlineEffectRegBuffers
 	ldr r0, =0x04000006
 	ldrh r2, [r0]
 	movs r0, 0xFF
@@ -3977,9 +3977,9 @@ sub_80C4998: @ 80C4998
 	movs r0, 0x3
 	bl HideBg
 	bl ScanlineEffect_Stop
-	bl dp12_8087EA4
+	bl ScanlineEffect_Clear
 	movs r1, 0
-	ldr r0, =gUnknown_02038C28
+	ldr r0, =gScanlineEffectRegBuffers
 	movs r2, 0
 	movs r3, 0xF0
 	lsls r3, 3
@@ -4066,7 +4066,7 @@ _080C4A0E:
 	movs r2, 0
 	cmp r2, r7
 	bcs _080C4A78
-	ldr r3, =gUnknown_02038C28
+	ldr r3, =gScanlineEffectRegBuffers
 _080C4A60:
 	lsls r0, r2, 16
 	asrs r0, 16
@@ -4091,7 +4091,7 @@ _080C4A78:
 	lsrs r7, r4, 16
 	cmp r1, r0
 	bge _080C4AB0
-	ldr r0, =gUnknown_02038C28
+	ldr r0, =gScanlineEffectRegBuffers
 	mov r12, r0
 	adds r4, r3, 0
 _080C4A92:
@@ -4116,7 +4116,7 @@ _080C4AB0:
 	asrs r0, r1, 16
 	cmp r0, 0x9F
 	bgt _080C4ACE
-	ldr r2, =gUnknown_02038C28
+	ldr r2, =gScanlineEffectRegBuffers
 _080C4ABC:
 	asrs r0, r1, 16
 	lsls r1, r0, 1
@@ -4392,7 +4392,7 @@ _080C4CB6:
 	movs r2, 0
 	cmp r2, r7
 	bcs _080C4D20
-	ldr r3, =gUnknown_02038C28
+	ldr r3, =gScanlineEffectRegBuffers
 _080C4D08:
 	lsls r0, r2, 16
 	asrs r0, 16
@@ -4417,7 +4417,7 @@ _080C4D20:
 	lsrs r7, r4, 16
 	cmp r1, r0
 	bge _080C4D56
-	ldr r0, =gUnknown_02038C28
+	ldr r0, =gScanlineEffectRegBuffers
 	mov r12, r0
 	adds r4, r3, 0
 _080C4D3A:
@@ -4441,7 +4441,7 @@ _080C4D56:
 	asrs r0, r1, 16
 	cmp r0, 0x9F
 	bgt _080C4D74
-	ldr r2, =gUnknown_02038C28
+	ldr r2, =gScanlineEffectRegBuffers
 _080C4D62:
 	asrs r0, r1, 16
 	lsls r1, r0, 1
@@ -8258,7 +8258,7 @@ _080C6E08:
 	str r1, [sp, 0x10]
 	movs r1, 0x1
 	movs r3, 0x1
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	ldr r0, [sp, 0x4C]
 	mov r10, r4
 	cmp r0, 0x6
@@ -8410,7 +8410,7 @@ sub_80C6EAC: @ 80C6EAC
 	movs r1, 0x1
 	movs r2, 0
 	movs r3, 0x2
-	bl AddTextPrinterParametrized2
+	bl AddTextPrinterParameterized2
 	lsrs r5, 1
 	adds r0, r7, 0
 	ldr r1, [sp, 0x24]

asm/unknown_task.s

@@ -1,593 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start ScanlineEffect_Stop
-ScanlineEffect_Stop: @ 80B9FB8
-	push {r4,lr}
-	ldr r4, =gUnknown_02039B28
-	movs r0, 0
-	strb r0, [r4, 0x15]
-	ldr r1, =0x040000b0
-	ldrh r2, [r1, 0xA]
-	ldr r0, =0x0000c5ff
-	ands r0, r2
-	strh r0, [r1, 0xA]
-	ldrh r2, [r1, 0xA]
-	ldr r0, =0x00007fff
-	ands r0, r2
-	strh r0, [r1, 0xA]
-	ldrh r0, [r1, 0xA]
-	ldrb r0, [r4, 0x18]
-	cmp r0, 0xFF
-	beq _080B9FE2
-	bl DestroyTask
-	movs r0, 0xFF
-	strb r0, [r4, 0x18]
-_080B9FE2:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ScanlineEffect_Stop
-
-	thumb_func_start dp12_8087EA4
-dp12_8087EA4: @ 80B9FF8
-	push {r4,lr}
-	sub sp, 0x4
-	mov r0, sp
-	movs r4, 0
-	strh r4, [r0]
-	ldr r1, =gUnknown_02038C28
-	ldr r2, =0x01000780
-	bl CpuSet
-	ldr r0, =gUnknown_02039B28
-	movs r1, 0
-	str r1, [r0]
-	str r1, [r0, 0x4]
-	str r1, [r0, 0x8]
-	str r1, [r0, 0xC]
-	strb r4, [r0, 0x14]
-	strb r4, [r0, 0x15]
-	strb r4, [r0, 0x16]
-	strb r4, [r0, 0x17]
-	movs r1, 0xFF
-	strb r1, [r0, 0x18]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end dp12_8087EA4
-
-	thumb_func_start sub_80BA038
-sub_80BA038: @ 80BA038
-	push {lr}
-	sub sp, 0xC
-	str r0, [sp]
-	str r1, [sp, 0x4]
-	str r2, [sp, 0x8]
-	ldr r0, =0xa2600001
-	cmp r1, r0
-	bne _080BA06C
-	ldr r0, =gUnknown_02039B28
-	ldr r1, =gUnknown_02038C2A
-	str r1, [r0]
-	movs r2, 0xF0
-	lsls r2, 3
-	adds r1, r2
-	str r1, [r0, 0x4]
-	ldr r1, =sub_80BA134
-	b _080BA07C
-	.pool
-_080BA06C:
-	ldr r0, =gUnknown_02039B28
-	ldr r1, =gUnknown_02038C2C
-	str r1, [r0]
-	movs r2, 0xF0
-	lsls r2, 3
-	adds r1, r2
-	str r1, [r0, 0x4]
-	ldr r1, =sub_80BA154
-_080BA07C:
-	str r1, [r0, 0x10]
-	adds r1, r0, 0
-	ldr r0, [sp, 0x4]
-	str r0, [r1, 0xC]
-	ldr r0, [sp]
-	str r0, [r1, 0x8]
-	mov r0, sp
-	ldrb r0, [r0, 0x8]
-	strb r0, [r1, 0x15]
-	mov r0, sp
-	ldrb r0, [r0, 0x9]
-	strb r0, [r1, 0x16]
-	strb r0, [r1, 0x17]
-	add sp, 0xC
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BA038
-
-	thumb_func_start sub_80BA0A8
-sub_80BA0A8: @ 80BA0A8
-	push {r4,lr}
-	ldr r4, =gUnknown_02039B28
-	ldrb r0, [r4, 0x15]
-	cmp r0, 0
-	beq _080BA122
-	cmp r0, 0x3
-	bne _080BA0EC
-	movs r0, 0
-	strb r0, [r4, 0x15]
-	ldr r1, =0x040000b0
-	ldrh r2, [r1, 0xA]
-	ldr r0, =0x0000c5ff
-	ands r0, r2
-	strh r0, [r1, 0xA]
-	ldrh r2, [r1, 0xA]
-	ldr r0, =0x00007fff
-	ands r0, r2
-	strh r0, [r1, 0xA]
-	ldrh r0, [r1, 0xA]
-	ldr r1, =gUnknown_02039B44
-	movs r0, 0x1
-	strb r0, [r1]
-	b _080BA122
-	.pool
-_080BA0EC:
-	ldr r1, =0x040000b0
-	ldrh r2, [r1, 0xA]
-	ldr r0, =0x0000c5ff
-	ands r0, r2
-	strh r0, [r1, 0xA]
-	ldrh r2, [r1, 0xA]
-	ldr r0, =0x00007fff
-	ands r0, r2
-	strh r0, [r1, 0xA]
-	ldrh r0, [r1, 0xA]
-	ldrb r0, [r4, 0x14]
-	lsls r0, 2
-	adds r0, r4
-	ldr r0, [r0]
-	str r0, [r1]
-	ldr r0, [r4, 0x8]
-	str r0, [r1, 0x4]
-	ldr r0, [r4, 0xC]
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	ldr r0, [r4, 0x10]
-	bl _call_via_r0
-	ldrb r0, [r4, 0x14]
-	movs r1, 0x1
-	eors r0, r1
-	strb r0, [r4, 0x14]
-_080BA122:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BA0A8
-
-	thumb_func_start sub_80BA134
-sub_80BA134: @ 80BA134
-	ldr r0, =gUnknown_02039B28
-	ldr r2, [r0, 0x8]
-	ldrb r1, [r0, 0x14]
-	lsls r0, r1, 4
-	subs r0, r1
-	lsls r0, 7
-	ldr r1, =gUnknown_02038C28
-	adds r0, r1
-	ldrh r0, [r0]
-	strh r0, [r2]
-	bx lr
-	.pool
-	thumb_func_end sub_80BA134
-
-	thumb_func_start sub_80BA154
-sub_80BA154: @ 80BA154
-	ldr r0, =gUnknown_02039B28
-	ldr r2, [r0, 0x8]
-	ldrb r1, [r0, 0x14]
-	lsls r0, r1, 4
-	subs r0, r1
-	lsls r0, 7
-	ldr r1, =gUnknown_02038C28
-	adds r0, r1
-	ldr r0, [r0]
-	str r0, [r2]
-	bx lr
-	.pool
-	thumb_func_end sub_80BA154
-
-	thumb_func_start task00_for_dp12
-task00_for_dp12: @ 80BA174
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r12, r0
-	movs r6, 0
-	ldr r0, =gUnknown_02039B44
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080BA1A4
-	mov r0, r12
-	bl DestroyTask
-	ldr r1, =gUnknown_02039B28
-	movs r0, 0xFF
-	strb r0, [r1, 0x18]
-	b _080BA324
-	.pool
-_080BA1A4:
-	ldr r1, =gTasks
-	mov r0, r12
-	lsls r2, r0, 2
-	adds r0, r2, r0
-	lsls r0, 3
-	adds r3, r0, r1
-	movs r4, 0x16
-	ldrsh r0, [r3, r4]
-	mov r10, r1
-	mov r9, r2
-	cmp r0, 0
-	beq _080BA250
-	movs r1, 0x14
-	ldrsh r0, [r3, r1]
-	cmp r0, 0xE
-	bhi _080BA250
-	lsls r0, 2
-	ldr r1, =_080BA1D8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_080BA1D8:
-	.4byte _080BA214
-	.4byte _080BA250
-	.4byte _080BA21C
-	.4byte _080BA250
-	.4byte _080BA224
-	.4byte _080BA250
-	.4byte _080BA22C
-	.4byte _080BA250
-	.4byte _080BA234
-	.4byte _080BA250
-	.4byte _080BA23C
-	.4byte _080BA250
-	.4byte _080BA244
-	.4byte _080BA250
-	.4byte _080BA24C
-_080BA214:
-	ldr r0, =gBattle_BG0_X
-	b _080BA24E
-	.pool
-_080BA21C:
-	ldr r0, =gBattle_BG0_Y
-	b _080BA24E
-	.pool
-_080BA224:
-	ldr r0, =gBattle_BG1_X
-	b _080BA24E
-	.pool
-_080BA22C:
-	ldr r0, =gBattle_BG1_Y
-	b _080BA24E
-	.pool
-_080BA234:
-	ldr r0, =gBattle_BG2_X
-	b _080BA24E
-	.pool
-_080BA23C:
-	ldr r0, =gBattle_BG2_Y
-	b _080BA24E
-	.pool
-_080BA244:
-	ldr r0, =gBattle_BG3_X
-	b _080BA24E
-	.pool
-_080BA24C:
-	ldr r0, =gBattle_BG3_Y
-_080BA24E:
-	ldrh r6, [r0]
-_080BA250:
-	mov r0, r9
-	add r0, r12
-	lsls r0, 3
-	mov r2, r10
-	adds r1, r0, r2
-	ldrh r2, [r1, 0x10]
-	movs r3, 0x10
-	ldrsh r0, [r1, r3]
-	cmp r0, 0
-	beq _080BA2BC
-	subs r0, r2, 0x1
-	strh r0, [r1, 0x10]
-	movs r4, 0xE
-	ldrsh r0, [r1, r4]
-	movs r3, 0xA0
-	lsls r3, 1
-	adds r2, r0, r3
-	movs r4, 0x8
-	ldrsh r3, [r1, r4]
-	movs r4, 0xA
-	ldrsh r0, [r1, r4]
-	cmp r3, r0
-	bge _080BA324
-	ldr r5, =gUnknown_02038C28
-	ldr r0, =gUnknown_02039B28
-	mov r8, r0
-	adds r7, r1, 0
-	lsls r0, r2, 1
-	adds r4, r0, r5
-_080BA28A:
-	lsls r2, r3, 1
-	mov r0, r8
-	ldrb r1, [r0, 0x14]
-	lsls r0, r1, 4
-	subs r0, r1
-	lsls r0, 7
-	adds r2, r0
-	adds r2, r5
-	ldrh r0, [r4]
-	adds r0, r6
-	strh r0, [r2]
-	adds r4, 0x2
-	adds r3, 0x1
-	movs r1, 0xA
-	ldrsh r0, [r7, r1]
-	cmp r3, r0
-	blt _080BA28A
-	b _080BA324
-	.pool
-_080BA2BC:
-	ldrh r0, [r1, 0x12]
-	strh r0, [r1, 0x10]
-	movs r2, 0xE
-	ldrsh r0, [r1, r2]
-	movs r3, 0xA0
-	lsls r3, 1
-	adds r2, r0, r3
-	movs r4, 0x8
-	ldrsh r3, [r1, r4]
-	movs r4, 0xA
-	ldrsh r0, [r1, r4]
-	cmp r3, r0
-	bge _080BA304
-	ldr r5, =gUnknown_02038C28
-	adds r7, r1, 0
-	lsls r0, r2, 1
-	adds r4, r0, r5
-	ldr r0, =gUnknown_02039B28
-	mov r8, r0
-_080BA2E2:
-	lsls r2, r3, 1
-	mov r0, r8
-	ldrb r1, [r0, 0x14]
-	lsls r0, r1, 4
-	subs r0, r1
-	lsls r0, 7
-	adds r2, r0
-	adds r2, r5
-	ldrh r0, [r4]
-	adds r0, r6
-	strh r0, [r2]
-	adds r4, 0x2
-	adds r3, 0x1
-	movs r1, 0xA
-	ldrsh r0, [r7, r1]
-	cmp r3, r0
-	blt _080BA2E2
-_080BA304:
-	mov r0, r9
-	add r0, r12
-	lsls r0, 3
-	mov r3, r10
-	adds r2, r0, r3
-	ldrh r0, [r2, 0xE]
-	adds r0, 0x1
-	strh r0, [r2, 0xE]
-	lsls r0, 16
-	asrs r0, 16
-	movs r4, 0xC
-	ldrsh r1, [r2, r4]
-	cmp r0, r1
-	bne _080BA324
-	movs r0, 0
-	strh r0, [r2, 0xE]
-_080BA324:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end task00_for_dp12
-
-	thumb_func_start sub_80BA33C
-sub_80BA33C: @ 80BA33C
-	push {r4-r7,lr}
-	adds r6, r0, 0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	lsls r2, 24
-	lsrs r4, r2, 24
-	movs r1, 0
-	movs r2, 0
-	ldr r0, =gSineTable
-	mov r12, r0
-_080BA350:
-	lsls r0, r1, 1
-	adds r3, r0, r6
-	lsls r0, r2, 1
-	add r0, r12
-	movs r7, 0
-	ldrsh r0, [r0, r7]
-	muls r0, r4
-	cmp r0, 0
-	bge _080BA364
-	adds r0, 0xFF
-_080BA364:
-	asrs r0, 8
-	strh r0, [r3]
-	adds r0, r2, r5
-	lsls r0, 24
-	lsrs r2, r0, 24
-	adds r0, r1, 0x1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	cmp r1, 0xFF
-	bls _080BA350
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_80BA33C
-
-	thumb_func_start sub_80BA384
-sub_80BA384: @ 80BA384
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x20
-	adds r5, r0, 0
-	str r1, [sp, 0x10]
-	ldr r0, [sp, 0x40]
-	mov r8, r0
-	ldr r1, [sp, 0x44]
-	mov r9, r1
-	ldr r0, [sp, 0x48]
-	mov r10, r0
-	lsls r5, 24
-	lsrs r5, 24
-	ldr r1, [sp, 0x10]
-	lsls r1, 24
-	str r1, [sp, 0x14]
-	lsrs r0, r1, 24
-	str r0, [sp, 0xC]
-	lsls r1, r2, 24
-	lsrs r1, 24
-	str r1, [sp, 0x18]
-	lsls r2, r3, 24
-	lsrs r2, 24
-	str r2, [sp, 0x1C]
-	mov r1, r8
-	lsls r1, 24
-	lsrs r1, 24
-	mov r8, r1
-	mov r3, r9
-	lsls r3, 24
-	lsrs r3, 24
-	mov r9, r3
-	mov r0, r10
-	lsls r0, 24
-	lsrs r0, 24
-	mov r10, r0
-	bl dp12_8087EA4
-	ldr r0, =0x04000010
-	add r0, r9
-	str r0, [sp]
-	ldr r0, =0xa2600001
-	str r0, [sp, 0x4]
-	mov r1, sp
-	movs r0, 0x1
-	strb r0, [r1, 0x8]
-	mov r0, sp
-	movs r1, 0
-	strb r1, [r0, 0x9]
-	ldr r0, [sp]
-	ldr r1, [sp, 0x4]
-	ldr r2, [sp, 0x8]
-	bl sub_80BA038
-	ldr r0, =task00_for_dp12
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r0, =gTasks
-	lsls r4, r7, 2
-	adds r4, r7
-	lsls r4, 3
-	adds r4, r0
-	strh r5, [r4, 0x8]
-	mov r3, sp
-	ldrh r3, [r3, 0xC]
-	strh r3, [r4, 0xA]
-	movs r0, 0x80
-	lsls r0, 1
-	ldr r1, [sp, 0x18]
-	bl __divsi3
-	strh r0, [r4, 0xC]
-	movs r0, 0
-	strh r0, [r4, 0xE]
-	mov r1, r8
-	strh r1, [r4, 0x10]
-	strh r1, [r4, 0x12]
-	mov r3, r9
-	strh r3, [r4, 0x14]
-	mov r0, r10
-	strh r0, [r4, 0x16]
-	ldr r0, =gUnknown_02039B28
-	strb r7, [r0, 0x18]
-	ldr r0, =gUnknown_02039B44
-	movs r1, 0
-	strb r1, [r0]
-	ldr r4, =gUnknown_02038EA8
-	ldr r3, [sp, 0xC]
-	subs r6, r3, r5
-	lsls r3, r6, 24
-	lsrs r3, 24
-	adds r0, r4, 0
-	ldr r1, [sp, 0x18]
-	ldr r2, [sp, 0x1C]
-	bl sub_80BA33C
-	ldr r0, [sp, 0xC]
-	cmp r5, r0
-	bge _080BA47E
-	ldr r1, =0xfffffd80
-	adds r2, r4, r1
-	lsls r1, r5, 1
-	movs r3, 0xF0
-	lsls r3, 3
-	adds r0, r1, r3
-	adds r3, r0, r2
-	adds r1, r2
-	adds r2, r4, 0
-	adds r5, r6, 0
-_080BA46A:
-	ldrh r0, [r2]
-	strh r0, [r1]
-	ldrh r0, [r2]
-	strh r0, [r3]
-	adds r2, 0x2
-	adds r3, 0x2
-	adds r1, 0x2
-	subs r5, 0x1
-	cmp r5, 0
-	bne _080BA46A
-_080BA47E:
-	adds r0, r7, 0
-	add sp, 0x20
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80BA384
-
-	.align 2, 0 @ Don't pad with nop.

asm/use_pokeblock.s

@@ -732,10 +732,10 @@ _08166C28:
 	b _08166D18
 	.pool
 _08166C40:
-	ldr r1, =gUnknown_02039B28
+	ldr r1, =gScanlineEffect
 	movs r0, 0x3
 	strb r0, [r1, 0x15]
-	bl sub_80BA0A8
+	bl ScanlineEffect_InitHBlankDmaTransfer
 _08166C4A:
 	ldr r1, [r4]
 	adds r1, 0x50