summaryrefslogtreecommitdiff
path: root/maps/CianwoodCityPhotoStudio.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CianwoodCityPhotoStudio.asm')
-rw-r--r--maps/CianwoodCityPhotoStudio.asm35
1 files changed, 14 insertions, 21 deletions
diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm
index ecd5b0b85..98dae6883 100644
--- a/maps/CianwoodCityPhotoStudio.asm
+++ b/maps/CianwoodCityPhotoStudio.asm
@@ -1,12 +1,11 @@
-CianwoodCityPhotoStudio_MapScriptHeader: ; 0x9e0de
- ; trigger count
+CianwoodCityPhotoStudio_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x9e0e0
-FishingGuruScript_0x9e0e0: ; 0x9e0e0
+FishingGuruScript_0x9e0e0:
faceplayer
loadfont
writetext UnknownText_0x9e0f9
@@ -18,16 +17,14 @@ FishingGuruScript_0x9e0e0: ; 0x9e0e0
closetext
loadmovesprites
end
-; 0x9e0f3
-UnknownScript_0x9e0f3: ; 0x9e0f3
+UnknownScript_0x9e0f3:
writetext UnknownText_0x9e156
closetext
loadmovesprites
end
-; 0x9e0f9
-UnknownText_0x9e0f9: ; 0x9e0f9
+UnknownText_0x9e0f9:
text "You have magnifi-"
line "cent #MON with"
cont "you."
@@ -35,38 +32,34 @@ UnknownText_0x9e0f9: ; 0x9e0f9
para "How about a photo"
line "for a souvenir?"
done
-; 0x9e142
-UnknownText_0x9e142: ; 0x9e142
+UnknownText_0x9e142:
text "OK! Big smile now!"
done
-; 0x9e156
-UnknownText_0x9e156: ; 0x9e156
+UnknownText_0x9e156:
text "Oh, that's too"
line "bad. I thought it"
para "would be a great"
line "memento…"
done
-; 0x9e191
-CianwoodCityPhotoStudio_MapEventHeader: ; 0x9e191
+CianwoodCityPhotoStudio_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 5, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
warp_def $7, $3, 5, GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 1
- person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, $ffff
-; 0x9e1ae
+ person_event SPRITE_FISHING_GURU, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x9e0e0, -1