diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 17:51:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 17:51:03 -0700 |
| commit | 54143d33fc1211fb0c949ba62633d1c8d94f2717 (patch) | |
| tree | 9176ffc5b6384a48eb32ea8f33ac97d1d67f6865 /engine/printer | |
| parent | Merge pull request #14 from PikalaxALT/master (diff) | |
| parent | remove address comments (diff) | |
| download | pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.tar.gz pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.tar.xz pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.zip | |
Merge pull request #13 from YamaArashi/master
remove address comments
Diffstat (limited to '')
| -rw-r--r-- | engine/printer.asm | 22 | ||||
| -rwxr-xr-x | engine/printer/serial.asm | 8 |
2 files changed, 15 insertions, 15 deletions
diff --git a/engine/printer.asm b/engine/printer.asm index 4bf04e1a..46eb2c59 100644 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -11,7 +11,7 @@ INCLUDE "engine/printer/serial.asm" -PrintPokedexEntry: ; e8b74 (3a:4b74) +PrintPokedexEntry: ld a, [wUpdateSpritesEnabled] push af xor a @@ -238,7 +238,7 @@ Func_e8d11: scf ret -PrintPCBox:: ; e8d35 (3a:4e79) +PrintPCBox:: ld a, [wBoxDataStart] and a jp z, Func_e8df4 @@ -397,7 +397,7 @@ PrintFanClubPortrait: ; e8e24 call Printer_PlayMapMusic ret -PrinterDebug: ; e8e79 (3a:4e79) +PrinterDebug: push af push bc push de @@ -443,7 +443,7 @@ PrinterDebug: ; e8e79 (3a:4e79) pop af ret -Printer_CheckPressingB: ; e8eca (3a:4eca) +Printer_CheckPressingB: ld a, [hJoyHeld] and B_BUTTON jr nz, .quit @@ -476,21 +476,21 @@ Printer_CheckPressingB: ; e8eca (3a:4eca) scf ret -Printer_CopyTileMapToPrinterTileBuffer: ; e8efc (3a:4efc) +Printer_CopyTileMapToPrinterTileBuffer: coord hl, 0, 0 coord de, 0, 0, wPrinterTileBuffer ld bc, SCREEN_HEIGHT * SCREEN_WIDTH call CopyData ret -Printer_CopyTileMapFromPrinterTileBuffer: ; e8f09 (3a:4f09) +Printer_CopyTileMapFromPrinterTileBuffer: coord hl, 0, 0, wPrinterTileBuffer coord de, 0, 0 ld bc, SCREEN_HEIGHT * SCREEN_WIDTH call CopyData ret -Printer_ResetJoypadHRAM: ; e8f16 (3a:4f16) +Printer_ResetJoypadHRAM: xor a ld [hJoyLast], a ld [hJoyReleased], a @@ -500,7 +500,7 @@ Printer_ResetJoypadHRAM: ; e8f16 (3a:4f16) ld [hJoy6], a ret -Printer_PlayPrinterMusic: ; e8f24 (3a:4f24) +Printer_PlayPrinterMusic: call Printer_FadeOutMusicAndWait ld a, [wAudioROMBank] ld [wAudioSavedROMBank], a @@ -511,12 +511,12 @@ Printer_PlayPrinterMusic: ; e8f24 (3a:4f24) call PlaySound ret -Printer_PlayMapMusic: ; e8f3b (3a:4f3b) +Printer_PlayMapMusic: call Printer_FadeOutMusicAndWait call PlayDefaultMusic ret -Printer_FadeOutMusicAndWait: ; e8f42 (3a:4f42) +Printer_FadeOutMusicAndWait: ld a, $4 ld [wAudioFadeOutControl], a call StopAllMusic @@ -526,7 +526,7 @@ Printer_FadeOutMusicAndWait: ; e8f42 (3a:4f42) jr nz, .wait_music_stop ret -GBPrinter_CheckForErrors: ; e8f51 (3a:4f51) +GBPrinter_CheckForErrors: ld a, [wPrinterHandshake] cp $81 jr z, .check_other_errors diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm index f3984420..b5d71596 100755 --- a/engine/printer/serial.asm +++ b/engine/printer/serial.asm @@ -1,4 +1,4 @@ -StartTransmission_Send9Rows: ; e8783 (3a:4783) +StartTransmission_Send9Rows: ld a, 9 Printer_StartTransmission: push af @@ -19,7 +19,7 @@ Printer_StartTransmission: ret ; e87a8 -PrinterTransmissionJumptable: ; e87a8 (3a:47a8) +PrinterTransmissionJumptable: ld a, [wPrinterSendState] ld e, a ld d, 0 @@ -406,7 +406,7 @@ Printer_Convert2RowsTo2bpp: jr nz, .loop ret -Printer_FillMemory: ; e8a2e (3a:4a2e) +Printer_FillMemory: push de ld e, a .loop @@ -439,7 +439,7 @@ PrinterDataPacket6: ; unused db 15, 0, $00, 0 dw 15 -PrinterSerial_: ; e8a5e (3a:4a5e) +PrinterSerial_: ld a, [wPrinterOpcode] ld e, a ld d, 0 |