diff options
author | Tetrable <atiftetra@gmail.com> | 2018-09-09 20:42:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-09 20:42:23 +0100 |
commit | 3a0c26887efb6abc8106671ceefcc098737d823b (patch) | |
tree | 930dcf2dc217011c45671f3bf2017ec9111fd6ed /src/egg_hatch.c | |
parent | 5a53d6d1fb304736c1fb3c222192a3b722707bca (diff) | |
parent | e1834c9d7bc961f872169e056b788fec04f39867 (diff) |
Merge pull request #3 from pret/master
merge
Diffstat (limited to 'src/egg_hatch.c')
-rw-r--r-- | src/egg_hatch.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c index 1c626cc86..25af28da4 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -253,13 +253,27 @@ static const struct BgTemplate sBgTemplates_EggHatch[2] = static const struct WindowTemplate sWinTemplates_EggHatch[2] = { - {0, 2, 0xF, 0x1A, 4, 0, 0x40}, + { + .priority = 0, + .tilemapLeft = 2, + .tilemapTop = 15, + .width = 26, + .height = 4, + .paletteNum = 0, + .baseBlock = 64 + }, DUMMY_WIN_TEMPLATE }; static const struct WindowTemplate sYesNoWinTemplate = { - 0, 0x15, 9, 5, 4, 0xF, 0x1A8 + .priority = 0, + .tilemapLeft = 21, + .tilemapTop = 9, + .width = 5, + .height = 4, + .paletteNum = 15, + .baseBlock = 424 }; static const s16 sEggShardVelocities[][2] = |