thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-05 05:10:58 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sevii bullshit at 3 AM

Browse source 
- Sevii islands tileset
- One Island mapping
- Sevii islands SGB and roof colors
This commit is contained in:
Zeta_Null 2024-07-30 03:09:24 -04:00
parent c80018db12
commit 1e0220bf06
16 changed files with 101 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/map_constants.asm
View file

@ -558,7 +558,7 @@ ENDM
newgroup ONE_ISLAND ; 28
map_const FARAWAY_ISLAND_OUTSIDE, 10, 10 ; 1
map_const FARAWAY_ISLAND_INSIDE, 10, 10 ; 2
map_const ONE_ISLAND, 10, 10 ; 3
map_const ONE_ISLAND, 12, 12 ; 3
map_const TREASURE_BEACH, 10, 10 ; 4
map_const KINDLE_ROAD, 10, 10 ; 5
map_const MT_EMBER_EXTERIOR, 10, 10 ; 6

1
constants/tileset_constants.asm
View file

@ -51,6 +51,7 @@
const TILESET_NIHON_GATE ; 31
const TILESET_NIHON_MART ; 32
const TILESET_NIHON_WHITECITY ; 33
const TILESET_SEVII ; 34
DEF NUM_TILESETS EQU const_value - 1
; wTileset struct size

8
data/maps/maps.asm
View file

@ -608,11 +608,11 @@ MapGroup_Citrine: ; 27
MapGroup_OneIsland: ; 28
table_width MAP_LENGTH, MapGroup_OneIsland
map FarawayIslandOutside, TILESET_CAVE, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map FarawayIslandOutside, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map FarawayIslandInside, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map OneIsland, TILESET_CAVE, TOWN, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map TreasureBeach, TILESET_CAVE, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map KindleRoad, TILESET_CAVE, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map OneIsland, TILESET_SEVII, TOWN, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map TreasureBeach, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map KindleRoad, TILESET_SEVII, ROUTE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map MtEmberExterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map MtEmberInterior, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map MtEmberSummit, TILESET_CAVE, CAVE, LANDMARK_ONE_ISLAND, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_AUTO, FISHGROUP_SHORE

1
data/tilesets.asm
View file

@ -63,4 +63,5 @@ Tilesets::
tileset TilesetNihonGate
tileset TilesetNihonMart
tileset TilesetNihonWhiteCity
tileset TilesetSevii
assert_table_length NUM_TILESETS + 1

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

Binary file not shown.

56
data/tilesets/sevii_collision.asm Normal file
View file

@ -0,0 +1,56 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll WATER, WATER, WATER, WATER ; 02
tilecoll WALL, WALL, WALL, WALL ; 03
tilecoll WATER, WATER, WATER, WATER ; 04
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
tilecoll WALL, WALL, WALL, WALL ; 06
tilecoll WALL, WALL, WALL, WALL ; 07
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0b
tilecoll WATER, WALL, WATER, WALL ; 0c
tilecoll WALL, WALL, WALL, WALL ; 0d
tilecoll WALL, WATER, WALL, WATER ; 0e
tilecoll WALL, WALL, WALL, WALL ; 0f
tilecoll WALL, WALL, WALL, DOOR ; 10
tilecoll WALL, WALL, WALL, WALL ; 11
tilecoll FLOOR, FLOOR, WALL, WALL ; 12
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
tilecoll WALL, WALL, WALL, WALL ; 14
tilecoll WALL, FLOOR, WALL, FLOOR ; 15
tilecoll FLOOR, WALL, FLOOR, WALL ; 16
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 17
tilecoll WALL, WALL, WALL, WALL ; 18
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 19
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1a
tilecoll FLOOR, FLOOR, WALL, WALL ; 1b
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1c
tilecoll WALL, DOOR, FLOOR, FLOOR ; 1d
tilecoll WALL, WALL, FLOOR, FLOOR ; 1e
tilecoll WALL, WALL, WALL, WALL ; 1f
tilecoll FLOOR, WALL, FLOOR, WALL ; 20
tilecoll WALL, WATER, WALL, WALL ; 21
tilecoll WALL, WATER, WALL, WATER ; 22
tilecoll WATER, WALL, WALL, WALL ; 23
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 24
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 25
tilecoll FLOOR, WALL, WALL, WALL ; 26
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
tilecoll WATER, WALL, WATER, FLOOR ; 29
tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2b
tilecoll WATER, WATER, WATER, WATER ; 2c
tilecoll WATER, WATER, WATER, WATER ; 2d
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2e
tilecoll WALL, WALL, WALL, WALL ; 2f
tilecoll WATER, WATER, WATER, WATER ; 30
tilecoll FLOOR, FLOOR, WALL, WALL ; 31
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 32
tilecoll WATER, WATER, WATER, WATER ; 33
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34
tilecoll WALL, WALL, WALL, WALL ; 35
tilecoll WALL, WALL, WALL, WALL ; 36
tilecoll WALL, WALL, WALL, WALL ; 37

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

Binary file not shown.

1
engine/tilesets/tileset_anims.asm
View file

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

14
gfx/sgb/predef.pal
View file

