diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
| commit | d004ce065c9cc6425df6f567dff39eb831f84875 (patch) | |
| tree | 2c20338324f10a553e78e731d999dd58669266c3 /data/layouts | |
| parent | ec780bb2098be75e591b212e85947f88c91d4e37 (diff) | |
| parent | 58f130d007b97623dd5c7a3b373800c138f75c5e (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into trade
Diffstat (limited to 'data/layouts')
| -rw-r--r-- | data/layouts/Route111_NoMirageTower/border.bin (renamed from data/layouts/UnknownMap_08470BD8/border.bin) | bin | 8 -> 8 bytes | |||
| -rw-r--r-- | data/layouts/Route111_NoMirageTower/layout.inc | 15 | ||||
| -rw-r--r-- | data/layouts/Route111_NoMirageTower/map.bin (renamed from data/layouts/UnknownMap_08470BD8/map.bin) | bin | 11200 -> 11200 bytes | |||
| -rw-r--r-- | data/layouts/UnknownMap_08470BD8/layout.inc | 15 |
4 files changed, 15 insertions, 15 deletions
diff --git a/data/layouts/UnknownMap_08470BD8/border.bin b/data/layouts/Route111_NoMirageTower/border.bin Binary files differindex 4531975c7..4531975c7 100644 --- a/data/layouts/UnknownMap_08470BD8/border.bin +++ b/data/layouts/Route111_NoMirageTower/border.bin diff --git a/data/layouts/Route111_NoMirageTower/layout.inc b/data/layouts/Route111_NoMirageTower/layout.inc new file mode 100644 index 000000000..bf6a188cc --- /dev/null +++ b/data/layouts/Route111_NoMirageTower/layout.inc @@ -0,0 +1,15 @@ +Route111_NoMirageTower_MapBorder:: + .incbin "data/layouts/Route111_NoMirageTower/border.bin" + +Route111_NoMirageTower_MapBlockdata:: + .incbin "data/layouts/Route111_NoMirageTower/map.bin" + + .align 2 +Route111_NoMirageTower_Layout:: + .4byte 0x28 + .4byte 0x8C + .4byte Route111_NoMirageTower_MapBorder + .4byte Route111_NoMirageTower_MapBlockdata + .4byte gTileset_General + .4byte gTileset_Mauville + diff --git a/data/layouts/UnknownMap_08470BD8/map.bin b/data/layouts/Route111_NoMirageTower/map.bin Binary files differindex 0f7bbb958..0f7bbb958 100644 --- a/data/layouts/UnknownMap_08470BD8/map.bin +++ b/data/layouts/Route111_NoMirageTower/map.bin diff --git a/data/layouts/UnknownMap_08470BD8/layout.inc b/data/layouts/UnknownMap_08470BD8/layout.inc deleted file mode 100644 index 671127587..000000000 --- a/data/layouts/UnknownMap_08470BD8/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08470BD8_MapBorder:: - .incbin "data/layouts/UnknownMap_08470BD8/border.bin" - -UnknownMap_08470BD8_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08470BD8/map.bin" - - .align 2 -UnknownMap_08470BD8_Layout:: - .4byte 0x28 - .4byte 0x8C - .4byte UnknownMap_08470BD8_MapBorder - .4byte UnknownMap_08470BD8_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - |