diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
| commit | a3ebca4d814adcf245212cb549f72812f2cf39c6 (patch) | |
| tree | 88fddcd03a5f19cf84b6199863f95fd06f1954bf /data/layouts | |
| parent | 1e3da62d24ad91e4d69ac6974476fd5ea47cae9b (diff) | |
| parent | a0ff38d0be4f618822d96cc7833e7c331ee78b5f (diff) | |
Fix merge conflicts
Diffstat (limited to 'data/layouts')
| -rw-r--r-- | data/layouts/Route111_NoMirageTower/layout.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/data/layouts/Route111_NoMirageTower/layout.inc b/data/layouts/Route111_NoMirageTower/layout.inc index acd390ada..bf6a188cc 100644 --- a/data/layouts/Route111_NoMirageTower/layout.inc +++ b/data/layouts/Route111_NoMirageTower/layout.inc @@ -12,3 +12,4 @@ Route111_NoMirageTower_Layout:: .4byte Route111_NoMirageTower_MapBlockdata .4byte gTileset_General .4byte gTileset_Mauville + |