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

[Reverse-engineering] [th04/th05] Item types and sprite IDs 

Completes P0057, funded by [Anonymous] and -Tom-.
This commit is contained in:
nmlgc 2019-11-10 14:54:28 +01:00
parent 2f0ca1ccf1
commit ac7540dada
7 changed files with 113 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
th04/item/enemy_drops[data].asm
View File

@ -1,9 +1,9 @@
ENEMY_DROPS label byte
db 0, 1, 0, 0, 1, 1, 0, 1
db 0, 1, 1, 1, 0, 0, 0, 2
db 1, 0, 1, 1, 0, 0, 1, 0
db 1, 0, 0, 0, 1, 1, 1, 2
db 0, 1, 0, 0, 1, 1, 0, 1
db 0, 1, 1, 1, 0, 0, 0, 2
db 1, 0, 1, 1, 0, 0, 1, 0
db 1, 0, 0, 0, 1, 1, 1, 3
db IT_POWER, IT_POINT, IT_POWER, IT_POWER, IT_POINT, IT_POINT, IT_POWER, IT_POINT
db IT_POWER, IT_POINT, IT_POINT, IT_POINT, IT_POWER, IT_POWER, IT_POWER, IT_DREAM
db IT_POINT, IT_POWER, IT_POINT, IT_POINT, IT_POWER, IT_POWER, IT_POINT, IT_POWER
db IT_POINT, IT_POWER, IT_POWER, IT_POWER, IT_POINT, IT_POINT, IT_POINT, IT_DREAM
db IT_POWER, IT_POINT, IT_POWER, IT_POWER, IT_POINT, IT_POINT, IT_POWER, IT_POINT
db IT_POWER, IT_POINT, IT_POINT, IT_POINT, IT_POWER, IT_POWER, IT_POWER, IT_DREAM
db IT_POINT, IT_POWER, IT_POINT, IT_POINT, IT_POWER, IT_POWER, IT_POINT, IT_POWER
db IT_POINT, IT_POWER, IT_POWER, IT_POWER, IT_POINT, IT_POINT, IT_POINT, IT_BIGPOWER

15
th04/item/items.hpp
View File

