diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 15:06:23 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 23:33:10 -0500 |
| commit | c7796024590fec48ac79756793c1a6e3b54daf8f (patch) | |
| tree | 0d61caa7ebe429995a61e800d1d78c3a82aec886 /data/mapObjects/fuchsiacity.asm | |
| parent | Merge pull request #193 from luckytyphlosion/master (diff) | |
| download | pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.gz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.tar.xz pokeyellow-c7796024590fec48ac79756793c1a6e3b54daf8f.zip | |
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/FuchsiaCity.asm (renamed from data/mapObjects/fuchsiacity.asm) | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/FuchsiaCity.asm index c89c03cd..09c97b02 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/FuchsiaCity.asm @@ -1,16 +1,16 @@ -FuchsiaCityObject: +FuchsiaCity_Object: db $f ; border block db 9 ; warps warp 5, 13, 0, FUCHSIA_MART - warp 11, 27, 0, FUCHSIA_HOUSE_1 + warp 11, 27, 0, FUCHSIA_BILLS_GRANDPAS_HOUSE warp 19, 27, 0, FUCHSIA_POKECENTER - warp 27, 27, 0, FUCHSIA_HOUSE_2 - warp 18, 3, 0, SAFARI_ZONE_ENTRANCE + warp 27, 27, 0, WARDENS_HOUSE + warp 18, 3, 0, SAFARI_ZONE_GATE warp 5, 27, 0, FUCHSIA_GYM warp 22, 13, 0, FUCHSIA_MEETING_ROOM - warp 31, 27, 1, FUCHSIA_HOUSE_3 - warp 31, 24, 0, FUCHSIA_HOUSE_3 + warp 31, 27, 1, FUCHSIA_GOOD_ROD_HOUSE + warp 31, 24, 0, FUCHSIA_GOOD_ROD_HOUSE db 14 ; signs sign 15, 23, 11 ; FuchsiaCityText11 @@ -42,11 +42,11 @@ FuchsiaCityObject: ; warp-to warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART - warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_1 + warp_to 11, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_BILLS_GRANDPAS_HOUSE warp_to 19, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_POKECENTER - warp_to 27, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_2 - warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_ENTRANCE + warp_to 27, 27, FUCHSIA_CITY_WIDTH ; WARDENS_HOUSE + warp_to 18, 3, FUCHSIA_CITY_WIDTH ; SAFARI_ZONE_GATE warp_to 5, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GYM warp_to 22, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MEETING_ROOM - warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 - warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_HOUSE_3 + warp_to 31, 27, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE + warp_to 31, 24, FUCHSIA_CITY_WIDTH ; FUCHSIA_GOOD_ROD_HOUSE |