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/CeruleanTrashedHouse.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/CeruleanTrashedHouse.asm (renamed from data/mapObjects/ceruleanhousetrashed.asm) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/ceruleanhousetrashed.asm b/data/mapObjects/CeruleanTrashedHouse.asm index 7b90ff73..44b7cf20 100755 --- a/data/mapObjects/ceruleanhousetrashed.asm +++ b/data/mapObjects/CeruleanTrashedHouse.asm @@ -1,4 +1,4 @@ -CeruleanHouseTrashedObject: +CeruleanTrashedHouse_Object: db $a ; border block db 3 ; warps @@ -14,6 +14,6 @@ CeruleanHouseTrashedObject: object SPRITE_GIRL, 5, 6, WALK, 2, 2 ; person ; warp-to - warp_to 2, 7, TRASHED_HOUSE_WIDTH - warp_to 3, 7, TRASHED_HOUSE_WIDTH - warp_to 3, 0, TRASHED_HOUSE_WIDTH + warp_to 2, 7, CERULEAN_TRASHED_HOUSE_WIDTH + warp_to 3, 7, CERULEAN_TRASHED_HOUSE_WIDTH + warp_to 3, 0, CERULEAN_TRASHED_HOUSE_WIDTH |