summaryrefslogtreecommitdiff
path: root/data/maps/objects/PokemonFanClub.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PokemonFanClub.asm')
-rw-r--r--data/maps/objects/PokemonFanClub.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/PokemonFanClub.asm b/data/maps/objects/PokemonFanClub.asm
index eb3e945e..c33d8f58 100644
--- a/data/maps/objects/PokemonFanClub.asm
+++ b/data/maps/objects/PokemonFanClub.asm
@@ -1,18 +1,18 @@
PokemonFanClub_Object:
db $d ; border block
- def_warps
- warp 2, 7, 1, LAST_MAP
- warp 3, 7, 1, LAST_MAP
+ def_warp_events
+ warp_event 2, 7, LAST_MAP, 1
+ warp_event 3, 7, LAST_MAP, 1
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_FISHER, 6, 3, STAY, LEFT, 1 ; person
- object SPRITE_GIRL, 1, 3, STAY, RIGHT, 2 ; person
- object SPRITE_CLEFAIRY, 6, 4, STAY, LEFT, 3 ; person
- object SPRITE_SEEL, 1, 4, STAY, RIGHT, 4 ; person
- object SPRITE_GENTLEMAN, 3, 1, STAY, DOWN, 5 ; person
- object SPRITE_LINK_RECEPTIONIST, 5, 1, STAY, DOWN, 6 ; person
+ def_object_events
+ object_event 6, 3, SPRITE_FISHER, STAY, LEFT, 1 ; person
+ object_event 1, 3, SPRITE_GIRL, STAY, RIGHT, 2 ; person
+ object_event 6, 4, SPRITE_CLEFAIRY, STAY, LEFT, 3 ; person
+ object_event 1, 4, SPRITE_SEEL, STAY, RIGHT, 4 ; person
+ object_event 3, 1, SPRITE_GENTLEMAN, STAY, DOWN, 5 ; person
+ object_event 5, 1, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
def_warps_to POKEMON_FAN_CLUB