pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

SaffronMagnetTrainStation

Browse Source
This commit is contained in:
Remy Oukaour
2018-01-12 02:33:06 -05:00
parent d83aefb30a
commit 2b4a4ccaab
11 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
constants/map_constants.asm
View File

@@ -465,7 +465,7 @@ ENDM
mapgroup SAFFRON_POKECENTER_1F, 4, 5 ; 6 mapgroup SAFFRON_POKECENTER_1F, 4, 5 ; 6
mapgroup SAFFRON_POKECENTER_2F_BETA, 4, 8 ; 7 mapgroup SAFFRON_POKECENTER_2F_BETA, 4, 8 ; 7
mapgroup MR_PSYCHICS_HOUSE, 4, 4 ; 8 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 SILPH_CO_1F, 4, 8 ; 10
mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11 mapgroup COPYCATS_HOUSE_1F, 4, 4 ; 11
mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12 mapgroup COPYCATS_HOUSE_2F, 3, 5 ; 12

2
data/maps/scenes.asm
View File

@@ -15,7 +15,7 @@ MapScenes:: ; 4d01e
scene_def ROUTE_25, wRoute25SceneID scene_def ROUTE_25, wRoute25SceneID
scene_def TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID scene_def TRAINER_HOUSE_B1F, wTrainerHouseB1FSceneID
scene_def VICTORY_ROAD_GATE, wVictoryRoadGateSceneID 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_16_GATE, wRoute16GateSceneID
scene_def ROUTE_17_ROUTE_18_GATE, wRoute17Route18GateSceneID scene_def ROUTE_17_ROUTE_18_GATE, wRoute17Route18GateSceneID
scene_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID scene_def INDIGO_PLATEAU_POKECENTER_1F, wIndigoPlateauPokecenter1FSceneID

2
maps.asm
View File

@@ -300,7 +300,7 @@ INCLUDE "maps/SaffronMart.asm"
INCLUDE "maps/SaffronPokecenter1F.asm" INCLUDE "maps/SaffronPokecenter1F.asm"
INCLUDE "maps/SaffronPokecenter2FBeta.asm" INCLUDE "maps/SaffronPokecenter2FBeta.asm"
INCLUDE "maps/MrPsychicsHouse.asm" INCLUDE "maps/MrPsychicsHouse.asm"
INCLUDE "maps/SaffronTrainStation.asm" INCLUDE "maps/SaffronMagnetTrainStation.asm"
INCLUDE "maps/SilphCo1F.asm" INCLUDE "maps/SilphCo1F.asm"
INCLUDE "maps/CopycatsHouse1F.asm" INCLUDE "maps/CopycatsHouse1F.asm"
INCLUDE "maps/CopycatsHouse2F.asm" INCLUDE "maps/CopycatsHouse2F.asm"

4
maps/GoldenrodMagnetTrainStation.asm
View File

@@ -172,8 +172,8 @@ GoldenrodMagnetTrainStation_MapEventHeader:
db 4 db 4
warp_def 8, 17, 5, GOLDENROD_CITY warp_def 8, 17, 5, GOLDENROD_CITY
warp_def 9, 17, 5, GOLDENROD_CITY warp_def 9, 17, 5, GOLDENROD_CITY
warp_def 6, 5, 4, SAFFRON_TRAIN_STATION warp_def 6, 5, 4, SAFFRON_MAGNET_TRAIN_STATION
warp_def 11, 5, 3, SAFFRON_TRAIN_STATION warp_def 11, 5, 3, SAFFRON_MAGNET_TRAIN_STATION
.CoordEvents: .CoordEvents:
db 1 db 1

2
maps/SaffronCity.asm
View File

@@ -276,7 +276,7 @@ SaffronCity_MapEventHeader:
warp_def 25, 11, 2, SAFFRON_MART warp_def 25, 11, 2, SAFFRON_MART
warp_def 9, 29, 1, SAFFRON_POKECENTER_1F warp_def 9, 29, 1, SAFFRON_POKECENTER_1F
warp_def 27, 29, 1, MR_PSYCHICS_HOUSE 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 18, 21, 1, SILPH_CO_1F
warp_def 9, 11, 1, COPYCATS_HOUSE_1F warp_def 9, 11, 1, COPYCATS_HOUSE_1F
warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE warp_def 18, 3, 3, ROUTE_5_SAFFRON_GATE

34
maps/SaffronTrainStation.asm → maps/SaffronMagnetTrainStation.asm
View File

