diff options
| author | dannye <33dannye@gmail.com> | 2020-05-20 19:40:33 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-20 20:02:53 -0500 |
| commit | 10f9559eab8c93b94abb8ae8d1083704ad4e169a (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/VictoryRoad2F.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| download | pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.gz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.tar.xz pokeyellow-10f9559eab8c93b94abb8ae8d1083704ad4e169a.zip | |
Sync with pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/VictoryRoad2F.asm (renamed from data/mapObjects/victoryroad2.asm) | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/VictoryRoad2F.asm index bc55e2da..55559bca 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/VictoryRoad2F.asm @@ -1,14 +1,14 @@ -VictoryRoad2Object: +VictoryRoad2F_Object: db $7d ; border block db 7 ; warps - warp 0, 8, 2, VICTORY_ROAD_1 + warp 0, 8, 2, VICTORY_ROAD_1F warp 29, 7, 3, -1 warp 29, 8, 3, -1 - warp 23, 7, 0, VICTORY_ROAD_3 - warp 25, 14, 2, VICTORY_ROAD_3 - warp 27, 7, 1, VICTORY_ROAD_3 - warp 1, 1, 3, VICTORY_ROAD_3 + warp 23, 7, 0, VICTORY_ROAD_3F + warp 25, 14, 2, VICTORY_ROAD_3F + warp 27, 7, 1, VICTORY_ROAD_3F + warp 1, 1, 3, VICTORY_ROAD_3F db 0 ; signs @@ -28,10 +28,10 @@ VictoryRoad2Object: object SPRITE_BOULDER, 23, 16, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person ; warp-to - warp_to 0, 8, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_1F - warp_to 29, 7, VICTORY_ROAD_2_WIDTH - warp_to 29, 8, VICTORY_ROAD_2_WIDTH - warp_to 23, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3F - warp_to 25, 14, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3F - warp_to 27, 7, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3F - warp_to 1, 1, VICTORY_ROAD_2_WIDTH ; VICTORY_ROAD_3F + warp_to 0, 8, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_1F + warp_to 29, 7, VICTORY_ROAD_2F_WIDTH + warp_to 29, 8, VICTORY_ROAD_2F_WIDTH + warp_to 23, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F + warp_to 25, 14, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F + warp_to 27, 7, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F + warp_to 1, 1, VICTORY_ROAD_2F_WIDTH ; VICTORY_ROAD_3F |