diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 11:20:12 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 11:20:12 -0400 |
| commit | d3c9c0650289728d107c3cdade5956f0f4a2a02a (patch) | |
| tree | c550234c6eed32601bb554e5a60dce1ae4838cb9 /data | |
| parent | 054cb312c7a8f64b7b1d842aae774115a62509cd (diff) | |
Merge map ID and dimension constants into a single file
Diffstat (limited to 'data')
| -rwxr-xr-x | data/hide_show_data.asm | 2 | ||||
| -rwxr-xr-x | data/mapObjects/ceruleancity.asm | 12 | ||||
| -rwxr-xr-x | data/town_map_entries.asm | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/data/hide_show_data.asm b/data/hide_show_data.asm index 4e3fe2c2..71a76e47 100755 --- a/data/hide_show_data.asm +++ b/data/hide_show_data.asm @@ -343,7 +343,7 @@ MapHS2D: ; c925 (3:4925) MapHS34: ; c92b (3:492b) db MUSEUM_1F,$05,Show MapHS3F: ; c92e (3:492e) ; bulbasaur adoption house - db CERULEAN_HOUSE,$02,Show + db CERULEAN_HOUSE_1,$02,Show MapHSE4: ; c931 (3:4931) db UNKNOWN_DUNGEON_1,$01,Show db UNKNOWN_DUNGEON_1,$02,Show diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 8c429695..248a8e83 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -3,15 +3,15 @@ CeruleanCityObject: ; 0x18786 (size=170) db $a ; warps db $b, $1b, $0, TRASHED_HOUSE - db $f, $d, $0, CERULEAN_HOUSE + db $f, $d, $0, CERULEAN_HOUSE_1 db $11, $13, $0, CERULEAN_POKECENTER db $13, $1e, $0, CERULEAN_GYM db $19, $d, $0, BIKE_SHOP db $19, $19, $0, CERULEAN_MART db $b, $4, $0, UNKNOWN_DUNGEON_1 db $9, $1b, $2, TRASHED_HOUSE - db $b, $9, $1, CERULEAN_HOUSE_3 - db $9, $9, $0, CERULEAN_HOUSE_3 + db $b, $9, $1, CERULEAN_HOUSE_2 + db $9, $9, $0, CERULEAN_HOUSE_2 db $6 ; signs db $13, $17, $c ; CeruleanCityText12 @@ -36,12 +36,12 @@ CeruleanCityObject: ; 0x18786 (size=170) ; warp-to EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE - EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE + EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE_1 EVENT_DISP CERULEAN_CITY_WIDTH, $11, $13 ; CERULEAN_POKECENTER EVENT_DISP CERULEAN_CITY_WIDTH, $13, $1e ; CERULEAN_GYM EVENT_DISP CERULEAN_CITY_WIDTH, $19, $d ; BIKE_SHOP EVENT_DISP CERULEAN_CITY_WIDTH, $19, $19 ; CERULEAN_MART EVENT_DISP CERULEAN_CITY_WIDTH, $b, $4 ; UNKNOWN_DUNGEON_1 EVENT_DISP CERULEAN_CITY_WIDTH, $9, $1b ; TRASHED_HOUSE - EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_3 - EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_3 + EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_2 + EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_2 diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index bb0f31ff..865f14d8 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -94,7 +94,7 @@ InternalMapEntries: ; 7140b (1c:540b) IMAP SAFARI_ZONE_REST_HOUSE_4, $8,$C,SafariZoneName IMAP UNKNOWN_DUNGEON_1, $9,$1,CeruleanCaveName IMAP NAME_RATERS_HOUSE, $E,$5,LavenderTownName - IMAP CERULEAN_HOUSE_3, $A,$2,CeruleanCityName + IMAP CERULEAN_HOUSE_2, $A,$2,CeruleanCityName IMAP ROCK_TUNNEL_2, $E,$3,RockTunnelName IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName |