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

Decimal paletteNums

Browse Source
This commit is contained in:
Martin Griffin
2022-08-19 16:32:00 +01:00
parent 5719a7f7bc
commit d57442a511
103 changed files with 1032 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon_jump.c
+18 -18
View File
@@ -3105,7 +3105,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.tilemapTop = 0,
.width = 6,
.height = 2,
.paletteNum = 0x2,
.paletteNum = 2,
.baseBlock = 0x13,
},
[WIN_TIMES] = {
@@ -3114,7 +3114,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.tilemapTop = 0,
.width = 6,
.height = 2,
.paletteNum = 0x2,
.paletteNum = 2,
.baseBlock = 0x1F,
},
DUMMY_WIN_TEMPLATE,
@@ -3183,21 +3183,21 @@ static void LoadPokeJumpGfx(void)
ResetTempTileDataBuffers();
LoadSpriteSheetsAndPalettes(sPokemonJumpGfx);
InitDigitPrinters();
LoadPalette(sBg_Pal, BG_PLTT_ID(0x0), PLTT_SIZE_4BPP);
LoadPalette(sBg_Pal, BG_PLTT_ID(0), PLTT_SIZE_4BPP);
DecompressAndCopyTileDataToVram(BG_SCENERY, sBg_Gfx, 0, 0, 0);
DecompressAndCopyTileDataToVram(BG_SCENERY, sBg_Tilemap, 0, 0, 1);
LoadPalette(sVenusaur_Pal, BG_PLTT_ID(0x3), PLTT_SIZE_4BPP);
LoadPalette(sVenusaur_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP);
DecompressAndCopyTileDataToVram(BG_VENUSAUR, sVenusaur_Gfx, 0, 0, 0);
DecompressAndCopyTileDataToVram(BG_VENUSAUR, sVenusaur_Tilemap, 0, 0, 1);
LoadPalette(sBonuses_Pal, BG_PLTT_ID(0x1), PLTT_SIZE_4BPP);
LoadPalette(sBonuses_Pal, BG_PLTT_ID(1), PLTT_SIZE_4BPP);
DecompressAndCopyTileDataToVram(BG_BONUSES, sBonuses_Gfx, 0, 0, 0);
DecompressAndCopyTileDataToVram(BG_BONUSES, sBonuses_Tilemap, 0, 0, 1);
LoadPalette(sInterface_Pal, BG_PLTT_ID(0x2), PLTT_SIZE_4BPP);
LoadPalette(sInterface_Pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP);
SetBgTilemapBuffer(BG_INTERFACE, sPokemonJumpGfx->tilemapBuffer);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 0x20, 0x20);
PrintScoreSuffixes();
PrintScore(0);
LoadUserWindowBorderGfxOnBg(0, 1, BG_PLTT_ID(0xE));
LoadUserWindowBorderGfxOnBg(0, 1, BG_PLTT_ID(14));
CopyBgTilemapBufferToVram(BG_INTERFACE);
CopyBgTilemapBufferToVram(BG_VENUSAUR);
CopyBgTilemapBufferToVram(BG_BONUSES);
@@ -3321,7 +3321,7 @@ static void Msg_WantToPlayAgain(void)
if (!IsDma3ManagerBusyWithBgCopy())
{
PutWindowTilemap(sPokemonJumpGfx->msgWindowId);
DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE);
DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14);
CreatePokeJumpYesNoMenu(23, 7, 0);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sPokemonJumpGfx->mainState++;
@@ -3348,7 +3348,7 @@ static void Msg_SavingDontTurnOff(void)
if (!IsDma3ManagerBusyWithBgCopy())
{
PutWindowTilemap(sPokemonJumpGfx->msgWindowId);
DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE);
DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sPokemonJumpGfx->mainState++;
}
@@ -3391,7 +3391,7 @@ static void Msg_SomeoneDroppedOut(void)
if (!IsDma3ManagerBusyWithBgCopy())
{
PutWindowTilemap(sPokemonJumpGfx->msgWindowId);
DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE);
DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sPokemonJumpGfx->mainState++;
}
@@ -3417,7 +3417,7 @@ static void Msg_CommunicationStandby(void)
if (!IsDma3ManagerBusyWithBgCopy())
{
PutWindowTilemap(sPokemonJumpGfx->msgWindowId);
DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE);
DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sPokemonJumpGfx->mainState++;
}
@@ -3527,7 +3527,7 @@ static bool32 DoPrizeMessageAndFanfare(void)
if (!IsDma3ManagerBusyWithBgCopy())
{
PutWindowTilemap(sPokemonJumpGfx->msgWindowId);
DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 0xE);
DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sPokemonJumpGfx->msgWindowState++;
}
@@ -3601,7 +3601,7 @@ static u32 AddMessageWindow(u32 left, u32 top, u32 width, u32 height)
window.tilemapTop = top;
window.width = width;
window.height = height;
window.paletteNum = 0xF;
window.paletteNum = 15;
window.baseBlock = 0x43;
windowId = AddWindow(&window);
@@ -3618,7 +3618,7 @@ static void CreatePokeJumpYesNoMenu(u16 left, u16 top, u8 cursorPos)
window.tilemapTop = top;
window.width = 6;
window.height = 4;
window.paletteNum = 0x2;
window.paletteNum = 2;
window.baseBlock = 0x2B;
CreateYesNoMenu(&window, 1, 0xD, cursorPos);
@@ -3832,7 +3832,7 @@ static void AddPlayerNameWindows(void)
window.bg = BG_INTERFACE;
window.width = 8;
window.height = 2;
window.paletteNum = 0x2;
window.paletteNum = 2;
window.baseBlock = 0x2B;
for (i = 0; i < playersCount; i++)
@@ -4142,7 +4142,7 @@ static const struct WindowTemplate sWindowTemplate_Records =
.tilemapTop = 1,
.width = 28,
.height = 9,
.paletteNum = 0xF,
.paletteNum = 15,
.baseBlock = 0x1,
};
@@ -4213,8 +4213,8 @@ static void PrintRecordsText(u16 windowId, int width)
recordNums[1] = records->bestJumpScore;
recordNums[2] = records->excellentsInRow;
LoadUserWindowBorderGfx_(windowId, 0x21D, BG_PLTT_ID(0xD));
DrawTextBorderOuter(windowId, 0x21D, 0xD);
LoadUserWindowBorderGfx_(windowId, 0x21D, BG_PLTT_ID(13));
DrawTextBorderOuter(windowId, 0x21D, 13);
FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
AddTextPrinterParameterized(windowId, FONT_NORMAL, gText_PkmnJumpRecords, GetStringCenterAlignXOffset(FONT_NORMAL, gText_PkmnJumpRecords, width * 8), 1, TEXT_SKIP_DRAW, NULL);
for (i = 0; i < ARRAY_COUNT(sRecordsTexts); i++)