Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-04-26 01:47:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Whoops, missed a bank somehow.

Browse Source
This commit is contained in:
entrpntr 2020-05-25 05:13:22 -04:00
parent 1fe8afcdba
commit f84274fb73
8 changed files with 364 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
data/tilesets/champions_room_collision.asm Normal file
View File

@ -0,0 +1,64 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll WALL, WALL, FLOOR, WALL ; 01
tilecoll WALL, WALL, WALL, FLOOR ; 02
tilecoll FLOOR, FLOOR, WALL, WALL ; 03
tilecoll WALL, WALL, WALL, WALL ; 04
tilecoll WALL, WALL, COUNTER, FLOOR ; 05
tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 06
tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 07
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08
tilecoll WALL, FLOOR, FLOOR, WALL ; 09
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll LADDER, LADDER, FLOOR, FLOOR ; 0b
tilecoll WALL, WALL, FLOOR, FLOOR ; 0c
tilecoll WALL, WALL, WALL, WALL ; 0d
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e
tilecoll WALL, WALL, WALL, WALL ; 0f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
tilecoll WALL, WALL, WALL, FLOOR ; 11
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
tilecoll WALL, WALL, FLOOR, WALL ; 13
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
tilecoll FLOOR, FLOOR, WALL, WALL ; 16
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17
tilecoll WALL, FLOOR, WALL, FLOOR ; 18
tilecoll FLOOR, WALL, FLOOR, WALL ; 19
tilecoll WALL, FLOOR, WALL, FLOOR ; 1a
tilecoll FLOOR, WALL, FLOOR, WALL ; 1b
tilecoll WALL, UP_WALL, WALL, FLOOR ; 1c
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1d
tilecoll UP_WALL, WALL, FLOOR, WALL ; 1e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f
tilecoll WALL, FLOOR, WALL, WALL ; 20
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21
tilecoll FLOOR, WALL, WALL, WALL ; 22
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 23
tilecoll WALL, FLOOR, WALL, FLOOR ; 24
tilecoll WALL, WALL, WALL, WALL ; 25
tilecoll WALL, WALL, WALL, WALL ; 26
tilecoll FLOOR, WALL, FLOOR, WALL ; 27
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
tilecoll WALL, WALL, WALL, WALL ; 2a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31
tilecoll WALL, WALL, FLOOR, FLOOR ; 32
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
tilecoll FLOOR, FLOOR, WALL, WALL ; 34
tilecoll WALL, FLOOR, WALL, FLOOR ; 35
tilecoll FLOOR, WALL, FLOOR, WALL ; 36
tilecoll WALL, WALL, FLOOR, FLOOR ; 37
tilecoll WALL, WALL, WALL, FLOOR ; 38
tilecoll WALL, WALL, FLOOR, WALL ; 39
tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
tilecoll FLOOR, WALL, FLOOR, WALL ; 3b
tilecoll WALL, WALL, WALL, WALL ; 3c
tilecoll WALL, WALL, WALL, WALL ; 3d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3f

64
data/tilesets/forest_collision.asm Normal file
View File

