diff options
author | camthesaxman <cameronghall@cox.net> | 2018-01-09 23:55:03 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2018-01-09 23:55:03 -0600 |
commit | f9f0e84b70f1b313200acd6f0d180413e34517da (patch) | |
tree | a714942823290d6561a4d9b920ab155fe8093d45 /asm | |
parent | cf7ffa568a2a09c761bae6aa4c70b8d8913c3e81 (diff) |
label some scanline_effect functions
Diffstat (limited to 'asm')
-rw-r--r-- | asm/battle_anim_812C144.s | 12 | ||||
-rwxr-xr-x | asm/battle_intro.s | 24 | ||||
-rw-r--r-- | asm/contest_link_80C2020.s | 2 | ||||
-rwxr-xr-x | asm/dark.s | 16 | ||||
-rwxr-xr-x | asm/dragon.s | 8 | ||||
-rwxr-xr-x | asm/ghost.s | 6 | ||||
-rwxr-xr-x | asm/ground.s | 8 | ||||
-rw-r--r-- | asm/pokenav.s | 6 | ||||
-rwxr-xr-x | asm/psychic.s | 4 | ||||
-rwxr-xr-x | asm/water.s | 18 |
10 files changed, 52 insertions, 52 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 02eec98ec..5fc9199eb 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -1946,7 +1946,7 @@ _0812CFDC: ldrsh r0, [r4, r1] cmp r0, 0 beq _0812CFF2 - ldr r1, _0812D004 @ =gUnknown_03004DC0 + ldr r1, _0812D004 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _0812CFF2: @@ -1958,7 +1958,7 @@ _0812CFF8: bx r0 .align 2, 0 _0812D000: .4byte gUnknown_03004DE0 -_0812D004: .4byte gUnknown_03004DC0 +_0812D004: .4byte gScanlineEffect thumb_func_end sub_812CEF0 thumb_func_start sub_812D008 @@ -6711,7 +6711,7 @@ _0812F4EA: ldrsh r0, [r6, r3] cmp r1, r0 ble _0812F60A - ldr r0, _0812F660 @ =gUnknown_03004DC0 + ldr r0, _0812F660 @ =gScanlineEffect mov r10, r0 ldr r1, [sp, 0x4] lsls r0, r1, 16 @@ -6856,7 +6856,7 @@ _0812F636: strh r0, [r6, 0xE] b _0812F676 .align 2, 0 -_0812F660: .4byte gUnknown_03004DC0 +_0812F660: .4byte gScanlineEffect _0812F664: .4byte gUnknown_03004DE0 _0812F668: .4byte gSineTable _0812F66C: .4byte 0xffff0000 @@ -6898,14 +6898,14 @@ _0812F6A6: asrs r0, 16 cmp r0, 0xC ble _0812F712 - ldr r1, _0812F6C0 @ =gUnknown_03004DC0 + ldr r1, _0812F6C0 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] movs r0, 0 strh r0, [r6, 0xC] b _0812F700 .align 2, 0 -_0812F6C0: .4byte gUnknown_03004DC0 +_0812F6C0: .4byte gScanlineEffect _0812F6C4: ldrh r0, [r6, 0xC] adds r0, 0x1 diff --git a/asm/battle_intro.s b/asm/battle_intro.s index 4bfcf42fb..16689a911 100755 --- a/asm/battle_intro.s +++ b/asm/battle_intro.s @@ -299,7 +299,7 @@ _080E45E6: strh r0, [r1, 0xC] _080E45FE: movs r3, 0 - ldr r5, _080E46A0 @ =gUnknown_03004DC0 + ldr r5, _080E46A0 @ =gScanlineEffect mov r9, r5 ldr r7, _080E46A4 @ =gUnknown_03004DE0 mov r6, r9 @@ -320,7 +320,7 @@ _080E460A: cmp r3, 0x9F bgt _080E464E ldr r7, _080E46A4 @ =gUnknown_03004DE0 - ldr r6, _080E46A0 @ =gUnknown_03004DC0 + ldr r6, _080E46A0 @ =gScanlineEffect ldr r1, _080E46A8 @ =gTasks mov r2, r12 adds r0, r2, r4 @@ -377,7 +377,7 @@ _080E4690: .4byte gBattle_BG1_Y _080E4694: .4byte 0x0000ffc8 _080E4698: .4byte gBattle_WIN0V _080E469C: .4byte 0xfffffc04 -_080E46A0: .4byte gUnknown_03004DC0 +_080E46A0: .4byte gScanlineEffect _080E46A4: .4byte gUnknown_03004DE0 _080E46A8: .4byte gTasks _080E46AC: .4byte 0x0600e000 @@ -669,7 +669,7 @@ _080E48CC: strh r0, [r1, 0xC] _080E48E0: movs r3, 0 - ldr r4, _080E4978 @ =gUnknown_03004DC0 + ldr r4, _080E4978 @ =gScanlineEffect mov r8, r4 ldr r0, _080E497C @ =gUnknown_03004DE0 mov r12, r0 @@ -692,7 +692,7 @@ _080E48EE: bgt _080E4932 ldr r1, _080E497C @ =gUnknown_03004DE0 mov r12, r1 - ldr r7, _080E4978 @ =gUnknown_03004DC0 + ldr r7, _080E4978 @ =gScanlineEffect ldr r1, _080E4980 @ =gTasks adds r0, r6, r5 lsls r0, 3 @@ -745,7 +745,7 @@ _080E4932: .align 2, 0 _080E4970: .4byte gBattle_WIN0V _080E4974: .4byte 0xfffffc04 -_080E4978: .4byte gUnknown_03004DC0 +_080E4978: .4byte gScanlineEffect _080E497C: .4byte gUnknown_03004DE0 _080E4980: .4byte gTasks _080E4984: .4byte 0x0600e000 @@ -978,7 +978,7 @@ _080E4B3A: strh r0, [r1, 0xC] _080E4B50: movs r3, 0 - ldr r6, _080E4BE8 @ =gUnknown_03004DC0 + ldr r6, _080E4BE8 @ =gScanlineEffect mov r8, r6 ldr r7, _080E4BEC @ =gUnknown_03004DE0 adds r5, r1, 0 @@ -998,7 +998,7 @@ _080E4B5A: cmp r3, 0x9F bgt _080E4B9E ldr r7, _080E4BEC @ =gUnknown_03004DE0 - ldr r6, _080E4BE8 @ =gUnknown_03004DC0 + ldr r6, _080E4BE8 @ =gScanlineEffect ldr r1, _080E4BF0 @ =gTasks mov r2, r12 adds r0, r2, r4 @@ -1053,7 +1053,7 @@ _080E4B9E: .align 2, 0 _080E4BE0: .4byte gBattle_WIN0V _080E4BE4: .4byte 0xfffffc04 -_080E4BE8: .4byte gUnknown_03004DC0 +_080E4BE8: .4byte gScanlineEffect _080E4BEC: .4byte gUnknown_03004DE0 _080E4BF0: .4byte gTasks _080E4BF4: .4byte 0x0600e000 @@ -1323,7 +1323,7 @@ _080E4E00: strh r0, [r1, 0xC] _080E4E16: movs r3, 0 - ldr r0, _080E4EA4 @ =gUnknown_03004DC0 + ldr r0, _080E4EA4 @ =gScanlineEffect mov r9, r0 ldr r2, _080E4EA8 @ =gUnknown_03004DE0 mov r8, r2 @@ -1346,7 +1346,7 @@ _080E4E24: bgt _080E4E68 ldr r0, _080E4EA8 @ =gUnknown_03004DE0 mov r8, r0 - ldr r7, _080E4EA4 @ =gUnknown_03004DC0 + ldr r7, _080E4EA4 @ =gScanlineEffect ldr r1, _080E4EAC @ =gTasks adds r0, r5, r6 lsls r0, 3 @@ -1395,7 +1395,7 @@ _080E4E94: .align 2, 0 _080E4E9C: .4byte gBattle_WIN0V _080E4EA0: .4byte 0xfffffc04 -_080E4EA4: .4byte gUnknown_03004DC0 +_080E4EA4: .4byte gScanlineEffect _080E4EA8: .4byte gUnknown_03004DE0 _080E4EAC: .4byte gTasks _080E4EB0: .4byte REG_BG1CNT diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 71788c918..9d9ead35b 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 sub_8089668 + bl ScanlineEffect_TransferDma pop {r0} bx r0 .align 2, 0 diff --git a/asm/dark.s b/asm/dark.s index f3274861c..37fdace81 100755 --- a/asm/dark.s +++ b/asm/dark.s @@ -575,7 +575,7 @@ _080E0380: .align 2, 0 _080E0398: .4byte gBattle_WIN0H _080E039C: - ldr r1, _080E03AC @ =gUnknown_03004DC0 + ldr r1, _080E03AC @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _080E03A2: @@ -584,7 +584,7 @@ _080E03A2: strh r0, [r4, 0x8] b _080E03B6 .align 2, 0 -_080E03AC: .4byte gUnknown_03004DC0 +_080E03AC: .4byte gScanlineEffect _080E03B0: adds r0, r2, 0 bl DestroyAnimVisualTask @@ -1043,7 +1043,7 @@ _080E0732: .align 2, 0 _080E0750: .4byte REG_BLDALPHA _080E0754: - ldr r1, _080E0764 @ =gUnknown_03004DC0 + ldr r1, _080E0764 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _080E075A: @@ -1052,7 +1052,7 @@ _080E075A: strh r0, [r4, 0x8] b _080E0784 .align 2, 0 -_080E0764: .4byte gUnknown_03004DC0 +_080E0764: .4byte gScanlineEffect _080E0768: ldr r0, _080E078C @ =gBattle_WIN0H movs r1, 0 @@ -1104,7 +1104,7 @@ sub_80E079C: @ 80E079C ble _080E07FC ldr r0, _080E0888 @ =gUnknown_03004DE0 mov r12, r0 - ldr r7, _080E088C @ =gUnknown_03004DC0 + ldr r7, _080E088C @ =gScanlineEffect _080E07D0: lsls r2, r4, 16 asrs r2, 16 @@ -1138,7 +1138,7 @@ _080E07FC: bgt _080E0846 ldr r0, _080E0888 @ =gUnknown_03004DE0 mov r12, r0 - ldr r7, _080E088C @ =gUnknown_03004DC0 + ldr r7, _080E088C @ =gScanlineEffect _080E0810: asrs r4, r3, 16 cmp r4, 0 @@ -1180,7 +1180,7 @@ _080E0846: cmp r1, r0 bge _080E08BE ldr r7, _080E0888 @ =gUnknown_03004DE0 - ldr r4, _080E088C @ =gUnknown_03004DC0 + ldr r4, _080E088C @ =gScanlineEffect _080E085E: asrs r3, r2, 16 cmp r3, 0 @@ -1205,7 +1205,7 @@ _080E0876: b _080E08BE .align 2, 0 _080E0888: .4byte gUnknown_03004DE0 -_080E088C: .4byte gUnknown_03004DC0 +_080E088C: .4byte gScanlineEffect _080E0890: movs r1, 0x1C ldrsh r0, [r6, r1] diff --git a/asm/dragon.s b/asm/dragon.s index 7c4ea0547..c9a2d490a 100755 --- a/asm/dragon.s +++ b/asm/dragon.s @@ -630,7 +630,7 @@ _080DFA8A: bl sub_80DFAB0 b _080DFAAA _080DFA92: - ldr r1, _080DFAA0 @ =gUnknown_03004DC0 + ldr r1, _080DFAA0 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] ldrh r0, [r2, 0x8] @@ -638,7 +638,7 @@ _080DFA92: strh r0, [r2, 0x8] b _080DFAAA .align 2, 0 -_080DFAA0: .4byte gUnknown_03004DC0 +_080DFAA0: .4byte gScanlineEffect _080DFAA4: adds r0, r3, 0 bl DestroyAnimVisualTask @@ -663,7 +663,7 @@ sub_80DFAB0: @ 80DFAB0 mov r12, r7 ldr r0, _080DFB20 @ =gSineTable mov r8, r0 - ldr r6, _080DFB24 @ =gUnknown_03004DC0 + ldr r6, _080DFB24 @ =gScanlineEffect _080DFACE: lsls r2, r4, 1 ldrb r1, [r6, 0x14] @@ -707,7 +707,7 @@ _080DFB06: .align 2, 0 _080DFB1C: .4byte gUnknown_03004DE0 _080DFB20: .4byte gSineTable -_080DFB24: .4byte gUnknown_03004DC0 +_080DFB24: .4byte gScanlineEffect thumb_func_end sub_80DFAB0 thumb_func_start sub_80DFB28 diff --git a/asm/ghost.s b/asm/ghost.s index 0db176d08..daf7cd9a5 100755 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -1334,7 +1334,7 @@ _080DE584: _080DE59C: movs r2, 0x2 movs r3, 0x6 - bl sub_8089944 + bl ScanlineEffect_InitWave lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x1C] @@ -1507,7 +1507,7 @@ _080DE6E8: beq _080DE740 b _080DE7AA _080DE6EE: - ldr r1, _080DE710 @ =gUnknown_03004DC0 + ldr r1, _080DE710 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] movs r0, 0x1 @@ -1523,7 +1523,7 @@ _080DE6EE: ldr r0, _080DE714 @ =0x0000fdff b _080DE720 .align 2, 0 -_080DE710: .4byte gUnknown_03004DC0 +_080DE710: .4byte gScanlineEffect _080DE714: .4byte 0x0000fdff _080DE718: movs r2, 0x80 diff --git a/asm/ground.s b/asm/ground.s index fd4cecbfd..00abfd4f3 100755 --- a/asm/ground.s +++ b/asm/ground.s @@ -631,7 +631,7 @@ _080E13D6: _080E13F8: .4byte gBattle_BG2_Y _080E13FC: .4byte gSprites _080E1400: - ldr r1, _080E1410 @ =gUnknown_03004DC0 + ldr r1, _080E1410 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _080E1406: @@ -640,7 +640,7 @@ _080E1406: strh r0, [r4, 0x8] b _080E1432 .align 2, 0 -_080E1410: .4byte gUnknown_03004DC0 +_080E1410: .4byte gScanlineEffect _080E1414: adds r0, r2, 0 bl DestroyAnimVisualTask @@ -925,7 +925,7 @@ _080E161C: ldrsh r0, [r0, r1] cmp r0, 0 bne _080E1662 - ldr r1, _080E1658 @ =gUnknown_03004DC0 + ldr r1, _080E1658 @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _080E164A: @@ -935,7 +935,7 @@ _080E164A: b _080E1662 .align 2, 0 _080E1654: .4byte gSprites -_080E1658: .4byte gUnknown_03004DC0 +_080E1658: .4byte gScanlineEffect _080E165C: adds r0, r2, 0 bl DestroyAnimVisualTask diff --git a/asm/pokenav.s b/asm/pokenav.s index 7c766addc..3e410872e 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -11013,14 +11013,14 @@ _080F5BD8: .4byte gUnknown_083E4990 thumb_func_start sub_80F5BDC sub_80F5BDC: @ 80F5BDC push {lr} - ldr r1, _080F5BEC @ =gUnknown_03004DC0 + ldr r1, _080F5BEC @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] - bl sub_8089668 + bl ScanlineEffect_TransferDma pop {r0} bx r0 .align 2, 0 -_080F5BEC: .4byte gUnknown_03004DC0 +_080F5BEC: .4byte gScanlineEffect thumb_func_end sub_80F5BDC thumb_func_start sub_80F5BF0 diff --git a/asm/psychic.s b/asm/psychic.s index 20e558bf6..bdc230dcb 100755 --- a/asm/psychic.s +++ b/asm/psychic.s @@ -1753,7 +1753,7 @@ _080DC4BE: ble _080DC4E6 b _080DC4D4 _080DC4CE: - ldr r1, _080DC4DC @ =gUnknown_03004DC0 + ldr r1, _080DC4DC @ =gScanlineEffect movs r0, 0x3 strb r0, [r1, 0x15] _080DC4D4: @@ -1762,7 +1762,7 @@ _080DC4D4: strh r0, [r5, 0x8] b _080DC4E6 .align 2, 0 -_080DC4DC: .4byte gUnknown_03004DC0 +_080DC4DC: .4byte gScanlineEffect _080DC4E0: adds r0, r2, 0 bl DestroyAnimVisualTask diff --git a/asm/water.s b/asm/water.s index d72f9438c..4336374aa 100755 --- a/asm/water.s +++ b/asm/water.s @@ -476,7 +476,7 @@ _080D3EE8: cmp r3, r0 bge _080D3F1C ldr r6, _080D3F80 @ =gUnknown_03004DE0 - ldr r5, _080D3F84 @ =gUnknown_03004DC0 + ldr r5, _080D3F84 @ =gScanlineEffect _080D3EF6: lsls r1, r3, 16 asrs r1, 16 @@ -506,7 +506,7 @@ _080D3F1C: cmp r1, r0 bge _080D3F50 ldr r6, _080D3F80 @ =gUnknown_03004DE0 - ldr r5, _080D3F84 @ =gUnknown_03004DC0 + ldr r5, _080D3F84 @ =gScanlineEffect _080D3F2E: asrs r3, r2, 16 lsls r2, r3, 1 @@ -532,7 +532,7 @@ _080D3F50: cmp r0, 0x9F bgt _080D4032 ldr r6, _080D3F80 @ =gUnknown_03004DE0 - ldr r5, _080D3F84 @ =gUnknown_03004DC0 + ldr r5, _080D3F84 @ =gScanlineEffect _080D3F5E: asrs r3, r1, 16 lsls r2, r3, 1 @@ -552,7 +552,7 @@ _080D3F5E: b _080D4032 .align 2, 0 _080D3F80: .4byte gUnknown_03004DE0 -_080D3F84: .4byte gUnknown_03004DC0 +_080D3F84: .4byte gScanlineEffect _080D3F88: movs r3, 0 movs r1, 0x10 @@ -560,7 +560,7 @@ _080D3F88: cmp r3, r0 bge _080D3FBC ldr r6, _080D403C @ =gUnknown_03004DE0 - ldr r5, _080D4040 @ =gUnknown_03004DC0 + ldr r5, _080D4040 @ =gScanlineEffect _080D3F96: lsls r1, r3, 16 asrs r1, 16 @@ -590,7 +590,7 @@ _080D3FBC: cmp r1, r0 bge _080D3FF0 ldr r6, _080D403C @ =gUnknown_03004DE0 - ldr r5, _080D4040 @ =gUnknown_03004DC0 + ldr r5, _080D4040 @ =gScanlineEffect _080D3FCE: asrs r3, r2, 16 lsls r2, r3, 1 @@ -616,7 +616,7 @@ _080D3FF0: cmp r0, 0x9F bgt _080D401C ldr r6, _080D403C @ =gUnknown_03004DE0 - ldr r5, _080D4040 @ =gUnknown_03004DC0 + 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: @@ -650,7 +650,7 @@ _080D4032: bx r0 .align 2, 0 _080D403C: .4byte gUnknown_03004DE0 -_080D4040: .4byte gUnknown_03004DC0 +_080D4040: .4byte gScanlineEffect thumb_func_end sub_80D3D68 thumb_func_start sub_80D4044 |