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

KrissHouse → PlayersHouse

Browse Source
This commit is contained in:
Rangi
2018-01-22 19:10:09 -05:00
parent 7f187be36c
commit 363d8b9242
26 changed files with 204 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/maps/blocks.asm
View File

@@ -188,7 +188,7 @@ CianwoodLugiaSpeechHouse_Blocks:
PokeSeersHouse_Blocks:
ViridianNicknameSpeechHouse_Blocks:
Route2NuggetSpeechHouse_Blocks:
KrissNeighborsHouse_Blocks:
PlayersNeighborsHouse_Blocks:
Route26HealSpeechHouse_Blocks:
Route26DayofWeekSiblingsHouse_Blocks:
Route27SandstormHouse_Blocks:
@@ -265,8 +265,8 @@ Route43_Blocks:
Route39_Blocks:
INCBIN "maps/Route39.blk"
KrissHouse1F_Blocks:
INCBIN "maps/KrissHouse1F.blk"
PlayersHouse1F_Blocks:
INCBIN "maps/PlayersHouse1F.blk"
Route38EcruteakGate_Blocks:
Route42EcruteakGate_Blocks:
@@ -846,8 +846,8 @@ OlivineCafe_Blocks:
SafariZoneMainOffice_Blocks:
INCBIN "maps/OlivineCafe.blk"
KrissHouse2F_Blocks:
INCBIN "maps/KrissHouse2F.blk"
PlayersHouse2F_Blocks:
INCBIN "maps/PlayersHouse2F.blk"
SaffronMagnetTrainStation_Blocks:
INCBIN "maps/SaffronMagnetTrainStation.blk"

6
data/maps/data.asm
View File

@@ -654,9 +654,9 @@ ENDM
map_data Route2Gate, ROUTE_2_GATE, $00, 0
map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0
map_data ElmsLab, ELMS_LAB, $00, 0
map_data KrissHouse1F, KRISS_HOUSE_1F, $00, 0
map_data KrissHouse2F, KRISS_HOUSE_2F, $00, 0
map_data KrissNeighborsHouse, KRISS_NEIGHBORS_HOUSE, $00, 0
map_data PlayersHouse1F, PLAYERS_HOUSE_1F, $00, 0
map_data PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0
map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0
map_data ElmsHouse, ELMS_HOUSE, $00, 0
map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0
map_data Route26DayofWeekSiblingsHouse, ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0

6
data/maps/definitions.asm
View File

@@ -445,9 +445,9 @@ MapGroup_NewBark:
map_def Route29, TILESET_JOHTO, ROUTE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map_def NewBarkTown, TILESET_JOHTO, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
map_def ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def KrissHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def KrissNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def PlayersHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map_def Route26DayofWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE

2
data/maps/scenes.asm
View File

@@ -28,7 +28,7 @@ MapScenes:: ; 4d01e
scene_def ROUTE_27, wRoute27SceneID
scene_def NEW_BARK_TOWN, wNewBarkTownSceneID
scene_def ELMS_LAB, wElmsLabSceneID
scene_def KRISS_HOUSE_1F, wKrissHouse1FSceneID
scene_def PLAYERS_HOUSE_1F, wPlayersHouse1FSceneID
scene_def ROUTE_29, wRoute29SceneID
scene_def CHERRYGROVE_CITY, wCherrygroveCitySceneID
scene_def MR_POKEMONS_HOUSE, wMrPokemonsHouseSceneID

6
data/maps/scripts.asm
View File

@@ -151,9 +151,9 @@ SECTION "Map Scripts 9", ROMX
INCLUDE "maps/Route34.asm"
INCLUDE "maps/ElmsLab.asm"
INCLUDE "maps/KrissHouse1F.asm"
INCLUDE "maps/KrissHouse2F.asm"
INCLUDE "maps/KrissNeighborsHouse.asm"
INCLUDE "maps/PlayersHouse1F.asm"
INCLUDE "maps/PlayersHouse2F.asm"
INCLUDE "maps/PlayersNeighborsHouse.asm"
INCLUDE "maps/ElmsHouse.asm"
INCLUDE "maps/Route26HealSpeechHouse.asm"
INCLUDE "maps/Route26DayofWeekSiblingsHouse.asm"

2
data/maps/spawn_points.asm
View File

@@ -7,7 +7,7 @@ ENDM
SpawnPoints: ; 0x152ab
; entries correspond to SPAWN_* constants
spawn KRISS_HOUSE_2F, 3, 3
spawn PLAYERS_HOUSE_2F, 3, 3
spawn VIRIDIAN_POKECENTER_1F, 5, 3
spawn PALLET_TOWN, 5, 6