summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-08-01 16:58:30 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-08-01 16:58:30 -0400
commitc1c7ac6826a5033fb06bc1b551bdd7bf4f806e50 (patch)
tree01ae490308033e3a7fd7855afabc1e69d69cf127 /data
parentad3fca33d3532f5dcffd22e5b88d3169675f43d0 (diff)
Attempt to make Yellow buildable, part 2.
Diffstat (limited to 'data')
-rwxr-xr-xdata/force_bike_surf.asm2
-rwxr-xr-xdata/warp_tile_ids.asm56
2 files changed, 31 insertions, 27 deletions
diff --git a/data/force_bike_surf.asm b/data/force_bike_surf.asm
index 66cae0a4..71c2c0cc 100755
--- a/data/force_bike_surf.asm
+++ b/data/force_bike_surf.asm
@@ -1,4 +1,4 @@
-ForcedBikeOrSurfMaps: ; c3e6 (3:43e6)
+ForcedBikeOrSurfMaps: ; c12f (3:412f)
; map id, y, x
db ROUTE_16,$0A,$11
db ROUTE_16,$0B,$11
diff --git a/data/warp_tile_ids.asm b/data/warp_tile_ids.asm
index aa725d00..1e40c9ce 100755
--- a/data/warp_tile_ids.asm
+++ b/data/warp_tile_ids.asm
@@ -1,4 +1,4 @@
-WarpTileIDPointers: ; c4cc (3:44cc)
+WarpTileIDPointers: ; c215 (3:4215)
dw OverworldWarpTileIDs
dw RedsHouse1WarpTileIDs
dw MartWarpTileIDs
@@ -23,63 +23,67 @@ WarpTileIDPointers: ; c4cc (3:44cc)
dw ClubWarpTileIDs
dw FacilityWarpTileIDs
dw PlateauWarpTileIDs
-
-OverworldWarpTileIDs: ; c4fc (3:44fc)
+ dw BeachHouseWarpTileIDs
+
+OverworldWarpTileIDs: ; c247 (3:4247)
db $1B,$58,$FF
-ForestGateWarpTileIDs: ; c4ff (3:44ff)
-MuseumWarpTileIDs: ; c4ff (3:44ff)
-GateWarpTileIDs: ; c4ff (3:44ff)
+ForestGateWarpTileIDs: ; c24a (3:424a)
+MuseumWarpTileIDs: ; c24a (3:424a)
+GateWarpTileIDs: ; c24a (3:424a)
db $3B
-RedsHouse1WarpTileIDs: ; c500 (3:4500)
-RedsHouse2WarpTileIDs: ; c500 (3:4500)
+RedsHouse1WarpTileIDs: ; c24b (3:424b)
+RedsHouse2WarpTileIDs: ; c24b (3:424b)
db $1A,$1C,$FF
-MartWarpTileIDs: ; c503 (3:4503)
-PokecenterWarpTileIDs: ; c503 (3:4503)
+MartWarpTileIDs: ; c24e (3:424e)
+PokecenterWarpTileIDs: ; c24e (3:424e)
db $5E,$FF
-ForestWarpTileIDs: ; c505 (3:4505)
+ForestWarpTileIDs: ; c250 (3:4250)
db $5A,$5C,$3A,$FF
-DojoWarpTileIDs: ; c509 (3:4509)
-GymWarpTileIDs: ; c509 (3:4509)
+DojoWarpTileIDs: ; c254 (3:4254)
+GymWarpTileIDs: ; c254 (3:4254)
db $4A,$FF
-HouseWarpTileIDs: ; c50b (3:450b)
+HouseWarpTileIDs: ; c256 (3:4256)
db $54,$5C,$32,$FF
-ShipWarpTileIDs: ; c50f (3:450f)
+ShipWarpTileIDs: ; c25a (3:425a)
db $37,$39,$1E,$4A,$FF
-InteriorWarpTileIDs: ; c514 (3:4514)
+InteriorWarpTileIDs: ; c25f (3:425f)
db $15,$55,$04,$FF
-CavernWarpTileIDs: ; c518 (3:4518)
+CavernWarpTileIDs: ; c263 (3:4263)
db $18,$1A,$22,$FF
-LobbyWarpTileIDs: ; c51c (3:451c)
+LobbyWarpTileIDs: ; c267 (3:4267)
db $1A,$1C,$38,$FF
-MansionWarpTileIDs: ; c520 (3:4520)
+MansionWarpTileIDs: ; c26b (3:426b)
db $1A,$1C,$53,$FF
-LabWarpTileIDs: ; c524 (3:4524)
+LabWarpTileIDs: ; c26f (3:426f)
db $34,$FF
-FacilityWarpTileIDs: ; c526 (3:4526)
+FacilityWarpTileIDs: ; c271 (3:4571)
db $43,$58,$20
-CemeteryWarpTileIDs: ; c529 (3:4529)
+CemeteryWarpTileIDs: ; c274 (3:4274)
db $1B
-UndergroundWarpTileIDs: ; c52a (3:452a)
+UndergroundWarpTileIDs: ; c275 (3:4275)
db $13,$FF
-PlateauWarpTileIDs: ; c52c (3:452c)
+PlateauWarpTileIDs: ; c277 (3:4277)
db $1B,$3B
-ShipPortWarpTileIDs: ; c52e (3:452e)
-ClubWarpTileIDs: ; c52e (3:452e)
+ShipPortWarpTileIDs: ; c279 (3:4279)
+ClubWarpTileIDs: ; c279 (3:4279)
db $FF
+
+BeachHouseWarpTileIDs: ; c27a (3:427a)
+ db $FF \ No newline at end of file