scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move CollisionTablesExpanded

Browse Source
This commit is contained in:
scawful
2024-03-13 11:58:22 -04:00
parent 8cbb773762
commit c1ad4cf3b8
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
Dungeons/Objects/Collision/CollisionTablesExpanded.asm → Dungeons/Collision/CollisionTablesExpanded.asm
View File

21
Dungeons/Objects/object_handler.asm
View File

@@ -1,16 +1,29 @@
; Dungeon Object Handler ; Dungeon Object Handler
incsrc Collision/CollisionTablesExpanded.asm
org $018262 ;object id 0x31 org $018262 ;object id 0x31
dw ExpandedObject dw ExpandedObject
; #_018650: dw RoomDraw_WeirdUglyPot ID 230
org $018650
dw HeavyPot
; Bank01 Free Space
org $01B53C org $01B53C
ExpandedObject: ExpandedObject:
JSL NewObjectsCode JSL NewObjectsCode
RTS RTS
HeavyPot:
LDA.w #$1010
PHX : LDX.w $042C
LDA.w #$1111 : STA $0500, X
; Store this object's position in the object buffer to $0520, X
LDA $BA : STA $0520, X
; Store it's tilemap position.
TYA : STA $0540, X
JMP $B350
warnpc $01B560
org $2C8000 org $2C8000
NewObjectsCode: NewObjectsCode:
@@ -146,5 +159,5 @@ pushpc
org $00A9AC org $00A9AC
dw $0D28, $0D38, $4D28, $4D38 dw $0D28, $0D38, $4D28, $4D38
org $01B306 ; RoomDraw_WeirdGloveRequiredPot ; org $01B306 ; RoomDraw_WeirdGloveRequiredPot
LDA.w #$1010 ; LDA.w #$1010

3
Dungeons/dungeons.asm
View File

@@ -9,6 +9,9 @@ print "End of entrances.asm ", pc
incsrc "Dungeons/enemy_damage.asm" incsrc "Dungeons/enemy_damage.asm"
print "End of enemy_damage.asm ", pc print "End of enemy_damage.asm ", pc
incsrc "Collision/CollisionTablesExpanded.asm"
incsrc "Collision/GlobalCollisionTables.asm"
; Use of Bank 0x2C begins ; Use of Bank 0x2C begins
incsrc "Dungeons/Objects/object_handler.asm" incsrc "Dungeons/Objects/object_handler.asm"
print "End of object_handler.asm ", pc print "End of object_handler.asm ", pc