From 179c8d078b78b721b69ea29ce49d02e5fb272a71 Mon Sep 17 00:00:00 2001
From: infinitefusion <pkmninfinitefusion@gmail.com>
Date: Sun, 19 Nov 2023 11:34:53 -0500
Subject: [PATCH] Fixes player becoming invisible after playing the pokefulute

---
 Data/CommonEvents.rxdata                 | Bin 133254 -> 133145 bytes
 Data/MapInfos.rxdata                     | Bin 43615 -> 43615 bytes
 Data/Scripts/001_Settings.rb             |   2 +-
 Data/Scripts/050_AddOns/GameplayUtils.rb |   2 ++
 Data/System.rxdata                       | Bin 28460 -> 28461 bytes
 5 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata
index 26eca1d7a94d83f52c00a8715e6f305dab843a12..b389ed0e3ec49a96c6ab4cb8d48de4583f478cac 100644
GIT binary patch
delta 992
zcmY*XTS!z<6lLvc?l`HT=~T{)jtY)Z{qz!2!iESfAHCGdjK+e(ATuRjO<_cejyj`P
z+9lRVkP!8e&l5uQQJ)bMMT*+HFEfq4!Uvr@R}{bYI&1Cc*}J|i<gP!YZUAGMaES3t
z#2Z9OHvSpuy_MSnaMA}W-zY+q2pqv?qEMUKI~yfF=fMFA3qH7~0P$jb0lb6)esLU!
zaf~BRV2-M7-0Oi8HJnli7izg$GgrlMAzDEFHmyJmKP`fFm9mEhxUL8}G-%_k7DTD9
zW>baz6n3wrX**~8rQ?@ASk2OL#-3&_QP{l=o7B4W2=Vq3j3$(GL=7ywyA3A(TZwd3
z=tO1}#^KX(YBjdNuVYU&R6NwM3q6{#i&BXV_`y#-NLGHv$|`0q?ZAHFyoOI96o})<
z8bqt<4WS~b9yUO*t3if8(~MmN8ej%SbZ#`rvE;JUvi49u)rg;%)5vHwyzMzhd$AAe
z__Y^yuJj@w>ou&>e4Hq5MkJIBM{vrwUa9z6kgsGe5jHlqqJp~hez>(2O?1%_Y>vx(
za{iq@BvI)ya|gHB?3bO^bCw?uaF2icv5W5O9zy<^!GMqK>OivW-`$L8ajgTwNICI(
z)&rf`Lb>`wG<Tv3RK6(1bV;dVQ99X$9R~EVKY(QFj}LB=WvW!6bYmoh&LrqZbv9w8
zq!3R$MwmGN7{dxSaAF@0Q%vIW-dCCSkd>cE8aA=ehhI*4l9Qvj4%zF4F$@DoIcY);
zm6xQt9wn&mb7t=L!OXwE$h?6Gyo0>F^3TWsc~-gz>9P$N;Dm3uf<et#_{lf8F{I<f
z?{Je?8KmcZ`5n2Yuso++l__m?3AIDLJQBlV239^ai3k*N@ud9Jd~TdXKPqldA)P(H
za1%F&rtsAe`erF~UUfBXQV*R=5!rvRHyj_>zW@tHM9%_j2E=j>(Ls(RN<*B6o5`_p
W#iU}5fvO0nx!y?As1=n8MbLkP#70X1

delta 1127
zcmZuwYfO_@7~b<X-`Cb|S=AC{Eq*P^C2ACne^^c0Wm(3uB?IRTMXk}P#3dRNfkZ-3
z6ed*)9FkY&55bsuix)t1@P7GWqQ-<66P;jz>OY)f;tvHeJ72#Bw#8rPxt#Of@}Aa4
zM{Sd%`T}|jkSY5L;J1mwJzM3-j~LbH*;k_BU4Yx>Kto*4Sb`9d$16HUr^+2mVSv(-
zg!7lfFYhcvl(3GMtVEG3;te`WUBOAE)GXe7Xy$M+BG}FC#mJ#OUXDcJ;dn9TQca5Z
zS1GbLMY?`L9!IJ$M^tB}bGTiB^ND#pe>G0iRj;ZkUCcA4C+pI$nVIa(qtkeP2^QeG
zTwj9d6nf|5{ut7^?F^=~;ew{W_o<6IM;2nXs1CX1#%<8-v@3(#6RMb=M%cNwOm$e9
zQhLkKM~716%L-*bDn}NzPAG!Trbu^%s{Wis<VXbyZ1i`ASlkm3;r*KaDnn&<GFtG1
zyi|#}gHFsyW)-12m+amLFL0Bqeus~TYmtRpCf+Q<^_jxo>*N!45E%TIpODI50n!XH
z(%8et>+u~7UKdsGolz`<-^7A+L%xk-GN{nta3?%wHqJhXA}Sge?A&q?<#f`jhXW0$
zr!vDD$*l&}RC$WnVmL$%);sQqVJ>1EkKri(<lT+Pr{mT=spe?2(SRYE_6OKqrxs^W
zeh|2?(Q>~P*7!q>@<po}<qAuYN+}2JO8Ku2E5GZo@+(umQWn|hihq0=>8hU>q+u$%
zTky4PJ%T3=+8UU!e+&HA)`_>D#^-Y66fWxsaHtb$e6ItGDKm3oO>}#yJxnuAw+ORj
zQzu?#!zZi$LKTo9$DZOcP{Q4Ps@*kN;+vBJ5!vMAPz9Xg!Kq0y?-?Eed!^Qo??L-M
zaU(i_T;LkFB~<>qgX&9Mw{R$-@C_61q?@03xb!&+?XET1=Bg(@73U3O5#Jbs+x4rd
zI!tv;G^JU;0&Cefgf3Ka&k%0ofO&-E!<RT}b3Go9GRALe@RK;=_Q?KWeEY?;c#aD7
zSuzy11?`TYW3?WpL7D#%UK_G`0Q55-0|k*|;scbM`~NX`<VB(lge{z|(QDL5r%rDA
E2c+JK8vp<R

diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index df577978ccacef881fc41c028f9bfb86f6bb025c..8a377201a0a981e81a3b01037d737d384690706a 100644
GIT binary patch
delta 16
XcmcbAh3WnkrVX0uj3Jw~(oLNKLvjYZ

delta 16
XcmcbAh3WnkrVX0ujBcB?(oLNKLmmdM

diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index 01616c6bd..1244e74c3 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -6,7 +6,7 @@
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
   GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "6.0.2"
+  GAME_VERSION_NUMBER = "6.0.3"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
diff --git a/Data/Scripts/050_AddOns/GameplayUtils.rb b/Data/Scripts/050_AddOns/GameplayUtils.rb
index 3d0d280c5..91388d7fd 100644
--- a/Data/Scripts/050_AddOns/GameplayUtils.rb
+++ b/Data/Scripts/050_AddOns/GameplayUtils.rb
@@ -209,7 +209,9 @@ def playPokeFluteAnimation
 end
 
 def restoreDefaultCharacterSprite(charset_number=0)
+  meta = GameData::Metadata.get_player($Trainer.character_ID)
   $game_player.setDefaultCharName(nil, 0, false)
+  $game_player.character_name =meta[1]
   Graphics.update
   Input.update
   pbUpdateSceneMap
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 187213d48e541c5d0087ee072af1324fb3052e3e..3e5338ff023fb3c17c3fcff34da7d06071cc9306 100644
GIT binary patch
delta 27
jcmZ2;k8$li#tm+gEKF7JST}n~?h0aJoWGehN1Yh}nd%9w

delta 26
icmZ2`k8#aC#tm+gEDXF3jGMhAcLg!BZDz|+X9fU%R0r_@