* Level3 more work, fixes

Author: iProgramMC

src/defines.asm

@@ -217,7 +217,6 @@ r2_outside    = $20
 ; warp flags (roomloffs)
 wf_nicevert   = $80
 wf_64         = $40
-wf_32         = $20
 
 ; Entity Types
 ; NOTE(iProgram): Keep this up to date with LEVELEDITOR\Entity.cs (public enum eEntityType)

src/g_level.asm

@@ -1762,10 +1762,10 @@ gm_fetch_room:
 	ldy #0
 	lda (temp1), y
 	sta roomloffs
-	and #%11100000 ; max offset of 32
+	and #%11000000 ; max offset of 64
 	sta warpflags
 	lda roomloffs
-	and #%00011111
+	and #%00111111
 	sta roomloffs
 	iny
 	lda (temp1), y

src/game.asm

@@ -59,7 +59,10 @@ gm_load_room_fully:
 	asl
 	asl
 	asl
-	clc
+	; the bit that you just shifted out... increment camera_x_pg with it
+	bcc :+
+	inc camera_x_pg	
+:	clc
 	adc camera_x
 	sta camera_x
 	bcc @dontMarkBeginning

src/level3/layout.txt

@@ -36,13 +36,16 @@ Props,level3_00_a,0,0
 Spawn,level3_00_a,0,152
 level3_02_a,2496,-112
 Props,level3_02_a,0,0
-Spawn,level3_02_a,304,136
 Spawn,level3_02_a,0,160
 Spawn,level3_02_a,152,24
+Spawn,level3_02_a,304,128
 level3_03_a,2816,-112
 Props,level3_03_a,0,0
 Spawn,level3_03_a,0,128
 Spawn,level3_03_a,496,168
-Spawn,level3_03_a,472,16
+Spawn,level3_03_a,472,24
+level3_04_b,3136,-352
+Props,level3_04_b,0,0
+Spawn,level3_04_b,152,184
 Filler,1200,-240,16,240
 Filler,1216,128,16,112

src/level3/roomlist.asm

@@ -2,7 +2,7 @@ level3:
 	.word level3_music	; music table
 	.word level3_banks	; list of banks for each room
 	.byte $03	; environment type
-	.byte $14	; warp count
+	.byte $16	; warp count
 	.word level3_w_init
 	.word level3_w_s0_to_s1
 	.word level3_w_s1_to_s0
@@ -23,6 +23,8 @@ level3:
 	.word level3_w_00_a_to_02_a
 	.word level3_w_02_a_to_03_a
 	.word level3_w_03_a_to_02_a
+	.word level3_w_03_a_to_04_b
+	.word level3_w_04_b_to_03_a
 level3_banks:
 	.byte prgb_lvl3a	; level3_w_init
 	.byte prgb_lvl3a	; level3_w_s0_to_s1
@@ -44,3 +46,5 @@ level3_banks:
 	.byte prgb_lvl3a	; level3_w_00_a_to_02_a
 	.byte prgb_lvl3a	; level3_w_02_a_to_03_a
 	.byte prgb_lvl3a	; level3_w_03_a_to_02_a
+	.byte prgb_lvl3a	; level3_w_03_a_to_04_b
+	.byte prgb_lvl3a	; level3_w_04_b_to_03_a

src/level3/rooms/0.asm

@@ -695,7 +695,7 @@ level3_03_a_p:
 	.byte $11,$00,$00,$55,$50,$00,$10,$01
 	.byte $00,$00,$51,$55,$10,$11,$05,$00
 	.byte $00,$00,$15,$11,$11,$55,$01,$00
-	.byte $11,$05,$05,$00,$11,$11,$11,$01
+	.byte $55,$04,$05,$00,$11,$11,$51,$05
 	.byte $FF
 level3_03_a_e:
 	.byte $FF
@@ -779,16 +779,98 @@ level3_03_a_t:
 	.byte $6E,$91,$E1,$AD,$86,$87,$6E,$8F
 	.byte $E1,$AC,$86,$85,$00,$00,$70,$96
 	.byte $A2,$B2,$A3,$B3,$E1,$B2,$A2,$B3
