mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
SaffronMagnetTrainStation
This commit is contained in:
parent
d83aefb30a
commit
2b4a4ccaab
@ -465,7 +465,7 @@ ENDM
|
||||
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
|
||||
|
@ -15,7 +15,7 @@ MapScenes:: ; 4d01e
|
||||
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
|
||||
|
2
maps.asm
2
maps.asm
@ -300,7 +300,7 @@ INCLUDE "maps/SaffronMart.asm"
|
||||
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"
|
||||
|
@ -172,8 +172,8 @@ GoldenrodMagnetTrainStation_MapEventHeader:
|
||||
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
|
||||
|
@ -276,7 +276,7 @@ SaffronCity_MapEventHeader:
|
||||
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
|
||||
|
@ -1,10 +1,10 @@
|
||||
const_value set 2
|
||||
const SAFFRONTRAINSTATION_OFFICER
|
||||
const SAFFRONTRAINSTATION_GYM_GUY
|
||||
const SAFFRONTRAINSTATION_TEACHER
|
||||
const SAFFRONTRAINSTATION_LASS
|
||||
const SAFFRONMAGNETTRAINSTATION_OFFICER
|
||||
const SAFFRONMAGNETTRAINSTATION_GYM_GUY
|
||||
const SAFFRONMAGNETTRAINSTATION_TEACHER
|
||||
const SAFFRONMAGNETTRAINSTATION_LASS
|
||||
|
||||
SaffronTrainStation_MapScriptHeader:
|
||||
SaffronMagnetTrainStation_MapScriptHeader:
|
||||
.SceneScripts:
|
||||
db 1
|
||||
scene_script .DummyScene
|
||||
@ -34,7 +34,7 @@ OfficerScript_0x18a81e:
|
||||
writetext UnknownText_0x18a917
|
||||
waitbutton
|
||||
closetext
|
||||
applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f
|
||||
applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f
|
||||
applymovement PLAYER, MovementData_0x18a898
|
||||
writebyte TRUE
|
||||
special Special_MagnetTrain
|
||||
@ -61,9 +61,9 @@ OfficerScript_0x18a81e:
|
||||
end
|
||||
|
||||
Script_ArriveFromGoldenrod:
|
||||
applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f
|
||||
applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f
|
||||
applymovement PLAYER, MovementData_0x18a8a1
|
||||
applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a894
|
||||
applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a894
|
||||
opentext
|
||||
writetext UnknownText_0x18a993
|
||||
waitbutton
|
||||
@ -86,11 +86,11 @@ UnknownScript_0x18a883:
|
||||
closetext
|
||||
end
|
||||
|
||||
SaffronTrainStationTeacherScript:
|
||||
jumptextfaceplayer SaffronTrainStationTeacherText
|
||||
SaffronMagnetTrainStationTeacherScript:
|
||||
jumptextfaceplayer SaffronMagnetTrainStationTeacherText
|
||||
|
||||
SaffronTrainStationLassScript:
|
||||
jumptextfaceplayer SaffronTrainStationLassText
|
||||
SaffronMagnetTrainStationLassScript:
|
||||
jumptextfaceplayer SaffronMagnetTrainStationLassText
|
||||
|
||||
MovementData_0x18a88f:
|
||||
step UP
|
||||
@ -192,7 +192,7 @@ UnknownText_0x18aa61:
|
||||
line "KANTO and JOHTO?"
|
||||
done
|
||||
|
||||
SaffronTrainStationTeacherText:
|
||||
SaffronMagnetTrainStationTeacherText:
|
||||
text "Before the MAGNET"
|
||||
line "TRAIN STATION was"
|
||||
|
||||
@ -204,7 +204,7 @@ SaffronTrainStationTeacherText:
|
||||
cont "to live there."
|
||||
done
|
||||
|
||||
SaffronTrainStationLassText:
|
||||
SaffronMagnetTrainStationLassText:
|
||||
text "Hi. Do you have a"
|
||||
line "rail PASS? I have"
|
||||
|
||||
@ -215,7 +215,7 @@ SaffronTrainStationLassText:
|
||||
line "TRAIN have PASSES."
|
||||
done
|
||||
|
||||
SaffronTrainStation_MapEventHeader:
|
||||
SaffronMagnetTrainStation_MapEventHeader:
|
||||
; filler
|
||||
db 0, 0
|
||||
|
||||
@ -237,5 +237,5 @@ SaffronTrainStation_MapEventHeader:
|
||||
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
|
||||
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
|
@ -849,8 +849,8 @@ SafariZoneMainOffice_BlockData:
|
||||
KrissHouse2F_BlockData:
|
||||
INCBIN "maps/KrissHouse2F.blk"
|
||||
|
||||
SaffronTrainStation_BlockData:
|
||||
INCBIN "maps/SaffronTrainStation.blk"
|
||||
SaffronMagnetTrainStation_BlockData:
|
||||
INCBIN "maps/SaffronMagnetTrainStation.blk"
|
||||
|
||||
CeruleanGym_BlockData:
|
||||
INCBIN "maps/CeruleanGym.blk"
|
||||
|
@ -487,7 +487,7 @@ MapGroup_Saffron:
|
||||
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
|
||||
|
@ -668,7 +668,7 @@ ENDM
|
||||
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
|
||||
|
2
wram.asm
2
wram.asm
@ -2496,7 +2496,7 @@ wCeruleanGymSceneID:: db ; d977
|
||||
wRoute25SceneID:: db ; d978
|
||||
wTrainerHouseB1FSceneID:: db ; d979
|
||||
wVictoryRoadGateSceneID:: db ; d97a
|
||||
wSaffronTrainStationSceneID:: db ; d97b
|
||||
wSaffronMagnetTrainStationSceneID:: db ; d97b
|
||||
wRoute16GateSceneID:: db ; d97c
|
||||
wRoute17Route18GateSceneID:: db ; d97d
|
||||
wIndigoPlateauPokecenter1FSceneID:: db ; d97e
|
||||
|
Loading…
Reference in New Issue
Block a user