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/celadonmart5.blk | |
| 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/celadonmart5.blk')
| -rw-r--r-- | maps/celadonmart5.blk | 5 |
1 files changed, 4 insertions, 1 deletions
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 +
% + + + |