diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-10 17:14:44 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-10 17:14:44 -0500 |
| commit | 690021476f3ec334e06b0dfc95267114949ecfc7 (patch) | |
| tree | d06cd3f1d45ed0e957f3bede6c0955f1375877c4 /asm/ghost.s | |
| parent | 8d658666a14f8364df32d3f14c6923ebe194153e (diff) | |
| parent | d4afe49b06a7ef2422839fcd0340c06c6a8e541b (diff) | |
conflict fix
Diffstat (limited to 'asm/ghost.s')
| -rwxr-xr-x | asm/ghost.s | 6 |
1 files changed, 3 insertions, 3 deletions
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 |