summaryrefslogtreecommitdiff
path: root/maps/CinnabarPokeCenter1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/CinnabarPokeCenter1F.asm')
-rw-r--r--maps/CinnabarPokeCenter1F.asm39
1 files changed, 16 insertions, 23 deletions
diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm
index 8662da1d8..1eea0d2f5 100644
--- a/maps/CinnabarPokeCenter1F.asm
+++ b/maps/CinnabarPokeCenter1F.asm
@@ -1,24 +1,20 @@
-CinnabarPokeCenter1F_MapScriptHeader: ; 0x1ab32a
- ; trigger count
+CinnabarPokeCenter1F_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x1ab32c
-NurseScript_0x1ab32c: ; 0x1ab32c
+NurseScript_0x1ab32c:
jumpstd pokecenternurse
-; 0x1ab32f
-CooltrainerFScript_0x1ab32f: ; 0x1ab32f
+CooltrainerFScript_0x1ab32f:
jumptextfaceplayer UnknownText_0x1ab335
-; 0x1ab332
-FisherScript_0x1ab332: ; 0x1ab332
+FisherScript_0x1ab332:
jumptextfaceplayer UnknownText_0x1ab37f
-; 0x1ab335
-UnknownText_0x1ab335: ; 0x1ab335
+UnknownText_0x1ab335:
text "CINNABAR GYM's"
line "BLAINE apparently"
@@ -26,34 +22,31 @@ UnknownText_0x1ab335: ; 0x1ab335
line "SEAFOAM ISLANDS"
cont "cave…"
done
-; 0x1ab37f
-UnknownText_0x1ab37f: ; 0x1ab37f
+UnknownText_0x1ab37f:
text "It's been a year"
line "since the volcano"
cont "erupted."
done
-; 0x1ab3ab
-CinnabarPokeCenter1F_MapEventHeader: ; 0x1ab3ab
+CinnabarPokeCenter1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 3
warp_def $7, $3, 1, GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND
warp_def $7, $4, 1, GROUP_CINNABAR_ISLAND, MAP_CINNABAR_ISLAND
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 3
- person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, $ffff
- person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, $ffff
- person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, $ffff
-; 0x1ab3e7
+ person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x1ab32c, -1
+ person_event SPRITE_COOLTRAINER_F, 10, 11, OW_UP | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1ab32f, -1
+ person_event SPRITE_FISHER, 8, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1ab332, -1