Merge pull request #250 from Rangi42/master

Move more tables from engine/ to data/

7 files changed, 13 insertions, 109 deletions

diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm
index f6ae6468..f61ca65f 100755
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
@@ -248,16 +248,4 @@ ReplaceTreeTileBlock:
 	ld [hl], a
 	ret
 
-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 $FF ; list terminator
+INCLUDE "data/cut_tree_blocks.asm"
diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm
index c39e096d..1339430a 100755
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -25,51 +25,4 @@ IsPlayerStandingOnDoorTile:
 	and a
 	ret
 
-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
-	db $ff
-
-OverworldDoorTileIDs:
-	db $1B,$58,$00
-
-ForestDoorTileIDs:
-	db $3a,$00
-
-MartDoorTileIDs:
-	db $5e,$00
-
-HouseDoorTileIDs:
-	db $54,$00
-
-TilesetMuseumDoorTileIDs:
-	db $3b,$00
-
-ShipDoorTileIDs:
-	db $1e,$00
-
-LobbyDoorTileIDs:
-	db $1c,$38,$1a,$00
-
-MansionDoorTileIDs:
-	db $1a,$1c,$53,$00
-
-LabDoorTileIDs:
-	db $34,$00
-
-FacilityDoorTileIDs:
-	db $43,$58,$1b,$00
-
-PlateauDoorTileIDs:
-	db $3b,$1b,$00
+INCLUDE "data/door_tile_ids.asm"
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index 342540b2..77e7bd47 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -54,17 +54,7 @@ HandleLedges:
 	call PlaySound
 	ret
 
-	; (player direction) (tile player standing on) (ledge tile) (input required)
-LedgeTiles:
-	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 $FF
+INCLUDE "data/ledge_tiles.asm"
 
 LoadHoppingShadowOAM:
 	ld hl, vChars1 + $7f0
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index a17e67bd..0f17de8f 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -349,7 +349,7 @@ GetPlayerTeleportAnimFrameDelay:
 
 IsPlayerStandingOnWarpPadOrHole:
 	ld b, 0
-	ld hl, .warpPadAndHoleData
+	ld hl, WarpPadAndHoleData
 	ld a, [wCurMapTileset]
 	ld c, a
 .loop
@@ -373,13 +373,7 @@ IsPlayerStandingOnWarpPadOrHole:
 	ld [wStandingOnWarpPadOrHole], a
 	ret
 
-; format: db tileset id, tile id, value to be put in [wStandingOnWarpPadOrHole]
-.warpPadAndHoleData:
-	db FACILITY, $20, 1 ; warp pad
-	db FACILITY, $11, 2 ; hole
-	db CAVERN,   $22, 2 ; hole
-	db INTERIOR, $55, 1 ; warp pad
-	db $FF
+INCLUDE "data/warp_pad_hole_tile_ids.asm"
 
 FishingAnim:
 	ld c, 10
diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm
index 73c55da2..ba47f7eb 100644
--- a/engine/overworld/player_state.asm
+++ b/engine/overworld/player_state.asm
@@ -157,12 +157,12 @@ IsWarpTileInFrontOfPlayer:
 	call _GetTileAndCoordsInFrontOfPlayer
 	ld a, [wCurMap]
 	cp SS_ANNE_BOW
-	jr z, .ssAnne5
+	jr z, IsSSAnneBowWarpTileInFrontOfPlayer
 	ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction
 	srl a
 	ld c, a
 	ld b, 0
-	ld hl, .warpTileListPointers
+	ld hl, WarpTileListPointers
 	add hl, bc
 	ld a, [hli]
 	ld h, [hl]
@@ -176,33 +176,17 @@ IsWarpTileInFrontOfPlayer:
 	pop hl
 	ret
 
-.warpTileListPointers:
-	dw .facingDownWarpTiles
-	dw .facingUpWarpTiles
-	dw .facingLeftWarpTiles
-	dw .facingRightWarpTiles
+INCLUDE "data/warp_carpet_tile_ids.asm"
 
-.facingDownWarpTiles
-	db $01,$12,$17,$3D,$04,$18,$33,$FF
-
-.facingUpWarpTiles
-	db $01,$5C,$FF
-
-.facingLeftWarpTiles
-	db $1A,$4B,$FF
-
-.facingRightWarpTiles
-	db $0F,$4E,$FF
-
-.ssAnne5
+IsSSAnneBowWarpTileInFrontOfPlayer:
 	ld a, [wTileInFrontOfPlayer]
 	cp $15
 	jr nz, .notSSAnne5Warp
 	scf
-	jr .done
+	jr IsWarpTileInFrontOfPlayer.done
 .notSSAnne5Warp
 	and a
-	jr .done
+	jr IsWarpTileInFrontOfPlayer.done
 
 IsPlayerStandingOnDoorTileOrWarpTile:
 	push hl
diff --git a/engine/overworld/saffron_guards.asm b/engine/overworld/saffron_guards.asm
index 3b26b6f8..92d4847f 100755
--- a/engine/overworld/saffron_guards.asm
+++ b/engine/overworld/saffron_guards.asm
@@ -12,5 +12,4 @@ RemoveGuardDrink:
 	jr z, .drinkLoop
 	jpba RemoveItemByID
 
-GuardDrinksList:
-	db FRESH_WATER, SODA_POP, LEMONADE, $00
+INCLUDE "data/guard_drink_items.asm"
diff --git a/engine/overworld/set_blackout_map.asm b/engine/overworld/set_blackout_map.asm
index bac2f0ca..14f0ba28 100644
--- a/engine/overworld/set_blackout_map.asm
+++ b/engine/overworld/set_blackout_map.asm
@@ -22,8 +22,4 @@ SetLastBlackoutMap:
 	pop hl
 	ret
 
-SafariZoneRestHouses:
-	db SAFARI_ZONE_WEST_REST_HOUSE
-	db SAFARI_ZONE_EAST_REST_HOUSE
-	db SAFARI_ZONE_NORTH_REST_HOUSE
-	db -1
+INCLUDE "data/rest_house_maps.asm"