Ledges

3 files changed, 38 insertions, 47 deletions

diff --git a/engine/overworld/doors.asm b/engine/overworld/doors.asm
index 6b0c0464..99e07174 100755
--- a/engine/overworld/doors.asm
+++ b/engine/overworld/doors.asm
@@ -25,33 +25,21 @@ IsPlayerStandingOnDoorTile: ; 1a609 (6:6609)
 	and a
 	ret
 
-DoorTileIDPointers: ; 1a62c (6:662c)
-	db OVERWORLD
-	dw OverworldDoorTileIDs
-	db FOREST
-	dw ForestDoorTileIDs
-	db MART
-	dw MartDoorTileIDs
-	db HOUSE
-	dw HouseDoorTileIDs
-	db FOREST_GATE
-	dw TilesetMuseumDoorTileIDs
-	db MUSEUM
-	dw TilesetMuseumDoorTileIDs
-	db GATE
-	dw TilesetMuseumDoorTileIDs
-	db SHIP
-	dw ShipDoorTileIDs
-	db LOBBY
-	dw LobbyDoorTileIDs
-	db MANSION
-	dw MansionDoorTileIDs
-	db LAB
-	dw LabDoorTileIDs
-	db FACILITY
-	dw FacilityDoorTileIDs
-	db PLATEAU
-	dw PlateauDoorTileIDs
+DoorTileIDPointers: ; 1a7a8 (6:67a8)
+	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 $ff
 
 OverworldDoorTileIDs: ; 1a654 (6:6654)
@@ -72,17 +60,20 @@ TilesetMuseumDoorTileIDs: ; 1a65d (6:665d)
 ShipDoorTileIDs: ; 1a65f (6:665f)
 	db $1e,$00
 
-LobbyDoorTileIDs: ; 1a661 (6:6661)
+LobbyDoorTileIDs: ; 1a7e0 (6:67e0)
 	db $1c,$38,$1a,$00
 
-MansionDoorTileIDs: ; 1a665 (6:6665)
+MansionDoorTileIDs: ; 1a7e4 (6:67e4)
 	db $1a,$1c,$53,$00
 
-LabDoorTileIDs: ; 1a669 (6:6669)
+LabDoorTileIDs: ; 1a7e8 (6:67e8)
 	db $34,$00
 
-FacilityDoorTileIDs: ; 1a66b (6:666b)
+FacilityDoorTileIDs: ; 1a7ea (6:67ea)
 	db $43,$58,$1b,$00
 
-PlateauDoorTileIDs: ; 1a66f (6:666f)
+PlateauDoorTileIDs: ; 1a7ee (6:67ee)
 	db $3b,$1b,$00
+
+InteriorDoorTileIDs: ; 1a7f1 (6:67f1)
+	db $04,$15,$00
diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm
index b04f6332..a6ebd9be 100755
--- a/engine/overworld/ledges.asm
+++ b/engine/overworld/ledges.asm
@@ -1,4 +1,4 @@
-HandleLedges: ; 1a672 (6:6672)
+HandleLedges: ; 1a7f4 (6:67f4)
 	ld a, [wd736]
 	bit 6, a ; already jumping down ledge
 	ret nz
@@ -55,7 +55,7 @@ HandleLedges: ; 1a672 (6:6672)
 	ret
 
 	; (player direction) (tile player standing on) (ledge tile) (input required)
-LedgeTiles: ; 1a6cf (6:66cf)
+LedgeTiles: ; 1a851 (6:6851)
 	db SPRITE_FACING_DOWN, $2C,$37,D_DOWN
 	db SPRITE_FACING_DOWN, $39,$36,D_DOWN
 	db SPRITE_FACING_DOWN, $39,$37,D_DOWN
@@ -66,21 +66,25 @@ LedgeTiles: ; 1a6cf (6:66cf)
 	db SPRITE_FACING_RIGHT,$39,$0D,D_RIGHT
 	db $FF
 
-LoadHoppingShadowOAM: ; 1a6f0 (6:66f0)
+LoadHoppingShadowOAM: ; 1a872 (6:6872)
 	ld hl, vChars1 + $7f0
 	ld de, LedgeHoppingShadow
 	lb bc, BANK(LedgeHoppingShadow), (LedgeHoppingShadowEnd - LedgeHoppingShadow) / $8
 	call CopyVideoDataDouble
-	ld a, $9
-	lb bc, $54, $48 ; b, c = y, x coordinates of shadow
-	ld de, LedgeHoppingShadowOAM
-	call WriteOAMBlock
+	ld hl, LedgeHoppingShadowOAM
+	ld de, wOAMBuffer + 36 * 4
+	ld bc, LedgeHoppingShadowOAMEnd - LedgeHoppingShadowOAM
+	call CopyData
+	ld a, $a0
+	ld [wOAMBuffer + 38 * 4], a
+	ld [wOAMBuffer + 39 * 4], a
 	ret
 
-LedgeHoppingShadow: ; 1a708 (6:6708)
+LedgeHoppingShadow: ; 1a893 (6:6893)
 	INCBIN "gfx/ledge_hopping_shadow.1bpp"
 LedgeHoppingShadowEnd:
 
-LedgeHoppingShadowOAM: ; 1a710 (6:6710)
-	db $FF,$10,$FF,$20
-	db $FF,$40,$FF,$60
+LedgeHoppingShadowOAM: ; 1a89b (6:689b)
+	db $58,$48,$FF,$00
+	db $58,$50,$FF,$20
+LedgeHoppingShadowOAMEnd: ; 1a8a3 (6:68a3)
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm
index f474a14c..58eb6a47 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
@@ -268,7 +268,3 @@ RLEList_PewterGymGuy: ; 1a6cd8(6:66d8)
 	db $FF
 
 INCLUDE "engine/overworld/pewter_guys.asm"
-; PewterGuys:
-	; dr $1a66e5,$1a785
-IsPlayerStandingOnDoorTile: ; 1a785 (6:6785)
-	dr $1a785,$1a7f4