summaryrefslogtreecommitdiff
path: root/maps/CopycatsHouse1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CopycatsHouse1F.asm')
-rw-r--r--maps/CopycatsHouse1F.asm48
1 files changed, 19 insertions, 29 deletions
diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm
index 160a25629..475d1aa2c 100644
--- a/maps/CopycatsHouse1F.asm
+++ b/maps/CopycatsHouse1F.asm
@@ -1,16 +1,14 @@
-CopycatsHouse1F_MapScriptHeader: ; 0x18ad11
- ; trigger count
+CopycatsHouse1F_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x18ad13
-PokefanMScript_0x18ad13: ; 0x18ad13
+PokefanMScript_0x18ad13:
jumptextfaceplayer UnknownText_0x18ad34
-; 0x18ad16
-PokefanFScript_0x18ad16: ; 0x18ad16
+PokefanFScript_0x18ad16:
faceplayer
loadfont
checkevent EVENT_RETURNED_MACHINE_PART
@@ -19,25 +17,22 @@ PokefanFScript_0x18ad16: ; 0x18ad16
closetext
loadmovesprites
end
-; 0x18ad24
-UnknownScript_0x18ad24: ; 0x18ad24
+UnknownScript_0x18ad24:
writetext UnknownText_0x18add3
closetext
loadmovesprites
end
-; 0x18ad2a
-ClefairyScript_0x18ad2a: ; 0x18ad2a
+ClefairyScript_0x18ad2a:
loadfont
writetext UnknownText_0x18ae4b
cry BLISSEY
closetext
loadmovesprites
end
-; 0x18ad34
-UnknownText_0x18ad34: ; 0x18ad34
+UnknownText_0x18ad34:
text "My daughter likes"
line "to mimic people."
@@ -47,18 +42,16 @@ UnknownText_0x18ad34: ; 0x18ad34
para "nickname COPYCAT"
line "around here."
done
-; 0x18ad95
-UnknownText_0x18ad95: ; 0x18ad95
+UnknownText_0x18ad95:
text "My daughter is so"
line "self-centered…"
para "She only has a few"
line "friends."
done
-; 0x18add3
-UnknownText_0x18add3: ; 0x18add3
+UnknownText_0x18add3:
text "She recently lost"
line "the # DOLL that"
@@ -69,32 +62,29 @@ UnknownText_0x18add3: ; 0x18add3
line "she's gotten even"
cont "better at mimicry…"
done
-; 0x18ae4b
-UnknownText_0x18ae4b: ; 0x18ae4b
+UnknownText_0x18ae4b:
text "BLISSEY: Bliisii!"
done
-; 0x18ae5e
-CopycatsHouse1F_MapEventHeader: ; 0x18ae5e
+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, $ffff
- person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, $ffff
- person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, $ffff
-; 0x18ae9a
+ 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