mirror of
https://github.com/thornAvery/jep-hack.git
synced 2026-02-06 16:15:24 +13:00
Merge branch 'master' of https://github.com/ZetaNull/jep-hack
This commit is contained in:
commit
aea0948bbd
32 changed files with 463 additions and 39 deletions
|
|
@ -89,15 +89,6 @@ INCLUDE "data/tilesets/cave_collision.asm"
|
|||
|
||||
SECTION "Tileset Data 3", ROMX
|
||||
|
||||
TilesetTowerGFX::
|
||||
INCBIN "gfx/tilesets/tower.2bpp.lz"
|
||||
|
||||
TilesetTowerMeta::
|
||||
INCBIN "data/tilesets/tower_metatiles.bin"
|
||||
|
||||
TilesetTowerColl::
|
||||
INCLUDE "data/tilesets/tower_collision.asm"
|
||||
|
||||
TilesetLabGFX::
|
||||
INCBIN "gfx/tilesets/lab.2bpp.lz"
|
||||
|
||||
|
|
@ -426,9 +417,6 @@ INCBIN "data/tilesets/pokecom_center_attributes.bin"
|
|||
TilesetBattleTowerInsideAttr::
|
||||
INCBIN "data/tilesets/battle_tower_inside_attributes.bin"
|
||||
|
||||
TilesetTowerAttr::
|
||||
INCBIN "data/tilesets/tower_attributes.bin"
|
||||
|
||||
|
||||
SECTION "Tileset Data 11", ROMX
|
||||
|
||||
|
|
@ -637,4 +625,17 @@ TilesetNihonWhiteCityMeta::
|
|||
INCBIN "data/tilesets/nihon_whitecity_metatiles.bin"
|
||||
|
||||
TilesetNihonWhiteCityColl::
|
||||
INCLUDE "data/tilesets/nihon_whitecity_collision.asm"
|
||||
INCLUDE "data/tilesets/nihon_whitecity_collision.asm"
|
||||
|
||||
; Inclusion of NEW things made it so I had to move it. THE DOMAIN EXPANSION, WAHOO!
|
||||
TilesetTowerGFX::
|
||||
INCBIN "gfx/tilesets/tower.2bpp.lz"
|
||||
|
||||
TilesetTowerMeta::
|
||||
INCBIN "data/tilesets/tower_metatiles.bin"
|
||||
|
||||
TilesetTowerColl::
|
||||
INCLUDE "data/tilesets/tower_collision.asm"
|
||||
|
||||
TilesetTowerAttr::
|
||||
INCBIN "data/tilesets/tower_attributes.bin"
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 4.1 KiB |
Loading…
Add table
Add a link
Reference in a new issue