@ -24,13 +24,13 @@
RGB 31,31,31, 26,26,26, 15,20,31, 00,00,00 ; PREDEFPAL_SILVER_CAVE
RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_DUNGEONS
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_CITRINE (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_ONE_ISLAND (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_TWO_ISLAND (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_THREE_ISLAND (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_FOUR_ISLAND (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_FIVE_ISLAND (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_SIX_ISLAND (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND (temp)
RGB 31,31,31, 30,20,21, 15,20,31, 00,00,00 ; PREDEFPAL_ONE_ISLAND
RGB 31,31,31, 30,23,17, 15,20,31, 00,00,00 ; PREDEFPAL_TWO_ISLAND
RGB 31,31,31, 29,28,15, 15,20,31, 00,00,00 ; PREDEFPAL_THREE_ISLAND
RGB 31,31,31, 18,31,16, 15,20,31, 00,00,00 ; PREDEFPAL_FOUR_ISLAND
RGB 31,31,31, 17,29,31, 15,20,31, 00,00,00 ; PREDEFPAL_FIVE_ISLAND
RGB 31,31,31, 24,23,31, 15,20,31, 00,00,00 ; PREDEFPAL_SIX_ISLAND
RGB 31,31,31, 29,21,31, 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND
RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_SILENT_HILLS
RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_OLD_CITY (31,31,31, 25,20,16, 15,20,31, 00,00,00 for Final-style colors)
RGB 31,31,31, 18,14,31, 15,20,20, 00,00,00 ; PREDEFPAL_BLUE_FOREST (31,31,31, 22,19,31, 15,20,31, 00,00,00 for Final-style colors)

12
gfx/tilesets.asm
View file

@ -639,3 +639,15 @@ INCLUDE "data/tilesets/tower_collision.asm"
TilesetTowerAttr::
INCBIN "data/tilesets/tower_attributes.bin"
TilesetSeviiGFX::
INCBIN "gfx/tilesets/sevii.2bpp.lz"
TilesetSeviiMeta::
INCBIN "data/tilesets/sevii_metatiles.bin"
TilesetSeviiColl::
INCLUDE "data/tilesets/sevii_collision.asm"
TilesetSeviiAttr::
INCBIN "data/tilesets/sevii_attributes.bin"

28
gfx/tilesets/roofs.pal
View file

@ -110,26 +110,26 @@
RGB 31,31,31, 29,26,18
RGB 15,20,31, 00,00,00 ; PREDEFPAL_CITRINE (temp)
RGB 31,31,31, 29,26,18
RGB 15,20,31, 00,00,00 ; PREDEFPAL_ONE_ISLAND (temp)
RGB 28,04,09, 19,00,08
RGB 19,02,12, 10,01,09 ; PREDEFPAL_ONE_ISLAND
RGB 31,31,31, 29,26,18
RGB 15,20,31, 00,00,00 ; PREDEFPAL_TWO_ISLAND (temp)
RGB 31,18,00, 27,08,00
RGB 19,11,07, 16,05,03 ; PREDEFPAL_TWO_ISLAND
RGB 31,31,31, 29,26,18
RGB 15,20,31, 00,00,00 ; PREDEFPAL_THREE_ISLAND (temp)
RGB 31,27,00, 28,18,00
RGB 16,13,06, 12,08,05 ; PREDEFPAL_THREE_ISLAND
RGB 31,31,31, 29,26,18
RGB 15,20,31, 00,00,00 ; PREDEFPAL_FOUR_ISLAND (temp)
RGB 00,31,12, 00,18,13
RGB 01,15,12, 02,10,11 ; PREDEFPAL_FOUR_ISLAND
RGB 31,31,31, 29,26,18
RGB 15,20,31, 00,00,00 ; PREDEFPAL_FIVE_ISLAND (temp)
RGB 00,23,31, 00,07,25
RGB 01,13,25, 00,04,21 ; PREDEFPAL_FIVE_ISLAND
RGB 31,31,31, 29,26,18
RGB 15,20,31, 00,00,00 ; PREDEFPAL_SIX_ISLAND (temp)
RGB 16,08,31, 12,01,21
RGB 11,02,27, 03,04,20 ; PREDEFPAL_SIX_ISLAND
RGB 31,31,31, 29,26,18
RGB 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND (temp)
RGB 26,08,31, 16,01,22
RGB 17,02,23, 08,02,20 ; PREDEFPAL_SEVEN_ISLAND
; group 27 (Silent Hills)
RGB 09,31,23, 10,22,22 ; morn/day

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

2
maps/DebugRoom.ablk
View file

@ -4,4 +4,4 @@
 !
E
E@AABHJ~IIIEF|}ABEJ~EF@AAB
DBIIIIJDFTnUDFX5YHIIIJ|}~EEE
DBIIIIJDFTnUDFX5YHIIIJTUTnŠYX|}XYX~EXYEXEXznnnŠ

2
maps/DebugRoom.asm
View file

@ -386,7 +386,7 @@ DebugRoom_MapEvents:
warp_event 35, 17, OLD_CITY, 1 ; east warp
warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp
warp_event 19, 34, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; southern warp
warp_event 33, 33, BLUE_FOREST, 1 ; southeast warp
warp_event 33, 33, ONE_ISLAND, 1 ; southeast warp
warp_event 5, 3, AZALEA_TOWN, 1
warp_event 34, 11, WINNERS_PATH, 3

BIN
maps/OneIsland.ablk
View file

Binary file not shown.

2
maps/OneIsland.asm
View file

@ -9,6 +9,8 @@ OneIsland_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 10, 17, DEBUG_ROOM, 1
warp_event 11, 17, DEBUG_ROOM, 1
def_coord_events