Skip to content

Commit

Permalink
[Reverse-engineering] [th04/th05] Death-related variables
Browse files Browse the repository at this point in the history 
Including the confirmation that both games have an 8-frame deathbomb
window.
The placement of the variables is all over the place though, what the
hell?

Part of P0034, funded by zorg.
  • Loading branch information
@nmlgc
nmlgc committed Sep 24, 2019
1 parent 5a6567e commit c77a927
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 64 deletions.
3 changes: 3 additions & 0 deletions th04/player/player.inc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
MISS_ANIM_FRAMES = 32
MISS_ANIM_FLASH_AT = 28
MISS_ANIM_EXPLODE_UNTIL = 31
7 changes: 7 additions & 0 deletions th04/shared.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ include th04/formats/bb.inc
include th04/formats/map.inc
; --------

include th04/player/player.inc

; Bombs
; -----
DEATHBOMB_WINDOW = 8
; -----

include th02/hud/hud.inc
include th04/hardware/grcg.inc
include th04/hardware/input.inc
Expand Down
67 changes: 35 additions & 32 deletions th04_main.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@ sub_B1D0 proc near
mov word_2599E, 30h ; '0'
mov word_259A0, 30h ; '0'
mov byte_259A3, 0
mov byte_259AA, 0
mov _miss_time, 0
mov byte_259A9, 0
mov byte_259A2, 40h
mov _point_items_collected, 0
Expand Down Expand Up @@ -10055,11 +10055,11 @@ sub_FFB4 proc near
jz short loc_10028
cmp byte_2D00A, 0
jnz short loc_10028
cmp byte_259AA, 0
cmp _miss_time, 0
jz short loc_FFED
cmp byte_259AA, 20h ; ' '
cmp _miss_time, MISS_ANIM_FRAMES
jbe short loc_10028
mov byte_259AA, 0
mov _miss_time, 0
mov byte_259A9, 0
mov byte_259A3, 0

Expand Down Expand Up @@ -11049,15 +11049,15 @@ var_1 = byte ptr -1
push si
push di
mov _tile_invalidate_box.y, 48
cmp byte_259AA, 0
cmp _miss_time, 0
jz short loc_10872
mov _tile_invalidate_box.x, 48
mov ax, word_259BA
add ax, 0FF90h
mov ax, _miss_explosion_radius
add ax, (-7 shl 4)
mov di, ax
xor si, si
mov al, byte_259B9
add al, 0F8h
mov al, _miss_explosion_angle
add al, -8
jmp short loc_10868
; ---------------------------------------------------------------------------

Expand Down Expand Up @@ -11169,15 +11169,15 @@ sub_10988 proc near
var_1 = byte ptr -1

enter 2, 0
dec byte_259AA
cmp byte_259AA, 20h ; ' '
dec _miss_time
cmp _miss_time, MISS_ANIM_FRAMES
ja locret_10ABD
cmp byte_259AA, 20h ; ' '
cmp _miss_time, MISS_ANIM_FRAMES
jnz loc_10A25
mov player_pos.velocity.x, 0
mov player_pos.velocity.y, 0
mov power_overflow_level, 0
mov word_259BA, 0
mov _miss_explosion_radius, 0
call sub_1DACE
mov al, power
mov ah, 0
Expand Down Expand Up @@ -11218,29 +11218,29 @@ loc_10A16:
inc byte ptr es:[bx+31h]

loc_10A25:
add word_259BA, 70h ; 'p'
mov al, byte_259B9
add _miss_explosion_radius, (7 shl 4)
mov al, _miss_explosion_angle
add al, 8
mov byte_259B9, al
cmp byte_259AA, 4
mov _miss_explosion_angle, al
cmp _miss_time, MISS_ANIM_FRAMES - MISS_ANIM_FLASH_AT
jnb locret_10ABD
les bx, _humaconfig
cmp byte ptr es:[bx+0Bh], 1
jbe short loc_10A60
test byte_259AA, 1
test _miss_time, 1
jz short loc_10A55
mov PaletteTone, 96h
mov PaletteTone, 150
jmp short loc_10A5B
; ---------------------------------------------------------------------------

loc_10A55:
mov PaletteTone, 64h ; 'd'
mov PaletteTone, 100

loc_10A5B:
mov _palette_changed, 1

