pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rename tilesets, consistent with constant names

Browse Source
This commit is contained in:
Remy Oukaour 2017-12-10 23:42:15 -05:00
parent a551e345df
commit 08b14e593e
195 changed files with 378 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
constants/tilemap_constants.asm
View File

@ -11,7 +11,7 @@ const_value SET 1
const TILESET_KANTO ; 03 const TILESET_KANTO ; 03
const TILESET_BATTLE_TOWER_OUTSIDE ; 04 const TILESET_BATTLE_TOWER_OUTSIDE ; 04
const TILESET_HOUSE_1 ; 05 const TILESET_HOUSE_1 ; 05
const TILESET_KRISS_HOUSE ; 06 const TILESET_PLAYERS_HOUSE ; 06
const TILESET_POKECENTER ; 07 const TILESET_POKECENTER ; 07
const TILESET_GATE ; 08 const TILESET_GATE ; 08
const TILESET_PORT ; 09 const TILESET_PORT ; 09
@ -21,11 +21,11 @@ const_value SET 1
const TILESET_CELADON_MANSION ; 0d const TILESET_CELADON_MANSION ; 0d
const TILESET_GAME_CORNER ; 0e const TILESET_GAME_CORNER ; 0e
const TILESET_GYM_1 ; 0f const TILESET_GYM_1 ; 0f
const TILESET_KURT_HOUSE ; 10 const TILESET_KURTS_HOUSE ; 10
const TILESET_TRAIN_STATION ; 11 const TILESET_TRAIN_STATION ; 11
const TILESET_OLIVINE_GYM ; 12 const TILESET_OLIVINE_GYM ; 12
const TILESET_LIGHTHOUSE ; 13 const TILESET_LIGHTHOUSE ; 13
const TILESET_KRISS_HOUSE_2F ; 14 const TILESET_PLAYERS_HOUSE_2F ; 14
const TILESET_POKECOM_CENTER ; 15 const TILESET_POKECOM_CENTER ; 15
const TILESET_BATTLE_TOWER ; 16 const TILESET_BATTLE_TOWER ; 16
const TILESET_SPROUT_TOWER ; 17 const TILESET_SPROUT_TOWER ; 17
@ -37,7 +37,7 @@ const_value SET 1
const TILESET_ICE_PATH ; 1d const TILESET_ICE_PATH ; 1d
const TILESET_WHIRL_ISLANDS ; 1e const TILESET_WHIRL_ISLANDS ; 1e
const TILESET_ILEX_FOREST ; 1f const TILESET_ILEX_FOREST ; 1f
const TILESET_32 ; 20 const TILESET_BETA_WORD_ROOM ; 20
const TILESET_HO_OH_WORD_ROOM ; 21 const TILESET_HO_OH_WORD_ROOM ; 21
const TILESET_KABUTO_WORD_ROOM ; 22 const TILESET_KABUTO_WORD_ROOM ; 22
const TILESET_OMANYTE_WORD_ROOM ; 23 const TILESET_OMANYTE_WORD_ROOM ; 23

2
data/sprite_engine.asm
View File

@ -1640,7 +1640,7 @@ BrokenStdGFXPointers: ; Broken 2bpp pointers
dbbw $80, $01, .deleted dbbw $80, $01, .deleted
dbbw $80, $01, .deleted dbbw $80, $01, .deleted
dbbw $80, $01, .deleted dbbw $80, $01, .deleted
dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within Tileset11GFX) dbbw $10, $37, .deleted ; 16-tile 2bpp at 37:672a (within TilesetTrainStationGFX)
dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data) dbbw $10, $11, .deleted ; 16-tile 2bpp at 11:672a (empty data)
dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data) dbbw $10, $39, .deleted ; 16-tile 2bpp at 39:672a (empty data)
dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7) dbbw $10, $24, .deleted ; 16-tile 2bpp at 24:672a (inside Function926f7)

BIN
gfx/tilesets/01.2bpp.lz.0c7e555a
View File

