summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim_812C144.s26
-rwxr-xr-xasm/battle_intro.s24
-rw-r--r--asm/contest_link_80C2020.s2
-rwxr-xr-xasm/dark.s24
-rwxr-xr-xasm/dragon.s10
-rwxr-xr-xasm/ground.s8
-rw-r--r--asm/pokenav.s16
-rwxr-xr-xasm/psychic.s10
-rwxr-xr-xasm/water.s26
9 files changed, 73 insertions, 73 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index 5fc9199eb..8a6a8fffa 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -1752,7 +1752,7 @@ _0812CE70:
ldrsh r0, [r5, r6]
cmp r1, r0
bgt _0812CEA6
- ldr r4, _0812CEB0 @ =gUnknown_03004DE0
+ ldr r4, _0812CEB0 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r0, r4
@@ -1777,7 +1777,7 @@ _0812CEA6:
ldr r0, _0812CEB4 @ =REG_BG1HOFS
b _0812CEBA
.align 2, 0
-_0812CEB0: .4byte gUnknown_03004DE0
+_0812CEB0: .4byte gScanlineEffectRegBuffers
_0812CEB4: .4byte REG_BG1HOFS
_0812CEB8:
ldr r0, _0812CEE4 @ =REG_BG2HOFS
@@ -1794,7 +1794,7 @@ _0812CEBA:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
- bl sub_80895F8
+ bl ScanlineEffect_SetParams
ldr r0, _0812CEEC @ =sub_812CEF0
str r0, [r5]
add sp, 0xC
@@ -1889,7 +1889,7 @@ _0812CF74:
ldrsh r0, [r4, r2]
cmp r1, r0
bge _0812CFA8
- ldr r5, _0812D000 @ =gUnknown_03004DE0
+ ldr r5, _0812D000 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r5, r0
@@ -1917,7 +1917,7 @@ _0812CFA8:
ldrsh r0, [r4, r2]
cmp r1, r0
bgt _0812CFDC
- ldr r5, _0812D000 @ =gUnknown_03004DE0
+ ldr r5, _0812D000 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r5, r0
@@ -1957,7 +1957,7 @@ _0812CFF8:
pop {r0}
bx r0
.align 2, 0
-_0812D000: .4byte gUnknown_03004DE0
+_0812D000: .4byte gScanlineEffectRegBuffers
_0812D004: .4byte gScanlineEffect
thumb_func_end sub_812CEF0
@@ -6545,7 +6545,7 @@ _0812F3EE:
ldrh r3, [r0]
movs r7, 0
movs r2, 0
- ldr r6, _0812F468 @ =gUnknown_03004DE0
+ ldr r6, _0812F468 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r0, r6
@@ -6586,7 +6586,7 @@ _0812F3FE:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
- bl sub_80895F8
+ bl ScanlineEffect_SetParams
ldr r0, _0812F470 @ =sub_812F474
str r0, [r4]
add sp, 0xC
@@ -6599,7 +6599,7 @@ _0812F458: .4byte REG_BLDCNT
_0812F45C: .4byte 0x00003f44
_0812F460: .4byte gBattle_BG2_X
_0812F464: .4byte gBattle_BG2_Y
-_0812F468: .4byte gUnknown_03004DE0
+_0812F468: .4byte gScanlineEffectRegBuffers
_0812F46C: .4byte 0xa6600001
_0812F470: .4byte sub_812F474
thumb_func_end sub_812F314
@@ -6732,7 +6732,7 @@ _0812F55A:
subs r0, r1
lsls r0, 7
adds r2, r0
- ldr r0, _0812F664 @ =gUnknown_03004DE0
+ ldr r0, _0812F664 @ =gScanlineEffectRegBuffers
adds r2, r0
lsls r4, 16
asrs r4, 16
@@ -6750,7 +6750,7 @@ _0812F55A:
subs r0, r1
lsls r0, 7
adds r3, r0
- ldr r1, _0812F664 @ =gUnknown_03004DE0
+ ldr r1, _0812F664 @ =gScanlineEffectRegBuffers
adds r3, r1
lsls r1, r7, 16
asrs r1, 16
@@ -6814,7 +6814,7 @@ _0812F60A:
lsls r1, r2, 17
cmp r1, 0
blt _0812F636
- ldr r4, _0812F664 @ =gUnknown_03004DE0
+ ldr r4, _0812F664 @ =gScanlineEffectRegBuffers
ldr r7, [sp, 0x4]
lsls r0, r7, 16
asrs r0, 16
@@ -6857,7 +6857,7 @@ _0812F636:
b _0812F676
.align 2, 0
_0812F660: .4byte gScanlineEffect
-_0812F664: .4byte gUnknown_03004DE0
+_0812F664: .4byte gScanlineEffectRegBuffers
_0812F668: .4byte gSineTable
_0812F66C: .4byte 0xffff0000
_0812F670:
diff --git a/asm/battle_intro.s b/asm/battle_intro.s
index 16689a911..3f3c58a65 100755
--- a/asm/battle_intro.s
+++ b/asm/battle_intro.s
@@ -301,7 +301,7 @@ _080E45FE:
movs r3, 0
ldr r5, _080E46A0 @ =gScanlineEffect
mov r9, r5
- ldr r7, _080E46A4 @ =gUnknown_03004DE0
+ ldr r7, _080E46A4 @ =gScanlineEffectRegBuffers
mov r6, r9
adds r5, r1, 0
_080E460A:
@@ -319,7 +319,7 @@ _080E460A:
ble _080E460A
cmp r3, 0x9F
bgt _080E464E
- ldr r7, _080E46A4 @ =gUnknown_03004DE0
+ ldr r7, _080E46A4 @ =gScanlineEffectRegBuffers
ldr r6, _080E46A0 @ =gScanlineEffect
ldr r1, _080E46A8 @ =gTasks
mov r2, r12
@@ -378,7 +378,7 @@ _080E4694: .4byte 0x0000ffc8
_080E4698: .4byte gBattle_WIN0V
_080E469C: .4byte 0xfffffc04
_080E46A0: .4byte gScanlineEffect
-_080E46A4: .4byte gUnknown_03004DE0
+_080E46A4: .4byte gScanlineEffectRegBuffers
_080E46A8: .4byte gTasks
_080E46AC: .4byte 0x0600e000
_080E46B0: .4byte 0x05000200
@@ -671,7 +671,7 @@ _080E48E0:
movs r3, 0
ldr r4, _080E4978 @ =gScanlineEffect
mov r8, r4
- ldr r0, _080E497C @ =gUnknown_03004DE0
+ ldr r0, _080E497C @ =gScanlineEffectRegBuffers
mov r12, r0
mov r7, r8
adds r4, r1, 0
@@ -690,7 +690,7 @@ _080E48EE:
ble _080E48EE
cmp r3, 0x9F
bgt _080E4932
- ldr r1, _080E497C @ =gUnknown_03004DE0
+ ldr r1, _080E497C @ =gScanlineEffectRegBuffers
mov r12, r1
ldr r7, _080E4978 @ =gScanlineEffect
ldr r1, _080E4980 @ =gTasks
@@ -746,7 +746,7 @@ _080E4932:
_080E4970: .4byte gBattle_WIN0V
_080E4974: .4byte 0xfffffc04
_080E4978: .4byte gScanlineEffect
-_080E497C: .4byte gUnknown_03004DE0
+_080E497C: .4byte gScanlineEffectRegBuffers
_080E4980: .4byte gTasks
_080E4984: .4byte 0x0600e000
_080E4988: .4byte 0x05000200
@@ -980,7 +980,7 @@ _080E4B50:
movs r3, 0
ldr r6, _080E4BE8 @ =gScanlineEffect
mov r8, r6
- ldr r7, _080E4BEC @ =gUnknown_03004DE0
+ ldr r7, _080E4BEC @ =gScanlineEffectRegBuffers
adds r5, r1, 0
_080E4B5A:
lsls r2, r3, 1
@@ -997,7 +997,7 @@ _080E4B5A:
ble _080E4B5A
cmp r3, 0x9F
bgt _080E4B9E
- ldr r7, _080E4BEC @ =gUnknown_03004DE0
+ ldr r7, _080E4BEC @ =gScanlineEffectRegBuffers
ldr r6, _080E4BE8 @ =gScanlineEffect
ldr r1, _080E4BF0 @ =gTasks
mov r2, r12
@@ -1054,7 +1054,7 @@ _080E4B9E:
_080E4BE0: .4byte gBattle_WIN0V
_080E4BE4: .4byte 0xfffffc04
_080E4BE8: .4byte gScanlineEffect
-_080E4BEC: .4byte gUnknown_03004DE0
+_080E4BEC: .4byte gScanlineEffectRegBuffers
_080E4BF0: .4byte gTasks
_080E4BF4: .4byte 0x0600e000
_080E4BF8: .4byte 0x05000200
@@ -1325,7 +1325,7 @@ _080E4E16:
movs r3, 0
ldr r0, _080E4EA4 @ =gScanlineEffect
mov r9, r0
- ldr r2, _080E4EA8 @ =gUnknown_03004DE0
+ ldr r2, _080E4EA8 @ =gScanlineEffectRegBuffers
mov r8, r2
mov r7, r9
adds r4, r1, 0
@@ -1344,7 +1344,7 @@ _080E4E24:
ble _080E4E24
cmp r3, 0x9F
bgt _080E4E68
- ldr r0, _080E4EA8 @ =gUnknown_03004DE0
+ ldr r0, _080E4EA8 @ =gScanlineEffectRegBuffers
mov r8, r0
ldr r7, _080E4EA4 @ =gScanlineEffect
ldr r1, _080E4EAC @ =gTasks
@@ -1396,7 +1396,7 @@ _080E4E94:
_080E4E9C: .4byte gBattle_WIN0V
_080E4EA0: .4byte 0xfffffc04
_080E4EA4: .4byte gScanlineEffect
-_080E4EA8: .4byte gUnknown_03004DE0
+_080E4EA8: .4byte gScanlineEffectRegBuffers
_080E4EAC: .4byte gTasks
_080E4EB0: .4byte REG_BG1CNT
_080E4EB4:
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 9d9ead35b..9cf156f07 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -532,7 +532,7 @@ sub_80C2448: @ 80C2448
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
- bl ScanlineEffect_TransferDma
+ bl ScanlineEffect_InitHBlankDmaTransfer
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/dark.s b/asm/dark.s
index 37fdace81..9e09d8fbe 100755
--- a/asm/dark.s
+++ b/asm/dark.s
@@ -386,7 +386,7 @@ _080E01F4:
movs r0, 0x3
bl sub_80E08CC
movs r3, 0
- ldr r4, _080E0290 @ =gUnknown_03004DE0
+ ldr r4, _080E0290 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r4, r0
@@ -406,7 +406,7 @@ _080E0220:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
- bl sub_80895F8
+ bl ScanlineEffect_SetParams
ldr r1, _080E0294 @ =REG_WINOUT
movs r0, 0x3F
eors r7, r0
@@ -441,7 +441,7 @@ _080E0280: .4byte 0x00003f44
_080E0284: .4byte REG_BG2VOFS
_080E0288: .4byte gBattle_BG1_X
_080E028C: .4byte 0xa2600001
-_080E0290: .4byte gUnknown_03004DE0
+_080E0290: .4byte gScanlineEffectRegBuffers
_080E0294: .4byte REG_WINOUT
_080E0298: .4byte gBattle_WIN0H
_080E029C: .4byte gBattle_WIN0V
@@ -786,7 +786,7 @@ _080E054E:
str r0, [sp, 0xC]
movs r3, 0
add r4, sp, 0xC
- ldr r6, _080E059C @ =gUnknown_03004DE0
+ ldr r6, _080E059C @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r7, r6, r0
@@ -815,7 +815,7 @@ _080E055C:
strb r2, [r4, 0x9]
ldr r0, [sp, 0xC]
ldr r2, [r4, 0x8]
- bl sub_80895F8
+ bl ScanlineEffect_SetParams
_080E0590:
ldrh r0, [r5, 0x8]
adds r0, 0x1
@@ -823,7 +823,7 @@ _080E0590:
b _080E05F2
.align 2, 0
_080E0598: .4byte REG_BG2VOFS
-_080E059C: .4byte gUnknown_03004DE0
+_080E059C: .4byte gScanlineEffectRegBuffers
_080E05A0: .4byte 0xa2600001
_080E05A4:
movs r1, 0xE
@@ -1102,7 +1102,7 @@ sub_80E079C: @ 80E079C
movs r4, 0
cmp r0, 0
ble _080E07FC
- ldr r0, _080E0888 @ =gUnknown_03004DE0
+ ldr r0, _080E0888 @ =gScanlineEffectRegBuffers
mov r12, r0
ldr r7, _080E088C @ =gScanlineEffect
_080E07D0:
@@ -1136,7 +1136,7 @@ _080E07FC:
ldrsh r0, [r6, r2]
cmp r1, r0
bgt _080E0846
- ldr r0, _080E0888 @ =gUnknown_03004DE0
+ ldr r0, _080E0888 @ =gScanlineEffectRegBuffers
mov r12, r0
ldr r7, _080E088C @ =gScanlineEffect
_080E0810:
@@ -1179,7 +1179,7 @@ _080E0846:
ldrsh r0, [r6, r3]
cmp r1, r0
bge _080E08BE
- ldr r7, _080E0888 @ =gUnknown_03004DE0
+ ldr r7, _080E0888 @ =gScanlineEffectRegBuffers
ldr r4, _080E088C @ =gScanlineEffect
_080E085E:
asrs r3, r2, 16
@@ -1204,7 +1204,7 @@ _080E0876:
blt _080E085E
b _080E08BE
.align 2, 0
-_080E0888: .4byte gUnknown_03004DE0
+_080E0888: .4byte gScanlineEffectRegBuffers
_080E088C: .4byte gScanlineEffect
_080E0890:
movs r1, 0x1C
@@ -1212,7 +1212,7 @@ _080E0890:
adds r5, r0, 0
adds r5, 0x9F
movs r4, 0
- ldr r3, _080E08C8 @ =gUnknown_03004DE0
+ ldr r3, _080E08C8 @ =gScanlineEffectRegBuffers
movs r2, 0xF0
lsls r2, 3
adds r6, r3, r2
@@ -1238,7 +1238,7 @@ _080E08BE:
pop {r0}
bx r0
.align 2, 0
-_080E08C8: .4byte gUnknown_03004DE0
+_080E08C8: .4byte gScanlineEffectRegBuffers
thumb_func_end sub_80E079C
thumb_func_start sub_80E08CC
diff --git a/asm/dragon.s b/asm/dragon.s
index c9a2d490a..59fdc4b68 100755
--- a/asm/dragon.s
+++ b/asm/dragon.s
@@ -510,7 +510,7 @@ _080DF996:
ldrsh r0, [r4, r1]
cmp r3, r0
bgt _080DF9C4
- ldr r5, _080DF9EC @ =gUnknown_03004DE0
+ ldr r5, _080DF9EC @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r5, r0
@@ -533,7 +533,7 @@ _080DF9C4:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
- bl sub_80895F8
+ bl ScanlineEffect_SetParams
ldr r0, _080DF9F0 @ =sub_80DF9F4
str r0, [r4]
add sp, 0xC
@@ -545,7 +545,7 @@ _080DF9DC: .4byte REG_BG2HOFS
_080DF9E0: .4byte gBattle_BG2_X
_080DF9E4: .4byte 0xa2600001
_080DF9E8: .4byte gAnimBankAttacker
-_080DF9EC: .4byte gUnknown_03004DE0
+_080DF9EC: .4byte gScanlineEffectRegBuffers
_080DF9F0: .4byte sub_80DF9F4
thumb_func_end sub_80DF924
@@ -659,7 +659,7 @@ sub_80DFAB0: @ 80DFAB0
ldrsh r0, [r5, r1]
cmp r4, r0
bgt _080DFB06
- ldr r7, _080DFB1C @ =gUnknown_03004DE0
+ ldr r7, _080DFB1C @ =gScanlineEffectRegBuffers
mov r12, r7
ldr r0, _080DFB20 @ =gSineTable
mov r8, r0
@@ -705,7 +705,7 @@ _080DFB06:
pop {r0}
bx r0
.align 2, 0
-_080DFB1C: .4byte gUnknown_03004DE0
+_080DFB1C: .4byte gScanlineEffectRegBuffers
_080DFB20: .4byte gSineTable
_080DFB24: .4byte gScanlineEffect
thumb_func_end sub_80DFAB0
diff --git a/asm/ground.s b/asm/ground.s
index 00abfd4f3..0ba721042 100755
--- a/asm/ground.s
+++ b/asm/ground.s
@@ -980,7 +980,7 @@ _080E169C:
asrs r4, r0, 16
cmp r2, r0
bge _080E16C8
- ldr r5, _080E1720 @ =gUnknown_03004DE0
+ ldr r5, _080E1720 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r5, r0
@@ -1003,7 +1003,7 @@ _080E16C8:
asrs r0, r1, 16
cmp r0, 0x9F
bgt _080E16F6
- ldr r4, _080E1720 @ =gUnknown_03004DE0
+ ldr r4, _080E1720 @ =gScanlineEffectRegBuffers
lsls r0, r3, 16
asrs r0, 16
adds r3, r0, 0
@@ -1035,7 +1035,7 @@ _080E16F6:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
- bl sub_80895F8
+ bl ScanlineEffect_SetParams
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -1043,7 +1043,7 @@ _080E16F6:
.align 2, 0
_080E1718: .4byte gBattle_BG2_X
_080E171C: .4byte REG_BG2HOFS
-_080E1720: .4byte gUnknown_03004DE0
+_080E1720: .4byte gScanlineEffectRegBuffers
_080E1724: .4byte 0xa2600001
thumb_func_end sub_80E1668
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 3e410872e..e1b30bdf7 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -10957,7 +10957,7 @@ _080F5B68: .4byte gUnknown_083DFEC4
_080F5B6C: .4byte 0x00009345
_080F5B70:
bl dp12_8087EA4
- ldr r0, _080F5BA8 @ =gUnknown_03004DE0
+ ldr r0, _080F5BA8 @ =gScanlineEffectRegBuffers
movs r2, 0xEF
movs r3, 0xF4
lsls r3, 3
@@ -10984,7 +10984,7 @@ _080F5B82:
movs r0, 0x1
b _080F5BCE
.align 2, 0
-_080F5BA8: .4byte gUnknown_03004DE0
+_080F5BA8: .4byte gScanlineEffectRegBuffers
_080F5BAC: .4byte gUnknown_083DFEC4
_080F5BB0: .4byte 0x00009345
_080F5BB4:
@@ -10995,7 +10995,7 @@ _080F5BB4:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
- bl sub_80895F8
+ bl ScanlineEffect_SetParams
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -11016,7 +11016,7 @@ sub_80F5BDC: @ 80F5BDC
ldr r1, _080F5BEC @ =gScanlineEffect
movs r0, 0x3
strb r0, [r1, 0x15]
- bl ScanlineEffect_TransferDma
+ bl ScanlineEffect_InitHBlankDmaTransfer
pop {r0}
bx r0
.align 2, 0
@@ -11045,7 +11045,7 @@ sub_80F5BF0: @ 80F5BF0
adds r0, r4, 0
bl sub_80F5A1C
movs r6, 0
- ldr r1, _080F5CC4 @ =gUnknown_03004DE0
+ ldr r1, _080F5CC4 @ =gScanlineEffectRegBuffers
mov r12, r1
movs r0, 0xF0
lsls r0, 3
@@ -11128,7 +11128,7 @@ _080F5CA6:
_080F5CB8: .4byte gUnknown_083DFEC4
_080F5CBC: .4byte 0x00009344
_080F5CC0: .4byte 0x0000911c
-_080F5CC4: .4byte gUnknown_03004DE0
+_080F5CC4: .4byte gScanlineEffectRegBuffers
_080F5CC8: .4byte 0x0000ffff
_080F5CCC: .4byte 0x00009130
_080F5CD0: .4byte 0x00009132
@@ -11164,7 +11164,7 @@ sub_80F5CDC: @ 80F5CDC
lsls r0, 17
lsrs r5, r0, 16
movs r7, 0
- ldr r1, _080F5DBC @ =gUnknown_03004DE0
+ ldr r1, _080F5DBC @ =gScanlineEffectRegBuffers
mov r12, r1
movs r4, 0xF0
lsls r4, 3
@@ -11248,7 +11248,7 @@ _080F5DA0:
_080F5DB0: .4byte gUnknown_083DFEC4
_080F5DB4: .4byte 0x00009344
_080F5DB8: .4byte 0x0000911c
-_080F5DBC: .4byte gUnknown_03004DE0
+_080F5DBC: .4byte gScanlineEffectRegBuffers
_080F5DC0: .4byte 0x0000ffff
_080F5DC4: .4byte 0x00009130
_080F5DC8: .4byte 0x00009132
diff --git a/asm/psychic.s b/asm/psychic.s
index bdc230dcb..7dbedd08f 100755
--- a/asm/psychic.s
+++ b/asm/psychic.s
@@ -1588,7 +1588,7 @@ _080DC380:
adds r0, 0x40
cmp r1, r0
bgt _080DC3BA
- ldr r5, _080DC3E8 @ =gUnknown_03004DE0
+ ldr r5, _080DC3E8 @ =gScanlineEffectRegBuffers
movs r0, 0xF0
lsls r0, 3
adds r6, r5, r0
@@ -1621,7 +1621,7 @@ _080DC3BA:
ldr r0, [sp]
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
- bl sub_80895F8
+ bl ScanlineEffect_SetParams
ldr r0, _080DC3F0 @ =sub_80DC3F4
str r0, [r4]
add sp, 0xC
@@ -1631,7 +1631,7 @@ _080DC3BA:
.align 2, 0
_080DC3E0: .4byte gBattle_BG2_X
_080DC3E4: .4byte REG_BG2HOFS
-_080DC3E8: .4byte gUnknown_03004DE0
+_080DC3E8: .4byte gScanlineEffectRegBuffers
_080DC3EC: .4byte 0xa2600001
_080DC3F0: .4byte sub_80DC3F4
thumb_func_end sub_80DC2D4
@@ -1676,7 +1676,7 @@ _080DC426:
ldr r0, _080DC470 @ =gSineTable
mov r9, r0
movs r7, 0x3
- ldr r1, _080DC474 @ =gUnknown_03004DE0
+ ldr r1, _080DC474 @ =gScanlineEffectRegBuffers
mov r12, r1
movs r2, 0xF0
lsls r2, 3
@@ -1704,7 +1704,7 @@ _080DC448:
b _080DC484
.align 2, 0
_080DC470: .4byte gSineTable
-_080DC474: .4byte gUnknown_03004DE0
+_080DC474: .4byte gScanlineEffectRegBuffers
_080DC478:
cmp r3, 0
bge _080DC488
diff --git a/asm/water.s b/asm/water.s
index 4336374aa..56e552241 100755
--- a/asm/water.s
+++ b/asm/water.s
@@ -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,7 +475,7 @@ _080D3EE8:
ldrsh r0, [r4, r1]
cmp r3, r0
bge _080D3F1C
- ldr r6, _080D3F80 @ =gUnknown_03004DE0
+ ldr r6, _080D3F80 @ =gScanlineEffectRegBuffers
ldr r5, _080D3F84 @ =gScanlineEffect
_080D3EF6:
lsls r1, r3, 16
@@ -505,7 +505,7 @@ _080D3F1C:
ldrsh r0, [r4, r3]
cmp r1, r0
bge _080D3F50
- ldr r6, _080D3F80 @ =gUnknown_03004DE0
+ ldr r6, _080D3F80 @ =gScanlineEffectRegBuffers
ldr r5, _080D3F84 @ =gScanlineEffect
_080D3F2E:
asrs r3, r2, 16
@@ -531,7 +531,7 @@ _080D3F50:
asrs r0, r1, 16
cmp r0, 0x9F
bgt _080D4032
- ldr r6, _080D3F80 @ =gUnknown_03004DE0
+ ldr r6, _080D3F80 @ =gScanlineEffectRegBuffers
ldr r5, _080D3F84 @ =gScanlineEffect
_080D3F5E:
asrs r3, r1, 16
@@ -551,7 +551,7 @@ _080D3F5E:
ble _080D3F5E
b _080D4032
.align 2, 0
-_080D3F80: .4byte gUnknown_03004DE0
+_080D3F80: .4byte gScanlineEffectRegBuffers
_080D3F84: .4byte gScanlineEffect
_080D3F88:
movs r3, 0
@@ -559,7 +559,7 @@ _080D3F88:
ldrsh r0, [r4, r1]
cmp r3, r0
bge _080D3FBC
- ldr r6, _080D403C @ =gUnknown_03004DE0
+ ldr r6, _080D403C @ =gScanlineEffectRegBuffers
ldr r5, _080D4040 @ =gScanlineEffect
_080D3F96:
lsls r1, r3, 16
@@ -589,7 +589,7 @@ _080D3FBC:
ldrsh r0, [r4, r3]
cmp r1, r0
bge _080D3FF0
- ldr r6, _080D403C @ =gUnknown_03004DE0
+ ldr r6, _080D403C @ =gScanlineEffectRegBuffers
ldr r5, _080D4040 @ =gScanlineEffect
_080D3FCE:
asrs r3, r2, 16
@@ -615,7 +615,7 @@ _080D3FF0:
asrs r0, r1, 16
cmp r0, 0x9F
bgt _080D401C
- ldr r6, _080D403C @ =gUnknown_03004DE0
+ ldr r6, _080D403C @ =gScanlineEffectRegBuffers
ldr r5, _080D4040 @ =gScanlineEffect
_080D3FFE:
asrs r3, r1, 16
@@ -649,7 +649,7 @@ _080D4032:
pop {r0}
bx r0
.align 2, 0
-_080D403C: .4byte gUnknown_03004DE0
+_080D403C: .4byte gScanlineEffectRegBuffers
_080D4040: .4byte gScanlineEffect
thumb_func_end sub_80D3D68
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 19:36:42 +0000