Merge pull request #50 from dannye/master

merge pokered

1 files changed, 0 insertions, 147 deletions

diff --git a/engine/overworld/special_warps.asm b/engine/overworld/special_warps.asm
deleted file mode 100644
index 4814e668..00000000
--- a/engine/overworld/special_warps.asm
+++ /dev/null
@@ -1,147 +0,0 @@
-SpecialWarpIn:
-	call LoadSpecialWarpData
-	predef LoadTilesetHeader
-	ld hl,wd732
-	bit 2,[hl] ; dungeon warp or fly warp?
-	res 2,[hl]
-	jr z,.next
-; if dungeon warp or fly warp
-	ld a,[wDestinationMap]
-	jr .next2
-.next
-	bit 1,[hl]
-	jr z,.next3
-	call EmptyFunc
-.next3
-	ld a,0
-.next2
-	ld b,a
-	ld a,[wd72d]
-	and a
-	jr nz,.next4
-	ld a,b
-.next4
-	ld hl,wd732
-	bit 4,[hl] ; dungeon warp?
-	ret nz
-; if not dungeon warp
-	ld [wLastMap],a
-	ret
-
-; gets the map ID, tile block map view pointer, tileset, and coordinates
-LoadSpecialWarpData:
-	ld a, [wd72d]
-	cp TRADE_CENTER
-	jr nz, .notTradeCenter
-	ld hl, TradeCenterSpec1
-	ld a, [hSerialConnectionStatus]
-	cp USING_INTERNAL_CLOCK ; which gameboy is clocking determines who is on the left and who is on the right
-	jr z, .copyWarpData
-	ld hl, TradeCenterSpec2
-	jr .copyWarpData
-.notTradeCenter
-	cp COLOSSEUM
-	jr nz, .notColosseum
-	ld hl, ColosseumSpec1
-	ld a, [hSerialConnectionStatus]
-	cp USING_INTERNAL_CLOCK
-	jr z, .copyWarpData
-	ld hl, ColosseumSpec2
-	jr .copyWarpData
-.notColosseum
-	ld a, [wd732]
-	bit 1, a
-	jr nz, .notFirstMap
-	bit 2, a
-	jr nz, .notFirstMap
-	ld hl, FirstMapSpec
-.copyWarpData
-	ld de, wCurMap
-	ld c, $7
-.copyWarpDataLoop
-	ld a, [hli]
-	ld [de], a
-	inc de
-	dec c
-	jr nz, .copyWarpDataLoop
-	ld a, [hli]
-	ld [wCurMapTileset], a
-	xor a
-	jr .done
-.notFirstMap
-	ld a, [wLastMap] ; this value is overwritten before it's ever read
-	ld hl, wd732
-	bit 4, [hl] ; used dungeon warp (jumped down hole/waterfall)?
-	jr nz, .usedDunegonWarp
-	bit 6, [hl] ; return to last pokemon center (or player's house)?
-	res 6, [hl]
-	jr z, .otherDestination
-; return to last pokemon center or player's house
-	ld a, [wLastBlackoutMap]
-	jr .usedFlyWarp
-.usedDunegonWarp
-	ld hl, wd72d
-	res 4, [hl]
-	ld a, [wDungeonWarpDestinationMap]
-	ld b, a
-	ld [wCurMap], a
-	ld a, [wWhichDungeonWarp]
-	ld c, a
-	ld hl, DungeonWarpList
-	ld de, 0
-	ld a, 6
-	ld [wDungeonWarpDataEntrySize], a
-.dungeonWarpListLoop
-	ld a, [hli]
-	cp b
-	jr z, .matchedDungeonWarpDestinationMap
-	inc hl
-	jr .nextDungeonWarp
-.matchedDungeonWarpDestinationMap
-	ld a, [hli]
-	cp c
-	jr z, .matchedDungeonWarpID
-.nextDungeonWarp
-	ld a, [wDungeonWarpDataEntrySize]
-	add e
-	ld e, a
-	jr .dungeonWarpListLoop
-.matchedDungeonWarpID
-	ld hl, DungeonWarpData
-	add hl, de
-	jr .copyWarpData2
-.otherDestination
-	ld a, [wDestinationMap]
-.usedFlyWarp
-	ld b, a
-	ld [wCurMap], a
-	ld hl, FlyWarpDataPtr
-.flyWarpDataPtrLoop
-	ld a, [hli]
-	inc hl
-	cp b
-	jr z, .foundFlyWarpMatch
-	inc hl
-	inc hl
-	jr .flyWarpDataPtrLoop
-.foundFlyWarpMatch
-	ld a, [hli]
-	ld h, [hl]
-	ld l, a
-.copyWarpData2
-	ld de, wCurrentTileBlockMapViewPointer
-	ld c, $6
-.copyWarpDataLoop2
-	ld a, [hli]
-	ld [de], a
-	inc de
-	dec c
-	jr nz, .copyWarpDataLoop2
-	xor a ; OVERWORLD
-	ld [wCurMapTileset], a
-.done
-	ld [wYOffsetSinceLastSpecialWarp], a
-	ld [wXOffsetSinceLastSpecialWarp], a
-	ld a, $ff ; the player's coordinates have already been updated using a special warp, so don't use any of the normal warps
-	ld [wDestinationWarpID], a
-	ret