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

revert underwater

Browse source
This commit is contained in:
Llinos Evans 2025-07-25 17:57:05 +01:00
parent c1b0ec142d
commit 555a96597e
5 changed files with 1 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/tileset_constants.asm
View file

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

1
data/tilesets.asm
View file

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

55
engine/tilesets/tileset_palettes.asm
View file

@ -228,58 +228,3 @@ LoadDesertPalette:
ret ret
INCLUDE "gfx/tilesets/desert.pal" INCLUDE "gfx/tilesets/desert.pal"
LoadUnderwaterPalette:
ld a, [wTimeOfDay]
and $7
cp NITE_F
jr z, .nite
cp DAY_F
jr z, .day
scf
;morn
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, UnderwaterMornPalette
ld bc, 8 palettes
jp FarCopyWRAM
ret
.day
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, UnderwaterDayPalette
ld bc, 8 palettes
jp FarCopyWRAM
ret
.nite
ld a, BANK(wBGPals1)
ld de, wBGPals1
ld hl, UnderwaterNitePalette
ld bc, 8 palettes
jp FarCopyWRAM
ret
INCLUDE "gfx/tilesets/underwater.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"

21
gfx/tilesets.asm
View file

@ -659,24 +659,3 @@ INCBIN "data/tilesets/players_room_metatiles.bin"
TilesetPlayersRoomColl:: TilesetPlayersRoomColl::
INCLUDE "data/tilesets/players_room_collision.asm" 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"
TilesetNihonFontGFX::
INCBIN "gfx/tilesets/nihon_font.2bpp.lz"
TilesetNihonFontMeta::
INCBIN "data/tilesets/nihon_font_metatiles.bin"
TilesetNihonFontColl::
INCLUDE "data/tilesets/nihon_font_collision.asm"

40
gfx/tilesets/underwater_sprites.pal
View file

@ -1,40 +0,0 @@
; 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