@ -0,0 +1,64 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll WATER, WATER, WATER, WATER ; 02
tilecoll WATER, WATER, WATER, WATER ; 03
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
tilecoll WALL, WALL, WALL, WALL ; 05
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 06
tilecoll WATER, WATER, WATER, WATER ; 07
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 08
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 09
tilecoll WATER, WATER, WATER, WATER ; 0a
tilecoll WATER, WATER, WATER, WATER ; 0b
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0c
tilecoll WATER, WATER, WATER, WATER ; 0d
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0e
tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 0f
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 10
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11
tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 12
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 14
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 15
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 16
tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 17
tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 18
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 19
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1b
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1c
tilecoll WALL, WALL, WALL, WALL ; 1d
tilecoll WALL, WALL, WALL, WALL ; 1e
tilecoll WALL, WALL, WALL, WALL ; 1f
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20
tilecoll WALL, WALL, WALL, WALL ; 21
tilecoll WALL, WALL, WALL, WALL ; 22
tilecoll WALL, WALL, WALL, WALL ; 23
tilecoll WALL, WALL, WALL, DOOR ; 24
tilecoll WALL, WALL, WALL, WALL ; 25
tilecoll WALL, WALL, WALL, WALL ; 26
tilecoll WALL, WALL, WALL, WALL ; 27
tilecoll WALL, FLOOR, WALL, FLOOR ; 28
tilecoll WALL, FLOOR, WALL, FLOOR ; 29
tilecoll WALL, FLOOR, WALL, FLOOR ; 2a
tilecoll WALL, FLOOR, WALL, FLOOR ; 2b
tilecoll WALL, FLOOR, WALL, FLOOR ; 2c
tilecoll WALL, FLOOR, WALL, FLOOR ; 2d
tilecoll WALL, FLOOR, WALL, FLOOR ; 2e
tilecoll WALL, FLOOR, WALL, FLOOR ; 2f
tilecoll WALL, FLOOR, WALL, FLOOR ; 30
tilecoll WALL, FLOOR, WALL, FLOOR ; 31
tilecoll WALL, FLOOR, WALL, FLOOR ; 32
tilecoll WALL, FLOOR, WALL, FLOOR ; 33
tilecoll WALL, FLOOR, WALL, FLOOR ; 34
tilecoll WALL, FLOOR, WALL, FLOOR ; 35
tilecoll WALL, FLOOR, WALL, FLOOR ; 36
tilecoll WALL, FLOOR, WALL, FLOOR ; 37
tilecoll WALL, FLOOR, WALL, FLOOR ; 38
tilecoll WALL, FLOOR, WALL, FLOOR ; 39
tilecoll WALL, FLOOR, WALL, FLOOR ; 3a
tilecoll WALL, FLOOR, WALL, FLOOR ; 3b
tilecoll WALL, FLOOR, WALL, FLOOR ; 3c
tilecoll WALL, FLOOR, WALL, FLOOR ; 3d
tilecoll WALL, FLOOR, WALL, FLOOR ; 3e
tilecoll WALL, FLOOR, WALL, FLOOR ; 3f

64
data/tilesets/house_collision.asm Normal file
View File

@ -0,0 +1,64 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 01
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 02
tilecoll WALL, WALL, FLOOR, FLOOR ; 03
tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 04
tilecoll WALL, WINDOW, FLOOR, FLOOR ; 05
tilecoll WALL, FLOOR, WALL, FLOOR ; 06
tilecoll FLOOR, WALL, FLOOR, WALL ; 07
tilecoll WALL, WINDOW, FLOOR, FLOOR ; 08
tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 09
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0c
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d
tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
tilecoll WALL, WALL, PC, WALL ; 10
tilecoll WALL, WALL, WALL, FLOOR ; 11
tilecoll WALL, WALL, FLOOR, FLOOR ; 12
tilecoll WALL, WALL, FLOOR, FLOOR ; 13
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15
tilecoll WINDOW, WALL, FLOOR, FLOOR ; 16
tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19
tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1a
tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1b
tilecoll WALL, WALL, FLOOR, PC ; 1c
tilecoll WALL, WALL, FLOOR, RADIO ; 1d
tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1e
tilecoll WALL, WALL, WALL, WALL ; 1f
tilecoll WALL, WALL, WALL, WALL ; 20
tilecoll FLOOR, WALL, FLOOR, WALL ; 21
tilecoll WALL, FLOOR, WALL, FLOOR ; 22
tilecoll FLOOR, WALL, FLOOR, WALL ; 23
tilecoll WALL, FLOOR, WALL, FLOOR ; 24
tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 25
tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 26
tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 27
tilecoll WALL, WALL, FLOOR, FLOOR ; 28
tilecoll WALL, WALL, FLOOR, FLOOR ; 29
tilecoll WALL, WALL, FLOOR, FLOOR ; 2a
tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
tilecoll WALL, WALL, WALL, WALL ; 2c
tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e
tilecoll WALL, WALL, FLOOR, WALL ; 2f
tilecoll WALL, FLOOR, WALL, FLOOR ; 30
tilecoll FLOOR, WALL, FLOOR, WALL ; 31
tilecoll WALL, WINDOW, WALL, WALL ; 32
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f

64
data/tilesets/lighthouse_collision.asm Normal file
View File