@ -1,3 +1,14 @@
enum item_type_t {
IT_POWER = 0,
IT_POINT = 1,
IT_DREAM = 2,
IT_BIGPOWER = 3,
IT_BOMB = 4,
IT_1UP = 5,
IT_FULLPOWER = 6,
IT_COUNT,
};
struct item_t {
char flag;
char unused;
@ -19,3 +30,7 @@ struct item_t {
#endif
extern item_t items[ITEM_COUNT];
extern const int ITEM_TYPE_PATNUM[IT_COUNT];
void pascal near items_add(Subpixel x, Subpixel y, item_type_t type);

11
th04/item/items[bss].asm
View File

@ -1,3 +1,12 @@
; item_type_t
IT_POWER = 0
IT_POINT = 1
IT_DREAM = 2
IT_BIGPOWER = 3
IT_BOMB = 4
IT_1UP = 5
IT_FULLPOWER = 6
item_t struc
flag db ?
db ?
@ -14,8 +23,10 @@ ITEM_PULL_SPEED = 10
if GAME eq 5
ITEM_COUNT = 40
ITEM_TYPE_PATNUM_OFFSET = 36
else
ITEM_COUNT = 32
ITEM_TYPE_PATNUM_OFFSET = 44
endif
public _items

8
th04/item/type_patnum[data].asm Normal file
View File

@ -0,0 +1,8 @@
ITEM_TYPE_PATNUM label word
dw ITEM_TYPE_PATNUM_OFFSET + IT_POWER
dw ITEM_TYPE_PATNUM_OFFSET + IT_POINT
dw ITEM_TYPE_PATNUM_OFFSET + IT_DREAM
dw ITEM_TYPE_PATNUM_OFFSET + IT_BIGPOWER
dw ITEM_TYPE_PATNUM_OFFSET + IT_BOMB
dw ITEM_TYPE_PATNUM_OFFSET + IT_1UP
dw ITEM_TYPE_PATNUM_OFFSET + IT_FULLPOWER

87
th04_main.asm
View File

@ -16563,10 +16563,7 @@ loc_14629:
mov _midboss_pos.velocity.x, 0
call sparks_add_circle pascal, _midboss_pos.cur.x, _midboss_pos.cur.y, large (((6 shl 4) shl 16) or 48)
call snd_se_play pascal, 12
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 5
call sub_1DA38
call items_add pascal, _midboss_pos.cur.x, _midboss_pos.cur.y, IT_1UP
jmp short loc_1468D
; ---------------------------------------------------------------------------
@ -16847,7 +16844,7 @@ loc_148D0:
call snd_se_play
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 3
push IT_BIGPOWER
jmp short loc_148F2
; ---------------------------------------------------------------------------
@ -16855,10 +16852,10 @@ loc_148E1:
call snd_se_play pascal, 9 ; jumptable 0001488D case 450
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 5
push IT_1UP
loc_148F2:
call sub_1DA38
call items_add
locret_148F5:
leave ; default
@ -17528,10 +17525,7 @@ loc_14EB5:
sub dx, ax
push dx
call sub_19F6E
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 4
call sub_1DA38
call items_add pascal, _midboss_pos.cur.x, _midboss_pos.cur.y, IT_BOMB
mov word_255C2, 0Ch
loc_14EE0:
@ -18138,17 +18132,17 @@ loc_15414:
jnz short loc_15480
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 4
push IT_BOMB
jmp short loc_1548A
; ---------------------------------------------------------------------------
loc_15480:
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 5
push IT_1UP
loc_1548A:
call sub_1DA38
call items_add
jmp loc_1552D
; ---------------------------------------------------------------------------
@ -23016,10 +23010,7 @@ loc_17F3C:
mov byte ptr [si+2Ah], 0
mov word ptr [si+0Ah], 0
mov word ptr [si+0Ch], 0
push word ptr [si+2]
push word ptr [si+4]
push word ptr [si+23h]
call sub_1DA38
call items_add pascal, word ptr [si+2], word ptr [si+4], word ptr [si+23h]
call snd_se_play pascal, 3
movzx eax, word ptr [si+14h]
add _score_delta, eax
@ -27115,10 +27106,7 @@ loc_1A1EE:
push word ptr [si+4]
push large (((4 shl 4) shl 16) or 8)
nopcall sparks_add_random
push word ptr [si+2]
push word ptr [si+4]
push 3
call sub_1DA38
call items_add pascal, word ptr [si+2], word ptr [si+4], IT_BIGPOWER
loc_1A22E:
inc word ptr [si+0Eh]
@ -34085,10 +34073,10 @@ sub_1DA1B endp
; =============== S U B R O U T I N E =======================================
; Attributes: bp-based frame
public ITEMS_ADD
items_add proc near
sub_1DA38 proc near
arg_0 = byte ptr 4
@@type = byte ptr 4
@@y = word ptr 6
@@x = word ptr 8
@ -34096,7 +34084,7 @@ arg_0 = byte ptr 4
mov bp, sp
push si
push di
cmp [bp+arg_0], 0FFh
cmp [bp+@@type], -1
jnz short loc_1DA6F
inc byte_2D00E
mov al, byte_2D00E
@ -34116,7 +34104,7 @@ arg_0 = byte ptr 4
idiv bx
mov bx, dx
mov al, ENEMY_DROPS[bx]
mov [bp+arg_0], al
mov [bp+@@type], al
loc_1DA6F:
mov si, offset _items
@ -34135,13 +34123,13 @@ loc_1DA76:
mov [si+4], ax
mov [si+item_t.pos.velocity.x], 0
mov [si+item_t.pos.velocity.y], (-3 shl 4)
mov al, [bp+arg_0]
mov [si+0Eh], al
mov al, [bp+@@type]
mov [si+item_t.ITEM_type], al
mov ah, 0
add ax, ax
mov bx, ax
mov ax, [bx+2322h]
mov [si+10h], ax
mov ax, ITEM_TYPE_PATNUM[bx]
mov [si+item_t.ITEM_patnum], ax
call item_splashes_add pascal, [bp+@@x], [bp+@@y]
mov word ptr [si+12h], 0
inc word_236D8
@ -34161,7 +34149,7 @@ loc_1DAC8:
pop si
pop bp
retn 6
sub_1DA38 endp
items_add endp
; =============== S U B R O U T I N E =======================================
@ -34171,7 +34159,7 @@ sub_1DA38 endp
sub_1DACE proc far
var_A = word ptr -0Ah
var_8 = word ptr -8
@@type = word ptr -8
var_6 = word ptr -6
var_4 = word ptr -4
var_2 = word ptr -2
@ -34240,26 +34228,26 @@ loc_1DB19:
jz short loc_1DB6B
push 1
call randring2_next16_and
mov [bp+var_8], ax
mov [bp+@@type], ax
jmp short loc_1DB70
; ---------------------------------------------------------------------------
loc_1DB6B:
mov [bp+var_8], 3
mov [bp+@@type], IT_BIGPOWER
loc_1DB70:
les bx, _humaconfig
cmp byte ptr es:[bx+0Bh], 1
jnz short loc_1DB80
mov [bp+var_8], 6
mov [bp+@@type], IT_FULLPOWER
loc_1DB80:
mov al, byte ptr [bp+var_8]
mov [si+0Eh], al
mov bx, [bp+var_8]
mov al, byte ptr [bp+@@type]
mov [si+item_t.ITEM_type], al
mov bx, [bp+@@type]
add bx, bx
mov ax, [bx+2322h]
mov [si+10h], ax
mov ax, ITEM_TYPE_PATNUM[bx]
mov [si+item_t.ITEM_patnum], ax
inc di
inc word_236D8
cmp di, 5
@ -35260,7 +35248,7 @@ loc_1E6C8:
imul bx, 5
mov al, [bx+si+23DEh]
push ax
call sub_1DA38
call items_add
inc si
loc_1E6EA:
@ -40022,20 +40010,7 @@ aBONUS_TOTAL_2 db '
include th04/item/enemy_drops[data].asm
byte_23660 db 0
byte_23661 db 0
db 2Ch ; ,
db 0
db 2Dh ; -
db 0
db 2Eh ; .
db 0
db 2Fh ; /
db 0
db 30h ; 0
db 0
db 31h ; 1
db 0
db 32h ; 2
db 0
include th04/item/type_patnum[data].asm
include th02/power_overflow[data].asm
include th04/dream_score[data].asm
power_overflow_level dw 0

16
th05/item/enemy_drops[data].asm
View File

@ -1,9 +1,9 @@
ENEMY_DROPS label byte
db 0, 1, 0, 0, 1, 1, 0, 1
db 0, 1, 1, 1, 0, 0, 0, 1
db 0, 1, 1, 0, 0, 1, 0, 1
db 0, 1, 1, 1, 1, 0, 1, 1
db 0, 0, 1, 1, 0, 1, 0, 1
db 1, 1, 0, 0, 1, 1, 0, 1
db 1, 0, 0, 1, 0, 1, 1, 0
db 0, 1, 1, 1, 0, 1, 0, 3
db IT_POWER, IT_POINT, IT_POWER, IT_POWER, IT_POINT, IT_POINT, IT_POWER, IT_POINT
db IT_POWER, IT_POINT, IT_POINT, IT_POINT, IT_POWER, IT_POWER, IT_POWER, IT_POINT
db IT_POWER, IT_POINT, IT_POINT, IT_POWER, IT_POWER, IT_POINT, IT_POWER, IT_POINT
db IT_POWER, IT_POINT, IT_POINT, IT_POINT, IT_POINT, IT_POWER, IT_POINT, IT_POINT
db IT_POWER, IT_POWER, IT_POINT, IT_POINT, IT_POWER, IT_POINT, IT_POWER, IT_POINT
db IT_POINT, IT_POINT, IT_POWER, IT_POWER, IT_POINT, IT_POINT, IT_POWER, IT_POINT
db IT_POINT, IT_POWER, IT_POWER, IT_POINT, IT_POWER, IT_POINT, IT_POINT, IT_POWER
db IT_POWER, IT_POINT, IT_POINT, IT_POINT, IT_POWER, IT_POINT, IT_POWER, IT_BIGPOWER

102
th05_main.asm
View File

@ -16273,10 +16273,7 @@ loc_16161:
mov word ptr [si+0Ch], 0
cmp byte ptr [si+20h], 0FEh
jz short loc_1618C
push word ptr [si+2]
push word ptr [si+4]
push word ptr [si+20h]
call sub_16D84
call items_add pascal, word ptr [si+2], word ptr [si+4], word ptr [si+20h]
loc_1618C:
call snd_se_play pascal, 3
@ -17588,10 +17585,10 @@ sub_16D67 endp
; =============== S U B R O U T I N E =======================================
; Attributes: bp-based frame
public ITEMS_ADD
items_add proc near
sub_16D84 proc near
arg_0 = byte ptr 4
@@type = byte ptr 4
@@y = word ptr 6
@@x = word ptr 8
@ -17601,16 +17598,16 @@ arg_0 = byte ptr 4
push di
cmp byte_2264E, 0
jz short loc_16DA0
cmp [bp+arg_0], 3
cmp [bp+@@type], IT_BIGPOWER
jb short loc_16D9C
cmp [bp+arg_0], 0FFh
cmp [bp+@@type], -1
jnz short loc_16DA0
loc_16D9C:
mov [bp+arg_0], 0
mov [bp+@@type], IT_POWER
loc_16DA0:
cmp [bp+arg_0], 0FFh
cmp [bp+@@type], -1
jnz short loc_16DCA
inc byte_2C98A
test byte_2C98A, 1
@ -17625,7 +17622,7 @@ loc_16DA0:
idiv bx
mov bx, dx
mov al, ENEMY_DROPS[bx]
mov [bp+arg_0], al
mov [bp+@@type], al
loc_16DCA:
mov si, offset _items
@ -17644,13 +17641,13 @@ loc_16DD1:
mov [si+4], ax
mov [si+item_t.pos.velocity.x], 0
mov [si+item_t.pos.velocity.y], (-3 shl 4)
mov al, [bp+arg_0]
mov [si+0Eh], al
mov al, [bp+@@type]
mov [si+item_t.ITEM_type], al
mov ah, 0
add ax, ax
mov bx, ax
mov ax, [bx+1BEEh]
mov [si+10h], ax
mov ax, ITEM_TYPE_PATNUM[bx]
mov [si+item_t.ITEM_patnum], ax
call item_splashes_add pascal, [bp+@@x], [bp+@@y]
mov word ptr [si+12h], 0
inc word_22644
@ -17670,7 +17667,7 @@ loc_16E23:
pop si
pop bp
retn 6
sub_16D84 endp
items_add endp
; =============== S U B R O U T I N E =======================================
@ -17680,7 +17677,7 @@ sub_16D84 endp
sub_16E29 proc far
var_A = word ptr -0Ah
var_8 = word ptr -8
@@type = word ptr -8
var_6 = word ptr -6
var_4 = word ptr -4
var_2 = word ptr -2
@ -17749,25 +17746,25 @@ loc_16E74:
jz short loc_16EC6
push 1
call randring2_next16_and
mov [bp+var_8], ax
mov [bp+@@type], ax
jmp short loc_16ECB
; ---------------------------------------------------------------------------
loc_16EC6:
mov [bp+var_8], 3
mov [bp+@@type], IT_BIGPOWER
loc_16ECB:
cmp lives, 1
jnz short loc_16ED7
mov [bp+var_8], 6
mov [bp+@@type], IT_FULLPOWER
loc_16ED7:
mov al, byte ptr [bp+var_8]
mov [si+0Eh], al
mov bx, [bp+var_8]
mov al, byte ptr [bp+@@type]
mov [si+item_t.ITEM_type], al
mov bx, [bp+@@type]
add bx, bx
mov ax, [bx+1BEEh]
mov [si+10h], ax
mov ax, ITEM_TYPE_PATNUM[bx]
mov [si+item_t.ITEM_patnum], ax
inc di
inc word_22644
cmp di, 5
@ -19583,10 +19580,7 @@ loc_17F64:
idiv bx
or dx, dx
jnz short loc_17F86
push word ptr [si+2]
push word ptr [si+4]
push 1
call sub_16D84
call items_add pascal, word ptr [si+2], word ptr [si+4], IT_POINT
loc_17F86:
inc [bp+var_2]
@ -19789,10 +19783,7 @@ loc_1812B:
mov _bullet_clear_trigger, 1
push 5
call sub_173AC
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 3
call sub_16D84
call items_add pascal, _midboss_pos.cur.x, _midboss_pos.cur.y, IT_BIGPOWER
loc_1818B:
mov _midboss_phase, 0FEh
@ -20853,10 +20844,7 @@ loc_18B24:
mov _bullet_clear_trigger, 1
push 0Fh
call sub_173AC
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 4
call sub_16D84
call items_add pascal, _midboss_pos.cur.x, _midboss_pos.cur.y, IT_BOMB
loc_18B67:
mov _midboss_phase, 0FEh
@ -22092,10 +22080,7 @@ loc_195BC:
mov _bullet_clear_trigger, 1
push 0Fh
call sub_173AC
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 5
call sub_16D84
call items_add pascal, _midboss_pos.cur.x, _midboss_pos.cur.y, IT_1UP
loc_195DA:
mov _midboss_phase, 0FEh
@ -25440,10 +25425,7 @@ loc_1B34A:
mov _bullet_clear_trigger, 1
push 0Fh
call sub_173AC
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 4
call sub_16D84
call items_add pascal, _midboss_pos.cur.x, _midboss_pos.cur.y, IT_BOMB
loc_1B368:
mov _midboss_phase, 0FEh
@ -31133,10 +31115,7 @@ loc_1E7F2:
mov _bullet_clear_trigger, 1
push 1Eh
call sub_173AC
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 5
call sub_16D84
call items_add pascal, _midboss_pos.cur.x, _midboss_pos.cur.y, IT_1UP
loc_1E82B:
mov _midboss_phase, 0FEh
@ -33098,10 +33077,7 @@ loc_1F936:
mov _bullet_clear_trigger, 1
push 1Eh
call sub_173AC
push _midboss_pos.cur.x
push _midboss_pos.cur.y
push 5
call sub_16D84
call items_add pascal, _midboss_pos.cur.x, _midboss_pos.cur.y, IT_1UP
loc_1F968:
mov _midboss_phase, 0FEh
@ -33339,7 +33315,7 @@ loc_1FB43:
imul bx, 5
mov al, [bx+si+1FD0h]
push ax
call sub_16D84
call items_add
inc si
loc_1FB65:
@ -34206,21 +34182,7 @@ word_22588 dw 800h
include th05/item/enemy_drops[data].asm
byte_225CC db 0
db 0
db 24h ; $
db 0
db 25h ; %
db 0
db 26h ; &
db 0
db 27h ; '
db 0
db 28h ; (
db 0
db 29h ; )
db 0
db 2Ah ; *
db 0
include th04/item/type_patnum[data].asm
include th02/power_overflow[data].asm
include th04/dream_score[data].asm
power_overflow_level dw 0