thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 00:25:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Nihon Pokemon Centre for Silent Hills

Browse source 
This adds the Pokemon Centre infrastructure for Nihon and Silent Hills's one.

For all future Nihon Pokemon Centres, they must refer to the 2F one for the warp, and the map blocks for 1Fs should use the Nihon variant.

Kanto will follow suit (eventually). The aim is to make a more immersive region structure.
This commit is contained in:
Llinos Evans 2023-11-04 04:40:36 +00:00
parent ebab1da7b4
commit c3065bd046
19 changed files with 1291 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/attributes.asm
View file

@ -634,6 +634,7 @@ ENDM
map_attributes TimeCapsule, TIME_CAPSULE, $00, 0
map_attributes MobileTradeRoom, MOBILE_TRADE_ROOM, $00, 0
map_attributes MobileBattleRoom, MOBILE_BATTLE_ROOM, $00, 0
map_attributes NihonPokecenter2F, NIHON_POKECENTER_2F, $00, 0
map_attributes CeladonDeptStore1F, CELADON_DEPT_STORE_1F, $00, 0
map_attributes CeladonDeptStore2F, CELADON_DEPT_STORE_2F, $00, 0
map_attributes CeladonDeptStore3F, CELADON_DEPT_STORE_3F, $00, 0
@ -722,3 +723,4 @@ ENDM
map_attributes CliffCave, CLIFF_CAVE, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes QuietCave, QUIET_CAVE, $76, 0
map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0

7
data/maps/blocks.asm
View file

@ -1095,3 +1095,10 @@ QuietCave_Blocks:
Route49_2_Blocks:
INCBIN "maps/Route49_2.ablk"
; All Nihon Pokecenter1Fs go here.
SilentHillsPokecenter1F_Blocks:
INCBIN "maps/NihonPokecenter1F.ablk"
NihonPokecenter2F_Blocks:
INCBIN "maps/NihonPokecenter2F.ablk"

2
data/maps/maps.asm
View file

@ -429,6 +429,7 @@ MapGroup_CableClub:
map TimeCapsule, TILESET_GATE, INDOOR, LANDMARK_SPECIAL, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map MobileTradeRoom, TILESET_MANSION, INDOOR, LANDMARK_SPECIAL, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map MobileBattleRoom, TILESET_MANSION, INDOOR, LANDMARK_SPECIAL, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map NihonPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_SPECIAL, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_CABLE_CLUB_MAPS
MapGroup_Celadon:
@ -560,6 +561,7 @@ MapGroup_SilentHills:
map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_SILENT_HILLS_MAPS
MapGroup_BlueForest:

2
data/maps/outdoor_sprites.asm
View file

@ -693,7 +693,7 @@ SilentHillsGroupSprites:
; 9 walking sprites
db SPRITE_COOLTRAINER_M
db SPRITE_YOUNGSTER
db SPRITE_MONSTER
db SPRITE_POKEFAN_F
db SPRITE_BEAUTY
db SPRITE_BUG_CATCHER
db SPRITE_ROCKER

5
data/maps/scripts.asm
View file

@ -504,3 +504,8 @@ INCLUDE "maps/Route49.asm"
INCLUDE "maps/BlueForest.asm"
INCLUDE "maps/QuietCave.asm"
INCLUDE "maps/Route49_2.asm"
SECTION "Map Scripts 26", ROMX
INCLUDE "maps/SilentHillsPokecenter1F.asm"
INCLUDE "maps/NihonPokecenter2F.asm"

BIN
data/tilesets/pokecenter_attributes.bin
View file

Binary file not shown.

49
data/tilesets/pokecenter_collision.asm
View file

@ -56,9 +56,48 @@
tilecoll DOOR, WALL, FLOOR, WALL ; 37
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 38
tilecoll WALL, WALL, FLOOR, WALL ; 39
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3a
tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 3a
tilecoll WALL, WALL, FLOOR, WALL ; 3b
tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3c
tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3d
tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3e
tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 3f
tilecoll WALL, WALL, FLOOR, WALL ; 3c
tilecoll WALL, WALL, FLOOR, WALL ; 3d
tilecoll WALL, DOOR, FLOOR, FLOOR ; 3e
tilecoll WALL, WALL, WALL, WALL ; 3f
tilecoll PC, WALL, FLOOR, WALL ; 40
tilecoll WALL, WALL, FLOOR, WALL ; 41
tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 42
tilecoll WALL, WALL, FLOOR, FLOOR ; 43
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 44
tilecoll WALL, WALL, FLOOR, WALL ; 45
tilecoll COUNTER, WALL, FLOOR, FLOOR ; 46
tilecoll WALL, COUNTER, FLOOR, FLOOR ; 47
tilecoll WALL, WALL, WALL, FLOOR ; 48
tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 49
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 4a
tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 4b
tilecoll FLOOR, WALL, FLOOR, WALL ; 4c
tilecoll WALL, WALL, FLOOR, WALL ; 4d
tilecoll WALL, WALL, FLOOR, PC ; 4e
tilecoll WALL, WALL, FLOOR, FLOOR ; 4f
tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 50
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 51
tilecoll FLOOR, WALL, FLOOR, WALL ; 52
tilecoll WALL, WALL, FLOOR, WALL ; 53
tilecoll WALL, WALL, FLOOR, PC ; 54
tilecoll WALL, WALL, FLOOR, WALL ; 55
tilecoll COUNTER, WALL, FLOOR, FLOOR ; 56
tilecoll WALL, WALL, FLOOR, FLOOR ; 57
tilecoll WALL, COUNTER, FLOOR, FLOOR ; 58
tilecoll WALL, WALL, WALL, FLOOR ; 59
tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 5a
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 5b
tilecoll WALL, WALL, FLOOR, FLOOR ; 5c
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5d
tilecoll WALL, WALL, FLOOR, FLOOR ; 5e
tilecoll WALL, WALL, FLOOR, WALL ; 5f
tilecoll PC, WALL, FLOOR, WALL ; 60
tilecoll WALL, WALL, FLOOR, WALL ; 61
tilecoll WALL, WALL, WALL, WALL ; 62
tilecoll WALL, WALL, FLOOR, WALL ; 63
tilecoll WALL, DOOR, FLOOR, FLOOR ; 64
tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 65
tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 66

BIN
data/tilesets/pokecenter_metatiles.bin
View file

Binary file not shown.