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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/landmark_constants.asm
View file

@ -134,6 +134,7 @@ DEF NIHON_LANDMARK EQU const_value
const LANDMARK_OLD_CITY
const LANDMARK_BLUE_FOREST
const LANDMARK_ROUTE_66
const LANDMARK_WHITE_CITY
DEF NUM_LANDMARKS EQU const_value
; used in CaughtData

9
constants/map_constants.asm
View file

@ -643,11 +643,14 @@ ENDM
map_const OLD_CITY_EARLS_HOUSE, 4, 4 ; 5
map_const OLD_CITY_FAMILY_HOUSE, 4, 4 ; 6
map_const SEPIA_SCHOOL, 4, 8 ; 7
endgroup
newgroup BLUE_FOREST ; 36
newgroup BLUE_FOREST ; 37
map_const BLUE_FOREST, 20, 18 ; 1
endgroup
DEF NUM_MAP_GROUPS EQU const_value ; 36
newgroup WHITE_CITY ; 38
map_const WHITE_CITY, 30, 27 ; 1
endgroup
DEF NUM_MAP_GROUPS EQU const_value ; 38

1
constants/scgb_constants.asm
View file

@ -82,6 +82,7 @@ DEF SCGB_DEFAULT EQU $ff
const PREDEFPAL_SILENT_HILLS
const PREDEFPAL_OLD_CITY
const PREDEFPAL_BLUE_FOREST
const PREDEFPAL_WHITE_CITY
const PREDEFPAL_NITE
const PREDEFPAL_BLACKOUT
const PREDEFPAL_DIPLOMA ; RB_MEWMON

1
constants/tileset_constants.asm
View file

@ -50,6 +50,7 @@
const TILESET_BLUE_LAB ; 30
const TILESET_NIHON_GATE ; 31
const TILESET_NIHON_MART ; 32
const TILESET_NIHON_WHITECITY ; 33
DEF NUM_TILESETS EQU const_value - 1
; wTileset struct size

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:

2
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"

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

1
data/tilesets.asm
View file

@ -62,4 +62,5 @@ Tilesets::
tileset TilesetBlueLab
tileset TilesetNihonGate
tileset TilesetNihonMart
tileset TilesetNihonWhiteCity
assert_table_length NUM_TILESETS + 1

BIN
data/tilesets/nihon01_attributes.bin
View file

Binary file not shown.

BIN
data/tilesets/nihon_whitecity_attributes.bin Normal file
View file

Binary file not shown.

112
data/tilesets/nihon_whitecity_collision.asm Normal file
View file

