diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-24 10:24:52 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-24 10:24:52 -0400 |
| commit | dc18e188b2948ede03328c0c0cf7ab423cacc861 (patch) | |
| tree | 0eff97454766331e3bb41e3158b1575cf044b983 /engine/printer | |
| parent | 8bf76af5a7360d9e86a24e3d9750329f354b3ac3 (diff) | |
Sync some files with pokegold
Diffstat (limited to 'engine/printer')
| -rw-r--r-- | engine/printer/printer.asm | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 5764b86d7..8ccdce866 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -71,7 +71,7 @@ PrintDexEntry: ld hl, hVBlank ld a, [hl] push af - ld [hl], 4 + ld [hl], 4 ; vblank mode that calls AskSerial ld a, 8 ; 16 rows ld [wPrinterQueueLength], a @@ -146,7 +146,7 @@ PrintPCBox: ld hl, hVBlank ld a, [hl] push af - ld [hl], $4 + ld [hl], 4 ; vblank mode that calls AskSerial xor a ldh [hBGMapMode], a @@ -212,19 +212,23 @@ Printer_ResetRegistersAndStartDataSend: PrintUnownStamp: ld a, [wPrinterQueueLength] push af + xor a ldh [hPrinter], a call Printer_PlayMusic + ldh a, [rIE] push af xor a ldh [rIF], a ld a, (1 << SERIAL) | (1 << VBLANK) ldh [rIE], a + ld hl, hVBlank ld a, [hl] push af - ld [hl], $4 + ld [hl], 4 ; vblank mode that calls AskSerial + xor a ldh [hBGMapMode], a call LoadTilemapToTempTilemap @@ -233,6 +237,7 @@ PrintUnownStamp: call Printer_PrepareTilemapForPrint call SafeLoadTempTilemapToTilemap call Printer_ResetJoypadRegisters + ld a, 18 / 2 ld [wPrinterQueueLength], a .loop @@ -260,10 +265,12 @@ PrintUnownStamp: ldh [hVBlank], a call Printer_CleanUpAfterSend call SafeLoadTempTilemapToTilemap + xor a ldh [rIF], a pop af ldh [rIE], a + pop af ld [wPrinterQueueLength], a ret @@ -295,7 +302,7 @@ PrintMail: ld hl, hVBlank ld a, [hl] push af - ld [hl], $4 + ld [hl], 4 ; vblank mode that calls AskSerial ld a, 18 / 2 ld [wPrinterQueueLength], a @@ -338,7 +345,7 @@ PrintPartymon: ld hl, hVBlank ld a, [hl] push af - ld [hl], $4 + ld [hl], 4 ; vblank mode that calls AskSerial ld a, 16 / 2 ld [wPrinterQueueLength], a @@ -396,7 +403,7 @@ _PrintDiploma: ld hl, hVBlank ld a, [hl] push af - ld [hl], $4 + ld [hl], 4 ; vblank mode that calls AskSerial ln a, 1, 0 ; to be loaded to wPrinterMargins call Printer_PrepareTilemapForPrint |