[Naming] [th01] Elis: Girl sprite unblitting and background snapping

In which ZUN wanted to use a parameter to distinguish between taking
the position from Stationary-Or-Wavy-Elis and Attacking-Elis, but then
sets the latter's position to the former's before doing anything with
that parameter.

Part of P0166, funded by Ember2528.
This commit is contained in:
nmlgc 2021-10-30 15:49:25 +02:00
parent 256d699b82
commit 5e8ed65c04
2 changed files with 60 additions and 91 deletions

View File

@ -2,12 +2,17 @@
/// -------------------------- /// --------------------------
extern "C" { extern "C" {
#include <stddef.h>
#include "platform.h" #include "platform.h"
#include "pc98.h" #include "pc98.h"
#include "planar.h" #include "planar.h"
#include "th01/main/vars.hpp" #include "th01/math/area.hpp"
#include "th01/formats/pf.hpp"
#include "th01/formats/ptn.hpp" #include "th01/formats/ptn.hpp"
#include "th01/main/vars.hpp"
#include "th01/main/boss/entity_a.hpp"
} }
#include "th01/main/boss/boss.hpp"
#define flash_colors elis_flash_colors #define flash_colors elis_flash_colors
#define invincibility_frame elis_invincibility_frame #define invincibility_frame elis_invincibility_frame
@ -24,5 +29,11 @@ static const main_ptn_slot_t PTN_SLOT_BG_ENT = PTN_SLOT_BOSS_1;
static const main_ptn_slot_t PTN_SLOT_MISSILE = PTN_SLOT_BOSS_2; static const main_ptn_slot_t PTN_SLOT_MISSILE = PTN_SLOT_BOSS_2;
// -------- // --------
void girl_bg_snap(int unncessary_parameter_that_still_needs_to_be_1_or_2)
;
void girl_bg_put(int unncessary_parameter_that_still_needs_to_be_1_or_2)
;
#define select_for_rank elis_select_for_rank #define select_for_rank elis_select_for_rank
#include "th01/main/select_r.cpp" #include "th01/main/select_r.cpp"

View File

