thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-16 18:20:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fully dynamic Pokecentres

Browse source 
This adds the Kanto Pokemon Centre maps, which combined with the Nihon versions, means every region has its own layout. This should make for some very immersive gameplay, no?
This commit is contained in:
Llinos Evans 2023-11-04 09:29:49 +00:00
parent c3065bd046
commit aa3de1dbe2
20 changed files with 1087 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/map_constants.asm
View file

@ -398,6 +398,7 @@ ENDM
map_const MOBILE_TRADE_ROOM, 5, 4 ; 5
map_const MOBILE_BATTLE_ROOM, 5, 4 ; 6
map_const NIHON_POKECENTER_2F, 8, 4 ; 7
map_const KANTO_POKECENTER_2F, 8, 4 ; 7
endgroup
newgroup CELADON ; 21

1
data/maps/attributes.asm
View file

@ -635,6 +635,7 @@ ENDM
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 KantoPokecenter2F, KANTO_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

27
data/maps/blocks.asm
View file

@ -348,22 +348,12 @@ OlivinePokecenter1F_Blocks:
MahoganyPokecenter1F_Blocks:
EcruteakPokecenter1F_Blocks:
BlackthornPokecenter1F_Blocks:
CinnabarPokecenter1F_Blocks:
CeruleanPokecenter1F_Blocks:
Route10Pokecenter1F_Blocks:
AzaleaPokecenter1F_Blocks:
VioletPokecenter1F_Blocks:
Route32Pokecenter1F_Blocks:
GoldenrodPokecenter1F_Blocks:
VermilionPokecenter1F_Blocks:
PewterPokecenter1F_Blocks:
FuchsiaPokecenter1F_Blocks:
LavenderPokecenter1F_Blocks:
SilverCavePokecenter1F_Blocks:
CeladonPokecenter1F_Blocks:
CianwoodPokecenter1F_Blocks:
ViridianPokecenter1F_Blocks:
SaffronPokecenter1F_Blocks:
CherrygrovePokecenter1F_Blocks:
LakeOfRagePokecenter1F_Blocks:
INCBIN "maps/Pokecenter1F.ablk"
@ -1102,3 +1092,20 @@ SilentHillsPokecenter1F_Blocks:
NihonPokecenter2F_Blocks:
INCBIN "maps/NihonPokecenter2F.ablk"
; This restores the Kanto Pokemon Centre blockset.
; Factoring the above, this means each region has its own version. Further immersion get!
ViridianPokecenter1F_Blocks:
PewterPokecenter1F_Blocks:
CeruleanPokecenter1F_Blocks:
VermilionPokecenter1F_Blocks:
CeladonPokecenter1F_Blocks:
FuchsiaPokecenter1F_Blocks:
Route10Pokecenter1F_Blocks:
LavenderPokecenter1F_Blocks:
SaffronPokecenter1F_Blocks:
CinnabarPokecenter1F_Blocks:
INCBIN "maps/KantoPokecenter1F.ablk"
KantoPokecenter2F_Blocks:
INCBIN "maps/KantoPokecenter2F.ablk"

1
data/maps/maps.asm
View file

@ -430,6 +430,7 @@ MapGroup_CableClub:
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
map KantoPokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_SPECIAL, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_CABLE_CLUB_MAPS
MapGroup_Celadon:

1
data/maps/scripts.asm
View file

@ -509,3 +509,4 @@ SECTION "Map Scripts 26", ROMX
INCLUDE "maps/SilentHillsPokecenter1F.asm"
INCLUDE "maps/NihonPokecenter2F.asm"
INCLUDE "maps/KantoPokecenter2F.asm"

BIN
data/tilesets/pokecenter_attributes.bin
View file

Binary file not shown.

6
data/tilesets/pokecenter_collision.asm
View file

@ -100,4 +100,8 @@
tilecoll WALL, WALL, FLOOR, WALL ; 63
tilecoll WALL, DOOR, FLOOR, FLOOR ; 64
tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 65
tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 66
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 66
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 67
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 68
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 69
tilecoll WALL, WALL, FLOOR, WALL ; 6a

BIN
data/tilesets/pokecenter_metatiles.bin
View file

Binary file not shown.

2
maps/CeruleanPokecenter1F.asm
View file