Binary file not shown.

BIN
gfx/tilesets/01.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.0 KiB

0
gfx/tilesets/26.2bpp.lz.8b42470b → gfx/tilesets/aerodactyl_word_room.2bpp.lz.8b42470b
View File

0
gfx/tilesets/26.png → gfx/tilesets/aerodactyl_word_room.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
gfx/tilesets/22.2bpp.lz.467b6a2d → gfx/tilesets/battle_tower.2bpp.lz.467b6a2d
View File

0
gfx/tilesets/22.png → gfx/tilesets/battle_tower.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 993 B

After

Width:  |  Height:  |  Size: 993 B

0
gfx/tilesets/02.2bpp.lz.391603fb → gfx/tilesets/battle_tower_outside.2bpp.lz.391603fb
View File

0
gfx/tilesets/02.png → gfx/tilesets/battle_tower_outside.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
gfx/tilesets/32.2bpp.lz.8b42470b → gfx/tilesets/beta_word_room.2bpp.lz.8b42470b
View File

0
gfx/tilesets/32.png → gfx/tilesets/beta_word_room.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
gfx/tilesets/24.2bpp.lz.3437812a → gfx/tilesets/cave.2bpp.lz.3437812a
View File

0
gfx/tilesets/24.png → gfx/tilesets/cave.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
gfx/tilesets/13.2bpp.lz.63b414d4 → gfx/tilesets/celadon_mansion.2bpp.lz.63b414d4
View File

0
gfx/tilesets/13.png → gfx/tilesets/celadon_mansion.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
gfx/tilesets/14.2bpp.lz.71d29a2f → gfx/tilesets/game_corner.2bpp.lz.71d29a2f
View File

0
gfx/tilesets/14.png → gfx/tilesets/game_corner.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
gfx/tilesets/08.2bpp.lz.f5a55006 → gfx/tilesets/gate.2bpp.lz.f5a55006
View File

0
gfx/tilesets/08.png → gfx/tilesets/gate.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
gfx/tilesets/15.2bpp.lz.c1f2ed8f → gfx/tilesets/gym_1.2bpp.lz.c1f2ed8f
View File

0
gfx/tilesets/15.png → gfx/tilesets/gym_1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
gfx/tilesets/33.2bpp.lz.8b42470b → gfx/tilesets/ho_oh_word_room.2bpp.lz.8b42470b
View File

0
gfx/tilesets/33.png → gfx/tilesets/ho_oh_word_room.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
gfx/tilesets/05.2bpp.lz.c848ef13 → gfx/tilesets/house_1.2bpp.lz.c848ef13
View File

0
gfx/tilesets/05.png → gfx/tilesets/house_1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
gfx/tilesets/29.2bpp.lz.e23bc89f → gfx/tilesets/ice_path.2bpp.lz.e23bc89f
View File

0
gfx/tilesets/29.png → gfx/tilesets/ice_path.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
gfx/tilesets/31.2bpp.lz.6b0ac896 → gfx/tilesets/ilex_forest.2bpp.lz.6b0ac896
View File

0
gfx/tilesets/31.png → gfx/tilesets/ilex_forest.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
gfx/tilesets/00.2bpp.lz.0c7e555a → gfx/tilesets/johto_1.2bpp.lz.0c7e555a
View File

0
gfx/tilesets/00.png → gfx/tilesets/johto_1.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
gfx/tilesets/04.2bpp.lz.391603fb → gfx/tilesets/johto_2.2bpp.lz.391603fb
View File

0
gfx/tilesets/04.png → gfx/tilesets/johto_2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

0
gfx/tilesets/34.2bpp.lz.8b42470b → gfx/tilesets/kabuto_word_room.2bpp.lz.8b42470b
View File

0
gfx/tilesets/34.png → gfx/tilesets/kabuto_word_room.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
gfx/tilesets/03.2bpp.lz.a29f5d51 → gfx/tilesets/kanto.2bpp.lz.a29f5d51
View File

