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

Nihon Tileset

Browse source 
Added Nihon01 tileset
This commit is contained in:
Zeta_Null 2023-10-20 16:57:41 -04:00
parent efd3ce0f00
commit cf907d225f
11 changed files with 159 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/tileset_constants.asm
View file

@ -36,6 +36,7 @@
const TILESET_KABUTO_WORD_ROOM ; 22 const TILESET_KABUTO_WORD_ROOM ; 22
const TILESET_OMANYTE_WORD_ROOM ; 23 const TILESET_OMANYTE_WORD_ROOM ; 23
const TILESET_AERODACTYL_WORD_ROOM ; 24 const TILESET_AERODACTYL_WORD_ROOM ; 24
const TILESET_NIHON_01 ; 25
DEF NUM_TILESETS EQU const_value - 1 DEF NUM_TILESETS EQU const_value - 1
; wTileset struct size ; wTileset struct size

2
data/maps/maps.asm
View file

@ -540,5 +540,5 @@ MapGroup_Cherrygrove:
MapGroup_SilentHills: MapGroup_SilentHills:
table_width MAP_LENGTH, MapGroup_SilentHills table_width MAP_LENGTH, MapGroup_SilentHills
map SilentHills, TILESET_JOHTO, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_AUTO, FISHGROUP_SHORE map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_SILENT_HILLS_MAPS assert_table_length NUM_SILENT_HILLS_MAPS

1
data/tilesets.asm
View file

@ -48,4 +48,5 @@ Tilesets::
tileset TilesetKabutoWordRoom tileset TilesetKabutoWordRoom
tileset TilesetOmanyteWordRoom tileset TilesetOmanyteWordRoom
tileset TilesetAerodactylWordRoom tileset TilesetAerodactylWordRoom
tileset TilesetNihon1
assert_table_length NUM_TILESETS + 1 assert_table_length NUM_TILESETS + 1

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

Binary file not shown.

128
data/tilesets/nihon01_collision.asm Normal file
View file

@ -0,0 +1,128 @@
tilecoll 01, 01, 01, 01 ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
tilecoll WALL, WALL, WALL, WALL ; 05
tilecoll LADDER, LADDER, LADDER, LADDER ; 06
tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 07
tilecoll WALL, WALL, WALL, WALL ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b
tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e
tilecoll WALL, WALL, WALL, WALL ; 0f
tilecoll WALL, WALL, WALL, WALL ; 10
tilecoll WALL, WALL, WALL, WALL ; 11
tilecoll WALL, WALL, WALL, WALL ; 12
tilecoll WALL, WALL, WALL, WALL ; 13
tilecoll WALL, WALL, WALL, DOOR ; 14
tilecoll WALL, WALL, WALL, WALL ; 15
tilecoll WALL, WALL, WALL, DOOR ; 16
tilecoll WALL, WALL, WALL, WALL ; 17
tilecoll WALL, WALL, WALL, WALL ; 18
tilecoll WALL, WALL, WALL, WALL ; 19
tilecoll WALL, DOOR, FLOOR, FLOOR ; 1a
tilecoll WALL, WALL, FLOOR, FLOOR ; 1b
tilecoll WALL, WALL, WALL, WALL ; 1c
tilecoll WALL, WALL, DOOR, DOOR ; 1d
tilecoll WALL, WALL, WALL, WALL ; 1e
tilecoll WALL, WALL, WALL, WALL ; 1f
tilecoll WALL, WALL, WALL, WALL ; 20
tilecoll WALL, WALL, WALL, WALL ; 21
tilecoll WALL, WALL, WALL, WALL ; 22
tilecoll WALL, WALL, WALL, WALL ; 23
tilecoll WALL, WALL, FLOOR, FLOOR ; 24
tilecoll WALL, WALL, WALL, WALL ; 25
tilecoll WALL, WALL, WALL, WALL ; 26
tilecoll WALL, WALL, DOOR, WALL ; 27
tilecoll WALL, WALL, WALL, DOOR ; 28
tilecoll WALL, WALL, WALL, WALL ; 29
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2a
tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2c
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d
tilecoll WALL, WALL, WALL, DOOR ; 2e
tilecoll FLOOR, FLOOR, WALL, WALL ; 2f
tilecoll BUOY, BUOY, BUOY, WATER ; 30
tilecoll BUOY, BUOY, WATER, WATER ; 31
tilecoll BUOY, BUOY, WATER, BUOY ; 32
tilecoll FLOOR, FLOOR, WALL, WALL ; 33
tilecoll BUOY, WATER, BUOY, WATER ; 34
tilecoll WATER, WATER, WATER, WATER ; 35
tilecoll WATER, BUOY, WATER, BUOY ; 36
tilecoll WALL, WALL, WALL, DOOR ; 37
tilecoll BUOY, WATER, BUOY, BUOY ; 38
tilecoll WATER, WATER, BUOY, BUOY ; 39
tilecoll WATER, BUOY, BUOY, BUOY ; 3a
tilecoll WALL, WALL, WALL, WALL ; 3b
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3c
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 3f
tilecoll WALL, WALL, WALL, FLOOR ; 40
tilecoll WALL, WALL, FLOOR, FLOOR ; 41
tilecoll WALL, WALL, FLOOR, WALL ; 42
tilecoll WATER, WATER, WATER, WATER ; 43
tilecoll WALL, FLOOR, WALL, FLOOR ; 44
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45
tilecoll FLOOR, WALL, FLOOR, WALL ; 46
tilecoll FLOOR, FLOOR, WALL, WALL ; 47
tilecoll WALL, FLOOR, WALL, WALL ; 48
tilecoll FLOOR, FLOOR, WALL, WALL ; 49
tilecoll FLOOR, WALL, WALL, WALL ; 4a
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e
tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53
tilecoll WATER, WATER, WATER, WATER ; 54
tilecoll WATER, WATER, WATER, WATER ; 55
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
tilecoll WATER, WATER, WATER, WATER ; 58
tilecoll WATER, WATER, WATER, WATER ; 59
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5c
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5d
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5e
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 60
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 62
tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 64
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65
tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 66
tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 67
tilecoll WALL, FLOOR, WALL, FLOOR ; 68
tilecoll FLOOR, WALL, FLOOR, WALL ; 69
tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a
tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b
tilecoll WALL, FLOOR, WALL, WALL ; 6c
tilecoll FLOOR, WALL, WALL, WALL ; 6d
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
tilecoll FLOOR, FLOOR, WALL, WALL ; 72
tilecoll FLOOR, FLOOR, CAVE, WALL ; 73
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74
tilecoll WALL, WALL, FLOOR, FLOOR ; 75
tilecoll WATER, WATER, WATER, WATER ; 76
tilecoll WALL, WALL, DOOR, WALL ; 77
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 78
tilecoll WATER, WATER, WATER, WATER ; 79
tilecoll WATER, WATER, WATER, WATER ; 7a
tilecoll WALL, WALL, WALL, WALL ; 7b
tilecoll WALL, WALL, WALL, WALL ; 7c
tilecoll WALL, WALL, FLOOR, FLOOR ; 7d
tilecoll WALL, DOOR, FLOOR, FLOOR ; 7e
tilecoll WALL, WALL, FLOOR, FLOOR ; 7f

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

