diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index d5b165919c..5b6dffe4f4 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -462,6 +462,9 @@ function	script	F_KafEnd	{
 		mes "^666666Kaffffra n-never";
 		mes "diiiiiiiiiiiiiies. On...";
 		mes "On y-yooour siiiiide~^000000";
+	} else if (.@type == 2) {// RockRidge Save
+		mes "Saved.";
+		mes "Thank you for your patronage.";
 	}
 	close3;
 }
diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt
index 305bf31bc5..6cf5c4b0c8 100644
--- a/npc/re/kafras/kafras.txt
+++ b/npc/re/kafras/kafras.txt
@@ -31,7 +31,7 @@
 
 // Brasilis
 //============================================================
-brasilis,197,221,4	script	Kafra Employee::kaf_bra	117,{
+brasilis,197,221,4	script	Kafra Employee::kaf_bra	4_F_KAFRA1,{
 	cutin "kafra_01",2;
 	callfunc "F_Kafra",0,3,0,80,700;
 	savepoint "brasilis",195,259,1,1;
@@ -40,7 +40,7 @@ brasilis,197,221,4	script	Kafra Employee::kaf_bra	117,{
 
 // Dewata
 //============================================================
-dewata,202,184,6	script	Kafra Employee::kaf_dewata	117,{
+dewata,202,184,6	script	Kafra Employee::kaf_dewata	4_F_KAFRA1,{
 	cutin "kafra_01",2;
 	callfunc "F_Kafra",0,10,1,40,700;
 	savepoint "dewata",206,174,1,1;
@@ -66,7 +66,7 @@ xmas,148,134,6	script	Kafra Employee::kaf_xmas	4_F_KAFRA3,{
 
 // Eden Group
 //============================================================
-moc_para01,10,185,4	script	Kafra Employee::kaf_eden	721,{
+moc_para01,10,185,4	script	Kafra Employee::kaf_eden	4_F_KAFRA7,{
 	cutin "kafra_07",2;
 	mes "[Kafra Employee]";
 	mes "Welcome to the";
@@ -77,21 +77,21 @@ moc_para01,10,185,4	script	Kafra Employee::kaf_eden	721,{
 
 // Izlude
 //============================================================
-izlude,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz	117
-izlude_a,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_a	117
-izlude_b,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_b	117
-izlude_c,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_c	117
-izlude_d,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_d	117
+izlude,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz	4_F_KAFRA1
+izlude_a,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_a	4_F_KAFRA1
+izlude_b,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_b	4_F_KAFRA1
+izlude_c,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_c	4_F_KAFRA1
+izlude_d,128,148,6	duplicate(kaf_izlude)	Kafra Employee#iz_d	4_F_KAFRA1
 
 // Port Malaya
 //============================================================
-malaya,71,79,4	script	Kafra Employee::kaf_malaya1	581,{
+malaya,71,79,4	script	Kafra Employee::kaf_malaya1	4_MAL_KAFRA,{
 	callfunc "F_Kafra",0,3,2,500,700;
 	savepoint "malaya",44,56,1,1;
 	callfunc "F_KafEnd",0,1,"in Port Malaya";
 }
 
-malaya,234,204,4	script	Kafra Employee::kaf_malaya2	581,{
+malaya,234,204,4	script	Kafra Employee::kaf_malaya2	4_MAL_KAFRA,{
 	callfunc "F_Kafra",0,3,2,500,700;
 	savepoint "malaya",281,212,1,1;
 	callfunc "F_KafEnd",0,1,"in Port Malaya";
@@ -99,7 +99,7 @@ malaya,234,204,4	script	Kafra Employee::kaf_malaya2	581,{
 
 // Rune Knight
 //============================================================
-job3_rune01,92,62,3	script	Kafra Employee::kaf_rune	114,{
+job3_rune01,92,62,3	script	Kafra Employee::kaf_rune	4_F_KAFRA4,{
 	cutin "kafra_04",2;
 	callfunc "F_KafSet";
 	callfunc "F_Kafra",0,9,2,80,700;
@@ -111,6 +111,6 @@ harboro1,291,207,5	script	Kafra Employee::kaf_rock	4_F_KAFRA1,{
 	cutin "kafra_01",2;
 	callfunc "F_KafSet";
 	callfunc "F_Kafra",0,8,2,500,0;
-	savepoint "harboro1",286,189,1,1;
-	callfunc "F_KafEnd",0,1,"in the city of Rockridge";
+	savepoint "harboro1",355,207,1,1;
+	callfunc "F_KafEnd",2,0,0;
 }