5 files changed, 15 insertions, 93 deletions
diff --git a/engine/evolve_trade.asm b/engine/evolve_trade.asm
deleted file mode 100755
index 81e41166..00000000
--- a/engine/evolve_trade.asm
+++ /dev/null
@@ -1,44 +0,0 @@
-EvolveTradeMon: ; 17d7d (5:7d7d)
-; Verify the TradeMon's species name before
-; attempting to initiate a trade evolution.
-
-; The names of the trade evolutions in Blue (JP)
-; are checked. In that version, TradeMons that
-; can evolve are Graveler and Haunter.
-
-; In localization, this check was translated
-; before monster names were finalized.
-; Then, Haunter's name was "Spectre".
-; Since its name no longer starts with
-; "SP", it is prevented from evolving.
-
-; This may have been why Red/Green's trades
-; were used instead, where none can evolve.
-
-; This was fixed in Yellow.
-
-	ld a, [wInGameTradeReceiveMonName]
-
-	; GRAVELER
-	cp "G"
-	jr z, .ok
-
-	; "SPECTRE" (HAUNTER)
-	cp "S"
-	ret nz
-	ld a, [wInGameTradeReceiveMonName + 1]
-	cp "P"
-	ret nz
-
-.ok
-	ld a, [wPartyCount]
-	dec a
-	ld [wWhichPokemon], a
-	ld a, $1
-	ld [wForceEvolution], a
-	ld a, LINK_STATE_TRADING
-	ld [wLinkState], a
-	callab TryEvolvingMon
-	xor a ; LINK_STATE_NONE
-	ld [wLinkState], a
-	jp PlayDefaultMusic
diff --git a/engine/overworld/is_player_just_outside_map.asm b/engine/overworld/is_player_just_outside_map.asm
index e9ba204a..19823c53 100644
--- a/engine/overworld/is_player_just_outside_map.asm
+++ b/engine/overworld/is_player_just_outside_map.asm
@@ -1,5 +1,5 @@
 ; returns whether the player is one tile outside the map in Z
-IsPlayerJustOutsideMap: ; 128d8 (4:68d8)
+IsPlayerJustOutsideMap: ; e876c (3a:476c)
 	ld a, [wYCoord]
 	ld b, a
 	ld a, [wCurMapHeight]
diff --git a/engine/predefs17.asm b/engine/predefs17.asm
index a674b45a..49818543 100755
--- a/engine/predefs17.asm
+++ b/engine/predefs17.asm
@@ -1,9 +1,15 @@
-; this function temporarily makes the starters (and Ivysaur) seen
-; so that the full Pokedex information gets displayed in Oak's lab
-StarterDex: ; 5c0dc (17:40dc)
-	ld a, %01001011 ; set starter flags
-	ld [wPokedexOwned], a
-	predef ShowPokedexData
-	xor a ; unset starter flags
-	ld [wPokedexOwned], a
+; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in wd11e
+SetPartyMonTypes: ; 5db93 (17:5b93)
+	call GetPredefRegisters
+	ld bc, wPartyMon1Type - wPartyMon1 ; $5
+	add hl, bc
+	ld a, [wd11e]
+	ld [wd0b5], a
+	push hl
+	call GetMonHeader
+	pop hl
+	ld a, [wMonHType1]
+	ld [hli], a
+	ld a, [wMonHType2]
+	ld [hl], a
 	ret
diff --git a/engine/predefs17_2.asm b/engine/predefs17_2.asm
deleted file mode 100755
index c0df7d0a..00000000
--- a/engine/predefs17_2.asm
+++ /dev/null
@@ -1,15 +0,0 @@
-; updates the types of a party mon (pointed to in hl) to the ones of the mon specified in wd11e
-SetPartyMonTypes: ; 5db5e (17:5b5e)
-	call GetPredefRegisters
-	ld bc, wPartyMon1Type - wPartyMon1 ; $5
-	add hl, bc
-	ld a, [wd11e]
-	ld [wd0b5], a
-	push hl
-	call GetMonHeader
-	pop hl
-	ld a, [wMonHType1]
-	ld [hli], a
-	ld a, [wMonHType2]
-	ld [hl], a
-	ret
diff --git a/engine/turn_sprite.asm b/engine/turn_sprite.asm
deleted file mode 100755
index 84037cfe..00000000
--- a/engine/turn_sprite.asm
+++ /dev/null
@@ -1,25 +0,0 @@
-UpdateSpriteFacingOffsetAndDelayMovement: ; 13074 (4:7074)
-	ld h, $c2
-	ld a, [H_CURRENTSPRITEOFFSET]
-	add $8
-	ld l, a
-	ld a, $7f ; maximum movement delay
-	ld [hl], a ; c2x8 (movement delay)
-	dec h
-	ld a, [H_CURRENTSPRITEOFFSET]
-	add $9
-	ld l, a
-	ld a, [hld] ; c1x9 (facing direction)
-	ld b, a
-	xor a
-	ld [hld], a
-	ld [hl], a ; c1x8 (walk animation frame)
-	ld a, [H_CURRENTSPRITEOFFSET]
-	add $2
-	ld l, a
-	ld a, [hl] ; c1x2 (facing and animation table offset)
-	or b ; or in the facing direction
-	ld [hld], a
-	ld a, $2 ; delayed movement status
-	ld [hl], a ; c1x1 (movement status)
-	ret