summaryrefslogtreecommitdiff
path: root/maps/CeruleanPoliceStation.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CeruleanPoliceStation.asm')
-rw-r--r--maps/CeruleanPoliceStation.asm42
1 files changed, 17 insertions, 25 deletions
diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm
index e9b0de73a..d0bdc7999 100644
--- a/maps/CeruleanPoliceStation.asm
+++ b/maps/CeruleanPoliceStation.asm
@@ -1,29 +1,25 @@
-CeruleanPoliceStation_MapScriptHeader: ; 0x188048
- ; trigger count
+CeruleanPoliceStation_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x18804a
-FishingGuruScript_0x18804a: ; 0x18804a
+FishingGuruScript_0x18804a:
jumptextfaceplayer UnknownText_0x18805a
-; 0x18804d
-PokefanFScript_0x18804d: ; 0x18804d
+PokefanFScript_0x18804d:
jumptextfaceplayer UnknownText_0x1880c3
-; 0x188050
-DiglettScript_0x188050: ; 0x188050
+DiglettScript_0x188050:
loadfont
writetext UnknownText_0x1880e7
cry DIGLETT
closetext
loadmovesprites
end
-; 0x18805a
-UnknownText_0x18805a: ; 0x18805a
+UnknownText_0x18805a:
text "I heard that some"
line "shady character is"
cont "skulking about."
@@ -32,37 +28,33 @@ UnknownText_0x18805a: ; 0x18805a
line "it if he turns out"
cont "to be a thief."
done
-; 0x1880c3
-UnknownText_0x1880c3: ; 0x1880c3
+UnknownText_0x1880c3:
text "We were held up by"
line "robbers before."
done
-; 0x1880e7
-UnknownText_0x1880e7: ; 0x1880e7
+UnknownText_0x1880e7:
text "DIGLETT: Dug dug."
done
-; 0x1880fa
-CeruleanPoliceStation_MapEventHeader: ; 0x1880fa
+CeruleanPoliceStation_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 2
warp_def $7, $2, 2, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
warp_def $7, $3, 2, GROUP_CERULEAN_CITY, MAP_CERULEAN_CITY
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, $ffff
- person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, $ffff
- person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, $ffff
-; 0x188131
+ person_event SPRITE_FISHING_GURU, 5, 9, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x18804a, -1
+ person_event SPRITE_POKEFAN_F, 8, 9, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x18804d, -1
+ person_event SPRITE_DIGLETT, 9, 7, OW_UP | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, DiglettScript_0x188050, -1