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 constants-num-frames

Browse Source
This commit is contained in:
GriffinR
2023-02-01 15:59:02 -05:00
parent 60e1ad20e4 603d870ea0
commit 3b15fd34cc
890 changed files with 40310 additions and 37715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/use_pokeblock.c
View File

@@ -505,7 +505,7 @@ static void LoadUsePokeblockMenu(void)
InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates));
InitWindows(sWindowTemplates);
DeactivateAllTextPrinters();
LoadUserWindowBorderGfx(0, 0x97, 0xE0);
LoadUserWindowBorderGfx(0, 0x97, BG_PLTT_ID(14));
sInfo->mainState++;
break;
case 4:
@@ -1233,13 +1233,13 @@ static void UpdateMonPic(u8 loadId)
gSprites[sMenu->curMonSpriteId].callback = SpriteCB_MonPic;
gSprites[sMenu->curMonSpriteId].y2 -= 34;
sMenu->curMonTileStart = (void *)(OBJ_VRAM0 + (sMenu->curMonSheet * 32));
sMenu->curMonPalette = (sMenu->curMonPalette * 16) + 0x100;
sMenu->curMonPalette = OBJ_PLTT_ID(sMenu->curMonPalette);
}
}
else
{
Dma3CopyLarge16_(sMenu->partySheets[loadId], sMenu->curMonTileStart, MON_PIC_SIZE);
LoadPalette(sMenu->partyPalettes[loadId], sMenu->curMonPalette, 32);
LoadPalette(sMenu->partyPalettes[loadId], sMenu->curMonPalette, PLTT_SIZE_4BPP);
}
}
@@ -1340,7 +1340,7 @@ static bool8 LoadUsePokeblockMenuGfx(void)
LoadBgTilemap(3, sMonFrame_TilemapPtr, 1280, 0);
break;
case 5:
LoadPalette(sMonFrame_Pal, 208, 32);
LoadPalette(sMonFrame_Pal, BG_PLTT_ID(13), PLTT_SIZE_4BPP);
sMenu->curMonXOffset = -80;
break;
case 6:
@@ -1348,7 +1348,7 @@ static bool8 LoadUsePokeblockMenuGfx(void)
break;
case 7:
LZ77UnCompVram(gUsePokeblockGraph_Tilemap, sGraph_Tilemap);
LoadPalette(gUsePokeblockGraph_Pal, 32, 32);
LoadPalette(gUsePokeblockGraph_Pal, BG_PLTT_ID(2), PLTT_SIZE_4BPP);
break;
case 8:
LoadBgTiles(1, sGraph_Gfx, 6656, 160 << 2);
@@ -1363,8 +1363,8 @@ static bool8 LoadUsePokeblockMenuGfx(void)
break;
case 11:
LoadBgTilemap(2, sMenu->tilemapBuffer, 1280, 0);
LoadPalette(gConditionGraphData_Pal, 48, 32);
LoadPalette(gConditionText_Pal, 240, 32);
LoadPalette(gConditionGraphData_Pal, BG_PLTT_ID(3), PLTT_SIZE_4BPP);
LoadPalette(gConditionText_Pal, BG_PLTT_ID(15), PLTT_SIZE_4BPP);
ConditionGraph_InitWindow(2);
break;
default: