Sync with pokered

15 files changed, 439 insertions, 0 deletions

diff --git a/data/tilesets/bike_riding_tilesets.asm b/data/tilesets/bike_riding_tilesets.asm
new file mode 100755
index 00000000..b78c7c8c
--- /dev/null
+++ b/data/tilesets/bike_riding_tilesets.asm
@@ -0,0 +1,7 @@
+BikeRidingTilesets::
+	db OVERWORLD
+	db FOREST
+	db UNDERGROUND
+	db SHIP_PORT
+	db CAVERN
+	db -1 ; end
diff --git a/data/tilesets/bookshelf_tile_ids.asm b/data/tilesets/bookshelf_tile_ids.asm
new file mode 100644
index 00000000..55143d73
--- /dev/null
+++ b/data/tilesets/bookshelf_tile_ids.asm
@@ -0,0 +1,25 @@
+bookshelf_tile: MACRO
+	db \1, \2
+	db_tx_pre \3
+ENDM
+
+BookshelfTileIDs:
+	; tileset id, bookshelf tile id, text id
+	bookshelf_tile PLATEAU,      $30, IndigoPlateauStatues
+	bookshelf_tile HOUSE,        $3D, TownMapText
+	bookshelf_tile HOUSE,        $1E, BookOrSculptureText
+	bookshelf_tile MANSION,      $32, BookOrSculptureText
+	bookshelf_tile REDS_HOUSE_1, $32, BookOrSculptureText
+	bookshelf_tile LAB,          $28, BookOrSculptureText
+	bookshelf_tile LOBBY,        $16, ElevatorText
+	bookshelf_tile GYM,          $1D, BookOrSculptureText
+	bookshelf_tile DOJO,         $1D, BookOrSculptureText
+	bookshelf_tile GATE,         $22, BookOrSculptureText
+	bookshelf_tile MART,         $54, PokemonStuffText
+	bookshelf_tile MART,         $55, PokemonStuffText
+	bookshelf_tile POKECENTER,   $54, PokemonStuffText
+	bookshelf_tile POKECENTER,   $55, PokemonStuffText
+	bookshelf_tile LOBBY,        $50, PokemonStuffText
+	bookshelf_tile LOBBY,        $52, PokemonStuffText
+	bookshelf_tile SHIP,         $36, BookOrSculptureText
+	db -1 ; end
diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm
new file mode 100644
index 00000000..058a815c
--- /dev/null
+++ b/data/tilesets/collision_tile_ids.asm
@@ -0,0 +1,74 @@
+coll_tiles: MACRO
+REPT _NARG
+	db \1
+	shift
+ENDR
+	db -1 ; end
+ENDM
+
+Underground_Coll::
+	coll_tiles $0b, $0c, $13, $15, $18
+
+Overworld_Coll::
+	coll_tiles $00, $10, $1b, $20, $21, $23, $2c, $2d, $2e, $30, $31, $33, $39, $3c, $3e, $52, $54, $58, $5b
+
+RedsHouse1_Coll::
+RedsHouse2_Coll::
+	coll_tiles $01, $02, $03, $11, $12, $13, $14, $1c, $1a
+
+Mart_Coll::
+Pokecenter_Coll::
+	coll_tiles $11, $1a, $1c, $3c, $5e
+
+Dojo_Coll::
+Gym_Coll::
+	coll_tiles $11, $16, $19, $2b, $3c, $3d, $3f, $4a, $4c, $4d, $03
+
+Forest_Coll::
+	coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $3a, $40, $51, $52, $5a, $5c, $5e, $5f
+
+House_Coll::
+	coll_tiles $01, $12, $14, $28, $32, $37, $44, $54, $5c
+
+ForestGate_Coll::
+Museum_Coll::
+Gate_Coll::
+	coll_tiles $01, $12, $14, $1a, $1c, $37, $38, $3b, $3c, $5e
+
+Ship_Coll::
+	coll_tiles $04, $0d, $17, $1d, $1e, $23, $34, $37, $39, $4a
+
+ShipPort_Coll::
+	coll_tiles $0a, $1a, $32, $3b
+
+Cemetery_Coll::
+	coll_tiles $01, $10, $13, $1b, $22, $42, $52
+
+Interior_Coll::
+	coll_tiles $04, $0f, $15, $1f, $3b, $45, $47, $55, $56
+
+Cavern_Coll::
+	coll_tiles $05, $15, $18, $1a, $20, $21, $22, $2a, $2d, $30
+
+	coll_tiles ; unused
+
+Lobby_Coll::
+	coll_tiles $14, $17, $1a, $1c, $20, $38, $45
+
+Mansion_Coll::
+	coll_tiles $01, $05, $11, $12, $14, $1a, $1c, $2c, $53
+
+Lab_Coll::
+	coll_tiles $0c, $26, $16, $1e, $34, $37
+
+Club_Coll::
+	coll_tiles $0f, $1a, $1f, $26, $28, $29, $2c, $2d, $2e, $2f, $41
+
+Facility_Coll::
+	coll_tiles $01, $10, $11, $13, $1b, $20, $21, $22, $30, $31, $32, $42, $43, $48, $52, $55, $58, $5e
+
+Plateau_Coll::
+	coll_tiles $1b, $23, $2c, $2d, $3b, $45
+
+BeachHouse_Coll::
+	coll_tiles $01, $11, $12, $14
diff --git a/data/tilesets/cut_tree_blocks.asm b/data/tilesets/cut_tree_blocks.asm
new file mode 100644
index 00000000..ddbe28fc
--- /dev/null
+++ b/data/tilesets/cut_tree_blocks.asm
@@ -0,0 +1,13 @@
+CutTreeBlockSwaps:
+	; first byte = tileset block containing the cut tree
+	; second byte = corresponding tileset block after the cut animation happens
+	db $32, $6D
+	db $33, $6C
+	db $34, $6F
+	db $35, $4C
+	db $60, $6E
+	db $0B, $0A
+	db $3C, $35
+	db $3F, $35
+	db $3D, $36
+	db -1 ; end
diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm
new file mode 100644
index 00000000..5fca7114
--- /dev/null
+++ b/data/tilesets/door_tile_ids.asm
@@ -0,0 +1,60 @@
+DoorTileIDPointers:
+	dbw OVERWORLD,   .OverworldDoorTileIDs
+	dbw FOREST,      .ForestDoorTileIDs
+	dbw MART,        .MartDoorTileIDs
+	dbw HOUSE,       .HouseDoorTileIDs
+	dbw FOREST_GATE, .TilesetMuseumDoorTileIDs
+	dbw MUSEUM,      .TilesetMuseumDoorTileIDs
+	dbw GATE,        .TilesetMuseumDoorTileIDs
+	dbw SHIP,        .ShipDoorTileIDs
+	dbw LOBBY,       .LobbyDoorTileIDs
+	dbw MANSION,     .MansionDoorTileIDs
+	dbw LAB,         .LabDoorTileIDs
+	dbw FACILITY,    .FacilityDoorTileIDs
+	dbw PLATEAU,     .PlateauDoorTileIDs
+	dbw INTERIOR,    .InteriorDoorTileIDs
+	db -1 ; end
+
+door_tiles: MACRO
+REPT _NARG
+	db \1
+	shift
+ENDR
+	db 0 ; end
+ENDM
+
+.OverworldDoorTileIDs:
+	door_tiles $1B, $58
+
+.ForestDoorTileIDs:
+	door_tiles $3a
+
+.MartDoorTileIDs:
+	door_tiles $5e
+
+.HouseDoorTileIDs:
+	door_tiles $54
+
+.TilesetMuseumDoorTileIDs:
+	door_tiles $3b
+
+.ShipDoorTileIDs:
+	door_tiles $1e
+
+.LobbyDoorTileIDs:
+	door_tiles $1c, $38, $1a
+
+.MansionDoorTileIDs:
+	door_tiles $1a, $1c, $53
+
+.LabDoorTileIDs:
+	door_tiles $34
+
+.FacilityDoorTileIDs:
+	door_tiles $43, $58, $1b
+
+.PlateauDoorTileIDs:
+	door_tiles $3b, $1b
+
+.InteriorDoorTileIDs:
+	door_tiles $04, $15
diff --git a/data/tilesets/dungeon_tilesets.asm b/data/tilesets/dungeon_tilesets.asm
new file mode 100755
index 00000000..2af36696
--- /dev/null
+++ b/data/tilesets/dungeon_tilesets.asm
@@ -0,0 +1,13 @@
+DungeonTilesets:
+	db FOREST
+	db MUSEUM
+	db SHIP
+	db CAVERN
+	db LOBBY
+	db MANSION
+	db GATE
+	db LAB
+	db FACILITY
+	db CEMETERY
+	db GYM
+	db -1 ; end
diff --git a/data/tilesets/escape_rope_tilesets.asm b/data/tilesets/escape_rope_tilesets.asm
new file mode 100644
index 00000000..6a40089c
--- /dev/null
+++ b/data/tilesets/escape_rope_tilesets.asm
@@ -0,0 +1,7 @@
+EscapeRopeTilesets:
+	db FOREST
+	db CEMETERY
+	db CAVERN
+	db FACILITY
+	db INTERIOR
+	db -1 ; end
diff --git a/data/tilesets/ledge_tiles.asm b/data/tilesets/ledge_tiles.asm
new file mode 100644
index 00000000..db293800
--- /dev/null
+++ b/data/tilesets/ledge_tiles.asm
@@ -0,0 +1,11 @@
+LedgeTiles:
+	; player direction, tile player standing on, ledge tile, input required
+	db SPRITE_FACING_DOWN,  $2C, $37, D_DOWN
+	db SPRITE_FACING_DOWN,  $39, $36, D_DOWN
+	db SPRITE_FACING_DOWN,  $39, $37, D_DOWN
+	db SPRITE_FACING_LEFT,  $2C, $27, D_LEFT
+	db SPRITE_FACING_LEFT,  $39, $27, D_LEFT
+	db SPRITE_FACING_RIGHT, $2C, $0D, D_RIGHT
+	db SPRITE_FACING_RIGHT, $2C, $1D, D_RIGHT
+	db SPRITE_FACING_RIGHT, $39, $0D, D_RIGHT
+	db -1 ; end
diff --git a/data/tilesets/pair_collision_tile_ids.asm b/data/tilesets/pair_collision_tile_ids.asm
new file mode 100644
index 00000000..84869556
--- /dev/null
+++ b/data/tilesets/pair_collision_tile_ids.asm
@@ -0,0 +1,24 @@
+; FORMAT: tileset number, tile 1, tile 2
+; terminated by -1
+; these entries indicate that the player may not cross between tile 1 and tile 2
+; it's mainly used to simulate differences in elevation
+
+TilePairCollisionsLand::
+	db CAVERN, $20, $05
+	db CAVERN, $41, $05
+	db FOREST, $30, $2E
+	db CAVERN, $2A, $05
+	db CAVERN, $05, $21
+	db FOREST, $52, $2E
+	db FOREST, $55, $2E
+	db FOREST, $56, $2E
+	db FOREST, $20, $2E
+	db FOREST, $5E, $2E
+	db FOREST, $5F, $2E
+	db -1 ; end
+
+TilePairCollisionsWater::
+	db FOREST, $14, $2E
+	db FOREST, $48, $2E
+	db CAVERN, $14, $05
+	db -1 ; end
diff --git a/data/tilesets/spinner_tiles.asm b/data/tilesets/spinner_tiles.asm
new file mode 100644
index 00000000..82506b6d
--- /dev/null
+++ b/data/tilesets/spinner_tiles.asm
@@ -0,0 +1,29 @@
+spinner: MACRO
+; \1: source
+; \2: offset (BANK() chokes on literals)
+; \3: dest
+	dw \1 tile \2
+	db 1
+	db BANK(\1)
+	dw vTileset tile \3
+ENDM
+
+FacilitySpinnerArrows:
+	spinner SpinnerArrowAnimTiles, 0,   $20
+	spinner SpinnerArrowAnimTiles, 1,   $21
+	spinner SpinnerArrowAnimTiles, 2,   $30
+	spinner SpinnerArrowAnimTiles, 3,   $31
+	spinner Facility_GFX,          $20, $20
+	spinner Facility_GFX,          $21, $21
+	spinner Facility_GFX,          $30, $30
+	spinner Facility_GFX,          $31, $31
+
+GymSpinnerArrows:
+	spinner SpinnerArrowAnimTiles, 1,   $3c
+	spinner SpinnerArrowAnimTiles, 3,   $3d
+	spinner SpinnerArrowAnimTiles, 0,   $4c
+	spinner SpinnerArrowAnimTiles, 2,   $4d
+	spinner Gym_GFX,               $3c, $3c
+	spinner Gym_GFX,               $3d, $3d
+	spinner Gym_GFX,               $4c, $4c
+	spinner Gym_GFX,               $4d, $4d
diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm
new file mode 100755
index 00000000..4e055591
--- /dev/null
+++ b/data/tilesets/tileset_headers.asm
@@ -0,0 +1,35 @@
+tileset: MACRO
+	db BANK(\2)   ; BANK(GFX)
+	dw \1, \2, \3 ; Block, GFX, Coll
+	db \4, \5, \6 ; counter tiles
+	db \7         ; grass tile
+	db \8         ; permission (indoor, cave, outdoor)
+ENDM
+
+Tilesets:
+	; block, gfx, coll, 3 counter tiles, grass tile, permission
+	tileset Overworld_Block,   Overworld_GFX,   Overworld_Coll,   $FF,$FF,$FF, $52, OUTDOOR
+	tileset RedsHouse1_Block,  RedsHouse1_GFX,  RedsHouse1_Coll,  $FF,$FF,$FF, $FF, INDOOR
+	tileset Mart_Block,        Mart_GFX,        Mart_Coll,        $18,$19,$1E, $FF, INDOOR
+	tileset Forest_Block,      Forest_GFX,      Forest_Coll,      $FF,$FF,$FF, $20, CAVE
+	tileset RedsHouse2_Block,  RedsHouse2_GFX,  RedsHouse2_Coll,  $FF,$FF,$FF, $FF, INDOOR
+	tileset Dojo_Block,        Dojo_GFX,        Dojo_Coll,        $3A,$FF,$FF, $FF, OUTDOOR
+	tileset Pokecenter_Block,  Pokecenter_GFX,  Pokecenter_Coll,  $18,$19,$1E, $FF, INDOOR
+	tileset Gym_Block,         Gym_GFX,         Gym_Coll,         $3A,$FF,$FF, $FF, OUTDOOR
+	tileset House_Block,       House_GFX,       House_Coll,       $FF,$FF,$FF, $FF, INDOOR
+	tileset ForestGate_Block,  ForestGate_GFX,  ForestGate_Coll,  $17,$32,$FF, $FF, INDOOR
+	tileset Museum_Block,      Museum_GFX,      Museum_Coll,      $17,$32,$FF, $FF, INDOOR
+	tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR
+	tileset Gate_Block,        Gate_GFX,        Gate_Coll,        $17,$32,$FF, $FF, INDOOR
+	tileset Ship_Block,        Ship_GFX,        Ship_Coll,        $FF,$FF,$FF, $FF, CAVE
+	tileset ShipPort_Block,    ShipPort_GFX,    ShipPort_Coll,    $FF,$FF,$FF, $FF, CAVE
+	tileset Cemetery_Block,    Cemetery_GFX,    Cemetery_Coll,    $12,$FF,$FF, $FF, INDOOR
+	tileset Interior_Block,    Interior_GFX,    Interior_Coll,    $FF,$FF,$FF, $FF, INDOOR
+	tileset Cavern_Block,      Cavern_GFX,      Cavern_Coll,      $FF,$FF,$FF, $FF, CAVE
+	tileset Lobby_Block,       Lobby_GFX,       Lobby_Coll,       $15,$36,$FF, $FF, INDOOR
+	tileset Mansion_Block,     Mansion_GFX,     Mansion_Coll,     $FF,$FF,$FF, $FF, INDOOR
+	tileset Lab_Block,         Lab_GFX,         Lab_Coll,         $FF,$FF,$FF, $FF, INDOOR
+	tileset Club_Block,        Club_GFX,        Club_Coll,        $07,$17,$FF, $FF, INDOOR
+	tileset Facility_Block,    Facility_GFX,    Facility_Coll,    $12,$FF,$FF, $FF, CAVE
+	tileset Plateau_Block,     Plateau_GFX,     Plateau_Coll,     $FF,$FF,$FF, $45, CAVE
+	tileset BeachHouse_Block,  BeachHouse_GFX,  BeachHouse_Coll,  $FF,$FF,$FF, $FF, INDOOR
diff --git a/data/tilesets/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm
new file mode 100644
index 00000000..be327599
--- /dev/null
+++ b/data/tilesets/warp_carpet_tile_ids.asm
@@ -0,0 +1,25 @@
+WarpTileListPointers:
+	dw .FacingDownWarpTiles
+	dw .FacingUpWarpTiles
+	dw .FacingLeftWarpTiles
+	dw .FacingRightWarpTiles
+
+warp_carpet_tiles: MACRO
+REPT _NARG
+	db \1
+	shift
+ENDR
+	db -1 ; end
+ENDM
+
+.FacingDownWarpTiles:
+	warp_carpet_tiles $01, $12, $17, $3D, $04, $18, $33
+
+.FacingUpWarpTiles:
+	warp_carpet_tiles $01, $5C
+
+.FacingLeftWarpTiles:
+	warp_carpet_tiles $1A, $4B
+
+.FacingRightWarpTiles:
+	warp_carpet_tiles $0F, $4E
diff --git a/data/tilesets/warp_pad_hole_tile_ids.asm b/data/tilesets/warp_pad_hole_tile_ids.asm
new file mode 100644
index 00000000..e12b3735
--- /dev/null
+++ b/data/tilesets/warp_pad_hole_tile_ids.asm
@@ -0,0 +1,7 @@
+WarpPadAndHoleData:
+	; tileset id, tile id, value for [wStandingOnWarpPadOrHole]
+	db FACILITY, $20, 1 ; warp pad
+	db FACILITY, $11, 2 ; hole
+	db CAVERN,   $22, 2 ; hole
+	db INTERIOR, $55, 1 ; warp pad
+	db -1 ; end
diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm
new file mode 100755
index 00000000..7c207e27
--- /dev/null
+++ b/data/tilesets/warp_tile_ids.asm
@@ -0,0 +1,97 @@
+WarpTileIDPointers:
+	dw .OverworldWarpTileIDs
+	dw .RedsHouse1WarpTileIDs
+	dw .MartWarpTileIDs
+	dw .ForestWarpTileIDs
+	dw .RedsHouse2WarpTileIDs
+	dw .DojoWarpTileIDs
+	dw .PokecenterWarpTileIDs
+	dw .GymWarpTileIDs
+	dw .HouseWarpTileIDs
+	dw .ForestGateWarpTileIDs
+	dw .MuseumWarpTileIDs
+	dw .UndergroundWarpTileIDs
+	dw .GateWarpTileIDs
+	dw .ShipWarpTileIDs
+	dw .ShipPortWarpTileIDs
+	dw .CemeteryWarpTileIDs
+	dw .InteriorWarpTileIDs
+	dw .CavernWarpTileIDs
+	dw .LobbyWarpTileIDs
+	dw .MansionWarpTileIDs
+	dw .LabWarpTileIDs
+	dw .ClubWarpTileIDs
+	dw .FacilityWarpTileIDs
+	dw .PlateauWarpTileIDs
+	dw .BeachHouseWarpTileIDs
+
+warp_tiles: MACRO
+REPT _NARG
+	db \1
+	shift
+ENDR
+	db -1 ; end
+ENDM
+
+.OverworldWarpTileIDs:
+	warp_tiles $1B, $58
+
+.ForestGateWarpTileIDs:
+.MuseumWarpTileIDs:
+.GateWarpTileIDs:
+	db $3B
+	; fallthrough
+.RedsHouse1WarpTileIDs:
+.RedsHouse2WarpTileIDs:
+	warp_tiles $1A, $1C
+
+.MartWarpTileIDs:
+.PokecenterWarpTileIDs:
+	warp_tiles $5E
+
+.ForestWarpTileIDs:
+	warp_tiles $5A, $5C, $3A
+
+.DojoWarpTileIDs:
+.GymWarpTileIDs:
+	warp_tiles $4A
+
+.HouseWarpTileIDs:
+	warp_tiles $54, $5C, $32
+
+.ShipWarpTileIDs:
+	warp_tiles $37, $39, $1E, $4A
+
+.InteriorWarpTileIDs:
+	warp_tiles $15, $55, $04
+
+.CavernWarpTileIDs:
+	warp_tiles $18, $1A, $22
+
+.LobbyWarpTileIDs:
+	warp_tiles $1A, $1C, $38
+
+.MansionWarpTileIDs:
+	warp_tiles $1A, $1C, $53
+
+.LabWarpTileIDs:
+	warp_tiles $34
+
+.FacilityWarpTileIDs:
+	db $43, $58, $20
+	; fallthrough
+.CemeteryWarpTileIDs:
+	db $1B
+	; fallthrough
+.UndergroundWarpTileIDs:
+	warp_tiles $13
+
+.PlateauWarpTileIDs:
+	db $1B, $3B
+	; fallthrough
+.ShipPortWarpTileIDs:
+.ClubWarpTileIDs:
+	warp_tiles
+
+.BeachHouseWarpTileIDs:
+	warp_tiles ; end
diff --git a/data/tilesets/water_tilesets.asm b/data/tilesets/water_tilesets.asm
new file mode 100644
index 00000000..8abdce39
--- /dev/null
+++ b/data/tilesets/water_tilesets.asm
@@ -0,0 +1,12 @@
+; tilesets with water
+WaterTilesets:
+	db OVERWORLD
+	db FOREST
+	db DOJO
+	db GYM
+	db SHIP
+	db SHIP_PORT
+	db CAVERN
+	db FACILITY
+	db PLATEAU
+	db -1 ; end