Sync with pokered

1 files changed, 38 insertions, 38 deletions

diff --git a/engine/save.asm b/engine/menus/save.asm
index 7f453bf0..bcb27ddf 100755
--- a/engine/save.asm
+++ b/engine/menus/save.asm
@@ -28,8 +28,8 @@ LoadSAV:
 	ret
 
 FileDataDestroyedText:
-	TX_FAR _FileDataDestroyedText
-	db "@"
+	text_far _FileDataDestroyedText
+	text_end
 
 LoadSAV0:
 	call EnableSRAMAndLatchClockData
@@ -68,7 +68,7 @@ LoadSAV0:
 	ld bc, wSpriteDataEnd - wSpriteDataStart
 	call CopyData
 	ld a, [sTilesetType]
-	ld [hTilesetType], a
+	ldh [hTilesetType], a
 	ld hl, sCurBoxData
 	ld de, wBoxDataStart
 	ld bc, wBoxDataEnd - wBoxDataStart
@@ -130,7 +130,7 @@ LoadSAVIgnoreBadCheckSum:
 	jp LoadSAV2
 
 SaveSAV:
-	callba PrintSaveScreenText
+	farcall PrintSaveScreenText
 	ld c, 10
 	call DelayFrames
 	ld hl, WouldYouLikeToSaveText
@@ -156,7 +156,7 @@ SaveSAV:
 	call DelayFrames
 	ld hl, GameSavedText
 	call PrintText
-	ld c,10
+	ld c, 10
 	call DelayFrames
 	ld a, SFX_SAVE
 	call PlaySoundWaitForCurrent
@@ -167,7 +167,7 @@ SaveSAV:
 
 SaveSAVConfirm:
 	call PrintText
-	coord hl, 0, 7
+	hlcoord 0, 7
 	lb bc, 8, 1
 	ld a, TWO_OPTION_MENU
 	ld [wTextBoxID], a
@@ -176,20 +176,20 @@ SaveSAVConfirm:
 	ret
 
 WouldYouLikeToSaveText:
-	TX_FAR _WouldYouLikeToSaveText
-	db "@"
+	text_far _WouldYouLikeToSaveText
+	text_end
 
 SavingText:
-	TX_FAR _SavingText
-	db "@"
+	text_far _SavingText
+	text_end
 
 GameSavedText:
-	TX_FAR _GameSavedText
-	db "@"
+	text_far _GameSavedText
+	text_end
 
 OlderFileWillBeErasedText:
-	TX_FAR _OlderFileWillBeErasedText
-	db "@"
+	text_far _OlderFileWillBeErasedText
+	text_end
 
 SaveSAVtoSRAM0:
 	call EnableSRAMAndLatchClockData
@@ -211,7 +211,7 @@ SaveSAVtoSRAM0:
 	ld de, sCurBoxData
 	ld bc, wBoxDataEnd - wBoxDataStart
 	call CopyData
-	ld a, [hTilesetType]
+	ldh a, [hTilesetType]
 	ld [sTilesetType], a
 	ld hl, sPlayerName
 	ld bc, sMainDataCheckSum - sPlayerName
@@ -262,7 +262,7 @@ SaveSAVtoSRAM2:
 	call DisableSRAMAndPrepareClockData
 	ret
 
-SaveSAVtoSRAM:
+SaveSAVtoSRAM::
 	ld a, $2
 	ld [wSaveFileStatus], a
 	call SaveSAVtoSRAM0
@@ -342,10 +342,10 @@ ChangeBox::
 	call z, EmptyAllSRAMBoxes ; if so, empty all boxes in SRAM
 	call DisplayChangeBoxMenu
 	call UpdateSprites
-	ld hl, hFlags_0xFFFA
+	ld hl, hFlagsFFFA
 	set 1, [hl]
 	call HandleMenuInput
