refactor object_handler

This commit is contained in:
scawful
2024-08-29 20:23:41 -04:00
parent 536671d5f4
commit 57d431e3b7

View File

@@ -38,11 +38,11 @@ org $07D938
; Bank01 Free Space ; Bank01 Free Space
org $01B53C org $01B53C
ExpandedObject: ExpandedObject:
JSL NewObjectsCode JSL CustomObjectHandler
RTS RTS
ExpandedObject2: ExpandedObject2:
JSL NewObjectsCode2 JSL CustomObjectHandler2
RTS RTS
SpriteBodyObjects: SpriteBodyObjects:
@@ -56,7 +56,7 @@ org $01B53C
warnpc $01B560 warnpc $01B560
org $2C8000 org $2C8000
NewObjectsCode: CustomObjectHandler:
{ {
PHB : PHK : PLB PHB : PHK : PLB
PHX PHX
@@ -108,7 +108,7 @@ NewObjectsCode:
PLB PLB
RTL RTL
.ObjOffset .ObjOffset
dw .LeftRight-.ObjData ; 00 dw .LeftRight-.ObjData ; 00
dw .UpDown-.ObjData ; 01 dw .UpDown-.ObjData ; 01
dw .TopLeft-.ObjData ; 02 dw .TopLeft-.ObjData ; 02
@@ -126,7 +126,7 @@ NewObjectsCode:
dw .TrackAny-.ObjData ; 14 dw .TrackAny-.ObjData ; 14
dw .SmallStatue-.ObjData ; 15 dw .SmallStatue-.ObjData ; 15
.ObjData .ObjData
.LeftRight .LeftRight
incbin Data/track_LR.bin incbin Data/track_LR.bin
.UpDown .UpDown
@@ -165,10 +165,13 @@ NewObjectsCode:
InitHeavyPot: InitHeavyPot:
{ {
LDA.w #$1010 LDA.w #$1010
PHX : LDX.w $042C PHX
LDA.w #$1111 : STA $0500, X LDX.w $042C ; MANIPINDEX
LDA.w #$1111 : STA $0500, X ; M16BUFF500
; Store this object's position in the object buffer to $0520, X ; Store this object's position in the object buffer to $0520, X
LDA $BA : STA $0520, X LDA $BA : STA $0520, X
; Store it's tilemap position. ; Store it's tilemap position.
TYA : STA $0540, X TYA : STA $0540, X
RTL RTL
@@ -239,7 +242,7 @@ SpriteObjectsDraw:
} }
NewObjectsCode2: CustomObjectHandler2:
{ {
PHB : PHK : PLB PHB : PHK : PLB
PHX PHX
@@ -268,7 +271,6 @@ NewObjectsCode2:
INX : INX INX : INX
; Vhopppcc cccccccc ; Vhopppcc cccccccc
LDA .ObjData, X : BEQ + LDA .ObjData, X : BEQ +
STA [$BF], Y STA [$BF], Y
+ +
@@ -292,12 +294,12 @@ NewObjectsCode2:
PLB PLB
RTL RTL
.ObjOffset .ObjOffset
dw .IceFurnace-.ObjData ; 00 dw .IceFurnace-.ObjData ; 00
dw .Firewood-.ObjData ; 01 dw .Firewood-.ObjData ; 01
dw .IceChair-.ObjData ; 02 dw .IceChair-.ObjData ; 02
.ObjData .ObjData
.IceFurnace .IceFurnace
incbin Data/furnace.bin incbin Data/furnace.bin
.Firewood .Firewood