Skip to content

Commit b884030

Browse files
committed
* Ch3: Some fixes
1 parent a16680f commit b884030

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

src/level3/entity.asm

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,13 @@ expFlags: .byte launbooks, launboxes, launclothes
707707
adc #4
708708
sta player_y
709709

710+
lda #0
711+
sta player_vl_x
712+
sta player_vs_x
713+
sta player_vs_y
714+
lda #4
715+
sta player_vl_y
716+
710717
lda #%00001111
711718
sta quakeflags
712719
lda #20

src/level3/rooms/2.asm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ level3_10_c_p:
116116
.byte $47,$04,$00,$00,$50,$50,$00,$00
117117
.byte $00,$00,$FF
118118
level3_10_c_e:
119+
.byte $B0,$D0,$24,$20,$18,$48,$00
119120
.byte $FF
120121
level3_10_c_t:
121122
.byte $DE,$E3,$B5,$B4,$B5,$A2,$B4,$E1
@@ -307,7 +308,7 @@ level3_10_x_p:
307308
level3_10_x_e:
308309
.byte $10,$30,$26,$01
309310
.byte $10,$40,$26,$01
310-
.byte $10,$50,$26,$00
311+
.byte $10,$50,$26,$01
311312
.byte $10,$88,$26,$01
312313
.byte $20,$30,$26,$01
313314
.byte $20,$40,$26,$01

src/s_entity.asm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2339,7 +2339,12 @@ commitSaveFile:
23392339

23402340
; ** ENTITY: Respawn Change
23412341
.proc xt_draw_respawn_change
2342-
ldx temp1
2342+
lda gamectrl3
2343+
and #g3_transitA
2344+
beq :+
2345+
rts
2346+
2347+
: ldx temp1
23432348
lda #0
23442349
sta temp7
23452350
sta temp8

0 commit comments

Comments
 (0)