diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index b5b578d2b..550e308e4 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -16,22 +16,22 @@ GoldenrodMagnetTrainStationOfficerScript: opentext checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToSaffron - writetext UnknownText_0x55160 + writetext GoldenrodMagnetTrainStationOfficerTheTrainHasntComeInText waitbutton closetext end .MagnetTrainToSaffron: - writetext UnknownText_0x551b7 + writetext GoldenrodMagnetTrainStationOfficerAreYouComingAboardText yesorno iffalse .DecidedNotToRide checkitem PASS iffalse .PassNotInBag - writetext UnknownText_0x551ed + writetext GoldenrodMagnetTrainStationOfficerRightThisWayText waitbutton closetext - applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 - applymovement PLAYER, MovementData_0x5514f + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, GoldenrodMagnetTrainStationOfficerApproachTrainDoorMovement + applymovement PLAYER, GoldenrodMagnetTrainStationPlayerApproachAndEnterTrainMovement setval FALSE special MagnetTrain warpcheck @@ -45,23 +45,23 @@ GoldenrodMagnetTrainStationOfficerScript: step_end .PassNotInBag: - writetext UnknownText_0x5522c + writetext GoldenrodMagnetTrainStationOfficerYouDontHaveARailPassText waitbutton closetext end .DecidedNotToRide: - writetext UnknownText_0x5524f + writetext GoldenrodMagnetTrainStationOfficerHopeToSeeYouAgainText waitbutton closetext end Script_ArriveFromSaffron: - applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 - applymovement PLAYER, MovementData_0x55158 - applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x5514b + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, GoldenrodMagnetTrainStationOfficerApproachTrainDoorMovement + applymovement PLAYER, GoldenrodMagnetTrainStationPlayerLeaveTrainAndEnterStationMovement + applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, GoldenrodMagnetTrainStationOfficerReturnToBoardingGateMovement opentext - writetext UnknownText_0x5526a + writetext GoldenrodMagnetTrainStationOfficerArrivedInGoldenrodText waitbutton closetext end @@ -69,20 +69,20 @@ Script_ArriveFromSaffron: GoldenrodMagnetTrainStationGentlemanScript: jumptextfaceplayer GoldenrodMagnetTrainStationGentlemanText -MovementData_0x55146: +GoldenrodMagnetTrainStationOfficerApproachTrainDoorMovement: step UP step UP step RIGHT turn_head LEFT step_end -MovementData_0x5514b: +GoldenrodMagnetTrainStationOfficerReturnToBoardingGateMovement: step LEFT step DOWN step DOWN step_end -MovementData_0x5514f: +GoldenrodMagnetTrainStationPlayerApproachAndEnterTrainMovement: step UP step UP step UP @@ -93,7 +93,7 @@ MovementData_0x5514f: step UP step_end -MovementData_0x55158: +GoldenrodMagnetTrainStationPlayerLeaveTrainAndEnterStationMovement: step LEFT step LEFT step DOWN @@ -103,7 +103,7 @@ MovementData_0x55158: turn_head UP step_end -UnknownText_0x55160: +GoldenrodMagnetTrainStationOfficerTheTrainHasntComeInText: text "The train hasn't" line "come in…" @@ -114,7 +114,7 @@ UnknownText_0x55160: para "That won't work." done -UnknownText_0x551b7: +GoldenrodMagnetTrainStationOfficerAreYouComingAboardText: text "We'll soon depart" line "for SAFFRON." @@ -122,7 +122,7 @@ UnknownText_0x551b7: line "aboard?" done -UnknownText_0x551ed: +GoldenrodMagnetTrainStationOfficerRightThisWayText: text "May I see your" line "rail PASS, please?" @@ -130,17 +130,17 @@ UnknownText_0x551ed: line "way, please." done -UnknownText_0x5522c: +GoldenrodMagnetTrainStationOfficerYouDontHaveARailPassText: text "Sorry. You don't" line "have a rail PASS." done -UnknownText_0x5524f: +GoldenrodMagnetTrainStationOfficerHopeToSeeYouAgainText: text "We hope to see you" line "again!" done -UnknownText_0x5526a: +GoldenrodMagnetTrainStationOfficerArrivedInGoldenrodText: text "We have arrived in" line "GOLDENROD."