diff options
| -rw-r--r-- | engine/battle/core.asm | 10 | ||||
| -rw-r--r-- | engine/printer/printer.asm | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 1d5bbc769..f8d99b24e 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1821,10 +1821,10 @@ SubtractHP: GetSixteenthMaxHP: call GetQuarterMaxHP - ; quarter result +; quarter result srl c srl c - ; round up +; at least 1 ld a, c and a jr nz, .ok @@ -1838,7 +1838,7 @@ GetEighthMaxHP: ; assumes nothing can have 1024 or more hp ; halve result srl c -; round up +; at least 1 ld a, c and a jr nz, .end @@ -1857,7 +1857,7 @@ GetQuarterMaxHP: rr c ; assumes nothing can have 1024 or more hp -; round up +; at least 1 ld a, c and a jr nz, .end @@ -1873,7 +1873,7 @@ GetHalfMaxHP: srl b rr c -; floor = 1 +; at least 1 ld a, c or b jr nz, .end diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 873c72b86..e26130098 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -146,7 +146,7 @@ PrintPCBox: ld hl, hVBlank ld a, [hl] push af - ld [hl], 4 + ld [hl], $4 xor a ldh [hBGMapMode], a @@ -295,7 +295,7 @@ PrintMail: ld hl, hVBlank ld a, [hl] push af - ld [hl], %0100 + ld [hl], $4 ld a, 18 / 2 ld [wPrinterQueueLength], a @@ -338,7 +338,7 @@ PrintPartymon: ld hl, hVBlank ld a, [hl] push af - ld [hl], %0100 + ld [hl], $4 ld a, 16 / 2 ld [wPrinterQueueLength], a @@ -396,7 +396,7 @@ _PrintDiploma: ld hl, hVBlank ld a, [hl] push af - ld [hl], %0100 + ld [hl], $4 ln a, 1, 0 ; to be loaded to wPrinterMargins call Printer_PrepareTilemapForPrint |