--- a/main.asm +++ b/main.asm @@ -16253,30 +16418,53 @@ Function13a47: ; 13a47 .asm_13b40 push hl ld c, NUM_MOVES - ld a, [hl] - and a + + ld a, [hli] + ld e, a + ld d, [hl] + or d jr z, .asm_13b4b - cp NUM_ATTACKS + 1 + ld a, d + cp (NUM_ATTACKS + 1) / $100 + jr c, .asm_13b4d + jr nc, .asm_13b4b + ld a, e + cp (NUM_ATTACKS + 1) % $100 jr c, .asm_13b4d + .asm_13b4b - ld [hl], POUND + ld [hl], POUND / $100 + dec hl + ld [hl], POUND % $100 + inc hl .asm_13b4d - ld a, [hl] - and a + inc hl + + ld a, [hli] + ld e, a + ld d, [hl] + dec hl + or d jr z, .asm_13b55 - cp NUM_ATTACKS + 1 + ld a, d + cp (NUM_ATTACKS + 1) / $100 + jr c, .asm_13b5c + jr nc, .asm_13b55 + ld a, e + cp (NUM_ATTACKS + 1) % $100 jr c, .asm_13b5c .asm_13b55 xor a ld [hli], a + ld [hli], a dec c jr nz, .asm_13b55 jr .asm_13b60 .asm_13b5c - inc hl + inc hl ; second one at .asm_13b4d dec c jr nz, .asm_13b4d