mirror of https://github.com/nmlgc/ReC98.git
[Decompilation] [th01] Sariel: Pattern 15/16
The one where ZUN copy-pasted Pattern 12, removed the expanding dotted circle, and made it twice as long. Part of P0180, funded by Yanga.
This commit is contained in:
nmlgc
parent
0393af6f0f
commit
77858c1337
|
|
@ -2368,6 +2368,11 @@ struct CurvedSpray {
|
|||
speed.set(7.0f);
|
||||
target.x = new_target;
|
||||
}
|
||||
|
||||
void reset_2(screen_x_t new_target) {
|
||||
target.x = new_target;
|
||||
speed.set(7.0f);
|
||||
}
|
||||
};
|
||||
|
||||
void pascal near pattern_curved_spray_leftright_once(int &frame)
|
||||
|
|
@ -2477,3 +2482,34 @@ void pascal near pattern_rain_from_seal_center(int &frame)
|
|||
#undef debris_cel_cur
|
||||
#undef ray
|
||||
}
|
||||
|
||||
void pascal near pattern_curved_spray_leftright_twice(int &frame)
|
||||
{
|
||||
#define spray pattern14_spray
|
||||
|
||||
extern CurvedSpray spray;
|
||||
|
||||
if(frame < 80) {
|
||||
return;
|
||||
} else if(frame == 80) {
|
||||
spray.init();
|
||||
}
|
||||
if((spray.subpattern_id % 2) == 0) {
|
||||
spray.fire_and_advance(X_RIGHT);
|
||||
if(spray.target.x >= PLAYFIELD_RIGHT) {
|
||||
spray.subpattern_id++;
|
||||
spray.reset(PLAYFIELD_RIGHT);
|
||||
}
|
||||
} else {
|
||||
spray.fire_and_advance(X_LEFT);
|
||||
if(spray.target.x < PLAYFIELD_LEFT) {
|
||||
spray.subpattern_id++;
|
||||
spray.reset_2(PLAYFIELD_LEFT);
|
||||
if(spray.subpattern_id == 4) {
|
||||
frame = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#undef spray
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22454,6 +22454,8 @@ main_36_TEXT segment byte public 'CODE' use16
|
|||
frame_seg:word, frame_off:word
|
||||
@PATTERN_RAIN_FROM_SEAL_CENTER$QMI procdesc pascal near \
|
||||
frame_seg:word, frame_off:word
|
||||
@PATTERN_CURVED_SPRAY_LEFTRIGHT_T$QMI procdesc pascal near \
|
||||
frame_seg:word, frame_off:word
|
||||
main_36_TEXT ends
|
||||
|
||||
main_36__TEXT segment byte public 'CODE' use16
|
||||
|
|
@ -22465,85 +22467,6 @@ include th01/main/boss/anim.inc
|
|||
|
||||
sariel_shield equ <boss_entity_0>
|
||||
|
||||
; =============== S U B R O U T I N E =======================================
|
||||
|
||||
; Attributes: bp-based frame
|
||||
|
||||
sub_2BA29 proc near
|
||||
|
||||
arg_0 = dword ptr 4
|
||||
|
||||
push bp
|
||||
mov bp, sp
|
||||
les bx, [bp+arg_0]
|
||||
cmp word ptr es:[bx], 50h ; 'P'
|
||||
jl loc_2BB42
|
||||
les bx, [bp+arg_0]
|
||||
cmp word ptr es:[bx], 50h ; 'P'
|
||||
jnz short loc_2BA6F
|
||||
mov x_3B338, 0
|
||||
mov y_3B338, PLAYFIELD_BOTTOM
|
||||
mov speed_3B33C, (7 shl 4)
|
||||
mov word_3B33F, 0
|
||||
call @sariel_select_for_rank$qmiiiii c, offset _sariel_pattern_state, ds, large 32 or (24 shl 16), large 18 or (16 shl 16)
|
||||
|
||||
loc_2BA6F:
|
||||
mov ax, word_3B33F
|
||||
mov bx, 2
|
||||
cwd
|
||||
idiv bx
|
||||
or dx, dx
|
||||
jnz short loc_2BADA
|
||||
mov ax, y_3B338
|
||||
add ax, -185
|
||||
push ax
|
||||
mov ax, x_3B338
|
||||
add ax, -320
|
||||
push ax
|
||||
call iatan2
|
||||
mov angle_3B33E, al
|
||||
call @CPellets@add_single$qiiuci15pellet_motion_tiii c, offset _Pellets, ds, large 320 or (185 shl 16), word ptr angle_3B33E, speed_3B33C, large PM_NORMAL or (0 shl 16), large 0 or (0 shl 16)
|
||||
sub speed_3B33C, 4
|
||||
mov ax, _sariel_pattern_state
|
||||
add x_3B338, ax
|
||||
cmp x_3B338, PLAYFIELD_RIGHT
|
||||
jl short loc_2BB42
|
||||
inc word_3B33F
|
||||
mov speed_3B33C, (7 shl 4)
|
||||
mov x_3B338, PLAYFIELD_RIGHT
|
||||
pop bp
|
||||
retn 4
|
||||
; ---------------------------------------------------------------------------
|
||||
|
||||
loc_2BADA:
|
||||
mov ax, y_3B338
|
||||
add ax, -185
|
||||
push ax
|
||||
mov ax, x_3B338
|
||||
add ax, -320
|
||||
push ax
|
||||
call iatan2
|
||||
mov angle_3B33E, al
|
||||
call @CPellets@add_single$qiiuci15pellet_motion_tiii c, offset _Pellets, ds, large 320 or (185 shl 16), word ptr angle_3B33E, speed_3B33C, large PM_NORMAL or (0 shl 16), large 0 or (0 shl 16)
|
||||
sub speed_3B33C, 4
|
||||
mov ax, _sariel_pattern_state
|
||||
sub x_3B338, ax
|
||||
cmp x_3B338, 0
|
||||
jge short loc_2BB42
|
||||
inc word_3B33F
|
||||
mov x_3B338, 0
|
||||
mov speed_3B33C, (7 shl 4)
|
||||
cmp word_3B33F, 4
|
||||
jnz short loc_2BB42
|
||||
les bx, [bp+arg_0]
|
||||
mov word ptr es:[bx], 0
|
||||
|
||||
loc_2BB42:
|
||||
pop bp
|
||||
retn 4
|
||||
sub_2BA29 endp
|
||||
|
||||
|
||||
; =============== S U B R O U T I N E =======================================
|
||||
|
||||
; Attributes: bp-based frame
|
||||
|
|
@ -24116,9 +24039,7 @@ loc_2CB8D:
|
|||
call sub_2BB46
|
||||
|
||||
loc_2CB9D:
|
||||
push ds
|
||||
push offset _boss_phase_frame
|
||||
call sub_2BA29
|
||||
call @pattern_curved_spray_leftright_t$qmi pascal, ds, offset _boss_phase_frame
|
||||
|
||||
loc_2CBA4:
|
||||
cmp _boss_phase_frame, 0
|
||||
|
|
@ -25520,11 +25441,9 @@ _pattern13_rays SymmetricSpawnraysWithDebris <?>
|
|||
_pattern13_debris_cel_cur dw ?
|
||||
_pattern13_debris_cel_prev dw ?
|
||||
|
||||
x_3B338 dw ?
|
||||
y_3B338 dw ?
|
||||
speed_3B33C dw ?
|
||||
angle_3B33E db ?
|
||||
word_3B33F dw ?
|
||||
public _pattern14_spray
|
||||
_pattern14_spray CurvedSpray <?>
|
||||
|
||||
word_3B341 dw 30 dup(?)
|
||||
word_3B37D dw 30 dup(?)
|
||||
word_3B3B9 dw 30 dup(?)
|
||||
|
|
|
|||
Loading…
Reference in New Issue