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/Route2TradeHouse.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/Route2TradeHouse.asm (renamed from data/mapObjects/route2house.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/route2house.asm b/data/mapObjects/Route2TradeHouse.asm index 1f655e15..29948d6b 100755 --- a/data/mapObjects/route2house.asm +++ b/data/mapObjects/Route2TradeHouse.asm @@ -1,4 +1,4 @@ -Route2HouseObject: +Route2TradeHouse_Object: db $a ; border block db 2 ; warps @@ -12,5 +12,5 @@ Route2HouseObject: object SPRITE_GAMEBOY_KID, 4, 1, STAY, DOWN, 2 ; person ; warp-to - warp_to 2, 7, ROUTE_2_HOUSE_WIDTH - warp_to 3, 7, ROUTE_2_HOUSE_WIDTH + warp_to 2, 7, ROUTE_2_TRADE_HOUSE_WIDTH + warp_to 3, 7, ROUTE_2_TRADE_HOUSE_WIDTH |