diff options
Diffstat (limited to 'maps/Route3.asm')
| -rw-r--r-- | maps/Route3.asm | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/maps/Route3.asm b/maps/Route3.asm index b5e08faf9..0df90cd80 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -5,52 +5,52 @@ const_value set 2 const ROUTE3_FISHER2 Route3_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 0 TrainerFirebreatherOtis: - trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, FirebreatherOtisScript + trainer EVENT_BEAT_FIREBREATHER_OTIS, FIREBREATHER, OTIS, FirebreatherOtisSeenText, FirebreatherOtisBeatenText, 0, .Script -FirebreatherOtisScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1adff7 + writetext FirebreatherOtisAfterBattleText waitbutton closetext end TrainerYoungsterWarren: - trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, YoungsterWarrenScript + trainer EVENT_BEAT_YOUNGSTER_WARREN, YOUNGSTER, WARREN, YoungsterWarrenSeenText, YoungsterWarrenBeatenText, 0, .Script -YoungsterWarrenScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae051 + writetext YoungsterWarrenAfterBattleText waitbutton closetext end TrainerYoungsterJimmy: - trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, YoungsterJimmyScript + trainer EVENT_BEAT_YOUNGSTER_JIMMY, YOUNGSTER, JIMMY, YoungsterJimmySeenText, YoungsterJimmyBeatenText, 0, .Script -YoungsterJimmyScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae0a9 + writetext YoungsterJimmyAfterBattleText waitbutton closetext end TrainerFirebreatherBurt: - trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, FirebreatherBurtScript + trainer EVENT_BEAT_FIREBREATHER_BURT, FIREBREATHER, BURT, FirebreatherBurtSeenText, FirebreatherBurtBeatenText, 0, .Script -FirebreatherBurtScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x1ae118 + writetext FirebreatherBurtAfterBattleText waitbutton closetext end @@ -68,7 +68,7 @@ FirebreatherOtisBeatenText: line "I'm all wet…" done -UnknownText_0x1adff7: +FirebreatherOtisAfterBattleText: text "When it rains," line "it's hard to get" cont "ignition…" @@ -83,7 +83,7 @@ YoungsterWarrenBeatenText: text "I knew I'd lose…" done -UnknownText_0x1ae051: +YoungsterWarrenAfterBattleText: text "You looked strong." para "I was afraid to" @@ -99,7 +99,7 @@ YoungsterJimmyBeatenText: text "Blown away!" done -UnknownText_0x1ae0a9: +YoungsterJimmyAfterBattleText: text "I wear shorts the" line "whole year round." @@ -116,7 +116,7 @@ FirebreatherBurtBeatenText: text "Yow! That's hot!" done -UnknownText_0x1ae118: +FirebreatherBurtAfterBattleText: text "The greatest fire-" line "breather in KANTO," cont "that's me." @@ -140,16 +140,16 @@ Route3_MapEventHeader: db 1 warp_def $1, $34, 1, MOUNT_MOON -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 13, 49, SIGNPOST_READ, MapRoute3Signpost0Script + bg_event 13, 49, BGEVENT_READ, MapRoute3Signpost0Script -.PersonEvents: +.ObjectEvents: db 4 - person_event SPRITE_FISHER, 12, 26, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 - person_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 - person_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 - person_event SPRITE_FISHER, 5, 49, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 + object_event SPRITE_FISHER, 12, 26, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 2, TrainerFirebreatherOtis, -1 + object_event SPRITE_YOUNGSTER, 7, 10, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerYoungsterWarren, -1 + object_event SPRITE_YOUNGSTER, 3, 16, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterJimmy, -1 + object_event SPRITE_FISHER, 5, 49, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherBurt, -1 |