From b95e09e6ac4917cc42eaf7ab1265325c83e0e62a Mon Sep 17 00:00:00 2001
From: Rikard Nordgren <hrn@posteo.net>
Date: Mon, 26 Jan 2026 19:25:01 +0100
Subject: [PATCH] Update mov_r_FAC1_TMP2

---
 STATUS.md                                 |  2 +-
 src/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s | 17 +++++++++++++++--
 src/basic/math_mov/mov_r_FAC1_TMP2.s      | 18 ------------------
 tools/similarity.c                        |  2 +-
 4 files changed, 17 insertions(+), 22 deletions(-)
 delete mode 100644 src/basic/math_mov/mov_r_FAC1_TMP2.s

diff --git a/STATUS.md b/STATUS.md
index 3fe31c2a..60c932e2 100644
--- a/STATUS.md
+++ b/STATUS.md
@@ -223,7 +223,7 @@ Floating point mathematical routines - not official, but well known and broadly
 | `$BB12`   | `div_FAC2_FAC1`        | DONE     |                                                    |
 | `$BBA2`   | `mov_MEM_FAC1`         | DONE     |                                                    |
 | `$BBA6`   | `get_FAC1_via_INDEX`   | DONE     |                                                    |
-| `$BBC7`   | `mov_r_FAC1_TMP2`      | PARTIAL  | not fully tested yet                               |
+| `$BBC7`   | `mov_r_FAC1_TMP2`      | DONE     | From the Microsoft BASIC, original name: MOV2F     |
 | `$BBCA`   | `mov_r_FAC1_TMP1`      | DONE     | From the Microsoft BASIC, original name: MOV1F     |
 | `$BBD0`   | `mov_r_FAC1_VAR`       | DONE     | From the Microsoft BASIC, original name: MOVVF     |
 | `$BBD4`   | `mov_r_FAC1_MEM`       | DONE     | From the Microsoft BASIC, original name: MOVMF     |
diff --git a/src/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s b/src/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s
index fd47291a..34a8a879 100644
--- a/src/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s
+++ b/src/basic/math_mov/bbc7.mov_r_FAC1_TMP2.s
@@ -3,6 +3,19 @@
 ;; #LAYOUT# *   BASIC_0 #TAKE
 ;; #LAYOUT# *   *       #IGNORE
 
-; Just a compatibility jump - our routine is longer than original one
+; This file is under the MIT license, it contains code released by Microsoft Corporation.
+; See LICENSE for more information.
 
-	jmp mov_r_FAC1_TMP2
+; Math package - store FAC1 (rounds) in TEMPF2
+;
+; This is verified to be identical to the original Microsoft implementation where it was named MOV2F.
+;
+; See also:
+; - https://www.c64-wiki.com/wiki/BASIC-ROM
+; - https://sta.c64.org/cbm64basconv.html
+;
+
+mov_r_FAC1_TMP2:
+
+    ldx #TEMPF2
+    +skip_2_bytes_trash_nvz
diff --git a/src/basic/math_mov/mov_r_FAC1_TMP2.s b/src/basic/math_mov/mov_r_FAC1_TMP2.s
deleted file mode 100644
index 0b94bbee..00000000
--- a/src/basic/math_mov/mov_r_FAC1_TMP2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-;; #LAYOUT# STD *       #TAKE
-;; #LAYOUT# *   BASIC_0 #TAKE
-;; #LAYOUT# *   *       #IGNORE
-
-;
-; Math package - store FAC1 (rounds) in TEMPF2
-;
-; See also:
-; - https://www.c64-wiki.com/wiki/BASIC-ROM
-; - https://sta.c64.org/cbm64basconv.html
-;
-
-mov_r_FAC1_TMP2:
-
-	ldy #$00
-	ldx #$57
-
-	jmp mov_r_FAC1_MEM
diff --git a/tools/similarity.c b/tools/similarity.c
index 09c09389..f762950a 100644
--- a/tools/similarity.c
+++ b/tools/similarity.c
@@ -24,7 +24,7 @@ int phase_mask[MAX_SIZE+MAX_SIZE];
 // Pairs of start, end memory addresses of known exact similarity with the open source Microsoft BASIC
 unsigned short microsoft_basic_chunks[NUM_CHUNKS * 2] = {
     0xB849, 0xB84F,
-    0xBBCA, 0xBC1A
+    0xBBC7, 0xBC1A
 };