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/SSAnneCaptainsRoom.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/SSAnneCaptainsRoom.asm (renamed from data/mapObjects/ssanne7.asm) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapObjects/ssanne7.asm b/data/mapObjects/SSAnneCaptainsRoom.asm index 7657170e..545656cc 100755 --- a/data/mapObjects/ssanne7.asm +++ b/data/mapObjects/SSAnneCaptainsRoom.asm @@ -1,8 +1,8 @@ -SSAnne7Object: +SSAnneCaptainsRoom_Object: db $c ; border block db 1 ; warps - warp 0, 7, 8, SS_ANNE_2 + warp 0, 7, 8, SS_ANNE_2F db 2 ; signs sign 4, 1, 2 ; SSAnne7Text2 @@ -12,4 +12,4 @@ SSAnne7Object: object SPRITE_SS_CAPTAIN, 4, 2, STAY, UP, 1 ; person ; warp-to - warp_to 0, 7, SS_ANNE_7_WIDTH ; SS_ANNE_2 + warp_to 0, 7, SS_ANNE_CAPTAINS_ROOM_WIDTH ; SS_ANNE_2F |