@ -0,0 +1,64 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll WALL, WALL, WALL, WALL ; 01
tilecoll WALL, WALL, WALL, WALL ; 02
tilecoll WALL, WALL, WALL, WALL ; 03
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
tilecoll WALL, WALL, WALL, WALL ; 05
tilecoll FLOOR, FLOOR, WALL, WALL ; 06
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 09
tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
tilecoll WALL, WALL, WALL, WALL ; 0c
tilecoll WALL, WALL, WALL, WALL ; 0d
tilecoll WALL, WALL, WALL, WALL ; 0e
tilecoll WALL, WALL, WALL, WALL ; 0f
tilecoll 9C, FLOOR, COUNTER, FLOOR ; 10
tilecoll WALL, WALL, WALL, WALL ; 11
tilecoll WALL, WALL, WALL, WALL ; 12
tilecoll WALL, WALL, WALL, WALL ; 13
tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 14
tilecoll WALL, WALL, WALL, WALL ; 15
tilecoll 9C, FLOOR, COUNTER, FLOOR ; 16
tilecoll WALL, WALL, WALL, WALL ; 17
tilecoll FLOOR, WALL, FLOOR, WALL ; 18
tilecoll WALL, WALL, WALL, STAIRCASE ; 19
tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1a
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1b
tilecoll WALL, WALL, WALL, WALL ; 1c
tilecoll WALL, WALL, FLOOR, FLOOR ; 1d
tilecoll WALL, WALL, WALL, WALL ; 1e
tilecoll WALL, WALL, WALL, WALL ; 1f
tilecoll WALL, FLOOR, WALL, FLOOR ; 20
tilecoll FLOOR, WALL, FLOOR, WALL ; 21
tilecoll WALL, FLOOR, WALL, WALL ; 22
tilecoll FLOOR, WALL, WALL, WALL ; 23
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24
tilecoll FLOOR, FLOOR, WALL, WALL ; 25
tilecoll WALL, WALL, WALL, WALL ; 26
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27
tilecoll FLOOR, FLOOR, PIT, PIT ; 28
tilecoll WALL, WALL, WINDOW, WINDOW ; 29
tilecoll WALL, WALL, WALL, WALL ; 2a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b
tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
tilecoll WALL, WALL, WALL, WALL ; 2d
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e
tilecoll WALL, WALL, WALL, BOOKSHELF ; 2f
tilecoll WALL, WALL, FLOOR, WALL ; 30
tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 31
tilecoll WALL, WALL, WALL, WALL ; 32
tilecoll WALL, FLOOR, WALL, FLOOR ; 33
tilecoll WALL, WALL, PC, FLOOR ; 34
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 35
tilecoll FLOOR, WALL, FLOOR, WALL ; 36
tilecoll WALL, WALL, WALL, WALL ; 37
tilecoll WALL, WALL, FLOOR, WALL ; 38
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 39
tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3a
tilecoll WALL, WALL, WALL, WALL ; 3b
tilecoll WALL, WALL, WALL, WALL ; 3c
tilecoll WALL, WALL, WINDOW, WALL ; 3d
tilecoll WALL, WALL, WALL, WALL ; 3e
tilecoll WALL, WALL, WALL, WALL ; 3f

64
data/tilesets/players_room_collision.asm Normal file
View File

@ -0,0 +1,64 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll WALL, WALL, WALL, WALL ; 01
tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 02
tilecoll WALL, WALL, TV, BOOKSHELF ; 03
tilecoll WALL, WALL, FLOOR, FLOOR ; 04
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
tilecoll WALL, WALL, FLOOR, FLOOR ; 07
tilecoll WALL, WALL, FLOOR, FLOOR ; 08
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
tilecoll WALL, WALL, FLOOR, FLOOR ; 0b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
tilecoll WALL, WALL, FLOOR, FLOOR ; 11
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13
tilecoll WALL, WALL, FLOOR, FLOOR ; 14
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16
tilecoll WALL, WALL, FLOOR, FLOOR ; 17
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a
tilecoll WALL, FLOOR, WALL, FLOOR ; 1b
tilecoll WALL, FLOOR, WALL, FLOOR ; 1c
tilecoll WALL, FLOOR, WALL, FLOOR ; 1d
tilecoll WALL, FLOOR, WALL, FLOOR ; 1e
tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 1f
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 20
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21
tilecoll FLOOR, WALL, FLOOR, WALL ; 22
tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 23
tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24
tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25
tilecoll FF, FF, FF, FF ; 26
tilecoll FF, FF, FF, FF ; 27
tilecoll FF, FF, FF, FF ; 28
tilecoll FF, FF, FF, FF ; 29
tilecoll FF, FF, FF, FF ; 2a
tilecoll FF, FF, FF, FF ; 2b
tilecoll FF, FF, FF, FF ; 2c
tilecoll FF, FF, FF, FF ; 2d
tilecoll FF, FF, FF, FF ; 2e
tilecoll FF, FF, FF, FF ; 2f
tilecoll FF, FF, FF, FF ; 30
tilecoll FF, FF, FF, FF ; 31
tilecoll FF, FF, FF, FF ; 32
tilecoll FF, FF, FF, FF ; 33
tilecoll FF, FF, FF, FF ; 34
tilecoll FF, FF, FF, FF ; 35
tilecoll FF, FF, FF, FF ; 36
tilecoll FF, FF, FF, FF ; 37
tilecoll FF, FF, FF, FF ; 38
tilecoll FF, FF, FF, FF ; 39
tilecoll FF, FF, FF, FF ; 3a
tilecoll FF, FF, FF, FF ; 3b
tilecoll FF, FF, FF, FF ; 3c
tilecoll FF, FF, FF, FF ; 3d
tilecoll FF, FF, FF, FF ; 3e
tilecoll FF, FF, FF, FF ; 3f

