diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-04 15:16:20 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-04 19:44:31 -0500 |
| commit | aae999f72bd81a3156c7e00da4ebf499f52da5a6 (patch) | |
| tree | 32fef70a31af3a0b5ad2b0d34042c312574fb42d /engine/printer | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.gz pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.tar.xz pokeyellow-aae999f72bd81a3156c7e00da4ebf499f52da5a6.zip | |
Start reorganizing pokeyellow
Diffstat (limited to '')
| -rw-r--r-- | engine/printer/printer.asm (renamed from engine/printer.asm) | 19 | ||||
| -rwxr-xr-x | engine/printer/printer2.asm (renamed from engine/unknown_ea3ea.asm) | 6 | ||||
| -rwxr-xr-x | engine/printer/serial.asm | 15 |
3 files changed, 19 insertions, 21 deletions
diff --git a/engine/printer.asm b/engine/printer/printer.asm index f0b681af..18bb18a6 100644 --- a/engine/printer.asm +++ b/engine/printer/printer.asm @@ -1,16 +1,3 @@ - const_def - const PRINTER_STATUS_BLANK - const PRINTER_STATUS_CHECKING_LINK - const PRINTER_STATUS_TRANSMITTING - const PRINTER_STATUS_PRINTING - const PRINTER_ERROR_1 - const PRINTER_ERROR_2 - const PRINTER_ERROR_3 - const PRINTER_ERROR_4 - const PRINTER_ERROR_WRONG_DEVICE - -INCLUDE "engine/printer/serial.asm" - PrintPokedexEntry: ld a, [wUpdateSpritesEnabled] push af @@ -128,7 +115,7 @@ Printer_PrepareDexEntryForPrinting: callfar Pokedex_PrepareDexEntryForPrinting ret -PrintSurfingMinigameHighScore: +PrintSurfingMinigameHighScore:: xor a ldh [hCanceledPrinting], a call Printer_PlayPrinterMusic @@ -641,7 +628,7 @@ GBPrinter_UpdateStatusMessage: db "This is not the" next "Game Boy Printer!@" -Printer_PrepareSurfingMinigameHighScoreTileMap: +Printer_PrepareSurfingMinigameHighScoreTileMap:: call GBPalWhiteOutWithDelay3 call ClearScreen ld de, SurfingPikachu2Graphics @@ -788,7 +775,7 @@ CopySurfingMinigameScore: dec de ret -SurfingPikachu2Graphics: INCBIN "gfx/surfing_pikachu_2.2bpp" +SurfingPikachu2Graphics: INCBIN "gfx/surfing_pikachu/surfing_pikachu_2.2bpp" SurfingPikachu2GraphicsEnd: PrintPCBox_DrawPage1: diff --git a/engine/unknown_ea3ea.asm b/engine/printer/printer2.asm index c10f1555..180f044c 100755 --- a/engine/unknown_ea3ea.asm +++ b/engine/printer/printer2.asm @@ -177,11 +177,11 @@ Printer_GetMonStats: db "--------------@" GFX_ea563: -INCBIN "gfx/stats_screen_hp.1bpp" +INCBIN "gfx/printer/hp.1bpp" GFX_ea563End: GFX_ea56b: -INCBIN "gfx/stats_screen_lv.1bpp" +INCBIN "gfx/printer/lv.1bpp" GFX_ea56bEnd: PrinterDebug_LoadGFX: @@ -208,7 +208,7 @@ PrinterDebug_LoadGFX: ret GFX_ea597: -INCBIN "gfx/zero_one_ea597.2bpp" +INCBIN "gfx/printer/01.2bpp" GFX_ea597End: PrinterDebug_ConvertStatusFlagsToTiles: diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm index 97f655bb..fd4dd056 100755 --- a/engine/printer/serial.asm +++ b/engine/printer/serial.asm @@ -1,3 +1,14 @@ + const_def + const PRINTER_STATUS_BLANK + const PRINTER_STATUS_CHECKING_LINK + const PRINTER_STATUS_TRANSMITTING + const PRINTER_STATUS_PRINTING + const PRINTER_ERROR_1 + const PRINTER_ERROR_2 + const PRINTER_ERROR_3 + const PRINTER_ERROR_4 + const PRINTER_ERROR_WRONG_DEVICE + StartTransmission_Send9Rows: ld a, 9 Printer_StartTransmission: @@ -104,9 +115,9 @@ Printer_StartTransmittingTilemap: ld hl, PrinterDataPacket3 call CopyPrinterDataHeader call Printer_Convert2RowsTo2bpp - ld a, (wPrinterSendDataSource1End - wPrinterSendDataSource1) % $100 + ld a, LOW(wPrinterSendDataSource1End - wPrinterSendDataSource1) ld [wPrinterDataSize], a - ld a, (wPrinterSendDataSource1End - wPrinterSendDataSource1) / $100 + ld a, HIGH(wPrinterSendDataSource1End - wPrinterSendDataSource1) ld [wPrinterDataSize + 1], a call ComputePrinterChecksum call Printer_Next |