Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/scawful/poltergeist
Browse files Browse the repository at this point in the history
  • Loading branch information
@JaredBrian
JaredBrian committed May 12, 2024
2 parents b27040a + a2f81d7 commit 0f7a6d8
Show file tree
Hide file tree
Showing 10 changed files with 1,538 additions and 84 deletions.
21 changes: 13 additions & 8 deletions CollectItemsWithSword.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
pushpc

org $86F725
JSL collectSword
JSL collectSword

pullpc

Expand All @@ -18,25 +18,30 @@ STA $09
LDA $79
BEQ $01
RTL
LDA $0E20,x

LDA $0E20, X
SEC
SBC #$D8
BCS $01
RTL
LDA $0E20,x

LDA $0E20, X
SEC
SBC #$E7
BCC $01
RTL

PHY
LDY $3C
BPL $02
PLY
RTL
LDA $F571,y

LDA $F571, Y
BEQ $02
PLY
RTL

PHX
LDA $2F
ASL A
Expand All @@ -49,7 +54,7 @@ INX
LDY #$00
LDA $45
CLC
ADC $F46D,x
ADC $F46D, X
BPL $01
DEY
CLC
Expand All @@ -61,7 +66,7 @@ STA $08
LDY #$00
LDA $44
CLC
ADC $F4EF,x
ADC $F4EF, X
BPL $01
DEY
CLC
Expand All @@ -70,9 +75,9 @@ STA $01
TYA
ADC $21
STA $09
LDA $F4AE,x
LDA $F4AE, X
STA $02
LDA $F530,x
LDA $F530, X
STA $03
PLX
PLY
Expand Down
24 changes: 22 additions & 2 deletions CollisionTables.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,31 @@ org $E9000
; 00 01 02 03 04 05 06
dw $0000, $0000, $0000, $0080, $0080, $0100, $0100
; 07 08 09 10 11 12 13
dw $0100, $0180, $0200, $0100, $0200, $0280, $0300
dw $0100, $0180, $0200, $0100, $0180, $0280, $0300
; 14 15 16 17 18 19 20
dw $0380, $0100, $0100, $0080, $0100, $0380, $0100


; Animated Tile Edits for Shadow Castle
; Room Blocksets 0; 1; 2; 9 (PC: $7102A > $710A9) (SNES: $E902A > $E90A9) - Group 00
; -----------------------------------------------------------------------------------
org $E902A

; 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F
; 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
; -----------------------------------------------------------------------------------
db $02, $02, $02, $02, $02, $02, $6E, $6F, $01, $6C, $02, $01, $01, $01, $01, $01
db $02, $02, $02, $02, $02, $02, $00, $00, $00, $00, $02, $01, $01, $01, $01, $01
db $01, $01, $01, $01, $01, $01, $6E, $6F, $01, $6C, $02, $02, $02, $02, $01, $02
db $00, $00, $22, $00, $00, $00, $02, $02, $02, $02, $02, $02, $00, $00, $01, $00

db $01, $01, $01, $01, $01, $01, $01, $02, $02, $02, $02, $02, $02, $02, $02, $02
db $01, $01, $01, $01, $01, $01, $01, $02, $02, $02, $02, $02, $02, $02, $02, $02
db $02, $02, $02, $02, $18, $00, $00, $00, $00, $00, $02, $02, $01, $01, $01, $01
db $6B, $6A, $02, $01, $02, $02, $08, $08, $08, $08, $09, $09, $09, $09, $68, $69 ; Animated Tiles



; Final Boss Room
; Room Blockset = 08 (PC: 711AA > 71229) (SNES: E91AA > E9229) - group 4
; ---------------------------------------------------------------------------------
Expand Down Expand Up @@ -180,6 +200,6 @@ org $E93AA

org $2811E
; 00 01 02 03 04 05 06 07 08 09 0A 0B
db $5D, $5D, $5D, $5D, $5D, $5D, $5D, $5F, $5D, $63, $5F, $5E
db $5E, $5D, $5E, $5D, $5E, $5D, $5D, $5F, $5D, $63, $5F, $5E
; 0C 0D 0E 0F 10 11 12 13 14 15 16 17
db $5F, $5E, $63, $5D, $5D, $5E, $5D, $5D, $5D, $5D, $5D, $5D
127 changes: 113 additions & 14 deletions DungeonMaps.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,71 @@
; Special thanks to Letterbomb for tracing the 8x8 tilemap data.
; ===============================================================================

; ===============================================================================
; Disable Dungeon Maps
; ===============================================================================

; org $0288FD ; Replace a BEQ by a BRA
; db $80


; ===============================================================================
; DungeonMap_DrawRoomMarkers
; ===============================================================================

; .offset_x_base
; org $0AE7F7 : dw $0090

; .fairy_rooms
org $0AE7F9 : dw $004C ; ROOM 004C - Manor Anti-Fairy Room
; org $0AE7FB : dw $00A7 ; ROOM 00A7 - Hera fairy room
; org $0AE7FD : dw $004F ; ROOM 004F - Ice Palace fairy room