@ -18395,8 +18395,8 @@ PTN_SLOT_MISSILE = PTN_SLOT_BOSS_2
; =============== S U B R O U T I N E ======================================= ; =============== S U B R O U T I N E =======================================
; Attributes: bp-based frame ; Attributes: bp-based frame
public @girl_bg_snap$qi
sub_24E33 proc far @girl_bg_snap$qi proc far
var_A = word ptr -0Ah var_A = word ptr -0Ah
var_8 = word ptr -8 var_8 = word ptr -8
@ -18479,14 +18479,14 @@ loc_24EB1:
pop si pop si
leave leave
retf retf
sub_24E33 endp @girl_bg_snap$qi endp
; =============== S U B R O U T I N E ======================================= ; =============== S U B R O U T I N E =======================================
; Attributes: bp-based frame ; Attributes: bp-based frame
public @girl_bg_put$qi
sub_24EC2 proc far @girl_bg_put$qi proc far
var_A = word ptr -0Ah var_A = word ptr -0Ah
var_8 = word ptr -8 var_8 = word ptr -8
@ -18563,7 +18563,7 @@ loc_24F38:
pop si pop si
leave leave
retf retf
sub_24EC2 endp @girl_bg_put$qi endp
; =============== S U B R O U T I N E ======================================= ; =============== S U B R O U T I N E =======================================
@ -18688,8 +18688,7 @@ arg_2 = word ptr 8
jnz short loc_25150 jnz short loc_25150
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
add sp, 6 add sp, 6
@ -18705,8 +18704,7 @@ loc_25132:
loc_25150: loc_25150:
cmp _boss_phase_frame, 28 cmp _boss_phase_frame, 28
jnz short loc_2516C jnz short loc_2516C
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
pop cx pop cx
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 3 mov elis_still_or_wave.BE_bos_image, 3
@ -18739,13 +18737,11 @@ loc_2519E:
mov elis_still_or_wave.BE_cur_left, ax mov elis_still_or_wave.BE_cur_left, ax
mov ax, [bp+var_6] mov ax, [bp+var_6]
mov elis_still_or_wave.BE_cur_top, ax mov elis_still_or_wave.BE_cur_top, ax
push 1 call @girl_bg_snap$qi stdcall, 1
call sub_24E33
pop cx pop cx
loc_251C7: loc_251C7:
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
pop cx pop cx
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 4 mov elis_still_or_wave.BE_bos_image, 4
@ -18756,8 +18752,7 @@ loc_251DD:
cmp _boss_phase_frame, 60 cmp _boss_phase_frame, 60
jnz short loc_251FF jnz short loc_251FF
mov elis_still_or_wave.BE_hitbox_orb_inactive, 1 mov elis_still_or_wave.BE_hitbox_orb_inactive, 1
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
pop cx pop cx
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 3 mov elis_still_or_wave.BE_bos_image, 3
@ -18768,8 +18763,7 @@ loc_251FF:
cmp _boss_phase_frame, 68 cmp _boss_phase_frame, 68
jnz short loc_25221 jnz short loc_25221
mov elis_still_or_wave.BE_hitbox_orb_inactive, 1 mov elis_still_or_wave.BE_hitbox_orb_inactive, 1
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
pop cx pop cx
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 2 mov elis_still_or_wave.BE_bos_image, 2
@ -18950,8 +18944,7 @@ var_8 = qword ptr -8
mov word_3A6E5, dx mov word_3A6E5, dx
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 1 mov elis_still_or_wave.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16)
@ -19068,8 +19061,7 @@ loc_25556:
jnz short loc_255B4 jnz short loc_255B4
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 0 mov elis_still_or_wave.BE_bos_image, 0
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16)
@ -19207,8 +19199,7 @@ var_2 = word ptr -2
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
pop cx pop cx
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
pop cx pop cx
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 1 mov elis_still_or_wave.BE_bos_image, 1
@ -19417,8 +19408,7 @@ loc_258D4:
jnz short loc_25947 jnz short loc_25947
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 1 mov elis_still_or_wave.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16)
@ -19548,15 +19538,13 @@ loc_25977:
mov word_3A6FC, 1 mov word_3A6FC, 1
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 0 mov elis_still_or_wave.BE_bos_image, 0
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
add sp, 32h add sp, 32h
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 0 mov elis_still_or_wave.BE_bos_image, 0
@ -19952,15 +19940,13 @@ loc_25E3D:
jnz short loc_25EB1 jnz short loc_25EB1
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 0 mov elis_attack.BE_bos_image, 0
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 0 mov elis_attack.BE_bos_image, 0
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
@ -20201,15 +20187,13 @@ sub_260DC proc far
jnz short loc_26136 jnz short loc_26136
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
add sp, 14h add sp, 14h
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
@ -20418,8 +20402,7 @@ loc_262FB:
mov _boss_phase_frame, 0 mov _boss_phase_frame, 0
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
add sp, 4 add sp, 4
xor ax, ax xor ax, ax
jmp short loc_2631F jmp short loc_2631F
@ -20454,15 +20437,13 @@ sub_26322 proc far
jnz short loc_2637D jnz short loc_2637D
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
add sp, 14h add sp, 14h
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
@ -20755,15 +20736,13 @@ var_2 = word ptr -2
jnz short loc_26678 jnz short loc_26678
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
add sp, 14h add sp, 14h
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
@ -21105,15 +21084,13 @@ var_2 = word ptr -2
jnz short loc_269A5 jnz short loc_269A5
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 0 mov elis_attack.BE_bos_image, 0
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 0 mov elis_attack.BE_bos_image, 0
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
@ -21253,12 +21230,10 @@ loc_26ABF:
mov elis_bat.BE_bos_image, 0 mov elis_bat.BE_bos_image, 0
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
call _z_vsync_wait_and_scrollup stdcall, RES_Y call _z_vsync_wait_and_scrollup stdcall, RES_Y
add sp, 0Ah add sp, 0Ah
mov _boss_phase_frame, 0 mov _boss_phase_frame, 0
@ -21442,19 +21417,16 @@ loc_26C85:
mov elis_still_or_wave.BE_cur_left, ax mov elis_still_or_wave.BE_cur_left, ax
mov ax, [bp+var_6] mov ax, [bp+var_6]
mov elis_still_or_wave.BE_cur_top, ax mov elis_still_or_wave.BE_cur_top, ax
push 1 call @girl_bg_snap$qi stdcall, 1
call sub_24E33
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
@ -21780,15 +21752,13 @@ sub_26F4F proc far
jnz short loc_26FAA jnz short loc_26FAA
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
add sp, 14h add sp, 14h
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
@ -22062,15 +22032,13 @@ loc_27201:
jnz short loc_27257 jnz short loc_27257
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
add sp, 14h add sp, 14h
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
@ -22204,15 +22172,13 @@ loc_27317:
mov word_3A76B, 1 mov word_3A76B, 1
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 0 mov elis_still_or_wave.BE_bos_image, 0
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
add sp, 32h add sp, 32h
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 0 mov elis_still_or_wave.BE_bos_image, 0
@ -22404,15 +22370,13 @@ sub_275F4 proc far
jnz short loc_2764F jnz short loc_2764F
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_attack, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 2 call @girl_bg_put$qi stdcall, 2
call sub_24EC2
add sp, 14h add sp, 14h
mov elis_attack.BE_move_lock_frame, 0 mov elis_attack.BE_move_lock_frame, 0
mov elis_attack.BE_bos_image, 1 mov elis_attack.BE_bos_image, 1
@ -22447,8 +22411,7 @@ loc_276AD:
jnz short loc_27729 jnz short loc_27729
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 1 mov elis_still_or_wave.BE_bos_image, 1
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16)
@ -22574,15 +22537,13 @@ loc_27759:
mov word_3A771, 1 mov word_3A771, 1
push 1 push 1
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 0 mov elis_still_or_wave.BE_bos_image, 0
call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16) call @CBossEntity@move_lock_and_put_8$qiiii stdcall, offset elis_still_or_wave, ds, large 0, large 0 or (3 shl 16)
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
add sp, 32h add sp, 32h
mov elis_still_or_wave.BE_move_lock_frame, 0 mov elis_still_or_wave.BE_move_lock_frame, 0
mov elis_still_or_wave.BE_bos_image, 0 mov elis_still_or_wave.BE_bos_image, 0
@ -23038,8 +22999,7 @@ var_4 = word ptr -4
cmp _boss_phase, 0 cmp _boss_phase, 0
jnz loc_281CF jnz loc_281CF
call @boss_palette_snap$qv call @boss_palette_snap$qv
push 1 call @girl_bg_snap$qi stdcall, 1
call sub_24E33
pop cx pop cx
mov [bp+var_9], 0 mov [bp+var_9], 0
mov _elis_invincibility_frame, 0 mov _elis_invincibility_frame, 0
@ -23466,8 +23426,7 @@ loc_280D6:
loc_28103: loc_28103:
cmp _elis_invincibility_frame, 128 cmp _elis_invincibility_frame, 128
jnz short loc_28130 jnz short loc_28130
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
call @CBossEntity@wave_put$xqiiiiii stdcall, offset elis_still_or_wave, ds, large [dword ptr elis_still_or_wave.BE_cur_left], large 0 or (3 shl 16), large 8 or (64 shl 16) call @CBossEntity@wave_put$xqiiiiii stdcall, offset elis_still_or_wave, ds, large [dword ptr elis_still_or_wave.BE_cur_left], large 0 or (3 shl 16), large 8 or (64 shl 16)
add sp, 12h add sp, 12h
jmp short loc_28158 jmp short loc_28158
@ -23933,8 +23892,7 @@ loc_285A5:
jg short loc_28655 jg short loc_28655
call _mdrv2_bgm_fade_out_nonblock call _mdrv2_bgm_fade_out_nonblock
call @CPellets@unput_and_reset$qv stdcall, offset _Pellets, ds call @CPellets@unput_and_reset$qv stdcall, offset _Pellets, ds
push 1 call @girl_bg_put$qi stdcall, 1
call sub_24EC2
call @CMissiles@reset$qv stdcall, offset _Missiles, ds call @CMissiles@reset$qv stdcall, offset _Missiles, ds
add sp, 0Ah add sp, 0Ah
xor si, si xor si, si