diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-23 09:39:46 -0500 |
| commit | 65391a1eb2979dc050dd4a98afea02bb0ef310ea (patch) | |
| tree | e31a90d0966cec7e8713ead9ca8083d439c8d9b5 /data/layouts/SecretBase_Tree2/layout.inc | |
| parent | eb48cc2f7eefc1e56c2dcec21c38381b4534b897 (diff) | |
| parent | abe56579c107af58e6f3a43968ba2257ff358189 (diff) | |
Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
# src/use_pokeblock.c
Diffstat (limited to 'data/layouts/SecretBase_Tree2/layout.inc')
| -rw-r--r-- | data/layouts/SecretBase_Tree2/layout.inc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc deleted file mode 100644 index 95b122220..000000000 --- a/data/layouts/SecretBase_Tree2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree2_MapBorder:: - .incbin "data/layouts/SecretBase_Tree2/border.bin" - -SecretBase_Tree2_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree2/map.bin" - - .align 2 -SecretBase_Tree2_Layout:: - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_Tree2_MapBorder - .4byte SecretBase_Tree2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - |