summaryrefslogtreecommitdiff
path: root/maps/PewterPokeCenter1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/PewterPokeCenter1F.asm')
-rw-r--r--maps/PewterPokeCenter1F.asm52
1 files changed, 21 insertions, 31 deletions
diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm
index f8962f9c8..b55fd7c44 100644
--- a/maps/PewterPokeCenter1F.asm
+++ b/maps/PewterPokeCenter1F.asm
@@ -1,42 +1,36 @@
-PewterPokeCenter1F_MapScriptHeader: ; 0x1a2ee5
- ; trigger count
+PewterPokeCenter1F_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x1a2ee7
-NurseScript_0x1a2ee7: ; 0x1a2ee7
+NurseScript_0x1a2ee7:
jumpstd pokecenternurse
-; 0x1a2eea
-TeacherScript_0x1a2eea: ; 0x1a2eea
+TeacherScript_0x1a2eea:
jumptextfaceplayer UnknownText_0x1a2f01
-; 0x1a2eed
-JigglypuffScript_0x1a2eed: ; 0x1a2eed
+JigglypuffScript_0x1a2eed:
loadfont
writetext UnknownText_0x1a2f5d
cry JIGGLYPUFF
closetext
loadmovesprites
end
-; 0x1a2ef7
-BugCatcherScript_0x1a2ef7: ; 0x1a2ef7
+BugCatcherScript_0x1a2ef7:
jumptextfaceplayer UnknownText_0x1a2f75
-; 0x1a2efa
-PokefanMScript_0x1a2efa: ; 0x1a2efa
+PokefanMScript_0x1a2efa:
faceplayer
loadfont
trade $4
closetext
loadmovesprites
end
-; 0x1a2f01
-UnknownText_0x1a2f01: ; 0x1a2f01
+UnknownText_0x1a2f01:
text "…Yeah, and the"
line "GYM in CINNABAR's"
@@ -46,15 +40,13 @@ UnknownText_0x1a2f01: ; 0x1a2f01
para "…Yes? I'm on the"
line "phone. Go away!"
done
-; 0x1a2f5d
-UnknownText_0x1a2f5d: ; 0x1a2f5d
+UnknownText_0x1a2f5d:
text "JIGGLYPUFF: Puu"
line "pupuu."
done
-; 0x1a2f75
-UnknownText_0x1a2f75: ; 0x1a2f75
+UnknownText_0x1a2f75:
text "Most #MON get"
line "drowsy if they"
@@ -67,29 +59,27 @@ UnknownText_0x1a2f75: ; 0x1a2f75
para "used only while a"
line "#MON is asleep."
done
-; 0x1a2ff4
-PewterPokeCenter1F_MapEventHeader: ; 0x1a2ff4
+PewterPokeCenter1F_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 3
warp_def $7, $3, 4, GROUP_PEWTER_CITY, MAP_PEWTER_CITY
warp_def $7, $4, 4, GROUP_PEWTER_CITY, MAP_PEWTER_CITY
warp_def $7, $0, 1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 0
- ; people-events
+.PersonEvents:
db 5
- person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1a2ee7, $ffff
- person_event SPRITE_TEACHER, 10, 12, $6, $0, 255, 255, $a0, 0, TeacherScript_0x1a2eea, $ffff
- person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, $ffff
- person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, $ffff
- person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, $ffff
-; 0x1a304a
+ person_event SPRITE_NURSE, 5, 7, OW_UP | $2, $0, -1, -1, $0, 0, NurseScript_0x1a2ee7, -1
+ person_event SPRITE_TEACHER, 10, 12, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a2eea, -1
+ person_event SPRITE_JIGGLYPUFF, 7, 5, OW_UP | $12, $0, -1, -1, $0, 0, JigglypuffScript_0x1a2eed, -1
+ person_event SPRITE_BUG_CATCHER, 7, 6, OW_UP | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BugCatcherScript_0x1a2ef7, -1
+ person_event SPRITE_POKEFAN_M, 6, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1a2efa, -1