@@ -1,10 +1,10 @@
const_value set 2 const_value set 2
const SAFFRONTRAINSTATION_OFFICER const SAFFRONMAGNETTRAINSTATION_OFFICER
const SAFFRONTRAINSTATION_GYM_GUY const SAFFRONMAGNETTRAINSTATION_GYM_GUY
const SAFFRONTRAINSTATION_TEACHER const SAFFRONMAGNETTRAINSTATION_TEACHER
const SAFFRONTRAINSTATION_LASS const SAFFRONMAGNETTRAINSTATION_LASS
SaffronTrainStation_MapScriptHeader: SaffronMagnetTrainStation_MapScriptHeader:
.SceneScripts: .SceneScripts:
db 1 db 1
scene_script .DummyScene scene_script .DummyScene
@@ -34,7 +34,7 @@ OfficerScript_0x18a81e:
writetext UnknownText_0x18a917 writetext UnknownText_0x18a917
waitbutton waitbutton
closetext closetext
applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f
applymovement PLAYER, MovementData_0x18a898 applymovement PLAYER, MovementData_0x18a898
writebyte TRUE writebyte TRUE
special Special_MagnetTrain special Special_MagnetTrain
@@ -61,9 +61,9 @@ OfficerScript_0x18a81e:
end end
Script_ArriveFromGoldenrod: Script_ArriveFromGoldenrod:
applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a88f
applymovement PLAYER, MovementData_0x18a8a1 applymovement PLAYER, MovementData_0x18a8a1
applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a894 applymovement SAFFRONMAGNETTRAINSTATION_OFFICER, MovementData_0x18a894
opentext opentext
writetext UnknownText_0x18a993 writetext UnknownText_0x18a993
waitbutton waitbutton
@@ -86,11 +86,11 @@ UnknownScript_0x18a883:
closetext closetext
end end
SaffronTrainStationTeacherScript: SaffronMagnetTrainStationTeacherScript:
jumptextfaceplayer SaffronTrainStationTeacherText jumptextfaceplayer SaffronMagnetTrainStationTeacherText
SaffronTrainStationLassScript: SaffronMagnetTrainStationLassScript:
jumptextfaceplayer SaffronTrainStationLassText jumptextfaceplayer SaffronMagnetTrainStationLassText
MovementData_0x18a88f: MovementData_0x18a88f:
step UP step UP
@@ -192,7 +192,7 @@ UnknownText_0x18aa61:
line "KANTO and JOHTO?" line "KANTO and JOHTO?"
done done
SaffronTrainStationTeacherText: SaffronMagnetTrainStationTeacherText:
text "Before the MAGNET" text "Before the MAGNET"
line "TRAIN STATION was" line "TRAIN STATION was"
@@ -204,7 +204,7 @@ SaffronTrainStationTeacherText:
cont "to live there." cont "to live there."
done done
SaffronTrainStationLassText: SaffronMagnetTrainStationLassText:
text "Hi. Do you have a" text "Hi. Do you have a"
line "rail PASS? I have" line "rail PASS? I have"
@@ -215,7 +215,7 @@ SaffronTrainStationLassText:
line "TRAIN have PASSES." line "TRAIN have PASSES."
done done
SaffronTrainStation_MapEventHeader: SaffronMagnetTrainStation_MapEventHeader:
; filler ; filler
db 0, 0 db 0, 0
@@ -237,5 +237,5 @@ SaffronTrainStation_MapEventHeader:
db 4 db 4
object_event 9, 9, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x18a81e, -1 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 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, 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, SaffronTrainStationLassScript, 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

0
maps/SaffronTrainStation.blk → maps/SaffronMagnetTrainStation.blk
View File

4
maps/blockdata.asm
View File

@@ -849,8 +849,8 @@ SafariZoneMainOffice_BlockData:
KrissHouse2F_BlockData: KrissHouse2F_BlockData:
INCBIN "maps/KrissHouse2F.blk" INCBIN "maps/KrissHouse2F.blk"
SaffronTrainStation_BlockData: SaffronMagnetTrainStation_BlockData:
INCBIN "maps/SaffronTrainStation.blk" INCBIN "maps/SaffronMagnetTrainStation.blk"
CeruleanGym_BlockData: CeruleanGym_BlockData:
INCBIN "maps/CeruleanGym.blk" INCBIN "maps/CeruleanGym.blk"

2
maps/map_headers.asm
View File

@@ -487,7 +487,7 @@ MapGroup_Saffron:
map_header SaffronPokecenter1F, TILESET_POKECENTER, INDOOR, SAFFRON_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE 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 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 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 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 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 map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE

2
maps/second_map_headers.asm
View File

@@ -668,7 +668,7 @@ ENDM
map_header_2 SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $0, 0 map_header_2 SaffronPokecenter1F, SAFFRON_POKECENTER_1F, $0, 0
map_header_2 SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0 map_header_2 SaffronPokecenter2FBeta, SAFFRON_POKECENTER_2F_BETA, $0, 0
map_header_2 MrPsychicsHouse, MR_PSYCHICS_HOUSE, $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 SilphCo1F, SILPH_CO_1F, $0, 0
map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0 map_header_2 CopycatsHouse1F, COPYCATS_HOUSE_1F, $0, 0
map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, 0 map_header_2 CopycatsHouse2F, COPYCATS_HOUSE_2F, $0, 0

2
wram.asm
View File

@@ -2496,7 +2496,7 @@ wCeruleanGymSceneID:: db ; d977
wRoute25SceneID:: db ; d978 wRoute25SceneID:: db ; d978
wTrainerHouseB1FSceneID:: db ; d979 wTrainerHouseB1FSceneID:: db ; d979
wVictoryRoadGateSceneID:: db ; d97a wVictoryRoadGateSceneID:: db ; d97a
wSaffronTrainStationSceneID:: db ; d97b wSaffronMagnetTrainStationSceneID:: db ; d97b
wRoute16GateSceneID:: db ; d97c wRoute16GateSceneID:: db ; d97c
wRoute17Route18GateSceneID:: db ; d97d wRoute17Route18GateSceneID:: db ; d97d
wIndigoPlateauPokecenter1FSceneID:: db ; d97e wIndigoPlateauPokecenter1FSceneID:: db ; d97e