diff options
Diffstat (limited to 'maps/SaffronGym.asm')
| -rw-r--r-- | maps/SaffronGym.asm | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 8e7dce341..a780ef4da 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -7,7 +7,7 @@ const_value set 2 const SAFFRONGYM_GYM_GUY SaffronGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: @@ -47,45 +47,45 @@ SabrinaScript_0x189c2e: end TrainerMediumRebecca: - trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, MediumRebeccaScript + trainer EVENT_BEAT_MEDIUM_REBECCA, MEDIUM, REBECCA, MediumRebeccaSeenText, MediumRebeccaBeatenText, 0, .Script -MediumRebeccaScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x18a034 + writetext MediumRebeccaAfterBattleText waitbutton closetext end TrainerPsychicFranklin: - trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, PsychicFranklinScript + trainer EVENT_BEAT_PSYCHIC_FRANKLIN, PSYCHIC_T, FRANKLIN, PsychicFranklinSeenText, PsychicFranklinBeatenText, 0, .Script -PsychicFranklinScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x18a0a6 + writetext PsychicFranklinAfterBattleText waitbutton closetext end TrainerMediumDoris: - trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, MediumDorisScript + trainer EVENT_BEAT_MEDIUM_DORIS, MEDIUM, DORIS, MediumDorisSeenText, MediumDorisBeatenText, 0, .Script -MediumDorisScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x18a136 + writetext MediumDorisAfterBattleText waitbutton closetext end TrainerPsychicJared: - trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, PsychicJaredScript + trainer EVENT_BEAT_PSYCHIC_JARED, PSYCHIC_T, JARED, PsychicJaredSeenText, PsychicJaredBeatenText, 0, .Script -PsychicJaredScript: +.Script: end_if_just_battled opentext - writetext UnknownText_0x18a1b3 + writetext PsychicJaredAfterBattleText waitbutton closetext end @@ -206,7 +206,7 @@ MediumRebeccaBeatenText: line "Far too strong…" done -UnknownText_0x18a034: +MediumRebeccaAfterBattleText: text "What is the source" line "of your power?" done @@ -222,7 +222,7 @@ PsychicFranklinBeatenText: line "power than mine!" done -UnknownText_0x18a0a6: +PsychicFranklinAfterBattleText: text "You made your soul" line "stronger, not just" cont "your abilities." @@ -241,7 +241,7 @@ MediumDorisBeatenText: line "I still lost…" done -UnknownText_0x18a136: +MediumDorisAfterBattleText: text "Darn! I forgot" line "that I predicted I" cont "would lose to you." @@ -257,7 +257,7 @@ PsychicJaredBeatenText: text "I was no match…" done -UnknownText_0x18a1b3: +PsychicJaredAfterBattleText: text "KARATE KING, the" line "master of the" @@ -329,18 +329,18 @@ SaffronGym_MapEventHeader: warp_def $3, $1, 16, SAFFRON_GYM warp_def $9, $b, 17, SAFFRON_GYM -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 1 - signpost 15, 8, SIGNPOST_READ, SaffronGymStatue + bg_event 15, 8, BGEVENT_READ, SaffronGymStatue -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_SABRINA, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 - person_event SPRITE_GRANNY, 16, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerMediumRebecca, -1 - person_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 - person_event SPRITE_GRANNY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerMediumDoris, -1 - person_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 2, TrainerPsychicJared, -1 - person_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 + object_event SPRITE_SABRINA, 8, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, SabrinaScript_0x189c2e, -1 + object_event SPRITE_GRANNY, 16, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerMediumRebecca, -1 + object_event SPRITE_YOUNGSTER, 16, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerPsychicFranklin, -1 + object_event SPRITE_GRANNY, 4, 3, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumDoris, -1 + object_event SPRITE_YOUNGSTER, 4, 17, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerPsychicJared, -1 + object_event SPRITE_GYM_GUY, 14, 9, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SaffronGymGuyScript, -1 |