Merge pull request #685 from mid-kid/master

Moshi moshi? minoru enhansumentsu desu

3 files changed, 46 insertions, 46 deletions

diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm
index 16310d8f6..9de5a0bfb 100644
--- a/engine/printer/print_party.asm
+++ b/engine/printer/print_party.asm
@@ -2,28 +2,28 @@ PRINTPARTY_HP EQU "◀" ; $71
 
 PrintPage1:
 	hlcoord 0, 0
-	decoord 0, 0, wPrinterTileMapBuffer
+	decoord 0, 0, wPrinterTilemapBuffer
 	ld bc, 17 * SCREEN_WIDTH
 	call CopyBytes
-	hlcoord 17, 1, wPrinterTileMapBuffer
+	hlcoord 17, 1, wPrinterTilemapBuffer
 	ld a, $62
 	ld [hli], a
 	inc a
 	ld [hl], a
-	hlcoord 17, 2, wPrinterTileMapBuffer
+	hlcoord 17, 2, wPrinterTilemapBuffer
 	ld a, $64
 	ld [hli], a
 	inc a
 	ld [hl], a
-	hlcoord 1, 9, wPrinterTileMapBuffer
+	hlcoord 1, 9, wPrinterTilemapBuffer
 	ld a, " "
 	ld [hli], a
 	ld [hl], a
-	hlcoord 1, 10, wPrinterTileMapBuffer
+	hlcoord 1, 10, wPrinterTilemapBuffer
 	ld a, $61
 	ld [hli], a
 	ld [hl], a
-	hlcoord 2, 11, wPrinterTileMapBuffer
+	hlcoord 2, 11, wPrinterTilemapBuffer
 	lb bc, 5, 18
 	call ClearBox
 	ld a, [wTempSpecies]
@@ -36,9 +36,9 @@ PrintPage1:
 	farcall GetDexEntryPagePointer
 	pop af
 	ld a, b
-	hlcoord 1, 11, wPrinterTileMapBuffer
+	hlcoord 1, 11, wPrinterTilemapBuffer
 	call nz, FarString
-	hlcoord 19, 0, wPrinterTileMapBuffer
+	hlcoord 19, 0, wPrinterTilemapBuffer
 	ld [hl], $35
 	ld de, SCREEN_WIDTH
 	add hl, de
@@ -52,26 +52,26 @@ PrintPage1:
 	ret
 
 PrintPage2:
-	hlcoord 0, 0, wPrinterTileMapBuffer
+	hlcoord 0, 0, wPrinterTilemapBuffer
 	ld bc, 8 * SCREEN_WIDTH
 	ld a, " "
 	call ByteFill
-	hlcoord 0, 0, wPrinterTileMapBuffer
+	hlcoord 0, 0, wPrinterTilemapBuffer
 	ld a, $36
 	ld b, 6
 	call .FillColumn
-	hlcoord 19, 0, wPrinterTileMapBuffer
+	hlcoord 19, 0, wPrinterTilemapBuffer
 	ld a, $37
 	ld b, 6
 	call .FillColumn
-	hlcoord 0, 6, wPrinterTileMapBuffer
+	hlcoord 0, 6, wPrinterTilemapBuffer
 	ld [hl], $38
 	inc hl
 	ld a, $39
 	ld bc, SCREEN_HEIGHT
 	call ByteFill
 	ld [hl], $3a
-	hlcoord 0, 7, wPrinterTileMapBuffer
+	hlcoord 0, 7, wPrinterTilemapBuffer
 	ld bc, SCREEN_WIDTH
 	ld a, $32
 	call ByteFill
@@ -84,7 +84,7 @@ PrintPage2:
 	ld c, 2 ; get page 2
 	farcall GetDexEntryPagePointer
 	pop af
-	hlcoord 1, 1, wPrinterTileMapBuffer
+	hlcoord 1, 1, wPrinterTilemapBuffer
 	ld a, b
 	call nz, FarString
 	ret
@@ -132,7 +132,7 @@ GBPrinterString_PrinterError4:
 
 PrintPartyMonPage1:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	xor a
 	ldh [hBGMapMode], a
@@ -231,7 +231,7 @@ PrintPartyMonPage1:
 
 PrintPartyMonPage2:
 	call ClearBGPalettes
-	call ClearTileMap
+	call ClearTilemap
 	call ClearSprites
 	xor a
 	ldh [hBGMapMode], a
diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm
index 588699863..e26130098 100644
--- a/engine/printer/printer.asm
+++ b/engine/printer/printer.asm
@@ -26,12 +26,12 @@ Printer_CleanUpAfterSend:
 	ld [wPrinterOpcode], a
 	ret
 
-Printer_PrepareTileMapForPrint:
+Printer_PrepareTilemapForPrint:
 	push af
 	call Printer_StartTransmission
 	pop af
 	ld [wPrinterMargins], a
-	call Printer_CopyTileMapToBuffer
+	call Printer_CopyTilemapToBuffer
 	ret
 
 Printer_ExitPrinter:
@@ -63,7 +63,7 @@ PrintDexEntry:
 	ln a, 1, 0
 	ld [wPrinterMargins], a
 	farcall PrintPage1
-	call ClearTileMap
+	call ClearTilemap
 	ld a, %11100100
 	call DmgToCgbBGPals
 	call DelayFrame
@@ -146,13 +146,13 @@ PrintPCBox:
 	ld hl, hVBlank
 	ld a, [hl]
 	push af
-	ld [hl], 4
+	ld [hl], $4
 
 	xor a
 	ldh [hBGMapMode], a
 	call PrintPCBox_Page1
 	ln a, 1, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	call Printer_ResetRegistersAndStartDataSend
 	jr c, .cancel
 