0
gfx/tilesets/03.png → gfx/tilesets/kanto.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
gfx/tilesets/16.2bpp.lz.dd51d079 → gfx/tilesets/kurts_house.2bpp.lz.dd51d079
View File

0
gfx/tilesets/16.png → gfx/tilesets/kurts_house.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
gfx/tilesets/10.2bpp.lz.b8d0f547 → gfx/tilesets/lab.2bpp.lz.b8d0f547
View File

0
gfx/tilesets/10.png → gfx/tilesets/lab.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

0
gfx/tilesets/19.2bpp.lz.0c1544c1 → gfx/tilesets/lighthouse.2bpp.lz.0c1544c1
View File

0
gfx/tilesets/19.png → gfx/tilesets/lighthouse.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
gfx/tilesets/12.2bpp.lz.e2e94f92 → gfx/tilesets/mart.2bpp.lz.e2e94f92
View File

0
gfx/tilesets/12.png → gfx/tilesets/mart.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
gfx/tilesets/18.2bpp.lz.93800351 → gfx/tilesets/olivine_gym.2bpp.lz.93800351
View File

0
gfx/tilesets/18.png → gfx/tilesets/olivine_gym.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

0
gfx/tilesets/35.2bpp.lz.8b42470b → gfx/tilesets/omanyte_word_room.2bpp.lz.8b42470b
View File

0
gfx/tilesets/35.png → gfx/tilesets/omanyte_word_room.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
gfx/tilesets/25.2bpp.lz.7fcb81d6 → gfx/tilesets/park.2bpp.lz.7fcb81d6
View File

0
gfx/tilesets/25.png → gfx/tilesets/park.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
gfx/tilesets/06.2bpp.lz.252cbd8f → gfx/tilesets/players_house.2bpp.lz.252cbd8f
View File

0
gfx/tilesets/06.png → gfx/tilesets/players_house.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1005 B

After

Width:  |  Height:  |  Size: 1005 B

0
gfx/tilesets/20.2bpp.lz.35e51007 → gfx/tilesets/players_house_2f.2bpp.lz.35e51007
View File

0
gfx/tilesets/20.png → gfx/tilesets/players_house_2f.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
gfx/tilesets/07.2bpp.lz.e1c4014c → gfx/tilesets/pokecenter.2bpp.lz.e1c4014c
View File

0
gfx/tilesets/07.png → gfx/tilesets/pokecenter.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
gfx/tilesets/21.2bpp.lz.febbc4ec → gfx/tilesets/pokecom_center.2bpp.lz.febbc4ec
View File

0
gfx/tilesets/21.png → gfx/tilesets/pokecom_center.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

0
gfx/tilesets/09.2bpp.lz.56b1a405 → gfx/tilesets/port.2bpp.lz.56b1a405
View File

0
gfx/tilesets/09.png → gfx/tilesets/port.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
gfx/tilesets/11.2bpp.lz.454cfd8b → gfx/tilesets/power_plant.2bpp.lz.454cfd8b
View File

0
gfx/tilesets/11.png → gfx/tilesets/power_plant.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
gfx/tilesets/27.2bpp.lz.27cdd9ad → gfx/tilesets/radio_tower.2bpp.lz.27cdd9ad
View File

0
gfx/tilesets/27.png → gfx/tilesets/radio_tower.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
gfx/tilesets/36.2bpp.lz.8b42470b → gfx/tilesets/ruins_of_alph.2bpp.lz.8b42470b
View File

0
gfx/tilesets/36.png → gfx/tilesets/ruins_of_alph.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
gfx/tilesets/23.2bpp.lz.bc56789c → gfx/tilesets/sprout_tower.2bpp.lz.bc56789c
View File

0
gfx/tilesets/23.png → gfx/tilesets/sprout_tower.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
gfx/tilesets/17.2bpp.lz.1600ca86 → gfx/tilesets/train_station.2bpp.lz.1600ca86
View File

