dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

Browse Source
This commit is contained in:
GriffinR
2023-02-01 14:59:45 -05:00
parent c91b13a12b 603d870ea0
commit 4328ed8b19
259 changed files with 4375 additions and 5702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/wireless_communication_status_screen.c
View File

@@ -221,10 +221,10 @@ static void CB2_InitWirelessCommunicationScreen(void)
ChangeBgY(0, 0, BG_COORD_SET);
ChangeBgX(1, 0, BG_COORD_SET);
ChangeBgY(1, 0, BG_COORD_SET);
LoadPalette(sPalettes, 0x00, 0x20);
LoadPalette(sPalettes, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
Menu_LoadStdPalAt(0xF0);
DynamicPlaceholderTextUtil_Reset();
FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 0x0F);
FillBgTilemapBufferRect(0, 0, 0, 0, 32, 32, 15);
CopyBgTilemapBufferToVram(1);
SetMainCallback2(CB2_RunWirelessCommunicationScreen);
RunTasks();
@@ -258,7 +258,7 @@ static void CyclePalette(s16 * counter, s16 * palIdx)
*counter = 0;
}
idx = *palIdx + 2; // +2 skips over default.pal and the empty black palette after it
LoadPalette(sPalettes[idx], 0, 16);
LoadPalette(sPalettes[idx], BG_PLTT_ID(0), PLTT_SIZEOF(8));
}
static void PrintHeaderTexts(void)