greatly improved exploit load time by immediately executing saving after exiting nes

FIX94 · FIX94 · commit de3a8426da25 · 2018-07-19T23:12:41.000+02:00
diff --git a/exploit/nesrom/resources/nametable2.nam b/exploit/nesrom/resources/nametable2.nam
diff --git a/patcher/gaej_v100.ld b/patcher/gaej_v100.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x8021EB4C;
 	PATCHER_VAL_2 = 0x8114341C;
-	PATCHER_VAL_3 = 0x800B0400;
+	PATCHER_VAL_3 = 0x81295F4C;
+	PATCHER_VAL_4 = 0x81143484;
+	PATCHER_VAL_5 = 0x800B0400;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/gaej_v101.ld b/patcher/gaej_v101.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x8022090C;
 	PATCHER_VAL_2 = 0x811438BC;
-	PATCHER_VAL_3 = 0x800B0B28;
+	PATCHER_VAL_3 = 0x812964EC;
+	PATCHER_VAL_4 = 0x81143924;
+	PATCHER_VAL_5 = 0x800B0B28;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/gafe.ld b/patcher/gafe.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x801F6C64;
 	PATCHER_VAL_2 = 0x806BF5BC;
-	PATCHER_VAL_3 = 0x8008AEB0;
+	PATCHER_VAL_3 = 0x8128E97C;
+	PATCHER_VAL_4 = 0x806BF624;
+	PATCHER_VAL_5 = 0x8008AEB0;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/gafj_v100.ld b/patcher/gafj_v100.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x801EF9C8;
 	PATCHER_VAL_2 = 0x807122C4;
-	PATCHER_VAL_3 = 0x8008C8F4;
+	PATCHER_VAL_3 = 0x81280284;
+	PATCHER_VAL_4 = 0x80712328;
+	PATCHER_VAL_5 = 0x8008C8F4;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/gafj_v101.ld b/patcher/gafj_v101.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x801EFF08;
 	PATCHER_VAL_2 = 0x80712C64;
-	PATCHER_VAL_3 = 0x8008CB90;
+	PATCHER_VAL_3 = 0x81280744;
+	PATCHER_VAL_4 = 0x80712CC8;
+	PATCHER_VAL_5 = 0x8008CB90;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/gafp_eng.ld b/patcher/gafp_eng.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x8020690C;
 	PATCHER_VAL_2 = 0x80FFEEF4;
-	PATCHER_VAL_3 = 0x80093878;
+	PATCHER_VAL_3 = 0x811202DC;
+	PATCHER_VAL_4 = 0x80FFEF5C;
+	PATCHER_VAL_5 = 0x80093878;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/gafp_fre.ld b/patcher/gafp_fre.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x802081EC;
 	PATCHER_VAL_2 = 0x81001F24;
-	PATCHER_VAL_3 = 0x80093738;
+	PATCHER_VAL_3 = 0x811239FC;
+	PATCHER_VAL_4 = 0x81001F8C;
+	PATCHER_VAL_5 = 0x80093738;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/gafp_ger.ld b/patcher/gafp_ger.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x8020732C;
 	PATCHER_VAL_2 = 0x81000F94;
-	PATCHER_VAL_3 = 0x80093618;
+	PATCHER_VAL_3 = 0x8112275C;
+	PATCHER_VAL_4 = 0x81000FFC;
+	PATCHER_VAL_5 = 0x80093618;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/gafp_ita.ld b/patcher/gafp_ita.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x802080AC;
 	PATCHER_VAL_2 = 0x8100194C;
-	PATCHER_VAL_3 = 0x800935B8;
+	PATCHER_VAL_3 = 0x81122F7C;
+	PATCHER_VAL_4 = 0x810019B4;
+	PATCHER_VAL_5 = 0x800935B8;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/gafp_spa.ld b/patcher/gafp_spa.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x802071AC;
 	PATCHER_VAL_2 = 0x81000D34;
-	PATCHER_VAL_3 = 0x80093498;
+	PATCHER_VAL_3 = 0x8112255C;
+	PATCHER_VAL_4 = 0x81000D9C;
+	PATCHER_VAL_5 = 0x80093498;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/gafu.ld b/patcher/gafu.ld
@@ -8,7 +8,9 @@ OUTPUT_ARCH(powerpc:common)
 SECTIONS {
 	PATCHER_VAL_1 = 0x80204B6C;
 	PATCHER_VAL_2 = 0x8070E6DC;
-	PATCHER_VAL_3 = 0x800928BC;
+	PATCHER_VAL_3 = 0x812CD43C;
+	PATCHER_VAL_4 = 0x8070E744;
+	PATCHER_VAL_5 = 0x800928BC;
 	.exploit :
 	{
 		start.o(.start)
diff --git a/patcher/start.S b/patcher/start.S
@@ -7,7 +7,9 @@ _start:
 #this will be filled in the linker file
 	.long PATCHER_VAL_1  #at 0x04(r12), rom pointer (loader source)
 	.long PATCHER_VAL_2  #at 0x08(r12), pointer to overwrite with loader entry
-	.long PATCHER_VAL_3  #at 0x0C(r12), PADSetSpec address to restore pointer
+	.long PATCHER_VAL_3  #at 0x0C(r12), game state that will be used when exiting nes
+	.long PATCHER_VAL_4  #at 0x10(r12), array that controls what save state we are on
+	.long PATCHER_VAL_5  #at 0x14(r12), PADSetSpec address to restore pointer
 begin:
 	#grab padread return address
 	mflr %r6
@@ -46,9 +48,20 @@ cpyend:
 	lis %r3, 0x8000
 	ori %r3, %r3, 0x4000
 	stw %r3, 0(%r4)
+	#state we will replace
+	lwz %r4, 0xC(%r12)
+	#set state to save game
+	li %r3, 0x22
+	stw %r3, 0(%r4)
+	#speed up save progress
+	lwz %r4, 0x10(%r12)
+	#get pointer to save function
+	lwz %r3, 8(%r4)
+	#execute it immediately
+	stw %r3, 0(%r4)
 exit:
 	#get PADSetSpec address
-	lwz %r4, 0xC(%r12)
+	lwz %r4, 0x14(%r12)
 	#grab originally set spec
 	lha %r3, 0x5A(%r4)
 	#use original spec as arg
