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

underwater tileset shit, brings number of errors down to 20

Browse source 
it's currently missing the custom palette but if I did I'd need to fuck with the code for it anyway when I add it properly when this stuff works so I dont think that's a big deal
This commit is contained in:
Zeta_Null 2024-12-29 16:50:30 -05:00
parent ef27eaf9ec
commit 29fc26f144
9 changed files with 78 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/tileset_constants.asm
View file

@ -53,6 +53,7 @@
const TILESET_NIHON_WHITECITY ; 33
const TILESET_SEVII ; 34
const TILESET_LUSHCAVE ; 35
const TILESET_UNDERWATER ; 36
DEF NUM_TILESETS EQU const_value - 1
; wTileset struct size

1
data/tilesets.asm
View file

@ -65,4 +65,5 @@ Tilesets::
tileset TilesetNihonWhiteCity
tileset TilesetSevii
tileset TilesetLushCave
tileset TilesetUnderwater
assert_table_length NUM_TILESETS + 1

0
data/tilesets/underwater_attributes.bin Normal file
View file

0
data/tilesets/underwater_collision.asm Normal file
View file

0
data/tilesets/underwater_metatiles.bin Normal file
View file

25
engine/tilesets/tileset_palettes.asm
View file

@ -227,4 +227,27 @@ LoadDesertPalette:
jp FarCopyWRAM
ret
INCLUDE "gfx/tilesets/desert.pal"
INCLUDE "gfx/tilesets/desert.pal"
LoadSpecialMapObjectPalette:
ld a, [wMapTileset]
cp TILESET_UNDERWATER
jr z, .underwater
jr .do_nothing
.underwater
call LoadUnderwaterObjectPalette
scf
ret
.do_nothing
and a
ret
LoadUnderwaterObjectPalette:
ld a, BANK(wOBPals1)
ld de, wOBPals1
ld hl, UnderwaterObjectPalette
ld bc, 8 palettes
call FarCopyWRAM
ret
UnderwaterObjectPalette:
INCLUDE "gfx/tilesets/underwater_sprites.pal"

12
gfx/tilesets.asm
View file

@ -668,3 +668,15 @@ INCBIN "data/tilesets/players_room_metatiles.bin"
TilesetPlayersRoomColl::
INCLUDE "data/tilesets/players_room_collision.asm"
TilesetUnderwaterGFX::
INCBIN "gfx/tilesets/underwater.2bpp.lz"
TilesetUnderwaterMeta::
INCBIN "data/tilesets/underwater_metatiles.bin"
TilesetUnderwaterColl::
INCLUDE "data/tilesets/underwater_collision.asm"
TilesetUnderwaterAttr::
INCBIN "data/tilesets/underwater_attributes.bin"

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

40
gfx/tilesets/underwater_sprites.pal Normal file
View file

@ -0,0 +1,40 @@
; red
RGB 14, 17, 24
RGB 11, 19, 10
RGB 11, 07, 01
RGB 00, 00, 00
; blue
RGB 14, 17, 24
RGB 11, 19, 10
RGB 10, 09, 29
RGB 00, 00, 00
; green
RGB 14, 17, 24
RGB 11, 19, 10
RGB 07, 22, 03
RGB 00, 00, 00
; brown
RGB 14, 17, 24
RGB 11, 19, 10
RGB 11, 10, 03
RGB 00, 00, 00
; pink
RGB 14, 17, 24
RGB 11, 19, 10
RGB 10, 09, 02
RGB 00, 00, 00
; silver
RGB 31, 31, 31
RGB 31, 31, 31
RGB 13, 13, 13
RGB 00, 00, 00
; tree (bg green)
RGB 19, 31, 19
RGB 11, 21, 28
RGB 04, 16, 24
RGB 00, 00, 00
; rock (bg brown)
RGB 14, 17, 24
RGB 08, 09, 16
RGB 04, 05, 10
RGB 02, 02, 04