summaryrefslogtreecommitdiff
path: root/maps/Route3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route3.asm')
-rw-r--r--maps/Route3.asm166
1 files changed, 39 insertions, 127 deletions
diff --git a/maps/Route3.asm b/maps/Route3.asm
index 647f3f313..7db9dc951 100644
--- a/maps/Route3.asm
+++ b/maps/Route3.asm
@@ -1,201 +1,116 @@
-Route3_MapScriptHeader: ; 0x1adf63
- ; trigger count
+Route3_MapScriptHeader:
+.MapTriggers:
db 0
- ; callback count
+.MapCallbacks:
db 0
-; 0x1adf65
-TrainerFirebreatherOtis: ; 0x1adf65
- ; bit/flag number
- dw $446
+TrainerFirebreatherOtis:
+ trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, $0000, FirebreatherOtisScript
- ; trainer group && trainer id
- db FIREBREATHER, OTIS
-
- ; text when seen
- dw FirebreatherOtisSeenText
-
- ; text when trainer beaten
- dw FirebreatherOtisBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw FirebreatherOtisScript
-; 0x1adf71
-
-FirebreatherOtisScript: ; 0x1adf71
+FirebreatherOtisScript:
talkaftercancel
loadfont
writetext UnknownText_0x1adff7
closetext
loadmovesprites
end
-; 0x1adf79
-
-TrainerYoungsterWarren: ; 0x1adf79
- ; bit/flag number
- dw $5b1
-
- ; trainer group && trainer id
- db YOUNGSTER, WARREN
-
- ; text when seen
- dw YoungsterWarrenSeenText
-
- ; text when trainer beaten
- dw YoungsterWarrenBeatenText
-
- ; script when lost
- dw $0000
- ; script when talk again
- dw YoungsterWarrenScript
-; 0x1adf85
+TrainerYoungsterWarren:
+ trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, $0000, YoungsterWarrenScript
-YoungsterWarrenScript: ; 0x1adf85
+YoungsterWarrenScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae051
closetext
loadmovesprites
end
-; 0x1adf8d
-TrainerYoungsterJimmy: ; 0x1adf8d
- ; bit/flag number
- dw $5b2
+TrainerYoungsterJimmy:
+ trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, $0000, YoungsterJimmyScript
- ; trainer group && trainer id
- db YOUNGSTER, JIMMY
-
- ; text when seen
- dw YoungsterJimmySeenText
-
- ; text when trainer beaten
- dw YoungsterJimmyBeatenText
-
- ; script when lost
- dw $0000
-
- ; script when talk again
- dw YoungsterJimmyScript
-; 0x1adf99
-
-YoungsterJimmyScript: ; 0x1adf99
+YoungsterJimmyScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae0a9
closetext
loadmovesprites
end
-; 0x1adfa1
-
-TrainerFirebreatherBurt: ; 0x1adfa1
- ; bit/flag number
- dw $449
-
- ; trainer group && trainer id
- db FIREBREATHER, BURT
-
- ; text when seen
- dw FirebreatherBurtSeenText
-
- ; text when trainer beaten
- dw FirebreatherBurtBeatenText
-
- ; script when lost
- dw $0000
- ; script when talk again
- dw FirebreatherBurtScript
-; 0x1adfad
+TrainerFirebreatherBurt:
+ trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, $0000, FirebreatherBurtScript
-FirebreatherBurtScript: ; 0x1adfad
+FirebreatherBurtScript:
talkaftercancel
loadfont
writetext UnknownText_0x1ae118
closetext
loadmovesprites
end
-; 0x1adfb5
-MapRoute3Signpost0Script: ; 0x1adfb5
+MapRoute3Signpost0Script:
jumptext UnknownText_0x1ae163
-; 0x1adfb8
-FirebreatherOtisSeenText: ; 0x1adfb8
+FirebreatherOtisSeenText:
text "Ah! The weather's"
line "as fine as ever."
done
-; 0x1adfdb
-FirebreatherOtisBeatenText: ; 0x1adfdb
+FirebreatherOtisBeatenText:
text "It's sunny, but"
line "I'm all wet…"
done
-; 0x1adff7
-UnknownText_0x1adff7: ; 0x1adff7
+UnknownText_0x1adff7:
text "When it rains,"
line "it's hard to get"
cont "ignition…"
done
-; 0x1ae021
-YoungsterWarrenSeenText: ; 0x1ae021
+YoungsterWarrenSeenText:
text "Hmmm… I don't know"
line "what to do…"
done
-; 0x1ae040
-YoungsterWarrenBeatenText: ; 0x1ae040
+YoungsterWarrenBeatenText:
text "I knew I'd lose…"
done
-; 0x1ae051
-UnknownText_0x1ae051: ; 0x1ae051
+UnknownText_0x1ae051:
text "You looked strong."
para "I was afraid to"
line "take you on…"
done
-; 0x1ae082
-YoungsterJimmySeenText: ; 0x1ae082
+YoungsterJimmySeenText:
text "I can run like the"
line "wind!"
done
-; 0x1ae09c
-YoungsterJimmyBeatenText: ; 0x1ae09c
+YoungsterJimmyBeatenText:
text "Blown away!"
done
-; 0x1ae0a9
-UnknownText_0x1ae0a9: ; 0x1ae0a9
+UnknownText_0x1ae0a9:
text "I wear shorts the"
line "whole year round."
para "That's my fashion"
line "policy."
done
-; 0x1ae0e7
-FirebreatherBurtSeenText: ; 0x1ae0e7
+FirebreatherBurtSeenText:
text "Step right up and"
line "take a look!"
done
-; 0x1ae107
-FirebreatherBurtBeatenText: ; 0x1ae107
+FirebreatherBurtBeatenText:
text "Yow! That's hot!"
done
-; 0x1ae118
-UnknownText_0x1ae118: ; 0x1ae118
+UnknownText_0x1ae118:
text "The greatest fire-"
line "breather in KANTO,"
cont "that's me."
@@ -203,35 +118,32 @@ UnknownText_0x1ae118: ; 0x1ae118
para "But not the best"
line "trainer…"
done
-; 0x1ae163
-UnknownText_0x1ae163: ; 0x1ae163
+UnknownText_0x1ae163:
text "MT.MOON SQUARE"
para "Just go up the"
line "stairs."
done
-; 0x1ae18a
-Route3_MapEventHeader: ; 0x1ae18a
+Route3_MapEventHeader:
; filler
db 0, 0
- ; warps
+.Warps:
db 1
warp_def $1, $34, 1, GROUP_MOUNT_MOON, MAP_MOUNT_MOON
- ; xy triggers
+.XYTriggers:
db 0
- ; signposts
+.Signposts:
db 1
- signpost 13, 49, $0, MapRoute3Signpost0Script
+ signpost 13, 49, SIGNPOST_READ, MapRoute3Signpost0Script
- ; people-events
+.PersonEvents:
db 4
- person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, $ffff
- person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, $ffff
- person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, $ffff
- person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, $ffff
-; 0x1ae1ce
+ person_event SPRITE_FISHER, 16, 30, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherOtis, -1
+ person_event SPRITE_YOUNGSTER, 11, 14, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterWarren, -1
+ person_event SPRITE_YOUNGSTER, 7, 20, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerYoungsterJimmy, -1
+ person_event SPRITE_FISHER, 9, 53, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerFirebreatherBurt, -1