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/ssanne8.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/SSAnne1FRooms.asm (renamed from data/mapObjects/ssanne8.asm) | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/ssanne8.asm b/data/mapObjects/SSAnne1FRooms.asm index b5ad60fd..fcd36532 100755 --- a/data/mapObjects/ssanne8.asm +++ b/data/mapObjects/SSAnne1FRooms.asm @@ -1,13 +1,13 @@ -SSAnne8Object: +SSAnne1FRooms_Object: db $c ; border block db 6 ; warps - warp 0, 0, 2, SS_ANNE_1 - warp 10, 0, 3, SS_ANNE_1 - warp 20, 0, 4, SS_ANNE_1 - warp 0, 10, 5, SS_ANNE_1 - warp 10, 10, 6, SS_ANNE_1 - warp 20, 10, 7, SS_ANNE_1 + warp 0, 0, 2, SS_ANNE_1F + warp 10, 0, 3, SS_ANNE_1F + warp 20, 0, 4, SS_ANNE_1F + warp 0, 10, 5, SS_ANNE_1F + warp 10, 10, 6, SS_ANNE_1F + warp 20, 10, 7, SS_ANNE_1F db 0 ; signs @@ -25,9 +25,9 @@ SSAnne8Object: object SPRITE_GENTLEMAN, 21, 13, WALK, 2, 11 ; person ; warp-to - warp_to 0, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 10, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 20, 0, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 0, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 10, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 - warp_to 20, 10, SS_ANNE_8_WIDTH ; SS_ANNE_1 + warp_to 0, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 10, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 20, 0, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 0, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 10, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F + warp_to 20, 10, SS_ANNE_1F_ROOMS_WIDTH ; SS_ANNE_1F |