From fbaa5c9d4b48c000a52860a8392fc423c4e312f9 Mon Sep 17 00:00:00 2001
From: vulcandth <vulcandth@gmail.com>
Date: Sat, 26 Mar 2022 21:05:06 -0500
Subject: Build the Virtual Console patch with `make yellow_vc` (#80)

---
 engine/menus/save.asm | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'engine/menus/save.asm')

diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index 55ae9e47..a623ee1a 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -35,20 +35,23 @@ LoadSAV0:
 	call EnableSRAMAndLatchClockData
 	ld a, $1
 	ld [MBC1SRamBank], a
-	ld hl, sPlayerName ; hero name located in SRAM
-	ld bc, sMainDataCheckSum - sPlayerName ; but here checks the full SAV
+; This vc_hook does not have to be in any particular location.
+; It is defined here because it refers to the same labels as the two lines below.
+	vc_hook SaveLimit
+	ld hl, sGameData
+	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
 	ld c, a
-	ld a, [sMainDataCheckSum] ; SAV's checksum
+	ld a, [sMainDataCheckSum]
 	cp c
 	jp z, .checkSumsMatched
 
 ; If the computed checksum didn't match the saved on, try again.
-	ld hl, sPlayerName
-	ld bc, sMainDataCheckSum - sPlayerName
+	ld hl, sGameData
+	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
 	ld c, a
-	ld a, [sMainDataCheckSum] ; SAV's checksum
+	ld a, [sMainDataCheckSum]
 	cp c
 	jp nz, SAVBadCheckSum
 
@@ -80,11 +83,11 @@ LoadSAV1:
 	call EnableSRAMAndLatchClockData
 	ld a, $1
 	ld [MBC1SRamBank], a
-	ld hl, sPlayerName ; hero name located in SRAM
-	ld bc, sMainDataCheckSum - sPlayerName  ; but here checks the full SAV
+	ld hl, sGameData
+	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
 	ld c, a
-	ld a, [sMainDataCheckSum] ; SAV's checksum
+	ld a, [sMainDataCheckSum]
 	cp c
 	jr nz, SAVBadCheckSum
 	ld hl, sCurBoxData
@@ -98,11 +101,11 @@ LoadSAV2:
 	call EnableSRAMAndLatchClockData
 	ld a, $1
 	ld [MBC1SRamBank], a
-	ld hl, sPlayerName ; hero name located in SRAM
-	ld bc, sMainDataCheckSum - sPlayerName  ; but here checks the full SAV
+	ld hl, sGameData
+	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
 	ld c, a
-	ld a, [sMainDataCheckSum] ; SAV's checksum
+	ld a, [sMainDataCheckSum]
 	cp c
 	jp nz, SAVBadCheckSum
 	ld hl, sPartyData
@@ -213,8 +216,8 @@ SaveSAVtoSRAM0:
 	call CopyData
 	ldh a, [hTileAnimations]
 	ld [sTileAnimations], a
-	ld hl, sPlayerName
-	ld bc, sMainDataCheckSum - sPlayerName
+	ld hl, sGameData
+	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
 	ld [sMainDataCheckSum], a
 	call DisableSRAMAndPrepareClockData
@@ -229,8 +232,8 @@ SaveSAVtoSRAM1:
 	ld de, sCurBoxData
 	ld bc, wBoxDataEnd - wBoxDataStart
 	call CopyData
-	ld hl, sPlayerName
-	ld bc, sMainDataCheckSum - sPlayerName
+	ld hl, sGameData
+	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
 	ld [sMainDataCheckSum], a
 	call DisableSRAMAndPrepareClockData
@@ -255,8 +258,8 @@ SaveSAVtoSRAM2:
 	inc de
 	ld a, [hl]
 	ld [de], a
-	ld hl, sPlayerName
-	ld bc, sMainDataCheckSum - sPlayerName
+	ld hl, sGameData
+	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
 	ld [sMainDataCheckSum], a
 	call DisableSRAMAndPrepareClockData
@@ -584,8 +587,8 @@ SAVCheckRandomID:
 	ld a, [sPlayerName]
 	and a
 	jr z, .next
-	ld hl, sPlayerName
-	ld bc, sMainDataCheckSum - sPlayerName
+	ld hl, sGameData
+	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
 	ld c, a
 	ld a, [sMainDataCheckSum]
-- 
cgit v1.3.1-sl0p