42
gfx/tilesets.asm
View File

@ -235,5 +235,47 @@ INCBIN "gfx/tilesets/forest.2bpp.lz"
SECTION "Tileset Data 5", ROMX
TilesetChampionsRoomGFX::
INCBIN "gfx/tilesets/champions_room.2bpp.lz"
TilesetChampionsRoomMeta::
INCBIN "data/tilesets/champions_room_metatiles.bin"
TilesetChampionsRoomColl::
INCLUDE "data/tilesets/champions_room_collision.asm"
TilesetHouseGFX::
INCBIN "gfx/tilesets/house.2bpp.lz"
TilesetHouseMeta::
INCBIN "data/tilesets/house_metatiles.bin"
TilesetHouseColl::
INCLUDE "data/tilesets/house_collision.asm"
TilesetLighthouseGFX::
INCBIN "gfx/tilesets/lighthouse.2bpp.lz"
TilesetLighthouseMeta::
INCBIN "data/tilesets/lighthouse_metatiles.bin"
TilesetLighthouseColl::
INCLUDE "data/tilesets/lighthouse_collision.asm"
TilesetPlayersRoomGFX::
INCBIN "gfx/tilesets/players_room.2bpp.lz"
TilesetPlayersRoomMeta::
INCBIN "data/tilesets/players_room_metatiles.bin"
TilesetPlayersRoomColl::
INCLUDE "data/tilesets/players_room_collision.asm"
TilesetForestColl::
INCLUDE "data/tilesets/forest_collision.asm"
SECTION "Tileset Data 6", ROMX
TilesetKantoGFX::
INCBIN "gfx/tilesets/kanto.2bpp.lz"

4
layout.link
View File

@ -136,7 +136,7 @@ ROMX $36
"Font Inversed"
ROMX $37
"Map Blocks 3"
"bank37_2"
"Tileset Data 5"
ROMX $38
"bank38"
ROMX $39
@ -246,7 +246,7 @@ ROMX $6e
"Item Descriptions"
ROMX $70
"bank70"
"Tileset Data 5"
"Tileset Data 6"
"bank70_2"
ROMX $7f
org $7df8

30
main.asm
View File

@ -498,36 +498,6 @@ FontInversed:
INCBIN "gfx/font/font_inversed.1bpp"
SECTION "bank37_2", ROMX
TilesetChampionsRoomGFX::
INCBIN "gfx/tilesets/champions_room.2bpp.lz"
TilesetChampionsRoomMeta::
INCBIN "data/tilesets/champions_room_metatiles.bin"
TilesetChampionsRoomColl::
dr $de033, $de133
TilesetHouseGFX::
INCBIN "gfx/tilesets/house.2bpp.lz"
TilesetHouseMeta::
INCBIN "data/tilesets/house_metatiles.bin"
TilesetHouseColl::
dr $de9d3, $dead3
TilesetLighthouseGFX::
INCBIN "gfx/tilesets/lighthouse.2bpp.lz"
TilesetLighthouseMeta::
INCBIN "data/tilesets/lighthouse_metatiles.bin"
TilesetLighthouseColl::
dr $df2d3, $df3d3
TilesetPlayersRoomGFX::
INCBIN "gfx/tilesets/players_room.2bpp.lz"
TilesetPlayersRoomMeta::
INCBIN "data/tilesets/players_room_metatiles.bin"
TilesetPlayersRoomColl::
dr $dfc93, $dfd93
TilesetForestColl::
dr $dfd93, $dfe93
SECTION "bank38", ROMX
ret