diff options
| author | IIMarckus <iimarckus@gmail.com> | 2013-09-17 22:50:33 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2013-09-17 22:50:33 -0600 |
| commit | 3c14752719d3063828de6e0512183ec822bff2b7 (patch) | |
| tree | 276f05f46f1e2adf1f1740db69ec5ddf8bb54a1b /constants.asm | |
| parent | fecbe4a60c25175a3fec944be9704b27e263142a (diff) | |
| parent | 4000d7a23ab9a9d46bea6e937ab12d63c3194b89 (diff) | |
Merge branch 'comments' of https://github.com/dannye/pokered
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/constants.asm b/constants.asm index 1e03b219..537c3c65 100644 --- a/constants.asm +++ b/constants.asm @@ -2727,7 +2727,7 @@ MT_MOON_3_WIDTH EQU $14 TRASHED_HOUSE_HEIGHT EQU $04 TRASHED_HOUSE_WIDTH EQU $04 -; CeruleanHouse2_h map_id=63 +; CeruleanHouse_h map_id=63 CERULEAN_HOUSE_HEIGHT EQU $04 CERULEAN_HOUSE_WIDTH EQU $04 @@ -2924,12 +2924,12 @@ CELADON_MART_4_HEIGHT EQU $04 CELADON_MART_4_WIDTH EQU $0a ; CeladonMartRoof_h map_id=126 -CELADON_MART_5_HEIGHT EQU $04 -CELADON_MART_5_WIDTH EQU $0a +CELADON_MART_ROOF_HEIGHT EQU $04 +CELADON_MART_ROOF_WIDTH EQU $0a ; CeladonMartElevator_h map_id=127 -CELADON_MART_6_HEIGHT EQU $02 -CELADON_MART_6_WIDTH EQU $02 +CELADON_MART_ELEVATOR_HEIGHT EQU $02 +CELADON_MART_ELEVATOR_WIDTH EQU $02 ; CeladonMansion1_h map_id=128 CELADON_MANSION_1_HEIGHT EQU $06 @@ -2964,8 +2964,8 @@ GAME_CORNER_HEIGHT EQU $09 GAME_CORNER_WIDTH EQU $0a ; CeladonMart5_h map_id=136 -CELADON_HOUSE_HEIGHT EQU $04 -CELADON_HOUSE_WIDTH EQU $0a +CELADON_MART_5_HEIGHT EQU $04 +CELADON_MART_5_WIDTH EQU $0a ; CeladonPrizeRoom_h map_id=137 CELADONPRIZE_ROOM_HEIGHT EQU $04 @@ -2976,8 +2976,8 @@ CELADON_DINER_HEIGHT EQU $04 CELADON_DINER_WIDTH EQU $05 ; CeladonHouse_h map_id=139 -CELADON_HOUSE_2_HEIGHT EQU $04 -CELADON_HOUSE_2_WIDTH EQU $04 +CELADON_HOUSE_HEIGHT EQU $04 +CELADON_HOUSE_WIDTH EQU $04 ; CeladonHotel_h map_id=140 CELADONHOTEL_HEIGHT EQU $04 @@ -3323,9 +3323,9 @@ UNKNOWN_DUNGEON_1_WIDTH EQU $0f NAME_RATERS_HOUSE_HEIGHT EQU $04 NAME_RATERS_HOUSE_WIDTH EQU $04 -; CeruleanHouse3_h map_id=230 -CERULEAN_HOUSE_3_HEIGHT EQU $04 -CERULEAN_HOUSE_3_WIDTH EQU $04 +; CeruleanHouse2_h map_id=230 +CERULEAN_HOUSE_2_HEIGHT EQU $04 +CERULEAN_HOUSE_2_WIDTH EQU $04 ; RockTunnel2_h map_id=232 ROCK_TUNNEL_2_HEIGHT EQU $12 |