diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-10 13:35:10 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 13:35:10 -0600 |
| commit | d4afe49b06a7ef2422839fcd0340c06c6a8e541b (patch) | |
| tree | 2574b4b45b52dc72f88d5064ef6b9b5a74a6cec4 /src/field/overworld.c | |
| parent | 0be27e16d2bea0fb4a9145849706779501ae3450 (diff) | |
| parent | bb2c758e8fa730b2bd19b92119a2bd7e37af57f8 (diff) | |
Merge pull request #519 from camthesaxman/label_unknown_task
label scanline effect routines
Diffstat (limited to 'src/field/overworld.c')
| -rw-r--r-- | src/field/overworld.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/field/overworld.c b/src/field/overworld.c index 9fab20876..86b0a5dac 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -47,7 +47,7 @@ #include "tileset_anim.h" #include "time_events.h" #include "tv.h" -#include "unknown_task.h" +#include "scanline_effect.h" #include "wild_encounter.h" #ifdef SAPPHIRE @@ -142,7 +142,7 @@ const struct UCoords32 gUnknown_0821664C[] = { 1, -1}, }; -const struct UnknownTaskStruct gUnknown_08216694 = +const struct ScanlineEffectParams gUnknown_08216694 = { (void *)REG_ADDR_WIN0H, ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, @@ -1410,7 +1410,7 @@ void VBlankCB_Field(void) { LoadOam(); ProcessSpriteCopyRequests(); - sub_8089668(); + ScanlineEffect_InitHBlankDmaTransfer(); sub_8057A58(); TransferPlttBuffer(); sub_8072E74(); @@ -1422,7 +1422,7 @@ void sub_8054814(void) if (val) { sub_80815E0(val); - sub_80895F8(gUnknown_08216694); + ScanlineEffect_SetParams(gUnknown_08216694); } } @@ -1669,7 +1669,7 @@ void sub_8054BA8(void) REG_DISPCNT = 0; - remove_some_task(); + ScanlineEffect_Stop(); DmaClear16(3, PLTT + 2, PLTT_SIZE - 2); @@ -1731,7 +1731,7 @@ void sub_8054D4C(u32 a1) ResetTasks(); ResetSpriteData(); ResetPaletteFade(); - dp12_8087EA4(); + ScanlineEffect_Clear(); ResetCameraUpdateInfo(); InstallCameraPanAheadCallback(); sub_805C7C4(0); |