diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2020-11-02 18:43:11 -0500 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2020-11-02 18:43:11 -0500 |
| commit | 8bf401c2272b7c4182f54cb1285f6067fb5247f9 (patch) | |
| tree | 6322a003e20536aae51399a930a9de9bea315c49 /src/pokenav_main_menu.c | |
| parent | fe40c0c4663d732c8ba9ca5f5e00b3c14a17d304 (diff) | |
address comments
Diffstat (limited to 'src/pokenav_main_menu.c')
| -rw-r--r-- | src/pokenav_main_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index a100e2c23..fc7004a88 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -436,9 +436,9 @@ static u32 LoopedTask_ScrollMenuHeaderUp(s32 a0) if (ChangeBgY(0, 384, 2) <= 0) { ChangeBgY(0, 0, 0); - return 4; + return LT_FINISH; } - return 2; + return LT_PAUSE; } void CopyPaletteIntoBufferUnfaded(const u16 *palette, u32 bufferOffset, u32 size) @@ -682,7 +682,7 @@ static void LoadLeftHeaderGfxForMenu(u32 menuGfxId) size = GetDecompressedDataSize(sPokenavMenuLeftHeaderSpriteSheets[menuGfxId].data); LoadPalette(&gPokenavLeftHeader_Pal[tag * 16], (IndexOfSpritePaletteTag(1) * 16) + 0x100, 0x20); LZ77UnCompWram(sPokenavMenuLeftHeaderSpriteSheets[menuGfxId].data, gDecompressionBuffer); - RequestDma3Copy(gDecompressionBuffer, (void *)VRAM + 0x10000 + (GetSpriteTileStartByTag(2) * 32), size, 1); + RequestDma3Copy(gDecompressionBuffer, (void *)OBJ_VRAM0 + (GetSpriteTileStartByTag(2) * 32), size, 1); structPtr->leftHeaderSprites[1]->oam.tileNum = GetSpriteTileStartByTag(2) + sPokenavMenuLeftHeaderSpriteSheets[menuGfxId].size; if (menuGfxId == POKENAV_GFX_MAP_MENU_ZOOMED_OUT || menuGfxId == POKENAV_GFX_MAP_MENU_ZOOMED_IN) |