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/easy_chat_1.c | |
| parent | 0be27e16d2bea0fb4a9145849706779501ae3450 (diff) | |
| parent | bb2c758e8fa730b2bd19b92119a2bd7e37af57f8 (diff) | |
Merge pull request #519 from camthesaxman/label_unknown_task
label scanline effect routines
Diffstat (limited to 'src/easy_chat_1.c')
| -rw-r--r-- | src/easy_chat_1.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index cb0e98b71..4b64846f9 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -14,7 +14,7 @@ #include "sprite.h" #include "string_util.h" #include "strings.h" -#include "unknown_task.h" +#include "scanline_effect.h" extern const struct WindowTemplate gWindowTemplate_81E6D54; extern const struct WindowTemplate gWindowTemplate_81E6DA8; @@ -43,7 +43,7 @@ const u16 gBerryMasterWifePhrases[][2] = // const pointer to gEasyChatStruct-> easy_chat might be two separate files. struct Shared1000 *const gEasyChatStruct = (struct Shared1000 *)(gSharedMem + 0x1000); -const struct UnknownTaskStruct gUnknown_083DB698 = +const struct ScanlineEffectParams gUnknown_083DB698 = { ®_BG3VOFS, ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1, @@ -297,10 +297,10 @@ void sub_80E62F8(void) SetVBlankCallback(0); ResetPaletteFade(); ResetSpriteData(); - dp12_8087EA4(); - remove_some_task(); + ScanlineEffect_Clear(); + ScanlineEffect_Stop(); sub_80EAD08(); - sub_80895F8(gUnknown_083DB698); + ScanlineEffect_SetParams(gUnknown_083DB698); FreeSpriteTileRanges(); FreeAllSpritePalettes(); break; @@ -655,7 +655,7 @@ void sub_80E6A6C(void) ProcessSpriteCopyRequests(); sub_80EAC5C(); TransferPlttBuffer(); - sub_8089668(); + ScanlineEffect_InitHBlankDmaTransfer(); } void sub_80E6A88(void) |