@@ -4881,8 +4881,8 @@ gfx_RotatedScaledSprite_NoClip:
4881
4881
; Returns:
4882
4882
; arg1 : Pointer to sprite struct output
4883
4883
ld a , - 1 + _RotatedScaledSprite_NoClip.inner_opaque - _RotatedScaledSprite_NoClip.dsrs_jump_1
4884
- ; push hl \ ld l, a \ inc l
4885
- ld bc , $ 2C6FE5
4884
+ ; jr .inner_opaque_hijack \ inc l
4885
+ ld bc , ( $ 2C0018) or ((( - 1 + _RotatedScaledSprite_NoClip.inner_opaque_hijack - _RotatedScaledSprite_NoClip.dsrs_jump_2) and $ FF) shl 8 )
4886
4886
jr _RotatedScaledSprite_NoClip
4887
4887
;-------------------------------------------------------------------------------
4888
4888
gfx_RotatedScaledTransparentSprite_NoClip:
@@ -4895,8 +4895,8 @@ gfx_RotatedScaledTransparentSprite_NoClip:
4895
4895
; Returns:
4896
4896
; arg1 : Pointer to sprite struct output
4897
4897
ld a , - 1 + _RotatedScaledSprite_NoClip.inner_transparent - _RotatedScaledSprite_NoClip.dsrs_jump_1
4898
- ; jr .inner_transparent_hijack \ inc l
4899
- ld bc , ( $ 2C0018) or ((( - 1 + _RotatedScaledSprite_NoClip.inner_transparent_hijack - _RotatedScaledSprite_NoClip.dsrs_jump_2) and $ FF) shl 8 )
4898
+ ; push hl \ ld l, a \ inc l
4899
+ ld bc , $ 2C6FE5
4900
4900
_RotatedScaledSprite_NoClip:
4901
4901
ld iy , .dsrs_base_address
4902
4902
ld (iy + (_RotatedScaledSprite_NoClip.dsrs_jump_1 - .dsrs_base_address)) , a
@@ -5048,13 +5048,13 @@ _RotatedScaledSprite_NoClip:
5048
5048
5049
5049
;-------------------------------------------------------------------------------
5050
5050
5051
- .inner_transparent :
5051
+ .inner_opaque :
5052
5052
cp a , h
5053
5053
jr c , .skip_pixel
5054
5054
ld c , ixh
5055
5055
cp a , c
5056
5056
jr c , .skip_pixel
5057
- .inner_transparent_hijack :
5057
+ .inner_opaque_hijack :
5058
5058
; get pixel and draw to buffer
5059
5059
push hl ; xs
5060
5060
ld l , a
@@ -5065,30 +5065,21 @@ _RotatedScaledSprite_NoClip:
5065
5065
add hl , bc ; y * size + x
5066
5066
5067
5067
ld bc , 0
5068
- .dsrs_sprptr_0A := $ - 3
5068
+ .dsrs_sprptr_0B := $ - 3
5069
5069
add hl , bc
5070
- ld b , a ; preserve A
5071
- ld a , (hl)
5072
- cp a , TRASPARENT_COLOR
5073
- smcByte _TransparentColor
5074
- jr z , .transparent_pixel
5075
- ld (de) , a
5076
- .transparent_pixel:
5077
- ld a , b ; restore A
5078
- pop hl ; ys
5079
- .skip_pixel:
5080
- inc de ; x++s
5070
+ ldi
5071
+ pop hl
5072
+
5081
5073
ld bc , 0 ; smc = -sinf
5082
- .dsrs_sinf_0A := $ - 3
5074
+ .dsrs_sinf_0B := $ - 3
5083
5075
add hl , bc ; ys += -sinf
5084
5076
5085
5077
ld bc , 0 ; smc = cosf
5086
- .dsrs_cosf_0A := $ - 3
5078
+ .dsrs_cosf_0B := $ - 3
5087
5079
add ix , bc ; xs += cosf
5088
5080
5089
5081
dec iyl
5090
- jr nz , .inner_transparent ; x loop
5091
- .dsrs_jump_1 := $ - 1
5082
+ jr nz , .inner_opaque ; x loop
5092
5083
5093
5084
dec iyh
5094
5085
jr z , .finish ; y loop
@@ -5113,14 +5104,14 @@ smcByte _TransparentColor
5113
5104
.begin_loop:
5114
5105
.dsrs_size_1 := $ + 2 ; smc = size * scale / 64
5115
5106
ld iyl , 0
5116
- .inner_opaque :
5107
+ .inner_transparent :
5117
5108
cp a , h
5118
5109
jr c , .skip_pixel
5119
5110
ld c , ixh
5120
5111
cp a , c
5121
5112
jr c , .skip_pixel
5122
5113
; get pixel and draw to buffer
5123
- ; SMC: push hl \ ld l, a --> jr inner_transparent_hijack
5114
+ ; SMC: push hl \ ld l, a --> jr inner_opaque_hijack
5124
5115
push hl ; xs
5125
5116
ld l , a
5126
5117
.dsrs_jump_2 := $ - 1
@@ -5131,21 +5122,30 @@ smcByte _TransparentColor
5131
5122
add hl , bc ; y * size + x
5132
5123
5133
5124
ld bc , 0
5134
- .dsrs_sprptr_0B := $ - 3
5125
+ .dsrs_sprptr_0A := $ - 3
5135
5126
add hl , bc
5136
- ldi
5137
- pop hl
5138
-
5127
+ ld b , a ; preserve A
5128
+ ld a , (hl)
5129
+ cp a , TRASPARENT_COLOR
5130
+ smcByte _TransparentColor
5131
+ jr z , .transparent_pixel
5132
+ ld (de) , a
5133
+ .transparent_pixel:
5134
+ ld a , b ; restore A
5135
+ pop hl ; ys
5136
+ .skip_pixel:
5137
+ inc de ; x++s
5139
5138
ld bc , 0 ; smc = -sinf
5140
- .dsrs_sinf_0B := $ - 3
5139
+ .dsrs_sinf_0A := $ - 3
5141
5140
add hl , bc ; ys += -sinf
5142
5141
5143
5142
ld bc , 0 ; smc = cosf
5144
- .dsrs_cosf_0B := $ - 3
5143
+ .dsrs_cosf_0A := $ - 3
5145
5144
add ix , bc ; xs += cosf
5146
5145
5147
5146
dec iyl
5148
- jr nz , .inner_opaque ; x loop
5147
+ jr nz , .inner_transparent ; x loop
5148
+ .dsrs_jump_1 := $ - 1
5149
5149
5150
5150
dec iyh
5151
5151
jr nz , .outer ; y loop
0 commit comments