New version v2.6.2

Vortyne · Nov 13, 2024 · 76b9954 · 76b9954
1 parent 72a6aca
commit 76b9954
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 4 deletions.
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
@@ -1869,7 +1869,10 @@ _SaveFileUpdateText::
 	line "seems to be from"
 	cont "an older build"
 	cont "of the game."
-	para "Which older build"
+	prompt
+
+_SaveFileUpdateText2::
+	text "Which older build"
 	line "did it come from?"
 	done
 

diff --git a/engine/menus/save_file_updater.asm b/engine/menus/save_file_updater.asm
@@ -7,6 +7,10 @@ SaveFileUpdateText:
 	text_far _SaveFileUpdateText
 	text_end
 
+SaveFileUpdateText2:
+	text_far _SaveFileUpdateText2
+	text_end
+
 PressStartToContinueText:
 	text_far _SaveFileUpdateTextConfirm
 	text_end
@@ -23,8 +27,17 @@ SaveFileUpdateCheck::
 	ld a, [wGameInternalVersion]
 	cp CURRENT_INTERNAL_VERSION
 	ret z ; also nc
+	push af
 	ld hl, SaveFileUpdateText
 	rst _PrintText
+	pop af
+	cp INTERNAL_VERSION_ORIGINAL_GAME
+	jr z, .updateSave
+	; TODO: future save file updates go here
+	jr .askPalletWarp
+.updateSave
+	ld hl, SaveFileUpdateText2
+	rst _PrintText
 	call SaveScreenTilesToBuffer1
 	xor a
 	ld [wCurrentMenuItem], a
@@ -45,6 +58,7 @@ SaveFileUpdateCheck::
 	ld hl, SaveFileUpdateCompleteText
 	rst _PrintText
 	call DisplayTextPromptButton
+.askPalletWarp
 	; last step: set the current internal version so we don't update the save again later
 	ld hl, wGameInternalVersion
 	ld [hl], CURRENT_INTERNAL_VERSION

diff --git a/releases/2.6.1/Pokemon_PureBlue_v2.6.1.bps → releases/2.6.2/Pokemon_PureBlue_v2.6.2.bps b/releases/2.6.1/Pokemon_PureBlue_v2.6.1.bps → releases/2.6.2/Pokemon_PureBlue_v2.6.2.bps
diff --git a/releases/2.6.1/Pokemon_PureGreen_v2.6.1.bps → releases/2.6.2/Pokemon_PureGreen_v2.6.2.bps b/releases/2.6.1/Pokemon_PureGreen_v2.6.1.bps → releases/2.6.2/Pokemon_PureGreen_v2.6.2.bps
diff --git a/releases/2.6.1/Pokemon_PureRed_v2.6.1.bps → releases/2.6.2/Pokemon_PureRed_v2.6.2.bps b/releases/2.6.1/Pokemon_PureRed_v2.6.1.bps → releases/2.6.2/Pokemon_PureRed_v2.6.2.bps
diff --git a/releases/2.6.1/pure_rgb_readme.txt → releases/2.6.2/pure_rgb_readme.txt b/releases/2.6.1/pure_rgb_readme.txt → releases/2.6.2/pure_rgb_readme.txt
diff --git a/version_number.asm b/version_number.asm
@@ -1,8 +1,9 @@
-db "2.6.1"
+db "2.6.2"
 
 ; wGameInternalVersion values
 	const_def
 	const INTERNAL_VERSION_ORIGINAL_GAME ; also any versions prior to 2.6.0
-	const INTERNAL_VERSION_2_6_0
+	const INTERNAL_VERSION_2_6_0 ; also 2.6.1
+	const INTERNAL_VERSION_2_6_2
 
-DEF CURRENT_INTERNAL_VERSION EQU INTERNAL_VERSION_2_6_0
+DEF CURRENT_INTERNAL_VERSION EQU INTERNAL_VERSION_2_6_2