Merge branch 'master' of https://github.com/ZetaNull/jep-hack

2026-02-07 08:35:23 +13:00 · 2024-12-28 16:31:05 -05:00 · 2024-12-28 16:31:05 -05:00 · fd7ae97fbd
commit fd7ae97fbd
parent b7a9f6569a 22e3c21f85
83 changed files with 2106 additions and 91 deletions
--- a/gfx/sprites.asm
+++ b/gfx/sprites.asm
@ -151,3 +151,4 @@ ChannelerGFX::             INCBIN "gfx/sprites/channeler.2bpp"
 BaldingGuyGFX::             INCBIN "gfx/sprites/balding_guy.2bpp"
 GameboyGirlGFX::             INCBIN "gfx/sprites/gameboy_girl.2bpp"
 OverworldPikachuGFX::             INCBIN "gfx/sprites/pikachu.2bpp"
+DiveSpriteGFX::                INCBIN "gfx/sprites/dive.2bpp"
--- a/gfx/sprites/dive.png
+++ b/gfx/sprites/dive.png
--- a/gfx/tileset_palette_maps.asm
+++ b/gfx/tileset_palette_maps.asm
@ -111,6 +111,9 @@ INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm"
 TilesetLavenderCryptPalMap:
 INCLUDE "gfx/tilesets/lavendercrypt_palette_map.asm"

+TilesetUnderwaterPalMap:
+INCLUDE "gfx/tilesets/underwater_palette_map.asm"
+
 MapGroupPalettes: ; unreferenced
 ; entries correspond to MAPGROUP_* constants
 rept NUM_MAP_GROUPS
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@ -665,4 +665,15 @@ TilesetForestKantoColl::
 INCLUDE "data/tilesets/forest_kanto_collision.asm"

 TilesetForestKantoAttr::
-INCBIN "data/tilesets/forest_kanto_attributes.bin"
+INCBIN "data/tilesets/forest_kanto_attributes.bin"
+
+SECTION "Tileset Data 17", ROMX
+; moved to make room for new rocky wall colls
+TilesetPlayersRoomGFX::
+INCBIN "gfx/tilesets/players_room.2bpp.lz"
+
+TilesetPlayersRoomMeta::
+INCBIN "data/tilesets/players_room_metatiles.bin"
+
+TilesetPlayersRoomColl::
+INCLUDE "data/tilesets/players_room_collision.asm"
--- a/gfx/tilesets/bubble/1.png
+++ b/gfx/tilesets/bubble/1.png
--- a/gfx/tilesets/bubble/2.png
+++ b/gfx/tilesets/bubble/2.png
--- a/gfx/tilesets/bubble/3.png
+++ b/gfx/tilesets/bubble/3.png
--- a/gfx/tilesets/bubble/4.png
+++ b/gfx/tilesets/bubble/4.png
--- a/gfx/tilesets/bubble/5.png
+++ b/gfx/tilesets/bubble/5.png
--- a/gfx/tilesets/cave.png
+++ b/gfx/tilesets/cave.png
--- a/gfx/tilesets/dark_cave.png
+++ b/gfx/tilesets/dark_cave.png
--- a/gfx/tilesets/ice_path.png
+++ b/gfx/tilesets/ice_path.png
--- a/gfx/tilesets/johto.png
+++ b/gfx/tilesets/johto.png
--- a/gfx/tilesets/johto_modern.png
+++ b/gfx/tilesets/johto_modern.png
--- a/gfx/tilesets/johto_palette_map.asm
+++ b/gfx/tilesets/johto_palette_map.asm
@ -9,11 +9,10 @@
 	tilepal 0, RED, BROWN, WATER, WATER, BROWN, GREEN, BROWN, BROWN
 	tilepal 0, BROWN, WATER, GRAY, BROWN, BROWN, BROWN, GRAY, GRAY
 	tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
-	tilepal 0, WATER, GRAY, GRAY, GRAY, BROWN, BROWN, GRAY, GRAY
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
-	tilepal 0, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF, TEXT
+	tilepal 0, WATER, GRAY, GRAY, WATER, BROWN, BROWN, GRAY, GRAY
+rept 16
+	db $ff
+endr
 	tilepal 1, BROWN, BROWN, BROWN, RED, RED, RED, RED, RED
 	tilepal 1, RED, RED, RED, RED, RED, RED, RED, RED
 	tilepal 1, RED, RED, RED, RED, BROWN, BROWN, BROWN, BROWN
--- a/gfx/tilesets/kanto.png
+++ b/gfx/tilesets/kanto.png
--- a/gfx/tilesets/nihon_south.png
+++ b/gfx/tilesets/nihon_south.png
--- a/gfx/tilesets/seaweed/1.png
+++ b/gfx/tilesets/seaweed/1.png
--- a/gfx/tilesets/seaweed/2.png
+++ b/gfx/tilesets/seaweed/2.png
--- a/gfx/tilesets/water/deep-water.png
+++ b/gfx/tilesets/water/deep-water.png