-	ld hl, hFlags_0xFFFA
+	ld hl, hFlagsFFFA
 	res 1, [hl]
 	bit 1, a ; pressed b
 	ret nz
@@ -377,8 +377,8 @@ ChangeBox::
 	ret
 
 WhenYouChangeBoxText:
-	TX_FAR _WhenYouChangeBoxText
-	db "@"
+	text_far _WhenYouChangeBoxText
+	text_end
 
 CopyBoxToOrFromSRAM:
 ; copy an entire box from hl to de with b as the SRAM bank
@@ -406,7 +406,7 @@ CopyBoxToOrFromSRAM:
 
 DisplayChangeBoxMenu:
 	xor a
-	ld [H_AUTOBGTRANSFERENABLED], a
+	ldh [hAutoBGTransferEnabled], a
 	ld a, A_BUTTON | B_BUTTON
 	ld [wMenuWatchedKeys], a
 	ld a, 11
@@ -421,39 +421,39 @@ DisplayChangeBoxMenu:
 	and $7f
 	ld [wCurrentMenuItem], a
 	ld [wLastMenuItem], a
-	coord hl, 0, 0
+	hlcoord 0, 0
 	lb bc, 2, 9
 	call TextBoxBorder
 	ld hl, ChooseABoxText
 	call PrintText
-	coord hl, 11, 0
+	hlcoord 11, 0
 	lb bc, 12, 7
 	call TextBoxBorder
-	ld hl, hFlags_0xFFFA
+	ld hl, hFlagsFFFA
 	set 2, [hl]
 	ld de, BoxNames
-	coord hl, 13, 1
+	hlcoord 13, 1
 	call PlaceString
-	ld hl, hFlags_0xFFFA
+	ld hl, hFlagsFFFA
 	res 2, [hl]
 	ld a, [wCurrentBoxNum]
 	and $7f
 	cp 9
 	jr c, .singleDigitBoxNum
 	sub 9
-	coord hl, 8, 2
+	hlcoord 8, 2
 	ld [hl], "1"
 	add "0"
 	jr .next
 .singleDigitBoxNum
 	add "1"
 .next
-	Coorda 9, 2
-	coord hl, 1, 2
+	ldcoord_a 9, 2
+	hlcoord 1, 2
 	ld de, BoxNoText
 	call PlaceString
 	call GetMonCountsForAllBoxes
-	coord hl, 18, 1
+	hlcoord 18, 1
 	ld de, wBoxMonCounts
 	ld bc, SCREEN_WIDTH
 	ld a, $c
@@ -470,12 +470,12 @@ DisplayChangeBoxMenu:
 	dec a
 	jr nz, .loop
 	ld a, 1
-	ld [H_AUTOBGTRANSFERENABLED], a
+	ldh [hAutoBGTransferEnabled], a
 	ret
 
 ChooseABoxText:
-	TX_FAR _ChooseABoxText
-	db "@"
+	text_far _ChooseABoxText
+	text_end
 
 BoxNames:
 	db   "BOX 1"
@@ -575,11 +575,11 @@ GetMonCountsForBoxesInBank:
 	ret
 
 SAVCheckRandomID:
-;checks if Sav file is the same by checking player's name 1st letter ($a598)
+; checks if Sav file is the same by checking player's name 1st letter
 ; and the two random numbers generated at game beginning
-;(which are stored at wPlayerID)s
+; (which are stored at wPlayerID)s
 	call EnableSRAMAndLatchClockData
-	ld a, $1
+	ld a, $01
 	ld [MBC1SRamBank], a
 	ld a, [sPlayerName]
 	and a
@@ -663,8 +663,8 @@ ClearSAV:
 
 PadSRAM_FF:
 	ld [MBC1SRamBank], a
-	ld hl, $a000
-	ld bc, $2000
+	ld hl, SRAM_Begin
+	ld bc, SRAM_End - SRAM_Begin
 	ld a, $ff
 	jp FillMemory