0
gfx/tilesets/17.png → gfx/tilesets/train_station.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
gfx/tilesets/28.2bpp.lz.cace291c → gfx/tilesets/underground.2bpp.lz.cace291c
View File

0
gfx/tilesets/28.png → gfx/tilesets/underground.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
gfx/tilesets/30.2bpp.lz.25b9c4b6 → gfx/tilesets/whirl_islands.2bpp.lz.25b9c4b6
View File

0
gfx/tilesets/30.png → gfx/tilesets/whirl_islands.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 851 B

After

Width:  |  Height:  |  Size: 851 B

4
home/map.asm
View File

@ -2374,12 +2374,12 @@ LoadTilesetHeader:: ; 2d27
push bc push bc
ld hl, Tilesets ld hl, Tilesets
ld bc, Tileset01 - Tileset00 ld bc, Tileset1 - Tileset0
ld a, [wTileset] ld a, [wTileset]
call AddNTimes call AddNTimes
ld de, TilesetBank ld de, TilesetBank
ld bc, Tileset01 - Tileset00 ld bc, Tileset1 - Tileset0
ld a, BANK(Tilesets) ld a, BANK(Tilesets)
call FarCopyBytes call FarCopyBytes

34
maps/map_headers.asm
View File

@ -38,7 +38,7 @@ MapGroup1:
map_header OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineCafe, TILESET_GAME_CORNER, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineMart, TILESET_MART, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route38EcruteakGate, TILESET_GATE, GATE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route39Barn, TILESET_KURT_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route39Barn, TILESET_KURTS_HOUSE, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route39Farmhouse, TILESET_HOUSE_1, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route39Farmhouse, TILESET_HOUSE_1, INDOOR, ROUTE_39, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route38, TILESET_JOHTO_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route38, TILESET_JOHTO_1, ROUTE, ROUTE_38, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE
map_header Route39, TILESET_JOHTO_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route39, TILESET_JOHTO_1, ROUTE, ROUTE_39, MUSIC_ROUTE_37, 0, PALETTE_AUTO, FISHGROUP_SHORE
@ -103,7 +103,7 @@ MapGroup3:
map_header OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineLighthouse4F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineLighthouse5F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_LIGHTHOUSE, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivineLighthouse6F, TILESET_LIGHTHOUSE, DUNGEON, LIGHTHOUSE, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header MahoganyMart1F, TILESET_KURT_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, 1, PALETTE_DAY, FISHGROUP_SHORE map_header MahoganyMart1F, TILESET_KURTS_HOUSE, INDOOR, MAHOGANY_TOWN, MUSIC_MAHOGANY_MART, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TeamRocketBaseB1F, TILESET_UNDERGROUND, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header TeamRocketBaseB2F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TeamRocketBaseB2F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header TeamRocketBaseB3F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE map_header TeamRocketBaseB3F, TILESET_POWER_PLANT, DUNGEON, MAHOGANY_TOWN, MUSIC_ROCKET_HIDEOUT, 1, PALETTE_DAY, FISHGROUP_SHORE
@ -151,13 +151,13 @@ MapGroup3:
MapGroup4: MapGroup4:
map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakHouse, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header WiseTriosRoom, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE map_header WiseTriosRoom, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header EcruteakLugiaSpeechHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakLugiaSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header DanceTheatre, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE map_header DanceTheatre, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_DANCING_HALL, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakMart, TILESET_MART, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header EcruteakGym, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakGym, TILESET_SPROUT_TOWER, INDOOR, ECRUTEAK_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header EcruteakItemfinderHouse, TILESET_KURT_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EcruteakItemfinderHouse, TILESET_KURTS_HOUSE, INDOOR, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_POND map_header EcruteakCity, TILESET_JOHTO_1, TOWN, ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, 0, PALETTE_AUTO, FISHGROUP_POND
@ -209,7 +209,7 @@ MapGroup8:
map_header AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, AZALEA_TOWN, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CharcoalKiln, TILESET_HOUSE_1, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header AzaleaMart, TILESET_MART, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header KurtsHouse, TILESET_KURT_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header KurtsHouse, TILESET_KURTS_HOUSE, INDOOR, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header AzaleaGym, TILESET_GYM_1, INDOOR, AZALEA_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header AzaleaGym, TILESET_GYM_1, INDOOR, AZALEA_TOWN, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header Route33, TILESET_JOHTO_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route33, TILESET_JOHTO_2, ROUTE, ROUTE_33, MUSIC_ROUTE_30, 0, PALETTE_AUTO, FISHGROUP_SHORE
map_header AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header AzaleaTown, TILESET_JOHTO_2, TOWN, AZALEA_TOWN, MUSIC_AZALEA_TOWN, 0, PALETTE_AUTO, FISHGROUP_SHORE
@ -233,9 +233,9 @@ MapGroup10:
map_header VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletMart, TILESET_MART, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header VioletGym, TILESET_GYM_1, INDOOR, VIOLET_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE
map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header EarlsPokemonAcademy, TILESET_LAB, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header VioletNicknameSpeechHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletNicknameSpeechHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletPokecenter1F, TILESET_POKECENTER, INDOOR, VIOLET_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header VioletOnixTradeHouse, TILESET_KURT_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VioletOnixTradeHouse, TILESET_KURTS_HOUSE, INDOOR, VIOLET_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32RuinsOfAlphGate, TILESET_GATE, GATE, ROUTE_32, MUSIC_ROUTE_30, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route32Pokecenter1F, TILESET_POKECENTER, INDOOR, ROUTE_32, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route35GoldenrodGate, TILESET_GATE, GATE, ROUTE_35, MUSIC_ROUTE_36, 0, PALETTE_DAY, FISHGROUP_SHORE
@ -290,8 +290,8 @@ MapGroup12:
MapGroup13: MapGroup13:
map_header Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route1, TILESET_KANTO, ROUTE, ROUTE_1, MUSIC_ROUTE_1, 0, PALETTE_AUTO, FISHGROUP_SHORE
map_header PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header PalletTown, TILESET_KANTO, TOWN, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN
map_header RedsHouse1F, TILESET_KRISS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header RedsHouse2F, TILESET_KRISS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header RedsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header BluesHouse, TILESET_HOUSE_1, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header BluesHouse, TILESET_HOUSE_1, INDOOR, PALLET_TOWN, MUSIC_PALLET_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OaksLab, TILESET_LAB, INDOOR, PALLET_TOWN, MUSIC_POKEMON_TALK, 0, PALETTE_DAY, FISHGROUP_SHORE
@ -318,7 +318,7 @@ MapGroup15:
map_header OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header OlivinePortPassage, TILESET_UNDERGROUND, INDOOR, OLIVINE_CITY, MUSIC_VIOLET_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header VermilionPortPassage, TILESET_UNDERGROUND, INDOOR, VERMILION_CITY, MUSIC_VERMILION_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header MountMoonSquare, TILESET_KANTO, ROUTE, MT_MOON, MUSIC_MT_MOON_SQUARE, 0, PALETTE_AUTO, FISHGROUP_SHORE
map_header MountMoonGiftShop, TILESET_KURT_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MountMoonGiftShop, TILESET_KURTS_HOUSE, INDOOR, MT_MOON, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header TinTowerRoof, TILESET_SPROUT_TOWER, ROUTE, TIN_TOWER, MUSIC_TIN_TOWER, 0, PALETTE_AUTO, FISHGROUP_SHORE
@ -452,10 +452,10 @@ MapGroup24:
map_header Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_AUTO, FISHGROUP_SHORE map_header Route29, TILESET_JOHTO_1, ROUTE, ROUTE_29, MUSIC_ROUTE_29, 0, PALETTE_AUTO, FISHGROUP_SHORE
map_header NewBarkTown, TILESET_JOHTO_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN map_header NewBarkTown, TILESET_JOHTO_1, TOWN, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_AUTO, FISHGROUP_OCEAN
map_header ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, 0, PALETTE_DAY, FISHGROUP_SHORE map_header ElmsLab, TILESET_LAB, INDOOR, NEW_BARK_TOWN, MUSIC_PROF_ELM, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header KrissHouse1F, TILESET_KRISS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header KrissHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header KrissHouse2F, TILESET_KRISS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header KrissHouse2F, TILESET_PLAYERS_HOUSE_2F, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header KrissNeighborsHouse, TILESET_HOUSE_1, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header KrissNeighborsHouse, TILESET_HOUSE_1, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header ElmsHouse, TILESET_KRISS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route26HealSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route26HealSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route26DayofWeekSiblingsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route26DayofWeekSiblingsHouse, TILESET_HOUSE_1, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route27SandstormHouse, TILESET_HOUSE_1, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route27SandstormHouse, TILESET_HOUSE_1, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, 0, PALETTE_DAY, FISHGROUP_SHORE
@ -473,8 +473,8 @@ MapGroup25:
map_header MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header MrPsychicsHouse, TILESET_HOUSE_1, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SaffronTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SaffronTrainStation, TILESET_TRAIN_STATION, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header SilphCo1F, TILESET_POWER_PLANT, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CopycatsHouse1F, TILESET_KRISS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CopycatsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header CopycatsHouse2F, TILESET_KRISS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route5UndergroundEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route5UndergroundEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route5SaffronCityGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route5SaffronCityGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE
map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header Route5CleanseTagSpeechHouse, TILESET_HOUSE_1, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE

