diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /data/mapObjects/VictoryRoad3F.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to '')
| -rwxr-xr-x | data/mapObjects/VictoryRoad3F.asm (renamed from data/mapObjects/victoryroad3.asm) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/mapObjects/victoryroad3.asm b/data/mapObjects/VictoryRoad3F.asm index a71cd172..2eb42417 100755 --- a/data/mapObjects/victoryroad3.asm +++ b/data/mapObjects/VictoryRoad3F.asm @@ -1,11 +1,11 @@ -VictoryRoad3Object: +VictoryRoad3F_Object: db $7d ; border block db 4 ; warps - warp 23, 7, 3, VICTORY_ROAD_2 - warp 26, 8, 5, VICTORY_ROAD_2 - warp 27, 15, 4, VICTORY_ROAD_2 - warp 2, 0, 6, VICTORY_ROAD_2 + warp 23, 7, 3, VICTORY_ROAD_2F + warp 26, 8, 5, VICTORY_ROAD_2F + warp 27, 15, 4, VICTORY_ROAD_2F + warp 2, 0, 6, VICTORY_ROAD_2F db 0 ; signs @@ -22,7 +22,7 @@ VictoryRoad3Object: object SPRITE_BOULDER, 22, 15, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person ; warp-to - warp_to 23, 7, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2F - warp_to 26, 8, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2F - warp_to 27, 15, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2F - warp_to 2, 0, VICTORY_ROAD_3_WIDTH ; VICTORY_ROAD_2F + warp_to 23, 7, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F + warp_to 26, 8, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F + warp_to 27, 15, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F + warp_to 2, 0, VICTORY_ROAD_3F_WIDTH ; VICTORY_ROAD_2F |