Merge branch 'master' into enigmaberry

This commit is contained in:
kittenchilly 2023-09-08 11:44:33 -05:00
commit 73cbe9e37b

View file

@ -204,7 +204,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] =
.bg = 0,
.tilemapLeft = 2,
.tilemapTop = 57,
.width = 8,
.width = 16, //for z effect descriptions
.height = 2,
.paletteNum = 5,
.baseBlock = 0x0328,
@ -216,7 +216,7 @@ static const struct WindowTemplate sStandardBattleWindowTemplates[] =
.width = 8,
.height = 2,
.paletteNum = 5,
.baseBlock = 0x0338,
.baseBlock = 0x0340,
},
[B_WIN_PP] = {
.bg = 0,