Rooba
/
ReC98
mirror of https://github.com/nmlgc/ReC98.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Decompilation] [th01] Pellets: Reset and decay functions 

Or, in more relevant news: That's the function that forced TH01's
pellet sprites to be defined in C land. First sprite to make that jump.

Part of P0102, funded by Yanga.
This commit is contained in:
nmlgc 2020-07-06 21:43:55 +02:00
parent 63dafdb9c7
commit 5735c1622e
6 changed files with 92 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build32b.bat
View File

@ -27,7 +27,7 @@ set BMP2ARR=bin\Pipeline\bmp2arr.exe
%CXX32% %CXX32FLAGS% -nbin/Pipeline/ Pipeline\bmp2arr.c Pipeline\bmp2arrl.c %CXX32% %CXX32FLAGS% -nbin/Pipeline/ Pipeline\bmp2arr.c Pipeline\bmp2arrl.c
%BMP2ARR% -i th01/sprites/pellet.bmp -o th01/sprites/pellet.asp -sym _sPELLET -of asm -sw 8 -sh 8 -pshf inner %BMP2ARR% -i th01/sprites/pellet.bmp -o th01/sprites/pellet.csp -sym sPELLET -of c -sw 8 -sh 8 -pshf inner
%BMP2ARR% -i th01/sprites/pellet_c.bmp -o th01/sprites/pellet_c.asp -sym _sPELLET_CLOUD -of asm -sw 16 -sh 16 %BMP2ARR% -i th01/sprites/pellet_c.bmp -o th01/sprites/pellet_c.asp -sym _sPELLET_CLOUD -of asm -sw 16 -sh 16
%BMP2ARR% -i th02/sprites/pellet.bmp -o th02/sprites/pellet.asp -sym _sPELLET -of asm -sw 8 -sh 8 -pshf outer %BMP2ARR% -i th02/sprites/pellet.bmp -o th02/sprites/pellet.asp -sym _sPELLET -of asm -sw 8 -sh 8 -pshf outer
%BMP2ARR% -i th02/sprites/sparks.bmp -o th02/sprites/sparks.asp -sym _sSPARKS -of asm -sw 8 -sh 8 -pshf outer %BMP2ARR% -i th02/sprites/sparks.bmp -o th02/sprites/sparks.asp -sym _sSPARKS -of asm -sw 8 -sh 8 -pshf outer

57
th01/main/bullet/pellet.cpp
View File

@ -19,6 +19,9 @@ static const int PELLET_DECAY_CELS = 2;
/// Globals /// Globals
/// ------- /// -------
pellet_t near *pellet_cur; pellet_t near *pellet_cur;
bool pellet_interlace = false;
unsigned int pellet_destroy_score_delta = 0;
#include "th01/sprites/pellet.csp"
/// ------- /// -------
CPellets::CPellets(void) CPellets::CPellets(void)
@ -675,3 +678,57 @@ void CPellets::unput_update_render(void)
} }
#undef p #undef p
} }
void CPellets::unput_and_reset_all(void)
{
#define p pellet_cur
p = iteration_start();
for(int i = 0; i < PELLET_COUNT; i++, p++) {
if(p->moving == false) {
continue;
}
if(p->not_rendered == false) {
p->sloppy_wide_unput_at_cur_pos();
}
p->decay_frame = 0;
p->moving = false;
p->cloud_frame = 0;
}
#undef p
alive_count = 0;
}
void CPellets::decay_all(void)
{
#define p pellet_cur
p = iteration_start();
for(int i = 0; i < PELLET_COUNT; i++, p++) {
if(p->moving == false) {
continue;
}
if(p->decay_frame) {
continue;
}
p->velocity.y.v /= 1.5f;
p->velocity.x.v /= 1.5f;
p->decay_frame = 1;
pellet_destroy_score_delta += PELLET_DESTROY_SCORE;
}
#undef p
}
void CPellets::reset_all(void)
{
#define p pellet_cur
p = iteration_start();
for(int i = 0; i < PELLET_COUNT; i++, p++) {
if(p->moving == false) {
continue;
}
p->moving = false;
p->decay_frame = 0;
p->cloud_frame = 0;
}
#undef p
alive_count = 0;
}

13
th01/main/bullet/pellet.hpp
View File

