ref: 7819dc288e4f0f380bd82cd359145bf26f5db818
parent: b6d8ebb416d11c376c961d187c27063a10469f0a
author: Bryan Bishop <kanzure@gmail.com>
date: Sun Jan 8 20:19:10 EST 2012
CELADON_HOUSE_2 -> CELADON_HOUSE hg-commit-id: 0574f08aaf85
--- a/constants.asm
+++ b/constants.asm
@@ -1045,8 +1045,8 @@
CELADON_MART_5 EQU $88
CELADONPRIZE_ROOM EQU $89
CELADON_DINER EQU $8A
-CELADON_HOUSE_2 EQU $8B
-CELADONHOTEL EQU $8C
+CELADON_HOUSE EQU $8B
+CELADON_HOTEL EQU $8C
LAVENDER_POKECENTER EQU $8D
POKEMONTOWER_1 EQU $8E
POKEMONTOWER_2 EQU $8F
--- a/extras/extract_maps.py
+++ b/extras/extract_maps.py
@@ -162,7 +162,7 @@
0x88: "Celadon Mart 5",
0x89: "Celadon Prize Room",
0x8A: "Celadon Diner",
- 0x8B: "Celadon House (2)",
+ 0x8B: "Celadon House",
0x8C: "Celadon Hotel",
0x8D: "Lavender Pokecenter",
0x8E: "Pokemon Tower (1)",
--- a/pokered.asm
+++ b/pokered.asm
@@ -5022,8 +5022,8 @@
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 @@
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