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

Merge branch 'master' into battle_frontier_2

Browse Source
This commit is contained in:
DizzyEggg
2018-10-30 21:48:18 +01:00
parent 0da7d7e6ae 9adbb5d871
commit 90ef269426
88 changed files with 63739 additions and 58616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_dome.c
+21 -21
View File
@@ -786,7 +786,7 @@ static const struct BgTemplate gUnknown_0860CE84[4] =
static const struct WindowTemplate gUnknown_0860CE94[] =
{
{
.priority = 0,
.bg = 0,
.tilemapLeft = 0,
.tilemapTop = 3,
.width = 8,
@@ -795,7 +795,7 @@ static const struct WindowTemplate gUnknown_0860CE94[] =
.baseBlock = 16,
},
{
.priority = 0,
.bg = 0,
.tilemapLeft = 22,
.tilemapTop = 3,
.width = 8,
@@ -804,7 +804,7 @@ static const struct WindowTemplate gUnknown_0860CE94[] =
.baseBlock = 144,
},
{
.priority = 0,
.bg = 0,
.tilemapLeft = 8,
.tilemapTop = 1,
.width = 14,
@@ -818,7 +818,7 @@ static const struct WindowTemplate gUnknown_0860CE94[] =
static const struct WindowTemplate gUnknown_0860CEB4[] =
{
{
.priority = 0,
.bg = 0,
.tilemapLeft = 2,
.tilemapTop = 2,
.width = 26,
@@ -827,7 +827,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 1,
},
{
.priority = 0,
.bg = 0,
.tilemapLeft = 16,
.tilemapTop = 5,
.width = 8,
@@ -836,7 +836,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 53,
},
{
.priority = 0,
.bg = 0,
.tilemapLeft = 19,
.tilemapTop = 7,
.width = 9,
@@ -845,7 +845,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 69,
},
{
.priority = 0,
.bg = 0,
.tilemapLeft = 16,
.tilemapTop = 10,
.width = 8,
@@ -854,7 +854,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 96,
},
{
.priority = 0,
.bg = 0,
.tilemapLeft = 2,
.tilemapTop = 12,
.width = 26,
@@ -863,7 +863,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 112,
},
{
.priority = 0,
.bg = 0,
.tilemapLeft = 5,
.tilemapTop = 2,
.width = 23,
@@ -872,7 +872,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 294,
},
{
.priority = 0,
.bg = 0,
.tilemapLeft = 2,
.tilemapTop = 5,
.width = 8,
@@ -881,7 +881,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 340,
},
{
.priority = 0,
.bg = 0,
.tilemapLeft = 20,
.tilemapTop = 5,
.width = 8,
@@ -890,7 +890,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 356,
},
{
.priority = 0,
.bg = 0,
.tilemapLeft = 2,
.tilemapTop = 16,
.width = 26,
@@ -899,7 +899,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 372,
},
{
.priority = 1,
.bg = 1,
.tilemapLeft = 2,
.tilemapTop = 2,
.width = 26,
@@ -908,7 +908,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 1,
},
{
.priority = 1,
.bg = 1,
.tilemapLeft = 16,
.tilemapTop = 5,
.width = 8,
@@ -917,7 +917,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 53,
},
{
.priority = 1,
.bg = 1,
.tilemapLeft = 19,
.tilemapTop = 7,
.width = 9,
@@ -926,7 +926,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 69,
},
{
.priority = 1,
.bg = 1,
.tilemapLeft = 16,
.tilemapTop = 10,
.width = 8,
@@ -935,7 +935,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 96,
},
{
.priority = 1,
.bg = 1,
.tilemapLeft = 2,
.tilemapTop = 12,
.width = 26,
@@ -944,7 +944,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 112,
},
{
.priority = 1,
.bg = 1,
.tilemapLeft = 5,
.tilemapTop = 2,
.width = 23,
@@ -953,7 +953,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 294,
},
{
.priority = 1,
.bg = 1,
.tilemapLeft = 2,
.tilemapTop = 5,
.width = 8,
@@ -962,7 +962,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 340,
},
{
.priority = 1,
.bg = 1,
.tilemapLeft = 20,
.tilemapTop = 5,
.width = 8,
@@ -971,7 +971,7 @@ static const struct WindowTemplate gUnknown_0860CEB4[] =
.baseBlock = 356,
},
{
.priority = 1,
.bg = 1,
.tilemapLeft = 2,
.tilemapTop = 16,
.width = 26,