@ -122,6 +122,12 @@ protected:
); );
} }
void sloppy_wide_unput_at_cur_pos(void) {
egc_copy_rect_1_to_0_16(
cur_left.to_screen(), cur_top.to_screen(), 16, PELLET_H
);
}
public: public:
unsigned char moving; unsigned char moving;
unsigned char motion_type; unsigned char motion_type;
@ -217,8 +223,15 @@ public:
int spin_center_y = 0 int spin_center_y = 0
); );
// Transitions all living pellets into their decay state, awarding points
// for each one.
void decay_all(void);
// Also calls Shots.unput_update_render()! // Also calls Shots.unput_update_render()!
void unput_update_render(void); void unput_update_render(void);
void unput_and_reset_all(void);
void reset_all(void);
}; };
/// Globals /// Globals

2
th01/sprites/pellet.h
View File

@ -5,5 +5,3 @@
#else #else
static const int PELLET_CELS = 3; static const int PELLET_CELS = 3;
#endif #endif
extern const dots16_t sPELLET[PELLET_CELS][PRESHIFT][PELLET_H];

189
th01_reiiden.asm
View File

@ -948,7 +948,7 @@ arg_0 = word ptr 6
mov word_34A78, 1 mov word_34A78, 1
cmp [bp+arg_0], 0 cmp [bp+arg_0], 0
jnz loc_BF82 jnz loc_BF82
call sub_30E54 c, offset _Pellets, ds call @CPellets@decay_all$qv c, offset _Pellets, ds
call _ptn_put_8 c, _player_left, (43h shl 16) or _player_top call _ptn_put_8 c, _player_left, (43h shl 16) or _player_top
xor si, si xor si, si
jmp short loc_BF75 jmp short loc_BF75
@ -1206,7 +1206,7 @@ loc_C128:
idiv bx idiv bx
or dx, dx or dx, dx
jnz loc_C42E jnz loc_C42E
call sub_30E54 c, offset _Pellets, ds call @CPellets@decay_all$qv c, offset _Pellets, ds
jmp loc_C42E jmp loc_C42E
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
@ -1330,7 +1330,7 @@ loc_C21C:
idiv bx idiv bx
or dx, dx or dx, dx
jnz short loc_C235 jnz short loc_C235
call sub_30E54 c, offset _Pellets, ds call @CPellets@decay_all$qv c, offset _Pellets, ds
loc_C235: loc_C235:
xor si, si xor si, si
@ -2813,7 +2813,7 @@ loc_D29E:
loc_D2A5: loc_D2A5:
cmp _input_up, 0 cmp _input_up, 0
jz short loc_D2C7 jz short loc_D2C7
call sub_30DEE c, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv c, offset _Pellets, ds
loc_D2B8: loc_D2B8:
push ds push ds
@ -3485,7 +3485,7 @@ loc_D7E4:
mov es:[bx+reiidenconfig_t.score], eax mov es:[bx+reiidenconfig_t.score], eax
mov eax, _continues_total mov eax, _continues_total
mov es:[bx+reiidenconfig_t.continues_total], eax mov es:[bx+reiidenconfig_t.continues_total], eax
call sub_30DEE c, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv c, offset _Pellets, ds
call @CShots@unput_and_reset_all$qv c, offset _Shots, ds call @CShots@unput_and_reset_all$qv c, offset _Shots, ds
mov word ptr [bp+s1+2], ds mov word ptr [bp+s1+2], ds
mov word ptr [bp+s1], 1250h mov word ptr [bp+s1], 1250h
@ -4394,7 +4394,7 @@ loc_E244:
inc si inc si
call sub_CE5C call sub_CE5C
call @CShots@unput_and_reset_all$qv c, offset _Shots, ds call @CShots@unput_and_reset_all$qv c, offset _Shots, ds
call sub_30DEE c, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv c, offset _Pellets, ds
call sub_D47D call sub_D47D
mov word_34A8A, 1 mov word_34A8A, 1
cmp byte_34ADF, 0 cmp byte_34ADF, 0
@ -7339,7 +7339,7 @@ arg_0 = word ptr 6
push si push si
push di push di
call @CShots@unput_and_reset_all$qv c, offset _Shots, ds call @CShots@unput_and_reset_all$qv c, offset _Shots, ds
call sub_30DEE c, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv c, offset _Pellets, ds
push 32h ; '2' push 32h ; '2'
call _frame_delay call _frame_delay
pop cx pop cx
@ -18332,7 +18332,7 @@ loc_1AE85:
call _egc_copy_rect_1_to_0_16 call _egc_copy_rect_1_to_0_16
add sp, 8 add sp, 8
call @CShots@unput_and_reset_all$qv c, offset _Shots, ds call @CShots@unput_and_reset_all$qv c, offset _Shots, ds
call sub_30E54 c, offset _Pellets, ds call @CPellets@decay_all$qv c, offset _Pellets, ds
push 0 push 0
call sub_19E48 call sub_19E48
pop cx pop cx
@ -22261,7 +22261,7 @@ loc_1D6C4:
cmp word_3A6C8, 0 cmp word_3A6C8, 0
jg short loc_1D75D jg short loc_1D75D
call _mdrv2_bgm_fade_out_nonblock call _mdrv2_bgm_fade_out_nonblock
call sub_30DEE c, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv c, offset _Pellets, ds
xor si, si xor si, si
jmp short loc_1D74B jmp short loc_1D74B
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
@ -23010,7 +23010,7 @@ loc_1DF5A:
cmp word_3A6C8, 0 cmp word_3A6C8, 0
jg short loc_1DFFC jg short loc_1DFFC
call _mdrv2_bgm_fade_out_nonblock call _mdrv2_bgm_fade_out_nonblock
call sub_30DEE stdcall, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv stdcall, offset _Pellets, ds
push ds push ds
push offset unk_39EC4 push offset unk_39EC4
call sub_21EFF call sub_21EFF
@ -26444,7 +26444,7 @@ loc_1FCF7:
push 0 push 0
call _graph_accesspage_func call _graph_accesspage_func
call _mdrv2_bgm_fade_out_nonblock call _mdrv2_bgm_fade_out_nonblock
call sub_30DEE stdcall, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv stdcall, offset _Pellets, ds
push ds push ds
push offset unk_39EC4 push offset unk_39EC4
call sub_21EFF call sub_21EFF
@ -32929,7 +32929,7 @@ loc_2326F:
push offset point_3982A push offset point_3982A
call sub_1588A call sub_1588A
call _mdrv2_bgm_fade_out_nonblock call _mdrv2_bgm_fade_out_nonblock
call sub_30DEE stdcall, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv stdcall, offset _Pellets, ds
add sp, 0Eh add sp, 0Eh
call sub_1261B call sub_1261B
@ -35929,7 +35929,7 @@ loc_24D59:
cmp word_3A6C8, 0 cmp word_3A6C8, 0
jg short loc_24DFB jg short loc_24DFB
call _mdrv2_bgm_fade_out_nonblock call _mdrv2_bgm_fade_out_nonblock
call sub_30DEE c, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv c, offset _Pellets, ds
xor si, si xor si, si
jmp short loc_24DE9 jmp short loc_24DE9
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
@ -41921,7 +41921,7 @@ loc_285A5:
cmp word_3A6C8, 0 cmp word_3A6C8, 0
jg short loc_28655 jg short loc_28655
call _mdrv2_bgm_fade_out_nonblock call _mdrv2_bgm_fade_out_nonblock
call sub_30DEE stdcall, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv stdcall, offset _Pellets, ds
push 1 push 1
call sub_24EC2 call sub_24EC2
push ds push ds
@ -48813,7 +48813,7 @@ loc_2C835:
mov word_3A6CA, 0 mov word_3A6CA, 0
mov word_3B433, 18Fh mov word_3B433, 18Fh
call @CShots@unput_and_reset_all$qv c, offset _Shots, ds call @CShots@unput_and_reset_all$qv c, offset _Shots, ds
call sub_30DEE c, offset _Pellets, ds call @CPellets@unput_and_reset_all$qv c, offset _Pellets, ds
xor si, si xor si, si
jmp short loc_2C8AE jmp short loc_2C8AE
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
@ -53939,161 +53939,14 @@ main_38_TEXT segment byte public 'CODE' use16
extern @CPellets@add_pattern$qii16pellet_pattern_ti:proc extern @CPellets@add_pattern$qii16pellet_pattern_ti:proc
extern @CPellets@add_single$qiiii15pellet_motion_tiii:proc extern @CPellets@add_single$qiiii15pellet_motion_tiii:proc
extern @CPellets@unput_update_render$qv:proc extern @CPellets@unput_update_render$qv:proc
extern @CPellets@unput_and_reset_all$qv:proc
extern @CPellets@decay_all$qv:proc
main_38_TEXT ends main_38_TEXT ends
main_38__TEXT segment byte public 'CODE' use16 main_38__TEXT segment byte public 'CODE' use16
assume cs:main_38 assume cs:main_38
assume es:nothing, ss:nothing, ds:_DATA, fs:nothing, gs:nothing assume es:nothing, ss:nothing, ds:_DATA, fs:nothing, gs:nothing
; =============== S U B R O U T I N E =======================================
; Attributes: bp-based frame
sub_30DEE proc far
@@CPellets = dword ptr 6
push bp
mov bp, sp
push si
mov ax, word ptr [bp+@@CPellets]
mov _pellet_cur, ax
xor si, si
jmp short loc_30E42
; ---------------------------------------------------------------------------
loc_30DFC:
mov bx, _pellet_cur
cmp byte ptr [bx], 0
jz short loc_30E3C
mov bx, _pellet_cur
cmp word ptr [bx+18h], 0
jnz short loc_30E2B
push (8 shl 16) or 16
mov ax, [bx+4]
sar ax, 4
push ax
mov ax, [bx+2]
sar ax, 4
push ax
call _egc_copy_rect_1_to_0_16
add sp, 8
loc_30E2B:
mov bx, _pellet_cur
mov word ptr [bx+1Eh], 0
mov byte ptr [bx], 0
mov word ptr [bx+20h], 0
loc_30E3C:
inc si
add _pellet_cur, size pellet_t
loc_30E42:
cmp si, PELLET_COUNT
jl short loc_30DFC
les bx, [bp+@@CPellets]
mov es:[bx+CPellets.PELLET_alive_count], 0
pop si
pop bp
retf
sub_30DEE endp
; =============== S U B R O U T I N E =======================================
; Attributes: bp-based frame
sub_30E54 proc far
var_2 = word ptr -2
@@CPellets = word ptr 6
enter 2, 0
push si
mov ax, [bp+@@CPellets]
mov _pellet_cur, ax
xor si, si
jmp short loc_30EC0
; ---------------------------------------------------------------------------
loc_30E63:
mov bx, _pellet_cur
cmp byte ptr [bx], 0
jz short loc_30EBA
mov bx, _pellet_cur
cmp word ptr [bx+1Eh], 0
jnz short loc_30EBA
mov bx, _pellet_cur
mov ax, [bx+12h]
mov [bp+var_2], ax
fild [bp+var_2]
fdiv flt_3624F
call ftol@
mov bx, _pellet_cur
mov [bx+12h], ax
mov ax, [bx+10h]
mov [bp+var_2], ax
fild [bp+var_2]
fdiv flt_3624F
call ftol@
mov bx, _pellet_cur
mov [bx+10h], ax
mov word ptr [bx+1Eh], 1
add _pellet_destroy_score_delta, 10
loc_30EBA:
inc si
add _pellet_cur, size pellet_t
loc_30EC0:
cmp si, PELLET_COUNT
jl short loc_30E63
pop si
leave
retf
sub_30E54 endp
; =============== S U B R O U T I N E =======================================
; Attributes: bp-based frame
sub_30EC8 proc far
@@CPellets = dword ptr 6
push bp
mov bp, sp
mov ax, word ptr [bp+@@CPellets]
mov _pellet_cur, ax
xor dx, dx
jmp short loc_30EF5
; ---------------------------------------------------------------------------
loc_30ED5:
mov bx, _pellet_cur
cmp byte ptr [bx], 0
jz short loc_30EEF
mov bx, _pellet_cur
mov byte ptr [bx], 0
mov word ptr [bx+1Eh], 0
mov word ptr [bx+20h], 0
loc_30EEF:
inc dx
add _pellet_cur, size pellet_t
loc_30EF5:
cmp dx, PELLET_COUNT
jl short loc_30ED5
les bx, [bp+@@CPellets]
mov es:[bx+CPellets.PELLET_alive_count], 0
pop bp
retf
sub_30EC8 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
@ -55283,12 +55136,8 @@ a0m_0 db 1Bh,'[0m',0
; char a11h[] ; char a11h[]
a11h db 1Bh,'[1;1H',0 a11h db 1Bh,'[1;1H',0
word_360CA dw 0 word_360CA dw 0
public _pellet_interlace, _pellet_destroy_score_delta extern _pellet_interlace:byte
_pellet_interlace db 0 extern _pellet_destroy_score_delta:word
_pellet_destroy_score_delta dw 0
include th01/sprites/pellet.asp
flt_3624F dd 1.5
db 0
_INIT_ segment word public 'INITDATA' use16 _INIT_ segment word public 'INITDATA' use16
db 1 db 1
db 20h db 20h

2
th02/main/bullet/pellet_r.cpp
View File

@ -1,5 +1,7 @@
#include "th01/sprites/pellet.h" #include "th01/sprites/pellet.h"
extern const dots16_t sPELLET[PELLET_CELS][PRESHIFT][PELLET_H];
void pascal near pellet_render(int left, int top) void pascal near pellet_render(int left, int top)
{ {
_ES = SEG_PLANE_B; _ES = SEG_PLANE_B;