Skip to content

Commit 49cc9c2

Browse files
Alt health by calc84maniac (#5)
* Fix .healthLoop
1 parent 37d8f02 commit 49cc9c2

File tree

3 files changed

+27
-9
lines changed

3 files changed

+27
-9
lines changed

art/judge/judge_health.png

2 Bytes
Loading

inc/judge.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,9 @@ IF !DEF (JUDGE_HEALTH)
174174
DEF JUDGE_HEALTH EQU 0
175175
ENDC
176176

177-
DEF T_HEALTH_EMPTY EQU $01
178-
DEF T_HEALTH_HALF EQU $02
179-
DEF T_HEALTH_FULL EQU $03
177+
DEF T_HEALTH_EMPTY EQU $02
178+
DEF T_HEALTH_HALF EQU $03
179+
DEF T_HEALTH_FULL EQU $04
180180

181181
DEF MAP_HEALTH EQU TILEMAP1
182182
DEF ROW_HEALTH EQU 0

src/judge/judge_main.asm

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,25 +69,43 @@ ENDR
6969
add T_HEALTH_HALF
7070
ld [MAP_HEALTH + ROW_HEALTH * TILEMAP_WIDTH + COL_HEALTH], a
7171

72-
ELSE
72+
ELIF JUDGE_HEALTH == 2
7373

74-
; Optimized by calc84maniac
74+
; Optimized by calc84maniac
7575
cpl
7676
add MAX_HEALTH + 1
7777
ld hl, MAP_HEALTH + ROW_HEALTH * TILEMAP_WIDTH + COL_HEALTH
7878
.healthLoop
7979
sub 2
80-
ld d, T_HEALTH_FULL
80+
ld b, T_HEALTH_FULL
8181
jr nc, .healthCont
82-
add d ; T_HEALTH_EMPTY or T_HEALTH_HALF
83-
ld d, a
82+
add b ; T_HEALTH_EMPTY or T_HEALTH_HALF
83+
ld b, a
8484
xor a
8585
.healthCont
86-
ld [hl], d
86+
ld [hl], b
8787
inc l
8888
bit 2, l
8989
jr z, .healthLoop
9090

91+
ELSE
92+
93+
; Optimized by calc84maniac
94+
sub MAX_HEALTH + 1
95+
rra
96+
ld b, a
97+
ld hl, MAP_HEALTH + ROW_HEALTH * TILEMAP_WIDTH + COL_HEALTH
98+
ld a, T_HEALTH_FULL
99+
.healthLoop
100+
inc b
101+
jr nz, .healthCont
102+
adc -2 ; T_HEALTH_EMPTY or T_HEALTH_HALF
103+
.healthCont
104+
ld [hli], a
105+
res 0, a ; Change T_HEALTH_HALF to T_HEALTH_EMPTY
106+
bit 2, l
107+
jr z, .healthLoop
108+
91109
ENDC
92110

93111
.wave

0 commit comments

Comments
 (0)