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

White city exists now

Browse source
This commit is contained in:
Zeta_Null 2024-07-24 17:21:50 -04:00
parent 0eb5a4e544
commit 9a0858971d
26 changed files with 221 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/attributes.asm
View file

@ -835,5 +835,7 @@ ENDM
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later.
map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0
map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0

5
data/maps/blocks.asm
View file

@ -1235,3 +1235,8 @@ HoneyGrandmasHouse_Blocks:
SepiaSchool_Blocks:
INCBIN "maps/SepiaSchool.ablk"
SECTION "Map Blocks 4", ROMX
WhiteCity_Blocks:
INCBIN "maps/WhiteCity.ablk"

2
data/maps/landmarks.asm
View file

@ -138,6 +138,7 @@ Landmarks:
landmark 76, 100, OldCityName
landmark 140, 60, BlueForestName
landmark 108, 108, Route66Name
landmark 124, 108, WhiteCityName
assert_table_length NUM_LANDMARKS
NewBarkTownName: db "NEW BARK¯TOWN@"
@ -252,3 +253,4 @@ QuietCaveName: db "QUIET¯CAVE@"
OldCityName: db "SEPIA¯CITY@"
; High Tech will be called "Vogue City"
BlueForestName: db "BLUE¯FOREST@"
WhiteCityName: db "WHITE¯CITY@"

7
data/maps/maps.asm
View file

@ -54,6 +54,7 @@ MapGroupPointers::
dw MapGroup_SilentHills ; 35
dw MapGroup_OldCity ; 36
dw MapGroup_BlueForest ; 37
dw MapGroup_WhiteCity ; 38
assert_table_length NUM_MAP_GROUPS
MapGroup_Olivine:
@ -708,3 +709,9 @@ MapGroup_BlueForest:
table_width MAP_LENGTH, MapGroup_BlueForest
map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_BLUE_FOREST_MAPS
MapGroup_WhiteCity:
table_width MAP_LENGTH, MapGroup_WhiteCity
map WhiteCity, TILESET_NIHON_WHITECITY, TOWN, LANDMARK_WHITE_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_WHITE_CITY_MAPS

2
data/maps/outdoor_sprites.asm
View file

@ -41,6 +41,7 @@ OutdoorSprites:
dw SilentHillsGroupSprites
dw OldCityGroupSprites
dw BlueForestGroupSprites
dw WhiteCityGroupSprites
assert_table_length NUM_MAP_GROUPS
; Since these areas aren't done yet, their outdoor sprites will just use Pallet's.
@ -329,6 +330,7 @@ IndigoGroupSprites:
db SPRITE_BOULDER
BlueForestGroupSprites: ; Will have its own thing eventually
WhiteCityGroupSprites: ; Ditto
NewBarkGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY

1
data/maps/roofs.asm
View file

@ -49,6 +49,7 @@ MapGroupRoofs:
db ROOF_NEW_BARK ; 35 (Silent Hills)
db ROOF_VIOLET ; 36 (Old City)
db ROOF_NEW_BARK ; 37 (Blue Forest)
db ROOF_NEW_BARK ; 38 (White City)
assert_table_length NUM_MAP_GROUPS + 1
Roofs:

4
data/maps/scripts.asm
View file

@ -585,6 +585,8 @@ INCLUDE "maps/HoneyGrandmasHouse.asm"
INCLUDE "maps/OldCityEarlsHouse.asm"
INCLUDE "maps/OldCityFamilyHouse.asm"
INCLUDE "maps/SepiaSchool.asm"
INCLUDE "maps/WhiteCity.asm"
SECTION "Map Scripts 30", ROMX ; spillover
INCLUDE "maps/TanobyRuins.asm"
@ -605,4 +607,4 @@ INCLUDE "maps/CelesteHillCave.asm"
INCLUDE "maps/ThreeIslandPort.asm"
INCLUDE "maps/AlteringCave.asm"
INCLUDE "maps/SinjohRuinsExterior.asm"
INCLUDE "maps/SinjohRuinsInterior.asm"
INCLUDE "maps/SinjohRuinsInterior.asm"

1
data/maps/sgb_roof_pal_inds.asm
View file

@ -41,4 +41,5 @@ MapGroupRoofSGBPalInds:
db PREDEFPAL_SILENT_HILLS
db PREDEFPAL_OLD_CITY
db PREDEFPAL_BLUE_FOREST
db PREDEFPAL_WHITE_CITY
assert_table_length NUM_MAP_GROUPS + 1