diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-12-23 17:14:09 -0500 |
| commit | c51968f0de6b8420c141dde27339e82a42837c5b (patch) | |
| tree | 782f2b25f21adacb48fd516694b8a82864fe0b99 /maps/blockdata.asm | |
| parent | c883ab4d34ecb4890010e808d6b6d533f5d8ad56 (diff) | |
| parent | 878092004956418bfd77bfdb9fc9dd7f640f80d2 (diff) | |
Merge remote-tracking branch 'origin/master' into master
Diffstat (limited to 'maps/blockdata.asm')
| -rw-r--r-- | maps/blockdata.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/maps/blockdata.asm b/maps/blockdata.asm index e6c3e7ae9..c14b30743 100644 --- a/maps/blockdata.asm +++ b/maps/blockdata.asm @@ -443,7 +443,7 @@ TimeCapsule_BlockData: EcruteakLugiaSpeechHouse_BlockData: EcruteakItemfinderHouse_BlockData: VioletNicknameSpeechHouse_BlockData: -VioletOnixTradeHouse_BlockData: +VioletKylesHouse_BlockData: INCBIN "maps/House2.blk" BetaCave_BlockData: |