loc_10A60:
cmp byte_259AA, 0
cmp _miss_time, 0
jnz short locret_10ABD
mov player_pos.cur.x, 192 * 16
mov player_pos.prev.x, 192 * 16
Expand Down Expand Up @@ -11302,7 +11302,7 @@ loc_10AE4:
mov word_25608, 21h ; '!'

loc_10AF1:
mov byte_259AA, 28h ; '('
mov _miss_time, MISS_ANIM_FRAMES + DEATHBOMB_WINDOW
mov byte_259A9, 0
mov byte_259A2, 0C0h
mov byte_259A3, 48h ; 'H'
Expand Down Expand Up @@ -11398,7 +11398,7 @@ loc_10BC7:
call fp_256AA

loc_10BF0:
cmp byte_259AA, 0
cmp _miss_time, 0
jz short loc_10BFA
call main_01:sub_10988

Expand All @@ -11422,9 +11422,9 @@ var_2 = word ptr -2
enter 6, 0
push si
push di
cmp byte_259AA, 0
cmp _miss_time, 0
jz short loc_10C13
cmp byte_259AA, 20h ; ' '
cmp _miss_time, MISS_ANIM_FRAMES
jbe loc_10CB2

loc_10C13:
Expand Down Expand Up @@ -11495,11 +11495,11 @@ loc_10C6F:
; ---------------------------------------------------------------------------

loc_10CB2:
cmp byte_259AA, 1
cmp _miss_time, MISS_ANIM_FRAMES - MISS_ANIM_EXPLODE_UNTIL
jbe loc_10D47
mov si, word_259BA
mov si, _miss_explosion_radius
mov [bp+var_4], 0
mov al, byte_259B9
mov al, _miss_explosion_angle
jmp short loc_10D3E
; ---------------------------------------------------------------------------

Expand Down Expand Up @@ -35267,7 +35267,7 @@ loc_1DF05:
mov word ptr [si+0Ah], 0

loc_1DF10:
cmp byte_259AA, 0
cmp _miss_time, 0
jnz short loc_1DF47
mov bx, player_pos.cur.x
add bx, 180h
Expand Down Expand Up @@ -41435,15 +41435,18 @@ byte_259A6 db ?
include th01/player_is_hit[bss].asm
db ? ;
byte_259A9 db ?
byte_259AA db ?
public _MISS_TIME
_miss_time db ?
public _POINT_ITEMS_COLLECTED
_point_items_collected db ?
include th04/player/option[bss].asm
dream_items_collected db ?
db ? ;
db ? ;
byte_259B9 db ?
word_259BA dw ?
public _MISS_EXPLOSION_ANGLE
_miss_explosion_angle db ?
public _MISS_EXPLOSION_RADIUS
_miss_explosion_radius dw ?
dw ?
dw ?
stage_title_len dw ?
Expand Down
67 changes: 35 additions & 32 deletions th05_main.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,7 @@ sub_B55A proc near
mov player_pos.prev.x, 192 * 16
mov player_pos.prev.y, 320 * 16
mov byte_2CEBD, 0
mov byte_2CEC2, 0
mov _miss_time, 0
mov _player_is_hit, 0
mov chara_invulnerable_time_left, 64;m_invulnerableTimeLeft
mov _point_items_collected, 0
Expand Down Expand Up @@ -2622,11 +2622,11 @@ sub_C483 proc near
jz loc_C518
cmp byte_2C96C, 0
jnz short loc_C518
cmp byte_2CEC2, 0
cmp _miss_time, 0
jz short loc_C4BC
cmp byte_2CEC2, 20h ; ' '
cmp _miss_time, MISS_ANIM_FRAMES
jbe short loc_C518
mov byte_2CEC2, 0
mov _miss_time, 0
mov _player_is_hit, 0
mov byte_2CEBD, 0

Expand Down Expand Up @@ -12833,15 +12833,15 @@ sub_12017 proc near
var_1 = byte ptr -1

enter 2, 0
dec byte_2CEC2
cmp byte_2CEC2, 20h ; ' '
dec _miss_time
cmp _miss_time, MISS_ANIM_FRAMES
ja locret_12148
cmp byte_2CEC2, 20h ; ' '
cmp _miss_time, MISS_ANIM_FRAMES
jnz short loc_12092
mov player_pos.velocity.x, 0
mov player_pos.velocity.y, 0
mov power_overflow_level, 0
mov word_2CEC4, 0
mov _miss_explosion_radius, 0
call sub_16E29
mov al, power
mov ah, 0
Expand Down Expand Up @@ -12888,28 +12888,28 @@ loc_120B1:

