summaryrefslogtreecommitdiff
path: root/maps/Route37.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route37.asm')
-rw-r--r--maps/Route37.asm160
1 files changed, 45 insertions, 115 deletions
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 5519f89c8..9ad9576b1 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -1,8 +1,8 @@
-Route37_MapScriptHeader: ; 0x1a8d72
- ; trigger count
+Route37_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 1
; callbacks
@@ -10,7 +10,7 @@ Route37_MapScriptHeader: ; 0x1a8d72
dbw 2, SunnyCallback
SunnyCallback:
- checkcode $b
+ checkcode VAR_WEEKDAY
if_equal SUNDAY, .SunnyAppears
disappear $6
return
@@ -19,99 +19,45 @@ SunnyCallback:
appear $6
return
-TrainerTwinsAnnandanne1: ; 0x1a8d83
- ; bit/flag number
- dw $465
+TrainerTwinsAnnandanne1:
+ trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE1, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, $0000, TwinsAnnandanne1Script
- ; trainer group && trainer id
- db TWINS, ANNANDANNE1
-
- ; text when seen
- dw TwinsAnnandanne1SeenText
-
- ; text when trainer beaten
- dw TwinsAnnandanne1BeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw TwinsAnnandanne1Script
-; 0x1a8d8f
-
-TwinsAnnandanne1Script: ; 0x1a8d8f
+TwinsAnnandanne1Script:
talkaftercancel
loadfont
writetext UnknownText_0x1a8e62
closetext
loadmovesprites
end
-; 0x1a8d97
-
-TrainerTwinsAnnandanne2: ; 0x1a8d97
- ; bit/flag number
- dw $465
-
- ; trainer group && trainer id
- db TWINS, ANNANDANNE2
-
- ; text when seen
- dw TwinsAnnandanne2SeenText
- ; text when trainer beaten
- dw TwinsAnnandanne2BeatenText
+TrainerTwinsAnnandanne2:
+ trainer EVENT_BEAT_TWINS_ANN_AND_ANNE, TWINS, ANNANDANNE2, TwinsAnnandanne2SeenText, TwinsAnnandanne2BeatenText, $0000, TwinsAnnandanne2Script
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw TwinsAnnandanne2Script
-; 0x1a8da3
-
-TwinsAnnandanne2Script: ; 0x1a8da3
+TwinsAnnandanne2Script:
talkaftercancel
loadfont
writetext UnknownText_0x1a8eec
closetext
loadmovesprites
end
-; 0x1a8dab
-
-TrainerPsychicGreg: ; 0x1a8dab
- ; bit/flag number
- dw $43e
-
- ; trainer group && trainer id
- db PSYCHIC_T, GREG
-
- ; text when seen
- dw PsychicGregSeenText
-
- ; text when trainer beaten
- dw PsychicGregBeatenText
-
- ; script when lost
- dw $0000
- ; script when talk again
- dw PsychicGregScript
-; 0x1a8db7
+TrainerPsychicGreg:
+ trainer EVENT_BEAT_PSYCHIC_GREG, PSYCHIC_T, GREG, PsychicGregSeenText, PsychicGregBeatenText, $0000, PsychicGregScript
-PsychicGregScript: ; 0x1a8db7
+PsychicGregScript:
talkaftercancel
loadfont
writetext UnknownText_0x1a8f80
closetext
loadmovesprites
end
-; 0x1a8dbf
SunnyScript:
faceplayer
loadfont
checkevent EVENT_GOT_MAGNET_FROM_SUNNY
iftrue SunnySundayScript
- checkcode $b
+ checkcode VAR_WEEKDAY
if_not_equal SUNDAY, SunnyNotSundayScript
checkevent EVENT_MET_SUNNY_OF_SUNDAY
iftrue .MetSunny
@@ -119,7 +65,7 @@ SunnyScript:
keeptextopen
setevent EVENT_MET_SUNNY_OF_SUNDAY
.MetSunny
- checkflag $0063
+ checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Kris
writetext SunnyGivesGiftText1
keeptextopen
@@ -149,71 +95,59 @@ SunnyNotSundayScript:
loadmovesprites
end
-MapRoute37Signpost0Script: ; 0x1a8e06
+MapRoute37Signpost0Script:
jumptext UnknownText_0x1a9197
-; 0x1a8e09
-FruitTreeScript_0x1a8e09: ; 0x1a8e09
+FruitTreeScript_0x1a8e09:
fruittree $11
-; 0x1a8e0b
-FruitTreeScript_0x1a8e0b: ; 0x1a8e0b
+FruitTreeScript_0x1a8e0b:
fruittree $12
-; 0x1a8e0d
-FruitTreeScript_0x1a8e0d: ; 0x1a8e0d
+FruitTreeScript_0x1a8e0d:
fruittree $13
-; 0x1a8e0f
-MapRoute37SignpostItem1: ; 0x1a8e0f
- dw $00a9
- db ETHER
+MapRoute37SignpostItem1:
+ dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER
-; 0x1a8e12
-TwinsAnnandanne1SeenText: ; 0x1a8e12
+TwinsAnnandanne1SeenText:
text "ANN: ANNE and I"
line "are in this to-"
cont "gether!"
done
-; 0x1a8e3b
-TwinsAnnandanne1BeatenText: ; 0x1a8e3b
+TwinsAnnandanne1BeatenText:
text "ANN & ANNE: Nnn… A"
line "little too strong."
done
-; 0x1a8e62
-UnknownText_0x1a8e62: ; 0x1a8e62
+UnknownText_0x1a8e62:
text "ANN: I can tell"
line "what my sister and"
para "my #MON are"
line "thinking."
done
-; 0x1a8e9c
-TwinsAnnandanne2SeenText: ; 0x1a8e9c
+TwinsAnnandanne2SeenText:
text "ANNE: ANN and I"
line "are in this to-"
cont "gether!"
done
-; 0x1a8ec5
-TwinsAnnandanne2BeatenText: ; 0x1a8ec5
+TwinsAnnandanne2BeatenText:
text "ANN & ANNE: Nnn… A"
line "little too strong."
done
-; 0x1a8eec
-UnknownText_0x1a8eec: ; 0x1a8eec
+UnknownText_0x1a8eec:
text "ANNE: We share the"
line "same feelings as"
cont "our #MON."
done
-; 0x1a8f1b
-PsychicGregSeenText: ; 0x1a8f1b
+PsychicGregSeenText:
text "#MON can't do a"
line "thing if they are"
cont "asleep."
@@ -221,21 +155,18 @@ PsychicGregSeenText: ; 0x1a8f1b
para "I'll show you how"
line "scary that is!"
done
-; 0x1a8f65
-PsychicGregBeatenText: ; 0x1a8f65
+PsychicGregBeatenText:
text "I lost. That's"
line "pretty sad…"
done
-; 0x1a8f80
-UnknownText_0x1a8f80: ; 0x1a8f80
+UnknownText_0x1a8f80:
text "Putting #MON to"
line "sleep or paralyz-"
cont "ing them are good"
cont "battle techniques."
done
-; 0x1a8fc8
MeetSunnyText:
text "SUNNY: Hi!"
@@ -297,32 +228,31 @@ SunnyNotSundayText:
cont "Um… I forgot!"
done
-UnknownText_0x1a9197: ; 0x1a9197
+UnknownText_0x1a9197:
text "ROUTE 37"
done
-; 0x1a91a1
-Route37_MapEventHeader: ; 0x1a91a1
+Route37_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 0
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 2
- signpost 3, 5, $0, MapRoute37Signpost0Script
- signpost 2, 4, $7, MapRoute37SignpostItem1
+ signpost 3, 5, SIGNPOST_READ, MapRoute37Signpost0Script
+ signpost 2, 4, SIGNPOST_ITEM, MapRoute37SignpostItem1
- ; people-events
+.PersonEvents:
db 7
- person_event SPRITE_WEIRD_TREE, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, $ffff
- person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, $ffff
- person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, $ffff
- person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, $ffff
- person_event SPRITE_BUG_CATCHER, 12, 20, $2, $11, 255, 255, $0, 0, SunnyScript, $075b
- person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, $ffff
- person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, $ffff
+ person_event SPRITE_WEIRD_TREE, 16, 10, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAnnandanne1, -1
+ person_event SPRITE_WEIRD_TREE, 16, 11, OW_UP | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAnnandanne2, -1
+ person_event SPRITE_YOUNGSTER, 10, 10, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerPsychicGreg, -1
+ person_event SPRITE_FRUIT_TREE, 9, 17, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e09, -1
+ person_event SPRITE_BUG_CATCHER, 12, 20, OW_DOWN | $2, $11, -1, -1, $0, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY
+ person_event SPRITE_FRUIT_TREE, 9, 20, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e0b, -1
+ person_event SPRITE_FRUIT_TREE, 11, 19, OW_DOWN | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e0d, -1