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/SSAnneBow.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/SSAnneBow.asm (renamed from data/mapObjects/ssanne5.asm) | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/mapObjects/ssanne5.asm b/data/mapObjects/SSAnneBow.asm index 106557be..8873c8f8 100755 --- a/data/mapObjects/ssanne5.asm +++ b/data/mapObjects/SSAnneBow.asm @@ -1,9 +1,9 @@ -SSAnne5Object: +SSAnneBow_Object: db $23 ; border block db 2 ; warps - warp 13, 6, 0, SS_ANNE_3 - warp 13, 7, 0, SS_ANNE_3 + warp 13, 6, 0, SS_ANNE_3F + warp 13, 7, 0, SS_ANNE_3F db 0 ; signs @@ -15,5 +15,5 @@ SSAnne5Object: object SPRITE_SAILOR, 10, 8, STAY, UP, 5, OPP_SAILOR, 2 ; warp-to - warp_to 13, 6, SS_ANNE_5_WIDTH ; SS_ANNE_3 - warp_to 13, 7, SS_ANNE_5_WIDTH ; SS_ANNE_3 + warp_to 13, 6, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F + warp_to 13, 7, SS_ANNE_BOW_WIDTH ; SS_ANNE_3F |