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