BIN
tilesets/00_collision.bin
View File

Binary file not shown.

BIN
tilesets/00_metatiles.bin
View File

Binary file not shown.

29
tilesets/01_palette_map.asm
View File

@ -1,29 +0,0 @@
tilepal 0, GRAY, BROWN, BROWN, RED, GREEN, GREEN, GRAY, RED
tilepal 0, RED, RED, ROOF, ROOF, ROOF, ROOF, ROOF, ROOF
tilepal 0, ROOF, ROOF, ROOF, GREEN, WATER, GREEN, BROWN, BROWN
tilepal 0, RED, RED, BROWN, BROWN, BROWN, GREEN, GREEN, GREEN
tilepal 0, BROWN, BROWN, BROWN, RED, RED, BROWN, YELLOW, BROWN
tilepal 0, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
tilepal 0, BROWN, BROWN, WATER, WATER, BROWN, BROWN, BROWN, YELLOW
tilepal 0, YELLOW, BROWN, BROWN, BROWN, BROWN, BROWN, GREEN, GREEN
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
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
tilepal 1, BROWN, BROWN, BROWN, GRAY, GRAY, BROWN, BROWN, BROWN
tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
tilepal 1, BROWN, GRAY, GRAY, GRAY, GRAY, GRAY, GRAY, BROWN
tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN
tilepal 1, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN, BROWN

