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/school.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/ViridianSchoolHouse.asm (renamed from data/mapObjects/school.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/school.asm b/data/mapObjects/ViridianSchoolHouse.asm index 8f07144f..01f2465d 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/ViridianSchoolHouse.asm @@ -1,4 +1,4 @@ -SchoolObject: +ViridianSchoolHouse_Object: db $a ; border block db 2 ; warps @@ -12,5 +12,5 @@ SchoolObject: object SPRITE_LASS, 4, 1, STAY, DOWN, 2 ; person ; warp-to - warp_to 2, 7, VIRIDIAN_SCHOOL_WIDTH - warp_to 3, 7, VIRIDIAN_SCHOOL_WIDTH + warp_to 2, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH + warp_to 3, 7, VIRIDIAN_SCHOOL_HOUSE_WIDTH |