@@ -163,7 +163,7 @@ PrintPCBox:
 	ldh [hBGMapMode], a
 	call PrintPCBox_Page2
 	ln a, 0, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	call Printer_ResetRegistersAndStartDataSend
 	jr c, .cancel
 
@@ -175,7 +175,7 @@ PrintPCBox:
 	ldh [hBGMapMode], a
 	call PrintPCBox_Page3
 	ln a, 0, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	call Printer_ResetRegistersAndStartDataSend
 	jr c, .cancel
 
@@ -187,7 +187,7 @@ PrintPCBox:
 	ldh [hBGMapMode], a
 	call PrintPCBox_Page4
 	ln a, 0, 3 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	call Printer_ResetRegistersAndStartDataSend
 .cancel
 	pop af
@@ -227,11 +227,11 @@ PrintUnownStamp:
 	ld [hl], $4
 	xor a
 	ldh [hBGMapMode], a
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	farcall PlaceUnownPrinterFrontpic
 	ln a, 0, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
-	call Call_LoadTempTileMapToTileMap
+	call Printer_PrepareTilemapForPrint
+	call SafeLoadTempTilemapToTilemap
 	call Printer_ResetJoypadRegisters
 	ld a, 18 / 2
 	ld [wPrinterQueueLength], a
@@ -259,7 +259,7 @@ PrintUnownStamp:
 	pop af
 	ldh [hVBlank], a
 	call Printer_CleanUpAfterSend
-	call Call_LoadTempTileMapToTileMap
+	call SafeLoadTempTilemapToTilemap
 	xor a
 	ldh [rIF], a
 	pop af
@@ -291,11 +291,11 @@ PrintMail:
 	ldh [hBGMapMode], a
 
 	ln a, 1, 3 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 	ld hl, hVBlank
 	ld a, [hl]
 	push af
-	ld [hl], %0100
+	ld [hl], $4
 
 	ld a, 18 / 2
 	ld [wPrinterQueueLength], a
@@ -304,7 +304,7 @@ PrintMail:
 	pop af
 	ldh [hVBlank], a
 	call Printer_CleanUpAfterSend
-	call Printer_CopyBufferToTileMap
+	call Printer_CopyBufferToTilemap
 
 	xor a
 	ldh [rIF], a
@@ -333,12 +333,12 @@ PrintPartymon:
 	ldh [hBGMapMode], a
 	farcall PrintPartyMonPage1
 	ln a, 1, 0 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 
 	ld hl, hVBlank
 	ld a, [hl]
 	push af
-	ld [hl], %0100
+	ld [hl], $4
 
 	ld a, 16 / 2
 	ld [wPrinterQueueLength], a
@@ -354,7 +354,7 @@ PrintPartymon:
 	ldh [hBGMapMode], a
 	farcall PrintPartyMonPage2
 	ln a, 0, 3 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
+	call Printer_PrepareTilemapForPrint
 
 	ld a, 18 / 2
 	ld [wPrinterQueueLength], a
@@ -365,7 +365,7 @@ PrintPartymon:
 	ldh [hVBlank], a
 	call Printer_CleanUpAfterSend
 
-	call Printer_CopyBufferToTileMap
+	call Printer_CopyBufferToTilemap
 	xor a
 	ldh [rIF], a
 	pop af
@@ -396,10 +396,10 @@ _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
+	call Printer_PrepareTilemapForPrint
 	call Printer_ResetJoypadRegisters
 
 	ld a, 18 / 2
@@ -410,15 +410,15 @@ _PrintDiploma:
 	ld c, 12
 	call DelayFrames
 
-	call LoadTileMapToTempTileMap
+	call LoadTilemapToTempTilemap
 	xor a
 	ldh [hBGMapMode], a
 
 	farcall PrintDiplomaPage2
 
 	ln a, 0, 3 ; to be loaded to wPrinterMargins
-	call Printer_PrepareTileMapForPrint
-	call Call_LoadTempTileMapToTileMap
+	call Printer_PrepareTilemapForPrint
+	call SafeLoadTempTilemapToTilemap
 	call Printer_ResetJoypadRegisters
 
 	ld a, 18 / 2
@@ -473,15 +473,15 @@ CheckCancelPrint:
 	scf
 	ret
 
-Printer_CopyTileMapToBuffer:
+Printer_CopyTilemapToBuffer:
 	hlcoord 0, 0
-	ld de, wPrinterTileMapBuffer
+	ld de, wPrinterTilemapBuffer
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call CopyBytes
 	ret
 
-Printer_CopyBufferToTileMap:
-	ld hl, wPrinterTileMapBuffer
+Printer_CopyBufferToTilemap:
+	ld hl, wPrinterTilemapBuffer
 	decoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 	call CopyBytes
diff --git a/engine/printer/printer_serial.asm b/engine/printer/printer_serial.asm
index e8cec0345..d047418e0 100644
--- a/engine/printer/printer_serial.asm
+++ b/engine/printer/printer_serial.asm
@@ -362,14 +362,14 @@ Printer_StageHeaderForSend:
 	ret
 
 Printer_Convert2RowsTo2bpp:
-	; de = wPrinterTileMapBuffer + 2 * SCREEN_WIDTH * ([wPrinterQueueLength] - [wPrinterRowIndex])
+	; de = wPrinterTilemapBuffer + 2 * SCREEN_WIDTH * ([wPrinterQueueLength] - [wPrinterRowIndex])
 	ld a, [wPrinterRowIndex]
 	xor $ff
 	ld d, a
 	ld a, [wPrinterQueueLength]
 	inc a
 	add d
-	ld hl, wPrinterTileMapBuffer
+	ld hl, wPrinterTilemapBuffer
 	ld de, 2 * SCREEN_WIDTH
 .loop1
 	and a