summaryrefslogtreecommitdiff
path: root/maps/CopycatsHouse1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CopycatsHouse1F.asm')
-rw-r--r--maps/CopycatsHouse1F.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
index 719619420..475d1aa2c 100644
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -1,8 +1,8 @@
CopycatsHouse1F_MapScriptHeader:
- ; trigger count
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
PokefanMScript_0x18ad13:
@@ -71,20 +71,20 @@ CopycatsHouse1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 3
warp_def $7, $2, 8, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
warp_def $7, $3, 8, GROUP_SAFFRON_CITY, MAP_SAFFRON_CITY
warp_def $0, $2, 1, GROUP_COPYCATS_HOUSE_2F, MAP_COPYCATS_HOUSE_2F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, -1
- person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, -1
- person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, -1
+ person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x18ad13, -1
+ person_event SPRITE_POKEFAN_F, 8, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PokefanFScript_0x18ad16, -1
+ person_event SPRITE_CLEFAIRY, 10, 10, OW_UP | $12, $0, -1, -1, $0, 0, ClefairyScript_0x18ad2a, -1