diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2013-12-15 16:18:14 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2013-12-15 16:18:14 -0600 |
| commit | 549fe35420c2cd114cafa5997633297fa3ff9290 (patch) | |
| tree | 454f88103f1a3616612afd73bc532adbdf036459 /maps | |
| parent | Nicknaming screen loads the 'ED' symbol separately. (diff) | |
| parent | incbin killing part 2 (diff) | |
| download | pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.tar.gz pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.tar.xz pokeyellow-549fe35420c2cd114cafa5997633297fa3ff9290.zip | |
Merged and fixed incbin conflicts with Danny.
Diffstat (limited to 'maps')
| -rwxr-xr-x | maps/unusedblocks58d7d.blk | 2 | ||||
| -rwxr-xr-x | maps/unusedblocks601f8.blk | 1 | ||||
| -rwxr-xr-x | maps/unusedblocks60cef.blk | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/maps/unusedblocks58d7d.blk b/maps/unusedblocks58d7d.blk new file mode 100755 index 00000000..9641efe4 --- /dev/null +++ b/maps/unusedblocks58d7d.blk @@ -0,0 +1,2 @@ +
!"# +
\ No newline at end of file diff --git a/maps/unusedblocks601f8.blk b/maps/unusedblocks601f8.blk new file mode 100755 index 00000000..eb9bb094 --- /dev/null +++ b/maps/unusedblocks601f8.blk @@ -0,0 +1 @@ +
, +> + + + +>
\ No newline at end of file diff --git a/maps/unusedblocks60cef.blk b/maps/unusedblocks60cef.blk new file mode 100755 index 00000000..21808bb7 --- /dev/null +++ b/maps/unusedblocks60cef.blk @@ -0,0 +1 @@ +
\ No newline at end of file |