From 3e1e785bd7dac08dcd76a977113a44af1bd7db5a Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Mon, 10 Oct 2022 12:00:43 -0600
Subject: [PATCH] update core

---
 mupen64plus-core/data/pifdata_ntsc.bin | Bin 0 -> 2048 bytes
 mupen64plus-core/data/pifdata_pal.bin  | Bin 0 -> 2048 bytes
 mupen64plus-core/src/main/main.c       |  27 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 mupen64plus-core/data/pifdata_ntsc.bin
 create mode 100644 mupen64plus-core/data/pifdata_pal.bin

diff --git a/mupen64plus-core/data/pifdata_ntsc.bin b/mupen64plus-core/data/pifdata_ntsc.bin
new file mode 100644
index 0000000000000000000000000000000000000000..58ed067ff4ce846998965b3955f6d24c118ee847
GIT binary patch
literal 2048
zcmdT_PiP!f82`PQ$?j~D+DV$$EyQ+)o!Q+qIV5X}73MIc3c0ybA~`NJ#jOcAkQ{R8
zVQC{Ikj(_`A%`B8c3Ts>n~D9S6<WHK3OR^Y)Sg4@y|D<2jf}sy-D(f<;L(A{_ul({
z-}n38_ulu7n;3?-P=K32>}cQ5C%uIdT)nE5br?fB#Jh<8lxtf@yDO?%EeoTiPfGpR
zKYEq=g4El(8gcG%-r1BU?3Oer^EDG_N$n*r?S(J5qYAh4Zo}Pkx8Y10a2D~SQ;+wS
z7a-@FGYM^fIohe8j&_>Z*Q$^>QGou&ox|JGuDlxGp-qD^mgslq`5xow*Z}kk_j1z^
z&~KmZE<nls2H|#G;r=ycs2vgX+DLg7uAP99dx$7^6T<F+5DCw56V+0=56PiEC}Spb
z!*!ilx3gMcj-vWJdN`7t@1^XeR4L8!X`Xpc)nNP>%09;-F``H;5^qV_i^SVfn&l9k
zroOjfO~M;`0@1aFxKn2?X)kqh&V6%iOP;H0aDaP^f6%e&@FbU|M?19FxYqU~dRAW}
zR-cL=)fY~QQ5*!!ZhMaBZmYt+3{UIAK6*grPV}Is0wui5cp6zJa|Hv`MVU{L4XPaL
z7!dc3RF4M*UeZA+=>)`P?qCoF!%?@OxBQs&;f7ygIQ#;G;Y|#LH;@gl!w#>(3_nM2
zxPj#2x<n_P%q85&T*QpHUrO5}FlzbeSB~E~c6yFS&nUMSd3C_NgUW_uzY0@9#aVg)
zq=$Gvd(|gPKR`=AgeHD5Q;Iq0XkF1a3bIac2{Vj+R?cxeX@y)<_qD_Xw{XU7n~H}Q
zF{>Jz>F_I@8NR%5Dy^Z7nA=UvDoV<--jC5y%P<iS*HEIr73q(d>k?xC8hxw;pJ7Gh
z$F1-xR&r-?nE9Gh9wk%oiyHEUm?*D0@Hb<~H#G6ntQCfsQx7u6DwgT1(&W2@MfzG+
zRJ}iMLJzKDE|4*F<t?F(TH;7DO};jsV^QjaU$DfvWLmD#bKqVOV*WX&PoAPC)|biY
zk$*ELo;IxT7UtD#lk+?|&q+>OsN3BZ-X!mN#<HP!&9j}6Iv9uUDUb6habi4%=}}Ge
zGmoAr&pspdwAr9dO{p|(K9qa8ZX8ygR#M6*MNK&&&;7T}`%)jQVKsM>n7kiTmS;8P
z@n%YVcg#^=XPncGSWw3WRnI#jGj53w3KltPVGXNFA?rwca*v4((_(%r)LnRK{~htb
zOfv`PdAC*SDq?#xtse6%1JQK2imH4M@*QQaW5(Xke#P2m?j|^j98(<rk`FM3iJZb1
zAC0GkpJ)C?W8z4`5jEdZUeWvc7TUsfOpvQc4*Exo@2ALI6kBg&pp~CuF3EaHdLzt>
z80$uim?_@fl<@hcq}>|V+-un#YS~S__i+>J^IiEOUzGPA3+wQS^;_6|Evzr=;K0%7
z`}8z4>L-HBC^AnSQXkZ4vrZ1yT)^53Sc3s;F<?ywtj&Nm8n9Mb%dWgz*7FwYUKdN*
zG(M93!Z&K)%KDq_t~~)>)VbTiUR#WByX{dlI2T2t-Lo-oI?iOgv1_lKV4v9K+YMVT
zHhZvHKZW6c?Y+d9?9*0X6tN#iQc64a@lw7$`a|mMc6f|y_ufsc{D<(L0@-inKjcMt
N(f{z1vHzE_{{qpG-@5<+

literal 0
HcmV?d00001

diff --git a/mupen64plus-core/data/pifdata_pal.bin b/mupen64plus-core/data/pifdata_pal.bin
new file mode 100644
index 0000000000000000000000000000000000000000..63970158005c620f8ee3e9f557e1e0f113e328cd
GIT binary patch
literal 2048
zcmd5-PiPcZ82`Q5$?j|t>m;sr1*<b;W_M$9NVc)HFyIhd$gNu>CC3FLU7J7$l0yz2
z7EK|6Y$miGa`3R|YBzN^llrH%P;n6pIh5AY)^pI_O{HL|DbwFuH?4=*a|a&Zd++!A
z{=DzK?;9sR1b03UCywZm-d|6;^F=sXMJ;L22Q`TI5dJ0CmWFmmRMc7qdJ9iVeDq&D
zLOd^VON)e@yPS76r2(rYb;?}L09sOg!I!#i%ju}V>Acf$cHL>%6FTe#{A|}_Mrj^$
zuG$k&_m;w~`sr}1$$hN?$rE{KZ{9w%DfLR#*cNpfjIl_&ThI3xN5>kVeRCGtg}d3O
z5ZNh+?mUz?o+9dWTp@N%8Ei)gtu|b$!m;AevkwqvZ$elJK*U|!iC2oHUL*&5p^O^L
z57%{aoz6<0c?#=uNN^-M-%WXdGD2yTPV?NmDmu@A!OU|W;=_vMBL23N2M~WpN~08@
z)6jM|%n7)Ik0H7?5VPydC-o&J=iE0&H{{tWItRGN_y=sW4p;gzwQ!62D%a{>gwN_L
z<Z6?#Bij5aF@pVo(QVB_IBgYJm*J{i*h33Q-wy95%20wkjHi*Y(^t?>EKGlfj9=kc
zMZdVG_as~>aFaHQN!uqkeH#PF>vm)VTFZ_>8&2>QhJr6K5Zpw6a08j(I;`LtjNl6#
z2-c8XSe5LgoxX${>5G^a_lhZN7<w%i{?73S$5!Ha_>6LMf!7Dj*(k5s)~hfSl<md)
zKx&Zpvpe#5@h7OM2T;XtMvr0)*lJh!oq~+*U&1tFpOJGMPnrSO#J-gr{}#?TZIiL!
zB4#4`dMfxDXNE4%pGv7{Bj=kYr;4Jor1fEB#MBMMf)x~LZ&}(S=ep$RfJz(7{^wX0
zxiK@iiskHC9Ads^m50e5cm)-?d{mUGHoWyHat&4dGGhh-W+VF<V+BjJRc`vbgaz7K
zQX*Pk&Vc4$#jG!5=*pQQGGdCu$rSyy@f-^h6JFjF=aMP8Mq=MxKfv5`pC0`bRI$25
zpDz8cN5zwd8Qj8LB-8YHo<7e>pO%PhcAI#Me$O+OHN|b7?To~rAH1tP%Jqm7V^K_v
zsG^T~bPaj-X^B&3jXE`@+|>C<?q$1iNO@B3Q9doG$_aVye{?>OxW9sG_9QtuFRCof
zsLG@D9`VCbJMuc?oN7e<Ixa-CoGsF0ruZ;#(nl?*p{nFFw$!KZQL$#2%x{_4g%|eU
z759x4b8wz_TOn2!o9n5_QP<QFP6bs|<a?0sD19B%)?W6k1O#(8&Qai)<nR_ffH90`
z6~_2*tVeh`=5Hh_4(DxA^GxLxt&eY^Em*}keHG|~_7Ua#DKHm>*4yZB<)@HMvR;zz
zF!LftyAdU4l6N;LJiaNZx572|T6zatdXw*e(&T!4SDwff<h@6OIy`c{7I#mJ>&ZIU
zcO?8VH3gOUxPKW1=BY#CevLY-^ue0*S$jTf&}S|BtVy4>>9a<C)+%e+k$1~_-eBEp
zVlk7#$Fg5|dhL5ze>2^+$G~=-J00w|h1jOk9)<(6VJO;N3v-5TPsAEK_R4Ygi5<S3
zxTQj~2OITM7<y^%CC6Z&HhaU6{Wz3T>amX(bM4`u60_RjGOnF_H@WgZ!v6|nzm@-y
U?eN0?`L`YCe@f-pv6tb01C_I(u>b%7

literal 0
HcmV?d00001

diff --git a/mupen64plus-core/src/main/main.c b/mupen64plus-core/src/main/main.c
index 7ab330c..fdab9b7 100644
--- a/mupen64plus-core/src/main/main.c
+++ b/mupen64plus-core/src/main/main.c
@@ -1462,6 +1462,22 @@ void main_change_gb_cart(int control_id)
     }
 }
 
+static const char* get_pif_path(m64p_system_type systemtype)
+{
+    const char *filename;
+    switch(systemtype)
+    {
+    case SYSTEM_PAL:
+        filename = "pifdata_pal.bin";
+        break;
+    case SYSTEM_MPAL:
+    case SYSTEM_NTSC:
+    default:
+        filename = "pifdata_ntsc.bin";
+        break;
+    }
+    return ConfigGetSharedDataFilepath(filename);
+}
 
 /*********************************************************************************************************
 * emulation thread - runs the core
@@ -1504,6 +1520,17 @@ m64p_error main_run(void)
             break;
     }
 
+    /* Load PIF */
+    FILE* PifFile = fopen(get_pif_path(ROM_PARAMS.systemtype), "rb");
+    if (PifFile != NULL)
+    {
+        unsigned char* pif_buffer = malloc(2048);
+        size_t file_size = fread(pif_buffer, 1, 2048, PifFile);
+        fclose(PifFile);
+        open_pif(pif_buffer, file_size);
+        free(pif_buffer);
+    }
+
     /* Seed MPK ID gen using current time */
     uint64_t mpk_seed = !netplay_is_init() ? (uint64_t)time(NULL) : 0;
     l_mpk_idgen = xoshiro256pp_seed(mpk_seed);