Binary file not shown.

13
engine/tilesets/tileset_anims.asm
View file

@ -250,6 +250,19 @@ UnusedTilesetAnim5: ; unreferenced
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
TilesetNihon1Anim:
dw vTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, AnimateWaterPalette
dw NULL, WaitTileAnimation
dw NULL, AnimateFlowerTile
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, StandingTileFrame8
dw NULL, DoneTileAnimation
TilesetBattleTowerOutsideAnim: TilesetBattleTowerOutsideAnim:
TilesetHouseAnim: TilesetHouseAnim:
TilesetPlayersHouseAnim: TilesetPlayersHouseAnim:

12
gfx/tilesets.asm
View file

@ -336,6 +336,15 @@ INCBIN "data/tilesets/omanyte_word_room_metatiles.bin"
TilesetAerodactylWordRoomMeta:: TilesetAerodactylWordRoomMeta::
INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin" INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin"
TilesetNihon1GFX::
INCBIN "gfx/tilesets/nihon01.2bpp.lz"
TilesetNihon1Meta::
INCBIN "data/tilesets/nihon01_metatiles.bin"
TilesetNihon1Coll::
INCLUDE "data/tilesets/nihon01_collision.asm"
SECTION "Tileset Data 9", ROMX SECTION "Tileset Data 9", ROMX
@ -451,3 +460,6 @@ INCBIN "data/tilesets/omanyte_word_room_attributes.bin"
TilesetAerodactylWordRoomAttr:: TilesetAerodactylWordRoomAttr::
INCBIN "data/tilesets/aerodactyl_word_room_attributes.bin" INCBIN "data/tilesets/aerodactyl_word_room_attributes.bin"
TilesetNihon1Attr::
INCBIN "data/tilesets/nihon01_attributes.bin"

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

4
maps/SilentHills.ablk
View file

@ -1,2 +1,2 @@
IJHFABFIJaJE IJHF|}+BF~E/JIJ
xxIIIIIJTvvvvU  !A|}G~E$AAAAAATvvvvUX5555Y

2
maps/SilentHills.asm
View file

@ -15,7 +15,7 @@ SilentHills_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
def_warp_events def_warp_events
warp_event 11, 5, PLAYERS_HOUSE_1F, 1 warp_event 13, 4, PLAYERS_HOUSE_1F, 1
def_coord_events def_coord_events