1 files changed, 23 insertions, 23 deletions

diff --git a/asm/water.s b/asm/water.s
index d72f9438c..45fb7f82a 100755
--- a/asm/water.s
+++ b/asm/water.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "asm/macros.inc"
+	.include "include/macros.inc"
 
 	.syntax unified
 
@@ -300,7 +300,7 @@ _080D3D9C:
 	movs r3, 0
 	movs r2, 0x10
 	ldrsh r0, [r4, r2]
-	ldr r1, _080D3E6C @ =gUnknown_03004DE0
+	ldr r1, _080D3E6C @ =gScanlineEffectRegBuffers
 	mov r12, r1
 	cmp r3, r0
 	bge _080D3DDA
@@ -337,7 +337,7 @@ _080D3DDA:
 	ldrsh r0, [r4, r3]
 	cmp r1, r0
 	bge _080D3E14
-	ldr r5, _080D3E6C @ =gUnknown_03004DE0
+	ldr r5, _080D3E6C @ =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r5, r0
@@ -366,7 +366,7 @@ _080D3E14:
 	asrs r0, r2, 16
 	cmp r0, 0x9F
 	bgt _080D3E4A
-	ldr r5, _080D3E6C @ =gUnknown_03004DE0
+	ldr r5, _080D3E6C @ =gScanlineEffectRegBuffers
 	movs r0, 0xF0
 	lsls r0, 3
 	adds r6, r5, r0
@@ -407,7 +407,7 @@ _080D3E4A:
 	ldrh r0, [r4, 0xA]
 	b _080D3E8A
 	.align 2, 0
-_080D3E6C: .4byte gUnknown_03004DE0
+_080D3E6C: .4byte gScanlineEffectRegBuffers
 _080D3E70: .4byte 0x0000ffff
 _080D3E74:
 	lsls r0, r3, 16
@@ -436,7 +436,7 @@ _080D3E8A:
 	ldr r0, [sp]
 	ldr r1, [sp, 0x4]
 	ldr r2, [sp, 0x8]
-	bl sub_80895F8
+	bl ScanlineEffect_SetParams
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
 	strh r0, [r4, 0x8]
@@ -475,8 +475,8 @@ _080D3EE8:
 	ldrsh r0, [r4, r1]
 	cmp r3, r0
 	bge _080D3F1C
-	ldr r6, _080D3F80 @ =gUnknown_03004DE0
-	ldr r5, _080D3F84 @ =gUnknown_03004DC0
+	ldr r6, _080D3F80 @ =gScanlineEffectRegBuffers
+	ldr r5, _080D3F84 @ =gScanlineEffect
 _080D3EF6:
 	lsls r1, r3, 16
 	asrs r1, 16
@@ -505,8 +505,8 @@ _080D3F1C:
 	ldrsh r0, [r4, r3]
 	cmp r1, r0
 	bge _080D3F50
-	ldr r6, _080D3F80 @ =gUnknown_03004DE0
-	ldr r5, _080D3F84 @ =gUnknown_03004DC0
+	ldr r6, _080D3F80 @ =gScanlineEffectRegBuffers
+	ldr r5, _080D3F84 @ =gScanlineEffect
 _080D3F2E:
 	asrs r3, r2, 16
 	lsls r2, r3, 1
@@ -531,8 +531,8 @@ _080D3F50:
 	asrs r0, r1, 16
 	cmp r0, 0x9F
 	bgt _080D4032
-	ldr r6, _080D3F80 @ =gUnknown_03004DE0
-	ldr r5, _080D3F84 @ =gUnknown_03004DC0
+	ldr r6, _080D3F80 @ =gScanlineEffectRegBuffers
+	ldr r5, _080D3F84 @ =gScanlineEffect
 _080D3F5E:
 	asrs r3, r1, 16
 	lsls r2, r3, 1
@@ -551,16 +551,16 @@ _080D3F5E:
 	ble _080D3F5E
 	b _080D4032
 	.align 2, 0
-_080D3F80: .4byte gUnknown_03004DE0
-_080D3F84: .4byte gUnknown_03004DC0
+_080D3F80: .4byte gScanlineEffectRegBuffers
+_080D3F84: .4byte gScanlineEffect
 _080D3F88:
 	movs r3, 0
 	movs r1, 0x10
 	ldrsh r0, [r4, r1]
 	cmp r3, r0
 	bge _080D3FBC
-	ldr r6, _080D403C @ =gUnknown_03004DE0
-	ldr r5, _080D4040 @ =gUnknown_03004DC0
+	ldr r6, _080D403C @ =gScanlineEffectRegBuffers
+	ldr r5, _080D4040 @ =gScanlineEffect
 _080D3F96:
 	lsls r1, r3, 16
 	asrs r1, 16
@@ -589,8 +589,8 @@ _080D3FBC:
 	ldrsh r0, [r4, r3]
 	cmp r1, r0
 	bge _080D3FF0
-	ldr r6, _080D403C @ =gUnknown_03004DE0
-	ldr r5, _080D4040 @ =gUnknown_03004DC0
+	ldr r6, _080D403C @ =gScanlineEffectRegBuffers
+	ldr r5, _080D4040 @ =gScanlineEffect
 _080D3FCE:
 	asrs r3, r2, 16
 	lsls r2, r3, 1
@@ -615,8 +615,8 @@ _080D3FF0:
 	asrs r0, r1, 16
 	cmp r0, 0x9F
 	bgt _080D401C
-	ldr r6, _080D403C @ =gUnknown_03004DE0
-	ldr r5, _080D4040 @ =gUnknown_03004DC0
+	ldr r6, _080D403C @ =gScanlineEffectRegBuffers
+	ldr r5, _080D4040 @ =gScanlineEffect
 _080D3FFE:
 	asrs r3, r1, 16
 	lsls r2, r3, 1
@@ -640,7 +640,7 @@ _080D401C:
 	negs r0, r0
 	cmp r1, r0
 	bne _080D4032
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	adds r0, r7, 0
 	bl DestroyTask
 _080D4032:
@@ -649,8 +649,8 @@ _080D4032:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080D403C: .4byte gUnknown_03004DE0
-_080D4040: .4byte gUnknown_03004DC0
+_080D403C: .4byte gScanlineEffectRegBuffers
+_080D4040: .4byte gScanlineEffect
 	thumb_func_end sub_80D3D68
 
 	thumb_func_start sub_80D4044