; .fairy_room_replacements
org $0AE7FF : dw $005B ; ROOM 005B - Manor Rectangle Floor Drop Room
; org $0AE801 : dw $0077 ; ROOM 0077 - Hera lobby
; org $0AE803 : dw $00BE ; ROOM 00BE - Ice Palace block switch room

; .floor_threshold
; org $0AE805 : dw $0004


; ===============================================================================
; Boss Skulls
; ===============================================================================

; .offsets
org $0AEE5D : db $FF, $FF, $FF, $FF
org $0AEE61 : db $08, $08, $08, $00
org $0AEE65 : db $FF, $FF, $08, $00
org $0AEE69 : db $04, $04, $08, $00
org $0AEE6D : db $08, $08, $00, $08
org $0AEE71 : db $08, $08, $08, $08
org $0AEE75 : db $08, $00, $08, $00

; -------------------------------------------------------------------------------

; DungeonMap_BossRoomFloor:
; org $0AEE79 : dw $FFFF ; // - Sewers
; org $0AEE7B : dw $FFFF ; // - Hyrule Castle
org $0AEE7D : dw $00FF ; B1 - Pumpkin Patch (Eastern Palace)
org $0AEE7F : dw $00FF ; 2F - Living spooM (Desert Palace)
org $0AEE81 : dw $FFFF ; // - Shadow Castle (Agahnim's Tower)
; org $0AEE83 : dw $00FF ; B1 - Swamp Palace
org $0AEE85 : dw $00FE ; B1 - Abandoned Mineshaft (Palace of Darkness)
; org $0AEE87 : dw $00FF ; B1 - Misery Mire
; org $0AEE89 : dw $00FE ; B2 - Skull Woods
; org $0AEE8B : dw $00F9 ; B7 - Ice Palace
org $0AEE8D : dw $00FE ; B2 - Haunted Manor (Tower of Hera)
; org $0AEE8F : dw $00FF ; B1 - Thieves' Town
; org $0AEE91 : dw $00FD ; B3 - Turtle Rock
; org $0AEE93 : dw $0006 ; 7F - Ganon's Tower


; ===============================================================================
; Pumpkin Patch
; By Jeimuzu
; -------------------------------------------------------------------------------
; ===============================================================================

org $219090
dw $0b40, $0b41, $0b42, $0b43, $0b44, $0b45, $0b48, $0b49
Expand All @@ -18,9 +80,10 @@ dw $0b5e, $0b5f, $0b60, $0b61, $0b63, $4b63, $1362, $5362
dw $575f, $4b5e, $4b61, $4b60, $0b00, $0b00, $0b00, $0b64


; ===============================================================================
; Living spooM
; By Jeimuzu
; -------------------------------------------------------------------------------
; ===============================================================================

org $219110
dw $0b65, $0b66, $0b6b, $0b00, $0b67, $0b68, $0b6c, $0b6d
Expand All @@ -33,20 +96,19 @@ dw $0b84, $0b85, $0b8a, $0b8b, $0b68, $0b86, $0b8c, $0b8d
dw $0b87, $4b87, $0b8e, $0b8f, $0b88, $0b89, $4b7e, $0b90
dw $0b92, $0b00, $1391, $0b00


; ===============================================================================
; The Haunted Manor
; By Jeimuzu
; -------------------------------------------------------------------------------
; ===============================================================================

org $219018
dw $1341, $5341, $0b43, $4b43

org $219020
dw $4b44, $0b00, $cb44, $0b00
dw $1341, $5341, $0b43, $4b43, $cb5b, $0b00, $4b5b, $0b00

org $219030
dw $1345, $4b45, $0b46, $4b46, $1744, $0b47, $8b44, $8b47
dw $1348, $5348, $8b48, $cb48, $4b47, $4b42, $cb47, $cb42
dw $1349, $134a, $8b49, $8b4a, $8b4b, $cb4b, $134b, $534b
dw $1345, $4b45, $0b46, $4b46, $1744, $0b47, $0b5b, $8b47
dw $1348, $5348, $8b48, $cb48, $4b47, $0b5c, $cb47, $cb42
dw $1349, $134a, $0b5d, $8b4a, $8b4b, $cb4b, $134b, $534b
dw $4b40, $0b4c, $0b4d, $cb44, $134e, $0b4f, $0b50, $0b51
dw $0b00, $0b52, $0b53, $0b54, $0b45, $0b55, $0b56, $0b57
dw $1358, $1359, $0b00, $8b4c, $0b00, $0b00, $0b00, $0b5a
Expand All @@ -55,11 +117,48 @@ org $219410
dw $0b00, $0b40, $0b00, $1342


; ===============================================================================
; Abandoned Mineshaft
; By
; -------------------------------------------------------------------------------
; By Jeimuzu & Letterbomb
; ===============================================================================

org $219280
dw $1382, $5382, $0b83, $4b83, $0b84, $0b85, $0b86, $0b87
dw $0b88, $4b88, $0b89, $4b89