@ -66,7 +66,7 @@ CeruleanPokecenter1F_MapEvents:
def_warp_events
warp_event 3, 7, CERULEAN_CITY, 4
warp_event 4, 7, CERULEAN_CITY, 4
warp_event 0, 7, POKECENTER_2F, 1
warp_event 0, 7, KANTO_POKECENTER_2F, 1
def_coord_events

2
maps/CinnabarPokecenter1F.asm
View file

@ -38,7 +38,7 @@ CinnabarPokecenter1F_MapEvents:
def_warp_events
warp_event 3, 7, CINNABAR_ISLAND, 1
warp_event 4, 7, CINNABAR_ISLAND, 1
warp_event 0, 7, POKECENTER_2F, 1
warp_event 0, 7, KANTO_POKECENTER_2F, 1
def_coord_events

2
maps/FuchsiaPokecenter1F.asm
View file

@ -92,7 +92,7 @@ FuchsiaPokecenter1F_MapEvents:
def_warp_events
warp_event 3, 7, FUCHSIA_CITY, 5
warp_event 4, 7, FUCHSIA_CITY, 5
warp_event 0, 7, POKECENTER_2F, 1
warp_event 0, 7, KANTO_POKECENTER_2F, 1
def_coord_events

1
maps/KantoPokecenter1F.ablk Normal file
View file

@ -0,0 +1 @@
HENGF#####fgKIJfg

1
maps/KantoPokecenter2F.ablk Normal file
View file

@ -0,0 +1 @@
A&?&?@ijh<>=########B##CDCD#

1050
maps/KantoPokecenter2F.asm Normal file
View file

File diff suppressed because it is too large Load diff

2
maps/LavenderPokecenter1F.asm
View file

@ -84,7 +84,7 @@ LavenderPokecenter1F_MapEvents:
def_warp_events
warp_event 3, 7, LAVENDER_TOWN, 1
warp_event 4, 7, LAVENDER_TOWN, 1
warp_event 0, 7, POKECENTER_2F, 1
warp_event 0, 7, KANTO_POKECENTER_2F, 1
def_coord_events

2
maps/PewterPokecenter1F.asm
View file

@ -71,7 +71,7 @@ PewterPokecenter1F_MapEvents:
def_warp_events
warp_event 3, 7, PEWTER_CITY, 4
warp_event 4, 7, PEWTER_CITY, 4
warp_event 0, 7, POKECENTER_2F, 1
warp_event 0, 7, KANTO_POKECENTER_2F, 1
def_coord_events

2
maps/Route10Pokecenter1F.asm
View file

@ -84,7 +84,7 @@ Route10Pokecenter1F_MapEvents:
def_warp_events
warp_event 3, 7, ROUTE_10_NORTH, 1
warp_event 4, 7, ROUTE_10_NORTH, 1
warp_event 0, 7, POKECENTER_2F, 1
warp_event 0, 7, KANTO_POKECENTER_2F, 1
def_coord_events

2
maps/SaffronPokecenter1F.asm
View file

@ -115,7 +115,7 @@ SaffronPokecenter1F_MapEvents:
def_warp_events
warp_event 3, 7, SAFFRON_CITY, 4
warp_event 4, 7, SAFFRON_CITY, 4
warp_event 0, 7, POKECENTER_2F, 1
warp_event 0, 7, KANTO_POKECENTER_2F, 1
def_coord_events

2
maps/VermilionPokecenter1F.asm
View file

@ -80,7 +80,7 @@ VermilionPokecenter1F_MapEvents:
def_warp_events
warp_event 3, 7, VERMILION_CITY, 2
warp_event 4, 7, VERMILION_CITY, 2
warp_event 0, 7, POKECENTER_2F, 1
warp_event 0, 7, KANTO_POKECENTER_2F, 1
def_coord_events

2
maps/ViridianPokecenter1F.asm
View file

@ -75,7 +75,7 @@ ViridianPokecenter1F_MapEvents:
def_warp_events
warp_event 3, 7, VIRIDIAN_CITY, 5
warp_event 4, 7, VIRIDIAN_CITY, 5
warp_event 0, 7, POKECENTER_2F, 1
warp_event 0, 7, KANTO_POKECENTER_2F, 1
def_coord_events