summaryrefslogtreecommitdiff
path: root/maps/ViridianCity.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/ViridianCity.asm')
-rw-r--r--maps/ViridianCity.asm105
1 files changed, 39 insertions, 66 deletions
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index d136f9101..a67644788 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -1,4 +1,4 @@
-ViridianCity_MapScriptHeader: ; 0x1a9a43
+ViridianCity_MapScriptHeader:
; trigger count
db 0
@@ -8,14 +8,12 @@ ViridianCity_MapScriptHeader: ; 0x1a9a43
; callbacks
dbw 5, UnknownScript_0x1a9a48
-; 0x1a9a48
-UnknownScript_0x1a9a48: ; 0x1a9a48
+UnknownScript_0x1a9a48:
setflag $0036
return
-; 0x1a9a4c
-GrampsScript_0x1a9a4c: ; 0x1a9a4c
+GrampsScript_0x1a9a4c:
faceplayer
loadfont
writetext UnknownText_0x1a9aa5
@@ -25,16 +23,14 @@ GrampsScript_0x1a9a4c: ; 0x1a9a4c
closetext
loadmovesprites
end
-; 0x1a9a5b
-UnknownScript_0x1a9a5b: ; 0x1a9a5b
+UnknownScript_0x1a9a5b:
writetext UnknownText_0x1a9bb7
closetext
loadmovesprites
end
-; 0x1a9a61
-GrampsScript_0x1a9a61: ; 0x1a9a61
+GrampsScript_0x1a9a61:
faceplayer
loadfont
checkevent $0775
@@ -43,16 +39,14 @@ GrampsScript_0x1a9a61: ; 0x1a9a61
closetext
loadmovesprites
end
-; 0x1a9a6f
-UnknownScript_0x1a9a6f: ; 0x1a9a6f
+UnknownScript_0x1a9a6f:
writetext UnknownText_0x1a9c7e
closetext
loadmovesprites
end
-; 0x1a9a75
-FisherScript_0x1a9a75: ; 0x1a9a75
+FisherScript_0x1a9a75:
faceplayer
loadfont
checkevent EVENT_GOT_TM42_DREAM_EATER
@@ -62,43 +56,35 @@ FisherScript_0x1a9a75: ; 0x1a9a75
verbosegiveitem TM_42, 1
iffalse UnknownScript_0x1a9a8e
setevent EVENT_GOT_TM42_DREAM_EATER
-UnknownScript_0x1a9a8a: ; 0x1a9a8a
+UnknownScript_0x1a9a8a:
writetext UnknownText_0x1a9d86
closetext
-UnknownScript_0x1a9a8e: ; 0x1a9a8e
+UnknownScript_0x1a9a8e:
loadmovesprites
end
-; 0x1a9a90
-YoungsterScript_0x1a9a90: ; 0x1a9a90
+YoungsterScript_0x1a9a90:
jumptextfaceplayer UnknownText_0x1a9daa
-; 0x1a9a93
-MapViridianCitySignpost0Script: ; 0x1a9a93
- jumptext UnknownText_0x1a9def
-; 0x1a9a96
+ViridianCitySign:
+ jumptext ViridianCitySignText
-MapViridianCitySignpost1Script: ; 0x1a9a96
- jumptext UnknownText_0x1a9e1b
-; 0x1a9a99
+ViridianGymSign:
+ jumptext ViridianGymSignText
-MapViridianCitySignpost2Script: ; 0x1a9a99
- jumptext UnknownText_0x1a9e60
-; 0x1a9a9c
+ViridianCityWelcomeSign:
+ jumptext ViridianCityWelcomeSignText
-MapViridianCitySignpost3Script: ; 0x1a9a9c
- jumptext UnknownText_0x1a9e99
-; 0x1a9a9f
+TrainerHouseSign:
+ jumptext TrainerHouseSignText
-MapViridianCitySignpost4Script: ; 0x1a9a9f
+ViridianCityPokeCenterSign:
jumpstd pokecentersign
-; 0x1a9aa2
-MapViridianCitySignpost5Script: ; 0x1a9aa2
+ViridianCityMartSign:
jumpstd martsign
-; 0x1a9aa5
-UnknownText_0x1a9aa5: ; 0x1a9aa5
+UnknownText_0x1a9aa5:
text "Hey, kid! I just"
line "had a double shot"
@@ -117,18 +103,16 @@ UnknownText_0x1a9aa5: ; 0x1a9aa5
para "Do you believe me?"
done
-; 0x1a9b6f
-UnknownText_0x1a9b6f: ; 0x1a9b6f
+UnknownText_0x1a9b6f:
text "Good, good. Yes, I"
line "was something out"
para "of the ordinary,"
line "let me tell you!"
done
-; 0x1a9bb7
-UnknownText_0x1a9bb7: ; 0x1a9bb7
+UnknownText_0x1a9bb7:
text "What? You little"
line "whelp!"
@@ -138,9 +122,8 @@ UnknownText_0x1a9bb7: ; 0x1a9bb7
para "show you a thing"
line "or two. Humph!"
done
-; 0x1a9c11
-UnknownText_0x1a9c11: ; 0x1a9c11
+UnknownText_0x1a9c11:
text "This GYM didn't"
line "have a LEADER"
cont "until recently."
@@ -151,18 +134,16 @@ UnknownText_0x1a9c11: ; 0x1a9c11
para "LEADER, but he's"
line "often away."
done
-; 0x1a9c7e
-UnknownText_0x1a9c7e: ; 0x1a9c7e
+UnknownText_0x1a9c7e:
text "Are you going to"
line "battle the LEADER?"
para "Good luck to you."
line "You'll need it."
done
-; 0x1a9cc4
-UnknownText_0x1a9cc4: ; 0x1a9cc4
+UnknownText_0x1a9cc4:
text "Yawn!"
para "I must have dozed"
@@ -184,34 +165,30 @@ UnknownText_0x1a9cc4: ; 0x1a9cc4
line "Here, you can have"
cont "this TM."
done
-; 0x1a9d86
-UnknownText_0x1a9d86: ; 0x1a9d86
+UnknownText_0x1a9d86:
text "TM42 contains"
line "DREAM EATER…"
para "…Zzzzz…"
done
-; 0x1a9daa
-UnknownText_0x1a9daa: ; 0x1a9daa
+UnknownText_0x1a9daa:
text "I heard that there"
line "are many items on"
para "the ground in"
line "VIRIDIAN FOREST."
done
-; 0x1a9def
-UnknownText_0x1a9def: ; 0x1a9def
+ViridianCitySignText:
text "VIRIDIAN CITY"
para "The Eternally"
line "Green Paradise"
done
-; 0x1a9e1b
-UnknownText_0x1a9e1b: ; 0x1a9e1b
+ViridianGymSignText:
text "VIRIDIAN CITY"
line "#MON GYM"
cont "LEADER: …"
@@ -219,26 +196,23 @@ UnknownText_0x1a9e1b: ; 0x1a9e1b
para "The rest of the"
line "text is illegible…"
done
-; 0x1a9e60
-UnknownText_0x1a9e60: ; 0x1a9e60
+ViridianCityWelcomeSignText:
text "WELCOME TO"
line "VIRIDIAN CITY,"
para "THE GATEWAY TO"
line "INDIGO PLATEAU"
done
-; 0x1a9e99
-UnknownText_0x1a9e99: ; 0x1a9e99
+TrainerHouseSignText:
text "TRAINER HOUSE"
para "The Club for Top"
line "Trainer Battles"
done
-; 0x1a9ec9
-ViridianCity_MapEventHeader: ; 0x1a9ec9
+ViridianCity_MapEventHeader:
; filler
db 0, 0
@@ -255,12 +229,12 @@ ViridianCity_MapEventHeader: ; 0x1a9ec9
; signposts
db 6
- signpost 17, 17, $0, MapViridianCitySignpost0Script
- signpost 7, 27, $0, MapViridianCitySignpost1Script
- signpost 1, 19, $0, MapViridianCitySignpost2Script
- signpost 15, 21, $0, MapViridianCitySignpost3Script
- signpost 25, 24, $0, MapViridianCitySignpost4Script
- signpost 19, 30, $0, MapViridianCitySignpost5Script
+ signpost 17, 17, $0, ViridianCitySign
+ signpost 7, 27, $0, ViridianGymSign
+ signpost 1, 19, $0, ViridianCityWelcomeSign
+ signpost 15, 21, $0, TrainerHouseSign
+ signpost 25, 24, $0, ViridianCityPokeCenterSign
+ signpost 19, 30, $0, ViridianCityMartSign
; people-events
db 4
@@ -268,4 +242,3 @@ ViridianCity_MapEventHeader: ; 0x1a9ec9
person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, $ffff
person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, $ffff
person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, $ffff
-; 0x1a9f3a