diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_constants.asm | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | constants/map_dimensions.asm | 44 |
2 files changed, 29 insertions, 25 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index b1d36a4d..4e4e314f 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -85,7 +85,7 @@ POWER_PLANT EQU $53 ROUTE_11_GATE_1F EQU $54 DIGLETTS_CAVE_ENTRANCE EQU $55 ROUTE_11_GATE_2F EQU $56 -ROUTE_12_GATE EQU $57 +ROUTE_12_GATE_1F EQU $57 BILLS_HOUSE EQU $58 VERMILION_POKECENTER EQU $59 POKEMON_FAN_CLUB EQU $5A @@ -135,7 +135,7 @@ CELADON_POKECENTER EQU $85 CELADON_GYM EQU $86 GAME_CORNER EQU $87 CELADON_MART_5 EQU $88 -CELADONPRIZE_ROOM EQU $89 +CELADON_PRIZE_ROOM EQU $89 CELADON_DINER EQU $8A CELADON_HOUSE EQU $8B CELADON_HOTEL EQU $8C @@ -154,9 +154,9 @@ FUCHSIA_MART EQU $98 FUCHSIA_HOUSE_1 EQU $99 FUCHSIA_POKECENTER EQU $9A FUCHSIA_HOUSE_2 EQU $9B -SAFARIZONEENTRANCE EQU $9C +SAFARI_ZONE_ENTRANCE EQU $9C FUCHSIA_GYM EQU $9D -FUCHSIAMEETINGROOM EQU $9E +FUCHSIA_MEETING_ROOM EQU $9E SEAFOAM_ISLANDS_2 EQU $9F SEAFOAM_ISLANDS_3 EQU $A0 SEAFOAM_ISLANDS_4 EQU $A1 @@ -175,7 +175,7 @@ CINNABAR_MART EQU $AC INDIGO_PLATEAU_LOBBY EQU $AE COPYCATS_HOUSE_1F EQU $AF COPYCATS_HOUSE_2F EQU $B0 -FIGHTINGDOJO EQU $B1 +FIGHTING_DOJO EQU $B1 SAFFRON_GYM EQU $B2 SAFFRON_HOUSE_1 EQU $B3 SAFFRON_MART EQU $B4 diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm index 8bb41a25..7339e153 100644..100755 --- a/constants/map_dimensions.asm +++ b/constants/map_dimensions.asm @@ -184,7 +184,7 @@ VIRIDIAN_GYM_WIDTH EQU $0a DIGLETTS_CAVE_EXIT_HEIGHT EQU $04 DIGLETTS_CAVE_EXIT_WIDTH EQU $04 -; ViridianForestexit_h map_id=47 +; ViridianForestExit_h map_id=47 VIRIDIAN_FOREST_EXIT_HEIGHT EQU $04 VIRIDIAN_FOREST_EXIT_WIDTH EQU $05 @@ -248,9 +248,9 @@ MT_MOON_3_WIDTH EQU $14 TRASHED_HOUSE_HEIGHT EQU $04 TRASHED_HOUSE_WIDTH EQU $04 -; CeruleanHouse_h map_id=63 -CERULEAN_HOUSE_HEIGHT EQU $04 -CERULEAN_HOUSE_WIDTH EQU $04 +; CeruleanHouse1_h map_id=63 +CERULEAN_HOUSE_1_HEIGHT EQU $04 +CERULEAN_HOUSE_1_WIDTH EQU $04 ; CeruleanPokecenter_h map_id=64 CERULEAN_POKECENTER_HEIGHT EQU $04 @@ -300,6 +300,10 @@ ROUTE_7_GATE_WIDTH EQU $03 PATH_ENTRANCE_ROUTE_7_HEIGHT EQU $04 PATH_ENTRANCE_ROUTE_7_WIDTH EQU $04 +; UndergroundPathEntranceRoute7Copy_h map_id=78 +PATH_ENTRANCE_ROUTE_7_COPY_HEIGHT EQU $04 +PATH_ENTRANCE_ROUTE_7_COPY_WIDTH EQU $04 + ; Route8Gate_h map_id=79 ROUTE_8_GATE_HEIGHT EQU $04 ROUTE_8_GATE_WIDTH EQU $03 @@ -333,8 +337,8 @@ ROUTE_11_GATE_2F_HEIGHT EQU $04 ROUTE_11_GATE_2F_WIDTH EQU $04 ; Route12Gate_h map_id=87 -ROUTE_12_GATE_HEIGHT EQU $04 -ROUTE_12_GATE_WIDTH EQU $05 +ROUTE_12_GATE_1F_HEIGHT EQU $04 +ROUTE_12_GATE_1F_WIDTH EQU $05 ; BillsHouse_h map_id=88 BILLS_HOUSE_HEIGHT EQU $04 @@ -489,8 +493,8 @@ CELADON_MART_5_HEIGHT EQU $04 CELADON_MART_5_WIDTH EQU $0a ; CeladonPrizeRoom_h map_id=137 -CELADONPRIZE_ROOM_HEIGHT EQU $04 -CELADONPRIZE_ROOM_WIDTH EQU $05 +CELADON_PRIZE_ROOM_HEIGHT EQU $04 +CELADON_PRIZE_ROOM_WIDTH EQU $05 ; CeladonDiner_h map_id=138 CELADON_DINER_HEIGHT EQU $04 @@ -501,8 +505,8 @@ CELADON_HOUSE_HEIGHT EQU $04 CELADON_HOUSE_WIDTH EQU $04 ; CeladonHotel_h map_id=140 -CELADONHOTEL_HEIGHT EQU $04 -CELADONHOTEL_WIDTH EQU $07 +CELADON_HOTEL_HEIGHT EQU $04 +CELADON_HOTEL_WIDTH EQU $07 ; LavenderPokecenter_h map_id=141 LAVENDER_POKECENTER_HEIGHT EQU $04 @@ -565,16 +569,16 @@ FUCHSIA_HOUSE_2_HEIGHT EQU $04 FUCHSIA_HOUSE_2_WIDTH EQU $05 ; SafariZoneEntrance_h map_id=156 -SAFARIZONEENTRANCE_HEIGHT EQU $03 -SAFARIZONEENTRANCE_WIDTH EQU $04 +SAFARI_ZONE_ENTRANCE_HEIGHT EQU $03 +SAFARI_ZONE_ENTRANCE_WIDTH EQU $04 ; FuchsiaGym_h map_id=157 FUCHSIA_GYM_HEIGHT EQU $09 FUCHSIA_GYM_WIDTH EQU $05 ; FuchsiaMeetingRoom_h map_id=158 -FUCHSIAMEETINGROOM_HEIGHT EQU $04 -FUCHSIAMEETINGROOM_WIDTH EQU $07 +FUCHSIA_MEETING_ROOM_HEIGHT EQU $04 +FUCHSIA_MEETING_ROOM_WIDTH EQU $07 ; SeafoamIslands2_h map_id=159 SEAFOAM_ISLANDS_2_HEIGHT EQU $09 @@ -636,17 +640,17 @@ CINNABAR_MART_WIDTH EQU $04 INDIGO_PLATEAU_LOBBY_HEIGHT EQU $06 INDIGO_PLATEAU_LOBBY_WIDTH EQU $08 -; CopycatsHouseF1_h map_id=175 +; CopycatsHouse1F_h map_id=175 COPYCATS_HOUSE_1F_HEIGHT EQU $04 COPYCATS_HOUSE_1F_WIDTH EQU $04 -; CopycatsHouseF2_h map_id=176 +; CopycatsHouse2F_h map_id=176 COPYCATS_HOUSE_2F_HEIGHT EQU $04 COPYCATS_HOUSE_2F_WIDTH EQU $04 ; FightingDojo_h map_id=177 -FIGHTINGDOJO_HEIGHT EQU $06 -FIGHTINGDOJO_WIDTH EQU $05 +FIGHTING_DOJO_HEIGHT EQU $06 +FIGHTING_DOJO_WIDTH EQU $05 ; SaffronGym_h map_id=178 SAFFRON_GYM_HEIGHT EQU $09 @@ -677,8 +681,8 @@ ROUTE_15_GATE_1F_HEIGHT EQU $05 ROUTE_15_GATE_1F_WIDTH EQU $04 ; Route15GateUpstairs_h map_id=185 -ROUTE_15_GATE_2F_HEIGHT EQU 4 -ROUTE_15_GATE_2F_WIDTH EQU 4 +ROUTE_15_GATE_2F_HEIGHT EQU $04 +ROUTE_15_GATE_2F_WIDTH EQU $04 ; Route16GateMap_h map_id=186 ROUTE_16_GATE_1F_HEIGHT EQU $07 |