ref: 2b4a4ccaab3d04fe593bcea9739f56c0673dad24
parent: d83aefb30af180eae03bbd65878e8de45166f3d0
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Thu Jan 11 21:33:06 EST 2018
SaffronMagnetTrainStation
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -465,7 +465,7 @@
mapgroup SAFFRON_POKECENTER_1F, 4, 5 ; 6
mapgroup SAFFRON_POKECENTER_2F_BETA, 4, 8 ; 7
mapgroup MR_PSYCHICS_HOUSE, 4, 4 ; 8
- mapgroup SAFFRON_TRAIN_STATION, 9, 10 ; 9
+ mapgroup SAFFRON_MAGNET_TRAIN_STATION, 9, 10 ; 9
mapgroup SILPH_CO_1F, 4, 8 ; 10
mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11
mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12
--- a/data/maps/scenes.asm
+++ b/data/maps/scenes.asm
@@ -15,7 +15,7 @@
scene_def ROUTE_25, wRoute25SceneID
scene_def TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID
scene_def VICTORY_ROAD_GATE, wVictoryRoadGateSceneID
- scene_def SAFFRON_TRAIN_STATION, wSaffronTrainStationSceneID
+ scene_def SAFFRON_MAGNET_TRAIN_STATION, wSaffronMagnetTrainStationSceneID
scene_def ROUTE_16_GATE, wRoute16GateSceneID
scene_def ROUTE_17_ROUTE_18_GATE, wRoute17Route18GateSceneID
scene_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID
--- a/maps.asm
+++ b/maps.asm
@@ -300,7 +300,7 @@
INCLUDE "maps/SaffronPokecenter1F.asm"
INCLUDE "maps/SaffronPokecenter2FBeta.asm"
INCLUDE "maps/MrPsychicsHouse.asm"
-INCLUDE "maps/SaffronTrainStation.asm"
+INCLUDE "maps/SaffronMagnetTrainStation.asm"
INCLUDE "maps/SilphCo1F.asm"
INCLUDE "maps/CopycatsHouse1F.asm"
INCLUDE "maps/CopycatsHouse2F.asm"
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -172,8 +172,8 @@
db 4
warp_def 8, 17, 5, GOLDENROD_CITY
warp_def 9, 17, 5, GOLDENROD_CITY
- warp_def 6, 5, 4, SAFFRON_TRAIN_STATION
- warp_def 11, 5, 3, SAFFRON_TRAIN_STATION
+ warp_def 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION
+ warp_def 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION
.CoordEvents:
db 1
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -276,7 +276,7 @@
warp_def 25, 11, 2, SAFFRON_MART
warp_def 9, 29, 1, SAFFRON_POKECENTER_1F
warp_def 27, 29, 1, MR_PSYCHICS_HOUSE
- warp_def 8, 3, 2, SAFFRON_TRAIN_STATION
+ warp_def 8, 3, 2, SAFFRON_MAGNET_TRAIN_STATION
warp_def 18, 21, 1, SILPH_CO_1F
warp_def 9, 11, 1, COPYCATS_HOUSE_1F
warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE
--- /dev/null
+++ b/maps/SaffronMagnetTrainStation.asm
@@ -1,0 +1,241 @@
+const_value set 2
+ const SAFFRONMAGNETTRAINSTATION_OFFICER
+ const SAFFRONMAGNETTRAINSTATION_GYM_GUY
+ const SAFFRONMAGNETTRAINSTATION_TEACHER
+ const SAFFRONMAGNETTRAINSTATION_LASS
+
+SaffronMagnetTrainStation_MapScriptHeader:
+.SceneScripts:
+ db 1
+ scene_script .DummyScene
+
+.MapCallbacks:
+ db 0
+
+.DummyScene:
+ end
+
+OfficerScript_0x18a81e:
+ faceplayer
+ opentext
+ checkevent EVENT_RESTORED_POWER_TO_KANTO
+ iftrue .MagnetTrainToGoldenrod
+ writetext UnknownText_0x18a8a9
+ waitbutton
+ closetext
+ end
+
+.MagnetTrainToGoldenrod:
+ writetext UnknownText_0x18a8dd
+ yesorno
+ iffalse .DecidedNotToRide
+ checkitem PASS
+ iffalse .PassNotInBag
+ writetext UnknownText_0x18a917
+ waitbutton
+ closetext
+ applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f
+ applymovement PLAYER, MovementData_0x18a898
+ writebyte TRUE
+ special Special_MagnetTrain
+ warpcheck
+ newloadmap MAPSETUP_TRAIN
+ applymovement PLAYER, .MovementBoardTheTrain
+ wait 20
+ end
+
+.MovementBoardTheTrain:
+ turn_head DOWN
+ step_end
+
+.PassNotInBag:
+ writetext UnknownText_0x18a956
+ waitbutton
+ closetext
+ end
+
+.DecidedNotToRide:
+ writetext UnknownText_0x18a978
+ waitbutton
+ closetext
+ end
+
+Script_ArriveFromGoldenrod:
+ applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f
+ applymovement PLAYER, MovementData_0x18a8a1
+ applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a894
+ opentext
+ writetext UnknownText_0x18a993
+ waitbutton
+ closetext
+ end
+
+GymGuyScript_0x18a875:
+ faceplayer
+ opentext
+ checkevent EVENT_RETURNED_MACHINE_PART
+ iftrue UnknownScript_0x18a883
+ writetext UnknownText_0x18a9ca
+ waitbutton
+ closetext
+ end
+
+UnknownScript_0x18a883:
+ writetext UnknownText_0x18aa61
+ waitbutton
+ closetext
+ end
+
+SaffronMagnetTrainStationTeacherScript:
+ jumptextfaceplayer SaffronMagnetTrainStationTeacherText
+
+SaffronMagnetTrainStationLassScript:
+ jumptextfaceplayer SaffronMagnetTrainStationLassText
+
+MovementData_0x18a88f:
+ step UP
+ step UP
+ step RIGHT
+ turn_head LEFT
+ step_end
+
+MovementData_0x18a894:
+ step LEFT
+ step DOWN
+ step DOWN
+ step_end
+
+MovementData_0x18a898:
+ step UP
+ step UP
+ step UP
+ step LEFT
+ step LEFT
+ step LEFT
+ step UP
+ step UP
+ step_end
+
+MovementData_0x18a8a1:
+ step LEFT
+ step LEFT
+ step DOWN
+ step DOWN
+ step DOWN
+ step DOWN
+ turn_head UP
+ step_end
+
+UnknownText_0x18a8a9:
+ text "I'm sorry, but the"
+ line "MAGNET TRAIN isn't"
+ cont "operating now."
+ done
+
+UnknownText_0x18a8dd:
+ text "We'll soon depart"
+ line "for GOLDENROD."
+
+ para "Are you coming on"
+ line "board?"
+ done
+
+UnknownText_0x18a917:
+ text "May I see your"
+ line "rail PASS, please?"
+
+ para "OK. Right this"
+ line "way, please."
+ done
+
+UnknownText_0x18a956:
+ text "Sorry, but you"
+ line "don't have a PASS."
+ done
+
+UnknownText_0x18a978:
+ text "We hope to see you"
+ line "again."
+ done
+
+UnknownText_0x18a993:
+ text "We have arrived in"
+ line "SAFFRON."
+
+ para "We hope to see you"
+ line "again."
+ done
+
+UnknownText_0x18a9ca:
+ text "The MAGNET TRAIN"
+ line "is a super-modern"
+
+ para "rail liner that"
+ line "uses electricity"
+
+ para "and magnets to"
+ line "attain incredible"
+ cont "speed."
+
+ para "However, if there"
+ line "isn't any elec-"
+ cont "tricity…"
+ done
+
+UnknownText_0x18aa61:
+ text "Whew…"
+
+ para "How many times"
+ line "have I gone back"
+
+ para "and forth between"
+ line "KANTO and JOHTO?"
+ done
+
+SaffronMagnetTrainStationTeacherText:
+ text "Before the MAGNET"
+ line "TRAIN STATION was"
+
+ para "built, there was a"
+ line "house there."
+
+ para "A little girl"
+ line "named COPYCAT used"
+ cont "to live there."
+ done
+
+SaffronMagnetTrainStationLassText:
+ text "Hi. Do you have a"
+ line "rail PASS? I have"
+
+ para "one. All the peo-"
+ line "ple in SAFFRON who"
+
+ para "ride the MAGNET"
+ line "TRAIN have PASSES."
+ done
+
+SaffronMagnetTrainStation_MapEventHeader:
+ ; filler
+ db 0, 0
+
+.Warps:
+ db 4
+ warp_def 8, 17, 6, SAFFRON_CITY
+ warp_def 9, 17, 6, SAFFRON_CITY
+ warp_def 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION
+ warp_def 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
+
+.CoordEvents:
+ db 1
+ coord_event 11, 6, 0, Script_ArriveFromGoldenrod
+
+.BGEvents:
+ db 0
+
+.ObjectEvents:
+ db 4
+ object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
+ object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1
+ object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
+ object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronMagnetTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
--- /dev/null
+++ b/maps/SaffronMagnetTrainStation.blk
@@ -1,0 +1,6 @@
+
+
+
+
+
+ / 3
\ No newline at end of file
--- a/maps/SaffronTrainStation.asm
+++ /dev/null
@@ -1,241 +1,0 @@
-const_value set 2
- const SAFFRONTRAINSTATION_OFFICER
- const SAFFRONTRAINSTATION_GYM_GUY
- const SAFFRONTRAINSTATION_TEACHER
- const SAFFRONTRAINSTATION_LASS
-
-SaffronTrainStation_MapScriptHeader:
-.SceneScripts:
- db 1
- scene_script .DummyScene
-
-.MapCallbacks:
- db 0
-
-.DummyScene:
- end
-
-OfficerScript_0x18a81e:
- faceplayer
- opentext
- checkevent EVENT_RESTORED_POWER_TO_KANTO
- iftrue .MagnetTrainToGoldenrod
- writetext UnknownText_0x18a8a9
- waitbutton
- closetext
- end
-
-.MagnetTrainToGoldenrod:
- writetext UnknownText_0x18a8dd
- yesorno
- iffalse .DecidedNotToRide
- checkitem PASS
- iffalse .PassNotInBag
- writetext UnknownText_0x18a917
- waitbutton
- closetext
- applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f
- applymovement PLAYER, MovementData_0x18a898
- writebyte TRUE
- special Special_MagnetTrain
- warpcheck
- newloadmap MAPSETUP_TRAIN
- applymovement PLAYER, .MovementBoardTheTrain
- wait 20
- end
-
-.MovementBoardTheTrain:
- turn_head DOWN
- step_end
-
-.PassNotInBag:
- writetext UnknownText_0x18a956
- waitbutton
- closetext
- end
-
-.DecidedNotToRide:
- writetext UnknownText_0x18a978
- waitbutton
- closetext
- end
-
-Script_ArriveFromGoldenrod:
- applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f
- applymovement PLAYER, MovementData_0x18a8a1
- applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a894
- opentext
- writetext UnknownText_0x18a993
- waitbutton
- closetext
- end
-
-GymGuyScript_0x18a875:
- faceplayer
- opentext
- checkevent EVENT_RETURNED_MACHINE_PART
- iftrue UnknownScript_0x18a883
- writetext UnknownText_0x18a9ca
- waitbutton
- closetext
- end
-
-UnknownScript_0x18a883:
- writetext UnknownText_0x18aa61
- waitbutton
- closetext
- end
-
-SaffronTrainStationTeacherScript:
- jumptextfaceplayer SaffronTrainStationTeacherText
-
-SaffronTrainStationLassScript:
- jumptextfaceplayer SaffronTrainStationLassText
-
-MovementData_0x18a88f:
- step UP
- step UP
- step RIGHT
- turn_head LEFT
- step_end
-
-MovementData_0x18a894:
- step LEFT
- step DOWN
- step DOWN
- step_end
-
-MovementData_0x18a898:
- step UP
- step UP
- step UP
- step LEFT
- step LEFT
- step LEFT
- step UP
- step UP
- step_end
-
-MovementData_0x18a8a1:
- step LEFT
- step LEFT
- step DOWN
- step DOWN
- step DOWN
- step DOWN
- turn_head UP
- step_end
-
-UnknownText_0x18a8a9:
- text "I'm sorry, but the"
- line "MAGNET TRAIN isn't"
- cont "operating now."
- done
-
-UnknownText_0x18a8dd:
- text "We'll soon depart"
- line "for GOLDENROD."
-
- para "Are you coming on"
- line "board?"
- done
-
-UnknownText_0x18a917:
- text "May I see your"
- line "rail PASS, please?"
-
- para "OK. Right this"
- line "way, please."
- done
-
-UnknownText_0x18a956:
- text "Sorry, but you"
- line "don't have a PASS."
- done
-
-UnknownText_0x18a978:
- text "We hope to see you"
- line "again."
- done
-
-UnknownText_0x18a993:
- text "We have arrived in"
- line "SAFFRON."
-
- para "We hope to see you"
- line "again."
- done
-
-UnknownText_0x18a9ca:
- text "The MAGNET TRAIN"
- line "is a super-modern"
-
- para "rail liner that"
- line "uses electricity"
-
- para "and magnets to"
- line "attain incredible"
- cont "speed."
-
- para "However, if there"
- line "isn't any elec-"
- cont "tricity…"
- done
-
-UnknownText_0x18aa61:
- text "Whew…"
-
- para "How many times"
- line "have I gone back"
-
- para "and forth between"
- line "KANTO and JOHTO?"
- done
-
-SaffronTrainStationTeacherText:
- text "Before the MAGNET"
- line "TRAIN STATION was"
-
- para "built, there was a"
- line "house there."
-
- para "A little girl"
- line "named COPYCAT used"
- cont "to live there."
- done
-
-SaffronTrainStationLassText:
- text "Hi. Do you have a"
- line "rail PASS? I have"
-
- para "one. All the peo-"
- line "ple in SAFFRON who"
-
- para "ride the MAGNET"
- line "TRAIN have PASSES."
- done
-
-SaffronTrainStation_MapEventHeader:
- ; filler
- db 0, 0
-
-.Warps:
- db 4
- warp_def 8, 17, 6, SAFFRON_CITY
- warp_def 9, 17, 6, SAFFRON_CITY
- warp_def 6, 5, 4, GOLDENROD_MAGNET_TRAIN_STATION
- warp_def 11, 5, 3, GOLDENROD_MAGNET_TRAIN_STATION
-
-.CoordEvents:
- db 1
- coord_event 11, 6, 0, Script_ArriveFromGoldenrod
-
-.BGEvents:
- db 0
-
-.ObjectEvents:
- db 4
- object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1
- object_event 10, 14, SPRITE_GYM_GUY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GymGuyScript_0x18a875, -1
- object_event 6, 11, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationTeacherScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
- object_event 6, 10, SPRITE_LASS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SaffronTrainStationLassScript, EVENT_SAFFRON_TRAIN_STATION_POPULATION
--- a/maps/SaffronTrainStation.blk
+++ /dev/null
@@ -1,6 +1,0 @@
-
-
-
-
-
- / 3
\ No newline at end of file
--- a/maps/blockdata.asm
+++ b/maps/blockdata.asm
@@ -849,8 +849,8 @@
KrissHouse2F_BlockData:
INCBIN "maps/KrissHouse2F.blk"
-SaffronTrainStation_BlockData:
- INCBIN "maps/SaffronTrainStation.blk"
+SaffronMagnetTrainStation_BlockData:
+ INCBIN "maps/SaffronMagnetTrainStation.blk"
CeruleanGym_BlockData:
INCBIN "maps/CeruleanGym.blk"
--- a/maps/map_headers.asm
+++ b/maps/map_headers.asm
@@ -487,7 +487,7 @@
map_header SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SaffronPokecenter2FBeta, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
- map_header SaffronTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
+ map_header SaffronMagnetTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
--- a/maps/second_map_headers.asm
+++ b/maps/second_map_headers.asm
@@ -668,7 +668,7 @@
map_header_2 SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $0, 0
map_header_2 SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0
map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $0, 0
- map_header_2 SaffronTrainStation, SAFFRON_TRAIN_STATION, $0, 0
+ map_header_2 SaffronMagnetTrainStation, SAFFRON_MAGNET_TRAIN_STATION, $0, 0
map_header_2 SilphCo1F, SILPH_CO_1F, $0, 0
map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0
map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, 0
--- a/wram.asm
+++ b/wram.asm
@@ -2496,7 +2496,7 @@
wRoute25SceneID:: db ; d978
wTrainerHouseB1FSceneID:: db ; d979
wVictoryRoadGateSceneID:: db ; d97a
-wSaffronTrainStationSceneID:: db ; d97b
+wSaffronMagnetTrainStationSceneID:: db ; d97b
wRoute16GateSceneID:: db ; d97c
wRoute17Route18GateSceneID:: db ; d97d
wIndigoPlateauPokecenter1FSceneID:: db ; d97e