@ -0,0 +1,112 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll WALL, WALL, WALL, WALL ; 01
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
tilecoll WATER, WATER, WATER, WATER ; 03
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
tilecoll WATER, WATER, WATER, WATER ; 06
tilecoll WATER, WATER, WATER, WATER ; 07
tilecoll WATER, WATER, WATER, WATER ; 08
tilecoll WATER, WATER, WATER, WATER ; 09
tilecoll WATER, WATER, WATER, WATER ; 0a
tilecoll WATER, WATER, WATER, WATER ; 0b
tilecoll WALL, WALL, WALL, WALL ; 0c
tilecoll WALL, WALL, WALL, WALL ; 0d
tilecoll WALL, WALL, WALL, WALL ; 0e
tilecoll WALL, WALL, DOOR, WALL ; 0f
tilecoll WATER, WATER, WATER, WATER ; 10
tilecoll WATER, WATER, WATER, WATER ; 11
tilecoll WATER, WATER, WATER, WATER ; 12
tilecoll WATER, WATER, WATER, WATER ; 13
tilecoll WATER, WATER, WATER, WATER ; 14
tilecoll WATER, WATER, WATER, WATER ; 15
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16
tilecoll WALL, WALL, WALL, WALL ; 17
tilecoll WALL, WALL, WALL, WALL ; 18
tilecoll WALL, WALL, WALL, WALL ; 19
tilecoll WALL, WALL, WALL, WALL ; 1a
tilecoll WALL, WALL, DOOR, WALL ; 1b
tilecoll WALL, WALL, WALL, WALL ; 1c
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
tilecoll WALL, WALL, WALL, WALL ; 1e
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f
tilecoll WALL, WALL, WALL, WALL ; 20
tilecoll WALL, WALL, WALL, WALL ; 21
tilecoll WALL, WALL, WALL, WALL ; 22
tilecoll WALL, WALL, DOOR, DOOR ; 23
tilecoll WALL, WALL, WALL, WALL ; 24
tilecoll WALL, WALL, WALL, WALL ; 25
tilecoll WALL, WALL, WALL, WALL ; 26
tilecoll WALL, WALL, DOOR, WALL ; 27
tilecoll WALL, WALL, WALL, WALL ; 28
tilecoll WALL, WALL, WALL, WALL ; 29
tilecoll WALL, WALL, WALL, WALL ; 2a
tilecoll WALL, WALL, WALL, WALL ; 2b
tilecoll WALL, WALL, WALL, WALL ; 2c
tilecoll WALL, WALL, WALL, WALL ; 2d
tilecoll WALL, WALL, WALL, WALL ; 2e
tilecoll WALL, WALL, WALL, WALL ; 2f
tilecoll WALL, WALL, WALL, WALL ; 30
tilecoll WALL, WALL, WALL, WALL ; 31
tilecoll WALL, WALL, WALL, WALL ; 32
tilecoll WALL, WALL, DOOR, WALL ; 33
tilecoll WALL, WALL, WALL, WALL ; 34
tilecoll WALL, WALL, WALL, WALL ; 35
tilecoll WALL, WALL, WALL, WALL ; 36
tilecoll WALL, WALL, DOOR, DOOR ; 37
tilecoll WALL, WALL, WALL, WALL ; 38
tilecoll WALL, WALL, WALL, WALL ; 39
tilecoll WALL, WALL, WALL, WALL ; 3a
tilecoll WALL, WALL, WALL, WALL ; 3b
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c
tilecoll WALL, WALL, WALL, WALL ; 3d
tilecoll WALL, WALL, WALL, WALL ; 3e
tilecoll WALL, WALL, WALL, WALL ; 3f
tilecoll WALL, WALL, WALL, WALL ; 40
tilecoll WALL, WALL, WALL, WALL ; 41
tilecoll WALL, WALL, WALL, WALL ; 42
tilecoll WALL, WALL, WATER, WATER ; 43
tilecoll WALL, WALL, WALL, WALL ; 44
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 45
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 46
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 47
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4c
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4d
tilecoll WALL, WALL, WALL, WALL ; 4e
tilecoll WALL, WALL, WALL, WALL ; 4f
tilecoll WALL, WALL, WALL, WALL ; 50
tilecoll WALL, WALL, WALL, WALL ; 51
tilecoll WALL, WALL, DOOR, WALL ; 52
tilecoll WALL, WALL, WALL, WALL ; 53
tilecoll WALL, WALL, WALL, WALL ; 54
tilecoll WALL, WALL, WALL, WALL ; 55
tilecoll WALL, WALL, WALL, WALL ; 56
tilecoll WALL, WALL, WALL, WALL ; 57
tilecoll WALL, WALL, WALL, WALL ; 58
tilecoll WALL, WALL, WALL, WALL ; 59
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5a
tilecoll WALL, FLOOR, WALL, WALL ; 5b
tilecoll FLOOR, FLOOR, WALL, WALL ; 5c
tilecoll FLOOR, WALL, WALL, WALL ; 5d
tilecoll FLOOR, FLOOR, WALL, WALL ; 5e
tilecoll WATER, WATER, WALL, WALL ; 5f
tilecoll WATER, WATER, WALL, WALL ; 60
tilecoll WALL, WALL, WATER, WATER ; 61
tilecoll WALL, WALL, WATER, WATER ; 62
tilecoll WATER, WATER, WALL, WALL ; 63
tilecoll WATER, WATER, WALL, WALL ; 64
tilecoll WALL, FLOOR, WALL, FLOOR ; 65
tilecoll WALL, WALL, WALL, WALL ; 66
tilecoll WALL, WALL, WALL, WALL ; 67
tilecoll WALL, WATER, WALL, WATER ; 68
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 69
tilecoll WALL, WALL, WALL, WALL ; 6a
tilecoll WALL, WALL, WALL, WALL ; 6b
tilecoll WALL, WALL, WALL, WALL ; 6c
tilecoll WALL, WALL, WALL, WALL ; 6d
tilecoll WALL, WALL, WALL, WALL ; 6e
tilecoll WALL, WALL, WALL, WALL ; 6f

