diff options
| author | Sanky <gsanky@gmail.com> | 2013-10-21 20:24:46 +0200 |
|---|---|---|
| committer | Sanky <gsanky@gmail.com> | 2013-10-21 20:24:46 +0200 |
| commit | b5268ab9207f02574abe8d6f5407e25f4a86365a (patch) | |
| tree | adce2892dd4c07781f2db42854e30fc25dba8b15 /maps | |
| parent | AskForMonNickname (diff) | |
| parent | Fix CheckIfInOutsideMap comments. (diff) | |
| download | pokeyellow-b5268ab9207f02574abe8d6f5407e25f4a86365a.tar.gz pokeyellow-b5268ab9207f02574abe8d6f5407e25f4a86365a.tar.xz pokeyellow-b5268ab9207f02574abe8d6f5407e25f4a86365a.zip | |
Merge remote-tracking branch 'kanzure/master' into mergetastic
Conflicts:
main.asm
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/celadonhouse.blk | 5 | ||||
| -rw-r--r-- | maps/celadonhouse2.blk | 1 | ||||
| -rw-r--r-- | maps/celadonmart5.blk | 5 | ||||
| -rw-r--r-- | maps/celadonmartelevator.blk (renamed from maps/celadonmart6.blk) | 0 | ||||
| -rw-r--r-- | maps/celadonmartroof.blk | 1 | ||||
| -rw-r--r-- | maps/ceruleanhouse.blk | 1 | ||||
| -rw-r--r-- | maps/ceruleanhouse2.blk | 2 | ||||
| -rw-r--r-- | maps/ceruleanhouse3.blk | 1 | ||||
| -rw-r--r-- | maps/lorelei.blk (renamed from maps/loreli.blk) | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | maps/route15gateupstairs.blk (renamed from maps/route18gateheader.blk) | bin | 16 -> 16 bytes | |||
| -rw-r--r-- | maps/route18gateupstairs.blk | bin | 0 -> 16 bytes |
11 files changed, 8 insertions, 8 deletions
diff --git a/maps/celadonhouse.blk b/maps/celadonhouse.blk index 8558b3de..4181d9de 100644 --- a/maps/celadonhouse.blk +++ b/maps/celadonhouse.blk @@ -1,4 +1 @@ -
% - - - +D@?D BC FG 6A 6
\ No newline at end of file diff --git a/maps/celadonhouse2.blk b/maps/celadonhouse2.blk deleted file mode 100644 index 4181d9de..00000000 --- a/maps/celadonhouse2.blk +++ /dev/null @@ -1 +0,0 @@ -D@?D BC FG 6A 6
\ No newline at end of file diff --git a/maps/celadonmart5.blk b/maps/celadonmart5.blk index 520407ba..8558b3de 100644 --- a/maps/celadonmart5.blk +++ b/maps/celadonmart5.blk @@ -1 +1,4 @@ -6 ;??A6! <C*A6 ! A677777777A
\ No newline at end of file +
% + + + diff --git a/maps/celadonmart6.blk b/maps/celadonmartelevator.blk index 824bc3de..824bc3de 100644 --- a/maps/celadonmart6.blk +++ b/maps/celadonmartelevator.blk diff --git a/maps/celadonmartroof.blk b/maps/celadonmartroof.blk new file mode 100644 index 00000000..520407ba --- /dev/null +++ b/maps/celadonmartroof.blk @@ -0,0 +1 @@ +6 ;??A6! <C*A6 ! A677777777A
\ No newline at end of file diff --git a/maps/ceruleanhouse.blk b/maps/ceruleanhouse.blk new file mode 100644 index 00000000..823e6053 --- /dev/null +++ b/maps/ceruleanhouse.blk @@ -0,0 +1 @@ +
\ No newline at end of file diff --git a/maps/ceruleanhouse2.blk b/maps/ceruleanhouse2.blk index 823e6053..35443909 100644 --- a/maps/ceruleanhouse2.blk +++ b/maps/ceruleanhouse2.blk @@ -1 +1 @@ -
\ No newline at end of file += == , 5
\ No newline at end of file diff --git a/maps/ceruleanhouse3.blk b/maps/ceruleanhouse3.blk deleted file mode 100644 index 35443909..00000000 --- a/maps/ceruleanhouse3.blk +++ /dev/null @@ -1 +0,0 @@ -= == , 5
\ No newline at end of file diff --git a/maps/loreli.blk b/maps/lorelei.blk index 8df8e929..8df8e929 100644 --- a/maps/loreli.blk +++ b/maps/lorelei.blk diff --git a/maps/route18gateheader.blk b/maps/route15gateupstairs.blk Binary files differindex f90c7db9..f90c7db9 100644..100755 --- a/maps/route18gateheader.blk +++ b/maps/route15gateupstairs.blk diff --git a/maps/route18gateupstairs.blk b/maps/route18gateupstairs.blk Binary files differnew file mode 100644 index 00000000..f90c7db9 --- /dev/null +++ b/maps/route18gateupstairs.blk |