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/mansion3.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/PokemonMansion3F.asm (renamed from data/mapObjects/mansion3.asm) | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/mapObjects/mansion3.asm b/data/mapObjects/PokemonMansion3F.asm index 54fbfa75..7c8c9c22 100755 --- a/data/mapObjects/mansion3.asm +++ b/data/mapObjects/PokemonMansion3F.asm @@ -1,10 +1,10 @@ -Mansion3Object: +PokemonMansion3F_Object: db $1 ; border block db 3 ; warps - warp 7, 10, 1, MANSION_2 - warp 6, 1, 3, MANSION_2 - warp 25, 14, 2, MANSION_2 + warp 7, 10, 1, POKEMON_MANSION_2F + warp 6, 1, 3, POKEMON_MANSION_2F + warp 25, 14, 2, POKEMON_MANSION_2F db 0 ; signs @@ -16,6 +16,6 @@ Mansion3Object: object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person ; warp-to - warp_to 7, 10, MANSION_3_WIDTH ; POKEMON_MANSION_2F - warp_to 6, 1, MANSION_3_WIDTH ; POKEMON_MANSION_2F - warp_to 25, 14, MANSION_3_WIDTH ; POKEMON_MANSION_2F + warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F + warp_to 6, 1, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F + warp_to 25, 14, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F |