diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-08-20 19:07:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 19:07:42 -0400 |
| commit | 7e9ccbb5b254f794a79c4d0f9d816b3cbfb81f3f (patch) | |
| tree | ddda1118461d6151597a4bf9eefcb0eddc835da1 /data/maps/objects/PokemonFanClub.asm | |
| parent | 2fe1505babaf02b995cc0d9c3a827b798935b19a (diff) | |
| parent | d5db0c3dbf78a957e8f10ad410789c4256d64f74 (diff) | |
Merge pull request #287 from Rangi42/master
Simplify map event definitions
Diffstat (limited to 'data/maps/objects/PokemonFanClub.asm')
| -rwxr-xr-x | data/maps/objects/PokemonFanClub.asm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm index 33d187bc..ee24d2a4 100755 --- a/data/maps/objects/PokemonFanClub.asm +++ b/data/maps/objects/PokemonFanClub.asm @@ -1,15 +1,15 @@ PokemonFanClub_Object: db $d ; border block - db 2 ; warps + def_warps warp 2, 7, 1, LAST_MAP warp 3, 7, 1, LAST_MAP - db 2 ; signs + def_signs sign 1, 0, 7 ; FanClubText7 sign 6, 0, 8 ; FanClubText8 - db 6 ; objects + def_objects object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person object SPRITE_FAIRY, 6, 4, STAY, LEFT, 3 ; person @@ -17,6 +17,4 @@ PokemonFanClub_Object: object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person object SPRITE_LINK_RECEPTIONIST, 5, 1, STAY, DOWN, 6 ; person - ; warp-to - warp_to 2, 7, POKEMON_FAN_CLUB_WIDTH - warp_to 3, 7, POKEMON_FAN_CLUB_WIDTH + def_warps_to POKEMON_FAN_CLUB |