0
tilesets/32_collision.bin → tilesets/aerodactyl_word_room_collision.bin
View File

0
tilesets/36_metatiles.bin → tilesets/aerodactyl_word_room_metatiles.bin
View File

0
tilesets/26_palette_map.asm → tilesets/aerodactyl_word_room_palette_map.asm
View File

74
tilesets/animations.asm
View File

@ -35,9 +35,9 @@ _AnimateTileset:: ; fc000
jp hl jp hl
; fc01b ; fc01b
Tileset00Anim: ; 0xfc01b Tileset0Anim: ; 0xfc01b
Tileset02Anim: ; 0xfc01b TilesetJohto2Anim: ; 0xfc01b
Tileset03Anim: ; 0xfc01b TilesetKantoAnim: ; 0xfc01b
dw VTiles2 tile $14, AnimateWaterTile dw VTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -51,7 +51,7 @@ Tileset03Anim: ; 0xfc01b
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc047 ; 0xfc047
Tileset25Anim: ; 0xfc047 TilesetParkAnim: ; 0xfc047
dw VTiles2 tile $14, AnimateWaterTile dw VTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw VTiles2 tile $5f, AnimateFountain dw VTiles2 tile $5f, AnimateFountain
@ -65,7 +65,7 @@ Tileset25Anim: ; 0xfc047
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc073 ; 0xfc073
Tileset31Anim: ; 0xfc073 TilesetIlexForestAnim: ; 0xfc073
dw NULL, ForestTreeLeftAnimation dw NULL, ForestTreeLeftAnimation
dw NULL, ForestTreeRightAnimation dw NULL, ForestTreeRightAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -80,7 +80,7 @@ Tileset31Anim: ; 0xfc073
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc0a3 ; 0xfc0a3
Tileset01Anim: ; 0xfc0a3 TilesetJohto1Anim: ; 0xfc0a3
dw VTiles2 tile $14, AnimateWaterTile dw VTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -124,7 +124,7 @@ TilesetAnimfc103: ; 0xfc103
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc12f ; 0xfc12f
Tileset09Anim: ; 0xfc12f TilesetPortAnim: ; 0xfc12f
dw VTiles2 tile $14, AnimateWaterTile dw VTiles2 tile $14, AnimateWaterTile
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -139,7 +139,7 @@ Tileset09Anim: ; 0xfc12f
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc15f ; 0xfc15f
Tileset15Anim: ; 0xfc15f TilesetGym1Anim: ; 0xfc15f
dw NULL, SafariFountainAnim2 dw NULL, SafariFountainAnim2
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
@ -182,8 +182,8 @@ TilesetAnimfc1af: ; 0xfc1af
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc1e7 ; 0xfc1e7
Tileset24Anim: ; 0xfc1e7 TilesetCaveAnim: ; 0xfc1e7
Tileset30Anim: ; 0xfc1e7 TilesetWhirlIslandsAnim: ; 0xfc1e7
dw VTiles2 tile $14, WriteTileToBuffer dw VTiles2 tile $14, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw wTileAnimBuffer, ScrollTileRightLeft dw wTileAnimBuffer, ScrollTileRightLeft
@ -205,7 +205,7 @@ Tileset30Anim: ; 0xfc1e7
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc233 ; 0xfc233
Tileset29Anim: ; 0xfc233 TilesetIcePathAnim: ; 0xfc233
dw VTiles2 tile $35, WriteTileToBuffer dw VTiles2 tile $35, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette dw NULL, FlickeringCaveEntrancePalette
dw wTileAnimBuffer, ScrollTileRightLeft dw wTileAnimBuffer, ScrollTileRightLeft
@ -227,7 +227,7 @@ Tileset29Anim: ; 0xfc233
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc27f ; 0xfc27f
Tileset23Anim: ; 0xfc27f TilesetSproutTowerAnim: ; 0xfc27f
dw SproutPillarTilePointer9, AnimateSproutPillarTile dw SproutPillarTilePointer9, AnimateSproutPillarTile
dw SproutPillarTilePointer10, AnimateSproutPillarTile dw SproutPillarTilePointer10, AnimateSproutPillarTile
dw SproutPillarTilePointer7, AnimateSproutPillarTile dw SproutPillarTilePointer7, AnimateSproutPillarTile
@ -259,31 +259,31 @@ TilesetAnimfc2bf: ; 0xfc2bf
dw NULL, DoneTileAnimation dw NULL, DoneTileAnimation
; 0xfc2e7 ; 0xfc2e7
Tileset04Anim: ; 0xfc2e7 TilesetBattleTowerOutsideAnim: ; 0xfc2e7
Tileset05Anim: ; 0xfc2e7 TilesetHouse1Anim: ; 0xfc2e7
Tileset06Anim: ; 0xfc2e7 TilesetPlayersHouseAnim: ; 0xfc2e7
Tileset07Anim: ; 0xfc2e7 TilesetPokecenterAnim: ; 0xfc2e7
Tileset08Anim: ; 0xfc2e7 TilesetGateAnim: ; 0xfc2e7
Tileset10Anim: ; 0xfc2e7 TilesetLabAnim: ; 0xfc2e7
Tileset11Anim: ; 0xfc2e7 TilesetPowerPlantAnim: ; 0xfc2e7
Tileset12Anim: ; 0xfc2e7 TilesetMartAnim: ; 0xfc2e7
Tileset13Anim: ; 0xfc2e7 TilesetCeladonMansionAnim: ; 0xfc2e7
Tileset14Anim: ; 0xfc2e7 TilesetGameCornerAnim: ; 0xfc2e7
Tileset16Anim: ; 0xfc2e7 TilesetKurtsHouseAnim: ; 0xfc2e7
Tileset17Anim: ; 0xfc2e7 TilesetTrainStationAnim: ; 0xfc2e7
Tileset18Anim: ; 0xfc2e7 TilesetOlivineGymAnim: ; 0xfc2e7
Tileset19Anim: ; 0xfc2e7 TilesetLighthouseAnim: ; 0xfc2e7
Tileset20Anim: ; 0xfc2e7 TilesetPlayersHouse2FAnim: ; 0xfc2e7
Tileset21Anim: ; 0xfc2e7 TilesetPokeComCenterAnim: ; 0xfc2e7
Tileset22Anim: ; 0xfc2e7 TilesetBattleTowerAnim: ; 0xfc2e7
Tileset26Anim: ; 0xfc2e7 TilesetRuinsOfAlphAnim: ; 0xfc2e7
Tileset27Anim: ; 0xfc2e7 TilesetRadioTowerAnim: ; 0xfc2e7
Tileset28Anim: ; 0xfc2e7 TilesetUndergroundAnim: ; 0xfc2e7
Tileset32Anim: ; 0xfc2e7 TilesetBetaWordRoomAnim: ; 0xfc2e7
Tileset33Anim: ; 0xfc2e7 TilesetHoOhWordRoomAnim: ; 0xfc2e7
Tileset34Anim: ; 0xfc2e7 TilesetKabutoWordRoomAnim: ; 0xfc2e7
Tileset35Anim: ; 0xfc2e7 TilesetOmanyteWordRoomAnim: ; 0xfc2e7
Tileset36Anim: ; 0xfc2e7 TilesetAerodactylWordRoomAnim: ; 0xfc2e7
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation dw NULL, WaitTileAnimation

