+18
-18
@@ -172,16 +172,16 @@ struct PokedexView
|
||||
u16 ownCount;
|
||||
u16 monSpriteIds[MAX_MONS_ON_SCREEN];
|
||||
u16 selectedMonSpriteId;
|
||||
u16 pokeBallRotationStep;
|
||||
u16 pokeBallRotationBackup;
|
||||
s16 pokeBallRotationStep;
|
||||
s16 pokeBallRotationBackup;
|
||||
u8 pokeBallRotation;
|
||||
u8 initialVOffset;
|
||||
u8 scrollTimer;
|
||||
u8 scrollDirection;
|
||||
s16 listVOffset;
|
||||
s16 listMovingVOffset;
|
||||
u16 scrollMonIncrement;
|
||||
u16 maxScrollTimer;
|
||||
s16 scrollMonIncrement;
|
||||
s16 maxScrollTimer;
|
||||
u16 scrollSpeed;
|
||||
u16 unkArr1[4]; // Cleared, never read
|
||||
u8 filler[8];
|
||||
@@ -2060,10 +2060,10 @@ static bool8 LoadPokedexListPage(u8 page)
|
||||
SetGpuReg(REG_OFFSET_BG2VOFS, sPokedexView->initialVOffset);
|
||||
ResetBgsAndClearDma3BusyFlags(0);
|
||||
InitBgsFromTemplates(0, sPokedex_BgTemplate, ARRAY_COUNT(sPokedex_BgTemplate));
|
||||
SetBgTilemapBuffer(3, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(2, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(1, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(0, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(3, AllocZeroed(BG_SCREEN_SIZE));
|
||||
SetBgTilemapBuffer(2, AllocZeroed(BG_SCREEN_SIZE));
|
||||
SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE));
|
||||
SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE));
|
||||
DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
|
||||
CopyToBgTilemapBuffer(1, gPokedexList_Tilemap, 0, 0);
|
||||
CopyToBgTilemapBuffer(3, gPokedexListUnderlay_Tilemap, 0, 0);
|
||||
@@ -3186,10 +3186,10 @@ static u8 LoadInfoScreen(struct PokedexListItem* item, u8 monSpriteId)
|
||||
gTasks[taskId].data[5] = 255;
|
||||
ResetBgsAndClearDma3BusyFlags(0);
|
||||
InitBgsFromTemplates(0, sInfoScreen_BgTemplate, ARRAY_COUNT(sInfoScreen_BgTemplate));
|
||||
SetBgTilemapBuffer(3, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(2, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(1, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(0, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(3, AllocZeroed(BG_SCREEN_SIZE));
|
||||
SetBgTilemapBuffer(2, AllocZeroed(BG_SCREEN_SIZE));
|
||||
SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE));
|
||||
SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE));
|
||||
InitWindows(sInfoScreen_WindowTemplates);
|
||||
DeactivateAllTextPrinters();
|
||||
|
||||
@@ -3951,8 +3951,8 @@ static void Task_DisplayCaughtMonDexPage(u8 taskId)
|
||||
ResetOtherVideoRegisters(DISPCNT_BG0_ON);
|
||||
ResetBgsAndClearDma3BusyFlags(0);
|
||||
InitBgsFromTemplates(0, sNewEntryInfoScreen_BgTemplate, ARRAY_COUNT(sNewEntryInfoScreen_BgTemplate));
|
||||
SetBgTilemapBuffer(3, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(2, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(3, AllocZeroed(BG_SCREEN_SIZE));
|
||||
SetBgTilemapBuffer(2, AllocZeroed(BG_SCREEN_SIZE));
|
||||
InitWindows(sNewEntryInfoScreen_WindowTemplates);
|
||||
DeactivateAllTextPrinters();
|
||||
gTasks[taskId].tState = 1;
|
||||
@@ -4820,10 +4820,10 @@ static void Task_LoadSearchMenu(u8 taskId)
|
||||
ResetOtherVideoRegisters(0);
|
||||
ResetBgsAndClearDma3BusyFlags(0);
|
||||
InitBgsFromTemplates(0, sSearchMenu_BgTemplate, ARRAY_COUNT(sSearchMenu_BgTemplate));
|
||||
SetBgTilemapBuffer(3, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(2, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(1, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(0, AllocZeroed(0x800));
|
||||
SetBgTilemapBuffer(3, AllocZeroed(BG_SCREEN_SIZE));
|
||||
SetBgTilemapBuffer(2, AllocZeroed(BG_SCREEN_SIZE));
|
||||
SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE));
|
||||
SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE));
|
||||
InitWindows(sSearchMenu_WindowTemplate);
|
||||
DeactivateAllTextPrinters();
|
||||
PutWindowTilemap(0);
|
||||
|
||||
Reference in New Issue
Block a user