-	.byte $E1,$B2,$A2,$B3,$A2,$B2,$E1,$B3
-	.byte $A2,$B2,$A2,$B3,$E1,$AA,$8B,$D2
-	.byte $E1,$AF,$84,$E1,$AD,$86,$92,$E1
-	.byte $B0,$84,$E1,$AC,$86,$FF
+	.byte $E9,$B2,$B3,$AA,$87,$9B,$9C,$9B
+	.byte $9C,$8D,$8D,$CA,$E4,$AF,$89,$8A
+	.byte $89,$A2,$88,$E2,$A5,$94,$85,$E1
+	.byte $AD,$86,$8A,$BF,$A2,$B2,$E1,$B3
+	.byte $A2,$B2,$A2,$B3,$E1,$AA,$84,$E1
+	.byte $AC,$86,$FF
 level3_03_a:
 	.byte 64, 0
-	.byte 255, 255, 19, 255
-	.byte 0, 0, 0, 0
+	.byte 20, 255, 19, 255
+	.byte 40, 0, 0, 0
 	.byte 4
 	.byte 255
 	.word level3_03_a_t
 	.word level3_03_a_p
 	.word level3_03_a_e
+level3_04_b_p:
+	.byte $44,$44,$44,$00,$00,$40,$44,$04
+	.byte $00,$00,$55,$00,$00,$54,$00,$00
+	.byte $44,$00,$55,$00,$00,$05,$00,$00
+	.byte $55,$00,$50,$00,$00,$05,$00,$05
+	.byte $00,$00,$50,$11,$00,$55,$00,$00
+	.byte $55,$00,$50,$11,$00,$05,$00,$05
+	.byte $05,$50,$55,$00,$00,$45,$00,$01
+	.byte $01,$00,$55,$00,$00,$15,$00,$00
+	.byte $00,$00,$55,$00,$00,$05,$00,$00
+	.byte $44,$44,$55,$00,$00,$51,$44,$04
+	.byte $FF
+level3_04_b_e:
+	.byte $30,$A0,$02
+	.byte $38,$58,$02
+	.byte $60,$38,$02
+	.byte $B0,$38,$02
+	.byte $FE
+	.byte $00,$38,$02
+	.byte $20,$98,$01,$00
+	.byte $FF
+level3_04_b_t:
+	.byte $DE,$9E,$8F,$E1,$BE,$A2,$B4,$C0
+	.byte $8B,$87,$E3,$BE,$B4,$B5,$A2,$B4
+	.byte $E7,$B5,$B4,$B5,$AB,$A2,$A3,$A9
+	.byte $A2,$B4,$A2,$B5,$E2,$B4,$C0,$85
+	.byte $87,$E1,$AF,$CF,$E2,$98,$AD,$85
+	.byte $97,$E1,$99,$86,$84,$E4,$BE,$B4
+	.byte $B5,$AB,$8F,$E2,$9A,$AC,$85,$84
+	.byte $E1,$B0,$D2,$E2,$85,$AD,$85,$97
+	.byte $E1,$98,$86,$97,$E2,$99,$AC,$85
+	.byte $84,$E1,$AF,$89,$E2,$84,$94,$87
+	.byte $E3,$85,$A9,$C0,$84,$84,$E1,$B0
+	.byte $89,$E4,$98,$89,$87,$8D,$85,$E3
+	.byte $86,$8C,$AC,$84,$84,$E1,$AF,$89
+	.byte $E4,$99,$88,$8A,$9E,$85,$E3,$00
+	.byte $00,$AD,$84,$8C,$E6,$84,$9C,$A7
+	.byte $88,$8B,$8E,$87,$E1,$AC,$84,$8C
+	.byte $E6,$86,$A2,$A6,$89,$A2,$8F,$87
+	.byte $E1,$AD,$84,$8C,$E4,$00,$00,$91
+	.byte $95,$C9,$85,$85,$E1,$94,$88,$CB
+	.byte $E3,$A9,$B5,$B4,$A2,$B5,$84,$E4
+	.byte $B0,$8A,$97,$8D,$91,$C5,$84,$E4
+	.byte $AF,$8A,$93,$8F,$96,$85,$E1,$95
+	.byte $D3,$6E,$84,$84,$E1,$B0,$C9,$E2
+	.byte $90,$94,$89,$70,$84,$8C,$E6,$84
+	.byte $9C,$89,$88,$9C,$8D,$87,$E3,$A8
+	.byte $B3,$B2,$A2,$B3,$84,$E1,$AF,$87
+	.byte $E6,$98,$89,$8A,$A4,$A2,$95,$87
+	.byte $E1,$AD,$C4,$8C,$E4,$99,$8A,$8B
+	.byte $8E,$C9,$E1,$AC,$84,$84,$E1,$B0
+	.byte $87,$E4,$86,$A2,$A6,$9F,$8E,$8C
+	.byte $E3,$00,$00,$85,$86,$E4,$90,$A1
+	.byte $9C,$87,$85,$84,$E2,$AF,$94,$88
+	.byte $E2,$98,$A0,$85,$E5,$91,$8B,$8A
+	.byte $A8,$C1,$84,$84,$E4,$B0,$A5,$9B
+	.byte $94,$86,$E2,$99,$8E,$85,$E4,$00
+	.byte $99,$89,$AD,$C5,$85,$E3,$8A,$93
+	.byte $8F,$86,$E2,$9A,$9F,$86,$E2,$86
+	.byte $88,$86,$85,$E1,$95,$C8,$E2,$91
+	.byte $95,$86,$E2,$00,$98,$86,$85,$D2
+	.byte $E2,$99,$AC,$85,$84,$E1,$AF,$92
+	.byte $E1,$9A,$86,$84,$E1,$B0,$92,$E1
+	.byte $85,$86,$84,$E1,$AF,$92,$E2,$99
+	.byte $AD,$85,$97,$E1,$98,$86,$97,$E1
+	.byte $85,$86,$84,$BF,$A2,$B2,$E1,$AA
+	.byte $8F,$E2,$99,$AC,$85,$84,$E4,$00
+	.byte $00,$00,$AF,$8F,$E2,$9A,$AD,$85
+	.byte $87,$BF,$A2,$B3,$E1,$B2,$A3,$B3
+	.byte $E2,$B2,$B3,$A2,$B2,$A2,$B3,$A4
+	.byte $B2,$E1,$C1,$85,$87,$D7,$FF
+level3_04_b:
+	.byte 40, 0
+	.byte 255, 21, 255, 255
+	.byte 0, 216, 0, 0
+	.byte 4
+	.byte 255
+	.word level3_04_b_t
+	.word level3_04_b_p
+	.word level3_04_b_e