0
tilesets/22_collision.bin → tilesets/battle_tower_collision.bin
View File

0
tilesets/22_metatiles.bin → tilesets/battle_tower_metatiles.bin
View File

0
tilesets/04_collision.bin → tilesets/battle_tower_outside_collision.bin
View File

0
tilesets/04_metatiles.bin → tilesets/battle_tower_outside_metatiles.bin
View File

0
tilesets/04_palette_map.asm → tilesets/battle_tower_outside_palette_map.asm
View File

0
tilesets/22_palette_map.asm → tilesets/battle_tower_palette_map.asm
View File

0
tilesets/33_collision.bin → tilesets/beta_word_room_collision.bin
View File

0
tilesets/32_metatiles.bin → tilesets/beta_word_room_metatiles.bin
View File

0
tilesets/32_palette_map.asm → tilesets/beta_word_room_palette_map.asm
View File

0
tilesets/24_collision.bin → tilesets/cave_collision.bin
View File

0
tilesets/24_metatiles.bin → tilesets/cave_metatiles.bin
View File

0
tilesets/24_palette_map.asm → tilesets/cave_palette_map.asm
View File

0
tilesets/13_collision.bin → tilesets/celadon_mansion_collision.bin
View File

0
tilesets/13_metatiles.bin → tilesets/celadon_mansion_metatiles.bin
View File

0
tilesets/13_palette_map.asm → tilesets/celadon_mansion_palette_map.asm
View File

Some files were not shown because too many files have changed in this diff Show More