diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 8 | ||||
| -rw-r--r-- | engine/printer/printer.asm | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 65685dd4..87809901 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -5133,7 +5133,7 @@ MoveSelectionScreen: dec a jr nz, .interpret_joypad hlcoord 11, 14 - ld de, .string_3e448 + ld de, .empty_string call PlaceString jr .interpret_joypad @@ -5229,7 +5229,7 @@ MoveSelectionScreen: call SafeLoadTempTilemapToTilemap jp MoveSelectionScreen -.string_3e448 +.empty_string db "@" .pressed_up @@ -7746,7 +7746,7 @@ StartBattle: call ShowLinkBattleParticipants farcall ClearBattleRAM ld hl, rLCDC - res rLCDC_WINDOW_TILEMAP, [hl] ; select 9800-9BFF + res rLCDC_WINDOW_TILEMAP, [hl] ; select vBGMap0/vBGMap2 ld a, [wOtherTrainerClass] and a jr nz, .trainer @@ -7767,7 +7767,7 @@ StartBattle: xor a ldh [hBGMapMode], a ld hl, rLCDC - set rLCDC_WINDOW_TILEMAP, [hl] ; select 9C00-9FFF + set rLCDC_WINDOW_TILEMAP, [hl] ; select vBGMap1/vBGMap3 call EmptyBattleTextbox hlcoord 9, 7 lb bc, 5, 11 diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 18e71c3d..47da5285 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -502,7 +502,7 @@ Printer_RestartMapMusic: CheckPrinterStatus: ; Check for printer errors -; If [ca88] == -1, we're disconnected +; If [wPrinterHandshake] == -1, we're disconnected ld a, [wPrinterHandshake] cp -1 jr nz, .printer_connected @@ -510,7 +510,6 @@ CheckPrinterStatus: cp -1 jr z, .error_2 .printer_connected -; ca89 contains printer status flags ld a, [wPrinterStatusFlags] and %11100000 ret z ; no error |