BIN
data/tilesets/nihon_whitecity_metatiles.bin Normal file
View file

Binary file not shown.

1
engine/tilesets/tileset_anims.asm
View file

@ -243,6 +243,7 @@ TilesetNihonHighTechAnim:
TilesetNihonOldAnim:
TilesetNihonSouthAnim:
TilesetNihonWestAnim:
TilesetNihonWhiteCityAnim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation

BIN
gfx/pokegear/nihon.bin
View file

Binary file not shown.

1
gfx/sgb/predef.pal
View file

@ -34,6 +34,7 @@
RGB 31,31,31, 12,28,22, 15,20,31, 00,00,00 ; PREDEFPAL_SILENT_HILLS
RGB 31,31,31, 25,20,16, 15,20,31, 00,00,00 ; PREDEFPAL_OLD_CITY (31,31,31, 21,14,09, 15,20,20, 00,00,00 for SW colors)
RGB 31,31,31, 22,19,31, 15,20,31, 00,00,00 ; PREDEFPAL_BLUE_FOREST (31,31,31, 18,14,31, 15,20,20, 00,00,00 for SW colors)
RGB 31,31,31, 27,28,31, 17,20,31, 00,00,00 ; PREDEFPAL_WHITE_CITY
RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_NITE
RGB 31,31,31, 07,07,07, 02,03,03, 00,00,00 ; PREDEFPAL_BLACKOUT
RGB 31,31,31, 30,22,17, 16,14,19, 00,00,00 ; PREDEFPAL_DIPLOMA

14
gfx/tilesets.asm
View file

@ -624,3 +624,17 @@ INCBIN "data/tilesets/nihonmart_metatiles.bin"
TilesetNihonMartColl::
INCLUDE "data/tilesets/nihonmart_collision.asm"
SECTION "Tileset Data 15", ROMX
TilesetNihonWhiteCityAttr::
INCBIN "data/tilesets/nihon_whitecity_attributes.bin"
TilesetNihonWhiteCityGFX::
INCBIN "gfx/tilesets/nihon_whitecity.2bpp.lz"
TilesetNihonWhiteCityMeta::
INCBIN "data/tilesets/nihon_whitecity_metatiles.bin"
TilesetNihonWhiteCityColl::
INCLUDE "data/tilesets/nihon_whitecity_collision.asm"

BIN
gfx/tilesets/nihon_whitecity.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.6 KiB

4
gfx/tilesets/roofs.pal
View file

@ -142,3 +142,7 @@
; group 29 (Blue Forest)
RGB 24,22,31, 18,14,31 ; morn/day
RGB 12,10,24, 08,03,23 ; nite
; group 30 (White City)
RGB 27,28,31, 24,24,26 ; morn/day
RGB 13,12,24, 11,09,22 ; nite

2
maps/Route66.asm
View file

@ -123,7 +123,7 @@ Route66_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 57, 9, DEBUG_ROOM, 1 ; Unsure, probably the other route.
warp_event 57, 9, WHITE_CITY, 1 ; Placeholder until route gate is set up
def_coord_events

36
maps/WhiteCity.ablk Normal file
View file

@ -0,0 +1,36 @@
8>9
UYAN@W8>9B+h
UPR/'DVAN@ e89+
T[\\\]V
/'D`_89/3B
bPOXZZSQbCa
A@EEI+ 
PORQ
/3+HEE+
 HEMFG

 EFBGG
  GG
 
  G
G
 
LL
=>?

 :7;
 89 
/3
  <
   !!!"
  $%#%& <
 
 ,-. +012 
 456  
 )'&
 
<
 `________cccd^^^^^`____



18
maps/WhiteCity.asm Normal file
View file

@ -0,0 +1,18 @@
object_const_def
WhiteCity_MapScripts:
def_scene_scripts
def_callbacks
WhiteCity_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 6, 27, ROUTE_66, 1
def_coord_events
def_bg_events
def_object_events