org $2192A0
dw $0b8e, $0b8f, $0b00, $0b00, $0b90, $4b90, $0b91, $4b91
dw $0b92, $4b8e, $0b00, $0b00, $0b93, $0b94, $0b95, $8b94
dw $1796, $5796, $0b97, $4b97, $0b98, $4b84, $0b99, $0b9a
dw $0b9b, $0b9c, $8b9b, $cb9b, $0b9d, $0b9e, $0b9f, $0ba0
dw $0ba1, $0ba2, $0ba3, $0ba4, $0ba5, $0ba6, $0ba7, $0ba8
dw $0b84, $4b84, $4ba8, $0ba8, $0ba9, $0baa, $0bab, $0bac
dw $0bad, $4bad, $13ae, $53ae, $0baf, $0bb0, $0bb1, $0bb2
dw $0bb3, $0bb4, $0bb5, $0bb6, $0bb7, $0bb8, $0bb9, $0bba
dw $0bbb, $4bbb, $8bbb, $cbbb, $0b80, $4b80, $0b81, $4b81
dw $0b8a, $0b8b, $0b8c, $0b8d


; ===============================================================================
; Shadow Castle
; By
; -------------------------------------------------------------------------------
; By Jeimuzu
; ===============================================================================

; dw $0b00, $0b00, $0b93, $0b00 ; Room 21
; dw $0b94, $1376, $0b74, $4b74 ; Room 31

org $2191A8
dw $0b00, $8b74, $0b97, $cb97
dw $0b95, $1396, $0b00, $0b00, $0b74, $136f, $0b00, $0b00
dw $0b98, $1399, $0b73, $0b00, $139b, $0b00, $0b9c, $0b9d
dw $0b94, $0b00, $4b74, $0b00, $0b00, $0b00, $4b6f, $0b9f
dw $0b97, $139e, $4b74, $0b00, $13a0, $0b94, $0ba1, $4b74
dw $8b74, $136f, $0ba2, $0b00, $8b73, $0b00, $8b98, $13a3
dw $13a4, $53a4, $0ba5, $4ba5, $8b74, $cb74, $1794, $13a6
dw $13a7, $53a7, $13a8, $53a8, $0b00, $0b98, $0b00, $0b73
dw $8b8e, $cb8e, $578f, $178f, $0ba9, $0b9a, $0baa, $0bab
dw $0b00, $0bac, $0b00, $4b73, $4b51, $0b51, $0b00, $0b00
dw $0bad, $0bae, $0baf, $0bb0, $13b1, $13b2, $0bb6, $0bb7
dw $13b3, $53b3, $13b8, $53b8, $0bb4, $0bb5, $0bb9, $0bba
dw $93a8, $d3a8, $0bbb, $4ba8, $0bbc, $0bbd, $0bbf, $4b74
dw $0ba9, $0bbe, $cbbe, $cba9, $4bbe, $0bbe, $8ba9, $8bbe
52 changes: 50 additions & 2 deletions FallingTiles.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ Overlord_SpecialCrumbleTilePath:
db $00, $00, $00, $00, $04, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; B0
db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; C0
db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; D0
db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; E0
db $00, $05, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; E0
db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; F0

TilePathPtrs:
Expand All @@ -308,6 +308,7 @@ Overlord_SpecialCrumbleTilePath:
dw TilePath02
dw TilePath03
dw TilePath04
dw TilePath05

;================================================
; Commands can be
Expand Down Expand Up @@ -405,4 +406,51 @@ TilePath04:
db $3F<<2, !left, !left
db $FF

; ==============================================================================
; Shadow Castle Random Drop
TilePath05:
db $00 ; Initial Delay
db !right, $FE, 1<<2, !right, $FE, $08<<2, !down

db $FE, 1<<2, !left, !down, $FE, $08<<2

db !right, $FE, 1<<2, !right, $FE, $08<<2, !down

db $FE, 1<<2, !left, $FE, $08<<2, !down

db $FE, 1<<2, !left, !left, $FE, $08<<2, !right

db $FE, 1<<2, !right, !right, !down, $FE, $08<<2, !down

db $FE, 1<<2, !left, !left, $FE, $08<<2, !down

db !right, !down

db $FE, 1<<2, !left, !left, $FE, $08<<2, !down

db $FE, 1<<2, !right, !right, !right, $FE, $08<<2, !down

db !left, $FE, 1<<2, !left, $FE, $08<<2, !left, $FE, 1<<2, !down, $FE, $08<<2

db !right, $FE, 1<<2, !right, !down, $FE, $08<<2

db !right, !down

db $FE, 1<<2, !left, !left, $FE, $08<<2, !down

db $FE, 1<<2, !right, $FE, $08<<2, !down

db $FE, 1<<2, !left, !left, $FE, $08<<2, !down

db $FE, 1<<2, !right, $FE, $08<<2, !right, $FE, 1<<2, !right, $FE, $08<<2, !down

db $FE, 1<<2, !left, !left, $FE, $08<<2, !left, $FE, 1<<2, !down, $FE, $08<<2

db !right, $FE, 1<<2, !right, !right, $FE, $08<<2, !down

db !left, $FE, 1<<2, !left, $FE, $08<<2, !down

db $FE, 1<<2, !right, $FE, $08<<2, !down

db $FF

; ==============================================================================
Loading

0 comments on commit 0f7a6d8

Please sign in to comment.