thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ZetaNull:master' into master

Browse source
This commit is contained in:
Martha Schilling 2023-10-27 17:09:09 +01:00 • committed by GitHub
commit 37fbf884f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 687 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gfx/tilesets.asm
View file

@ -345,6 +345,15 @@ INCBIN "data/tilesets/forest_kanto_metatiles.bin"
TilesetForestKantoColl::
INCLUDE "data/tilesets/forest_kanto_collision.asm"
TilesetMuseumGFX::
INCBIN "gfx/tilesets/museum.2bpp.lz"
TilesetMuseumMeta::
INCBIN "data/tilesets/museum_metatiles.bin"
TilesetMuseumColl::
INCLUDE "data/tilesets/museum_collision.asm"
SECTION "Tileset Data 9", ROMX
@ -469,6 +478,9 @@ INCBIN "data/tilesets/forest_kanto_attributes.bin"
SECTION "Tileset Data 12", ROMX
TilesetMuseumAttr::
INCBIN "data/tilesets/museum_attributes.bin"
TilesetTraditionalHouseGFX::
INCBIN "gfx/tilesets/traditional_house.2bpp.lz"

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB