aboutsummaryrefslogtreecommitdiffstats
path: root/pokered.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-09 01:19:10 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-09 01:19:10 -0600
commit7819dc288e4f0f380bd82cd359145bf26f5db818 (patch)
treeef50ac51e7e8f32da44bd8a86e97af2d8b848bdc /pokered.asm
parentfix map naming mistakes in celadon city (diff)
downloadpokeyellow-7819dc288e4f0f380bd82cd359145bf26f5db818.tar.gz
pokeyellow-7819dc288e4f0f380bd82cd359145bf26f5db818.tar.xz
pokeyellow-7819dc288e4f0f380bd82cd359145bf26f5db818.zip
CELADON_HOUSE_2 -> CELADON_HOUSE
hg-commit-id: 0574f08aaf85
Diffstat (limited to 'pokered.asm')
-rw-r--r--pokered.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/pokered.asm b/pokered.asm
index 1884a0e4..d117720a 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -5022,8 +5022,8 @@ CeladonCityObject: ; 0x18022 (size=189)
db $13, $27, $0, CELADON_MART_5
db $13, $21, $0, CELADONPRIZE_ROOM
db $1b, $1f, $0, CELADON_DINER
- db $1b, $23, $0, CELADON_HOUSE_2
- db $1b, $2b, $0, CELADONHOTEL
+ db $1b, $23, $0, CELADON_HOUSE
+ db $1b, $2b, $0, CELADON_HOTEL
db $9 ; signs
db $f, $1b, $a ; CeladonCityText10
@@ -5059,8 +5059,8 @@ CeladonCityObject: ; 0x18022 (size=189)
EVENT_DISP $19, $13, $27 ; CELADON_MART_5
EVENT_DISP $19, $13, $21 ; CELADONPRIZE_ROOM
EVENT_DISP $19, $1b, $1f ; CELADON_DINER
- EVENT_DISP $19, $1b, $23 ; CELADON_HOUSE_2
- EVENT_DISP $19, $1b, $2b ; CELADONHOTEL
+ EVENT_DISP $19, $1b, $23 ; CELADON_HOUSE
+ EVENT_DISP $19, $1b, $2b ; CELADON_HOTEL
INCBIN "baserom.gbc",$180df,$0