src/level3/warplist.asm

@@ -76,5 +76,13 @@ level3_w_02_a_to_03_a:
 	.word level3_03_a
 level3_w_03_a_to_02_a:
 	.byte 8			; room left offset
-	.byte 240, 136	; player spawn X/Y
+	.byte 240, 128	; player spawn X/Y
 	.word level3_02_a
+level3_w_03_a_to_04_b:
+	.byte 4			; room left offset
+	.byte 120, 184	; player spawn X/Y
+	.word level3_04_b
+level3_w_04_b_to_03_a:
+	.byte 32			; room left offset
+	.byte 216, 24	; player spawn X/Y
+	.word level3_03_a

src/p_physic.asm

@@ -1008,7 +1008,7 @@ xt_colljumptable:
 	.word xt_collidedream
 	.word xt_collidecass1
 	.word xt_collidecass2
-	.word xt_collidedeadly
+	.word xt_collidespinnerstatic
 
 xt_collidecass1:
 	lda cassrhythm
@@ -1158,11 +1158,13 @@ xt_collidespikesDOWN:
 @kill:
 	jmp gm_killplayer
 
-xt_collidedeadly:
+xt_collidespinnerstatic:
 	lda gamectrl4
 	and #g4_nodeath
 	bne @returnNone
-	jmp gm_killplayer
+	
+	; ok, check if one of two centre points is inside this tile
+	;jmp gm_killplayer
 
 @returnNone:
 	lda #0

src/x_rmtran.asm

@@ -608,7 +608,10 @@ actuallyWarp:
 	asl
 	asl
 	asl
-	clc
+	; the bit that you just shifted out... increment camera_x_pg with it
+	bcc :+
+	inc camera_x_pg	
+:	clc
 	adc camdst_x
 	sta camdst_x
 	bcc :+
@@ -1190,12 +1193,14 @@ actuallyWarp:
 	asl
 	asl
 	asl
-	clc
+	; the bit that you just shifted out... increment camera_x_pg with it
+	bcc :+
+	inc camdst_x_pg	
+:	clc
 	adc camdst_x
 	sta camdst_x
 	bcc :+
 	inc camdst_x_pg
-	
 :	; subtract it from the player X to determine the destination player X
 	lda player_x
 	clc