mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-27 13:53:52 +01:00
Merge branch 'master' into enigmaberry
This commit is contained in:
commit
73cbe9e37b
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user