diff options
Diffstat (limited to 'maps/GoldenrodGym.asm')
| -rw-r--r-- | maps/GoldenrodGym.asm | 76 |
1 files changed, 37 insertions, 39 deletions
diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 3fb6057dc..19bb2400b 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -7,20 +7,18 @@ const_value set 2 const GOLDENRODGYM_GYM_GUY GoldenrodGym_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 2 - - ; triggers - dw UnknownScript_0x5400a, 0 - dw UnknownScript_0x5400b, 0 + scene_script .DummyScene0 + scene_script .DummyScene1 .MapCallbacks: db 0 -UnknownScript_0x5400a: +.DummyScene0: end -UnknownScript_0x5400b: +.DummyScene1: end WhitneyScript_0x5400c: @@ -37,7 +35,7 @@ WhitneyScript_0x5400c: reloadmapafterbattle setevent EVENT_BEAT_WHITNEY setevent EVENT_MADE_WHITNEY_CRY - dotrigger $1 + setscene $1 setevent EVENT_BEAT_BEAUTY_VICTORIA setevent EVENT_BEAT_BEAUTY_SAMANTHA setevent EVENT_BEAT_LASS_CARRIE @@ -64,7 +62,7 @@ WhitneyScript_0x5400c: waitsfx setflag ENGINE_PLAINBADGE checkcode VAR_BADGES - scall GoldenrodGymTriggerRockets + scall GoldenrodGymActivateRockets UnknownScript_0x54064: writetext UnknownText_0x5428b buttonsound @@ -83,7 +81,7 @@ UnknownScript_0x5407b: closetext end -GoldenrodGymTriggerRockets: +GoldenrodGymActivateRockets: if_equal 7, .RadioTowerRockets if_equal 6, .GoldenrodRockets end @@ -95,12 +93,12 @@ GoldenrodGymTriggerRockets: jumpstd radiotowerrockets TrainerLassCarrie: - trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, LassCarrieScript + trainer EVENT_BEAT_LASS_CARRIE, LASS, CARRIE, LassCarrieSeenText, LassCarrieBeatenText, 0, .Script -LassCarrieScript: +.Script: end_if_just_battled opentext - writetext LassCarrieOWText + writetext LassCarrieAfterBattleText waitbutton closetext end @@ -114,39 +112,39 @@ WhitneyCriesScript: waitbutton closetext applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement - dotrigger $0 + setscene $0 clearevent EVENT_MADE_WHITNEY_CRY end TrainerLassBridget: - trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, LassBridgetScript + trainer EVENT_BEAT_LASS_BRIDGET, LASS, BRIDGET, LassBridgetSeenText, LassBridgetBeatenText, 0, .Script -LassBridgetScript: +.Script: end_if_just_battled opentext - writetext LassBridgetOWText + writetext LassBridgetAfterBattleText waitbutton closetext end TrainerBeautyVictoria: - trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, BeautyVictoriaScript + trainer EVENT_BEAT_BEAUTY_VICTORIA, BEAUTY, VICTORIA, BeautyVictoriaSeenText, BeautyVictoriaBeatenText, 0, .Script -BeautyVictoriaScript: +.Script: end_if_just_battled opentext - writetext BeautyVictoriaOWText + writetext BeautyVictoriaAfterBattleText waitbutton closetext end TrainerBeautySamantha: - trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, BeautySamanthaScript + trainer EVENT_BEAT_BEAUTY_SAMANTHA, BEAUTY, SAMANTHA, BeautySamanthaSeenText, BeautySamanthaBeatenText, 0, .Script -BeautySamanthaScript: +.Script: end_if_just_battled opentext - writetext BeautySamanthaOWText + writetext BeautySamanthaAfterBattleText waitbutton closetext end @@ -285,7 +283,7 @@ LassCarrieBeatenText: line "you were weak…" done -LassCarrieOWText: +LassCarrieAfterBattleText: text "Do my #MON" line "think I'm cute?" done @@ -303,7 +301,7 @@ LassBridgetBeatenText: text "Oh, no, no, no!" done -LassBridgetOWText: +LassBridgetAfterBattleText: text "I'm trying to beat" line "WHITNEY, but…" cont "It's depressing." @@ -339,7 +337,7 @@ BeautyVictoriaBeatenText: line "it's over?" done -BeautyVictoriaOWText: +BeautyVictoriaAfterBattleText: text "Wow, you must be" line "good to beat me!" cont "Keep it up!" @@ -356,7 +354,7 @@ BeautySamanthaBeatenText: line "I'm so sorry!" done -BeautySamanthaOWText: +BeautySamanthaAfterBattleText: text "I taught MEOWTH" line "moves for taking" cont "on any type…" @@ -390,20 +388,20 @@ GoldenrodGym_MapEventHeader: warp_def $11, $2, 1, GOLDENROD_CITY warp_def $11, $3, 1, GOLDENROD_CITY -.XYTriggers: +.CoordEvents: db 1 - xy_trigger 1, $5, $8, $0, WhitneyCriesScript, $0, $0 + coord_event 1, $5, $8, WhitneyCriesScript -.Signposts: +.BGEvents: db 2 - signpost 15, 1, SIGNPOST_READ, GoldenrodGymStatue - signpost 15, 4, SIGNPOST_READ, GoldenrodGymStatue + bg_event 15, 1, BGEVENT_READ, GoldenrodGymStatue + bg_event 15, 4, BGEVENT_READ, GoldenrodGymStatue -.PersonEvents: +.ObjectEvents: db 6 - person_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 - person_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerLassCarrie, -1 - person_event SPRITE_LASS, 6, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 1, TrainerLassBridget, -1 - person_event SPRITE_BUENA, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 - person_event SPRITE_BUENA, 5, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 3, TrainerBeautySamantha, -1 - person_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 + object_event SPRITE_WHITNEY, 3, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, WhitneyScript_0x5400c, -1 + object_event SPRITE_LASS, 13, 9, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 4, TrainerLassCarrie, -1 + object_event SPRITE_LASS, 6, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerLassBridget, -1 + object_event SPRITE_BUENA, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautyVictoria, -1 + object_event SPRITE_BUENA, 5, 19, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerBeautySamantha, -1 + object_event SPRITE_GYM_GUY, 15, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGymGuyScript, -1 |