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/VermilionTradeHouse.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/VermilionTradeHouse.asm (renamed from data/mapObjects/vermilionhouse3.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/vermilionhouse3.asm b/data/mapObjects/VermilionTradeHouse.asm index bc5ec829..fcf8a8e9 100755 --- a/data/mapObjects/vermilionhouse3.asm +++ b/data/mapObjects/VermilionTradeHouse.asm @@ -1,4 +1,4 @@ -VermilionHouse3Object: +VermilionTradeHouse_Object: db $a ; border block db 2 ; warps @@ -11,5 +11,5 @@ VermilionHouse3Object: object SPRITE_GENTLEMAN, 3, 5, STAY, UP, 1 ; person ; warp-to - warp_to 2, 7, VERMILION_HOUSE_3_WIDTH - warp_to 3, 7, VERMILION_HOUSE_3_WIDTH + warp_to 2, 7, VERMILION_TRADE_HOUSE_WIDTH + warp_to 3, 7, VERMILION_TRADE_HOUSE_WIDTH |