loc_120B6:
nopcall sub_1059D
add word_2CEC4, 70h ; 'p'
mov al, byte_2CEC8
add _miss_explosion_radius, (7 shl 4)
mov al, _miss_explosion_angle
add al, 8
mov byte_2CEC8, al
cmp byte_2CEC2, 4
mov _miss_explosion_angle, al
cmp _miss_time, MISS_ANIM_FRAMES - MISS_ANIM_FLASH_AT
jnb short locret_12148
cmp lives, 1
jbe short loc_120F0
test byte_2CEC2, 1
test _miss_time, 1
jz short loc_120E5
mov PaletteTone, 96h
mov PaletteTone, 150
jmp short loc_120EB
; ---------------------------------------------------------------------------

loc_120E5:
mov PaletteTone, 64h ; 'd'
mov PaletteTone, 100

loc_120EB:
mov _palette_changed, 1

loc_120F0:
cmp byte_2CEC2, 0
cmp _miss_time, 0
jnz short locret_12148
mov player_pos.cur.x, 192 * 16
mov player_pos.prev.x, 192 * 16
Expand Down Expand Up @@ -12960,7 +12960,7 @@ var_1 = byte ptr -1
loc_12161:
cmp _player_is_hit, 0
jz short loc_12188
mov byte_2CEC2, 28h ; '('
mov _miss_time, MISS_ANIM_FRAMES + DEATHBOMB_WINDOW
mov _player_is_hit, 0
mov chara_invulnerable_time_left, 0C0h
mov byte_2CEBD, 48h ; 'H'
Expand Down Expand Up @@ -13051,7 +13051,7 @@ loc_1222E:
call sub_C483

loc_12256:
cmp byte_2CEC2, 0
cmp _miss_time, 0
jz short loc_12260
call sub_12017

Expand All @@ -13075,9 +13075,9 @@ var_2 = word ptr -2
enter 6, 0
push si
push di
cmp byte_2CEC2, 0
cmp _miss_time, 0
jz short loc_12279
cmp byte_2CEC2, 20h ; ' '
cmp _miss_time, MISS_ANIM_FRAMES
jbe loc_12314

loc_12279:
Expand Down Expand Up @@ -13148,11 +13148,11 @@ loc_122D5:
; ---------------------------------------------------------------------------

loc_12314:
cmp byte_2CEC2, 1
cmp _miss_time, MISS_ANIM_FRAMES - MISS_ANIM_EXPLODE_UNTIL
jbe loc_123A9
mov si, word_2CEC4
mov si, _miss_explosion_radius
mov [bp+var_4], 0
mov al, byte_2CEC8
mov al, _miss_explosion_angle
jmp short loc_123A0
; ---------------------------------------------------------------------------

Expand Down Expand Up @@ -17503,14 +17503,14 @@ table_1425B dw loc_14187

sub_14266 proc near
mov _tile_invalidate_box.y, 48
cmp byte_2CEC2, 0
cmp _miss_time, 0
jz short loc_142D4
push di
mov _tile_invalidate_box.x, 48
mov di, word_2CEC4
add di, 0FF90h
mov al, byte_2CEC8
add al, 0F8h
mov di, _miss_explosion_radius
add di, (-7 shl 4)
mov al, _miss_explosion_angle
add al, -8
mov ah, 8

loc_14288:
Expand Down Expand Up @@ -21586,7 +21586,7 @@ loc_172A3:
mov word ptr [si+0Ah], 0

loc_172AE:
cmp byte_2CEC2, 0
cmp _miss_time, 0
jnz short loc_172E5
mov bx, player_pos.cur.x
add bx, 24 * 16
Expand Down Expand Up @@ -45053,12 +45053,15 @@ power db ?
shot_level db ?
byte_2CEC0 db ?
include th01/player_is_hit[bss].asm
byte_2CEC2 db ?
public _MISS_TIME
_miss_time db ?
dream db ?
word_2CEC4 dw ?
public _MISS_EXPLOSION_RADIUS
_miss_explosion_radius dw ?
public _POINT_ITEMS_COLLECTED
_point_items_collected dw ?
byte_2CEC8 db ?
public _MISS_EXPLOSION_ANGLE
_miss_explosion_angle db ?
dd ? ;
db ? ;
playchar_shot_func dw ?
Expand Down

0 comments on commit c77a927

Please sign in to comment.