From 62a87707e30998ff163fd0539018dac11a2637f1 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Sat, 14 Jan 2012 11:21:35 -0600 Subject: ViridianHouseBlocks and PewterHouse1Blocks are the same hg-commit-id: f2c45cdce8f7 --- pokered.asm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pokered.asm b/pokered.asm index 4d70c123..394844e7 100644 --- a/pokered.asm +++ b/pokered.asm @@ -10402,7 +10402,8 @@ UndergroundPathEntranceRoute8Blocks: ; 16 OaksLabBlocks: ; 30 INCBIN "maps/oakslab.blk" -ViridianHouseBlocks: ; 16 +PewterHouse1Blocks: +ViridianHouseBlocks: ; 16 0x1c1de INCBIN "maps/viridianhouse.blk" SchoolBlocks: ; 16 @@ -11525,7 +11526,7 @@ ViridianHouseObject: ; 0x1d5bb (size=44) PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55) db $08 ; tileset db $04, $04 ; dimensions (y, x) - dw $41de, PewterHouse1Texts, PewterHouse1Script ; blocks, texts, scripts + dw PewterHouse1Blocks, PewterHouse1Texts, PewterHouse1Script ; blocks, texts, scripts db $00 ; connections dw PewterHouse1Object ; objects -- cgit v1.2.3