From 9b1623d9a0d85f88da344406ca9b80ca09f3f25c Mon Sep 17 00:00:00 2001
From: infinitefusion <pkmninfinitefusion@gmail.com>
Date: Fri, 3 Jun 2022 16:08:50 -0400
Subject: [PATCH] Adds autosave to options menu + reorder

---
 Data/Map137.rxdata                    | Bin 19044 -> 19044 bytes
 Data/MapInfos.rxdata                  | Bin 36457 -> 36457 bytes
 Data/Scripts/016_UI/015_UI_Options.rb | 137 +++++++++++++++-----------
 Data/System.rxdata                    | Bin 27344 -> 27345 bytes
 4 files changed, 81 insertions(+), 56 deletions(-)

diff --git a/Data/Map137.rxdata b/Data/Map137.rxdata
index c0f6973d844ef0f0d972b312b271ab9b45ecc510..6faca423344e090ed9e185dcbbd7df3bd97597a3 100644
GIT binary patch
delta 2662
zcmdUxO=}ZT6ozM#I{BI;L#t_<CT*J5HfgISX`8k=n;3Amq6C9f2*FO_Nb8g)epHYk
zx)Py=+l`<L5d;@5B;d}i3m1a_p+CT_3(+%aayv<yMoY1{7;YfLo#z~$`<}bIBkt~q
z&#!uvbP3nAqE^b|3I-}yQXgI@VqjgrtK~~u8yX6!zVr%iYBx)$-_Eb%eU-fxzpzJ^
z$4Xziuy(JoRm{^LC4EC>R_iu<V~tAQUhtv7zFO~$joU$4w&`%z2EEGyoJPs?TY!ly
zOtRIUr{w`120h?cVJIwJga8gfFbl&dz=#SVlweeaFfIKmjOkF@v}Gd|CbJMhJ498O
zqGd*hb26Mq@fTbO3lO8N;`AiY2D7xz(KD^Wd=`@Q@&YTK8uhrH;4xSUUs-ms_r3=#
zBo)f^CVjRQP=cU(0N~+tQiF~@{Re<GI+^g)8r0wP^rh{@dpfRyBka6%Ef!0{B96ln
z`XPlb!+=_+Y4!H9Z+72tc39}vVT*sPNdoF|w59;3jT5axwEaXYp=_qDZaWHcdC$XE
zAuL6)$yxDrL)ycg=tz7flgn&sg%xcxzpAYl*0j3BDZ^qHx45A&=U*UxKk>VXUq<qI
z-)r{H_v1Lb{qKDKH1O=CGa|w}oTwY3P={^kHXC9DU-kQ-BDT?X2#l_Y#{Fmt3^|hv
zMP}!t9fNJUo@^X?k)T7Qg_EG&Xm8Qt6}ud`@qeoEIe6k~>_^>f{qXsy%Xajb)nGq|
zpLEEM4sIMVIQHB~9OOnq;3JQVu|&v5IvdCybeNHAV|*$UYaip}4<G3?#%cPphoShf
zNza3&N&2p1e1;b_M@0=#QG-;J1HES3jiPA4hnYAsSFMbG>}jvA{cgc-O<ZrQ&Qh`R
z$j=_-n&N7{1voRgSaQL1q}@E_jk}86IMQ7PXGg3f`gCyHY3>X)4bFIsdLFEc<gL0R
Gx$ti^xk)Mj

delta 2748
zcmdUxOHUI~6vt;;oK7Fp4wUd{LCR1O5Oqp<pO{n<#tkksjVx-?G*Xk3phKi8U3KHi
z_@KFLT$soQP(w)Exi;=xx-%wh{Q$1y%rG50Lkray35(l1$!%`_=YM|poU^yZ?``p$
zH>-s?DU!LTKPu)+<+UPmJFnV#_L=`AM>8w<pm?W*`u+S}+|bxd&l8sPzMzA`>f=Ir
zJx>QEeNAIK-Z4+OgMIft92ycq&iQmm`k*7nK_?1z-yEFF!Z0hhJ*`BLgFy|tbm$I4
zj|RPpa1~-0hj<qH=&WCZvnarT1_{~}9n6bemuWDZh4U!Fhz6syr8OAS;X(+;k^co3
z6%H=ZRhMb0=z|pP6SO9?FqNi%Pix>;0*kj)b!y(1DPxj;H?VzP%-{+JFsMT)0Fn_*
zxC2Npdwb?v#idt(xYj@~MRv4gp(eQny%d!p*;L$Sh-umA_r4Q1y5cZ;8fGvFvlxRp
z3>s*d4%2?%Frh==?V^cJlv346%Z<pNSzaOLEKIl~J@>?h9F)|%UgIQ1@@10WP4Wc{
zx#SBZA1(O-I_I~M!`*lO>!G}h8qYfK;GEyCfqpDF4TE5XuIRPjs0VG-8wD{#LBuEs
ziGm0r(e0xAWBfI{(S7@Lk^ZIU*-4j_aR=!W7Ai8i>_f?ciku6wsxrwS_O+SlCXgRp
zRBSffbuhHBoES+@jUFzCX{#POw9k_E1Q8M-?GlO&2>E&1=;&lW`Zt=H{lA)y>To%2
zy~8eYS;Vk|kO=iWIVYNwWCoW0mD@HTj;?b+$3z1<2oAG?j9J~MRtM)ux>3dr>0$KO
zOJ`RS>fs@P7_tX~gM!R96RBqT_$&DBj_QWL`4HgD$0P;SLqYXYP=1WKsi%A>Mm~1m
z41Q=!9yjI~Er(STQTBXzvEuGvo~qYT{_Qd6*y?XhIzi`{6IfVQr)TOOx8!I5mD=!N
zw%JB4w#hJ7uQS{FIA&93Wn!s?d940rq*Tg8zlB$1Ue1(owYXj^<!LPI+m%L^m3_CD
BSp@(9

diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 89ba84cdc0816ad4507dd58d66c6ceae4afec84c..59727cf88f50c1e95c06e14e177b4e08a56d0d21 100644
GIT binary patch
delta 37
qcmaDkhw0@UrVUCgjBcBiSzfa+hHU2NJmv)CUGr`f22v66g8Bdh9Spqy

delta 37
qcmaDkhw0@UrVUCgj3JwqSzfa+x^3p?Jmv)CUGr`f22v66g8Bdii455Q

diff --git a/Data/Scripts/016_UI/015_UI_Options.rb b/Data/Scripts/016_UI/015_UI_Options.rb
index b10d000c8..bd92128d8 100644
--- a/Data/Scripts/016_UI/015_UI_Options.rb
+++ b/Data/Scripts/016_UI/015_UI_Options.rb
@@ -330,8 +330,8 @@ class PokemonOption_Scene
   end
 
   def pbGetOptions(inloadscreen = false)
-    options = [
-      SliderOption.new(_INTL("Music Volume"), 0, 100, 5,
+    options = []
+    options << SliderOption.new(_INTL("Music Volume"), 0, 100, 5,
                        proc { $PokemonSystem.bgmvolume },
                        proc { |value|
                          if $PokemonSystem.bgmvolume != value
@@ -343,8 +343,9 @@ class PokemonOption_Scene
                            end
                          end
                        }
-      ),
-      SliderOption.new(_INTL("SE Volume"), 0, 100, 5,
+      )
+
+    options <<  SliderOption.new(_INTL("SE Volume"), 0, 100, 5,
                        proc { $PokemonSystem.sevolume },
                        proc { |value|
                          if $PokemonSystem.sevolume != value
@@ -358,61 +359,35 @@ class PokemonOption_Scene
                            pbPlayCursorSE
                          end
                        }
-      ),
-      EnumOption.new(_INTL("Text Speed"), [_INTL("Normal"), _INTL("Fast"), _INTL("Instant")],
-                     proc { $PokemonSystem.textspeed },
-                     proc { |value|
-                       $PokemonSystem.textspeed = value
-                       MessageConfig.pbSetTextSpeed(MessageConfig.pbSettingToTextSpeed(value))
-                     }
-      ),
-      EnumOption.new(_INTL("Battle Effects"), [_INTL("On"), _INTL("Off")],
-                     proc { $PokemonSystem.battlescene },
-                     proc { |value| $PokemonSystem.battlescene = value }
-      ),
-      EnumOption.new(_INTL("Battle Style"), [_INTL("Switch"), _INTL("Set")],
-                     proc { $PokemonSystem.battlestyle },
-                     proc { |value| $PokemonSystem.battlestyle = value }
-      ),
-      EnumOption.new(_INTL("Default Movement"), [_INTL("Walking"), _INTL("Running")],
-                     proc { $PokemonSystem.runstyle },
-                     proc { |value| $PokemonSystem.runstyle = value }
-      ),
-      NumberOption.new(_INTL("Speech Frame"), 1, Settings::SPEECH_WINDOWSKINS.length,
-                       proc { $PokemonSystem.textskin },
-                       proc { |value|
-                         $PokemonSystem.textskin = value
-                         MessageConfig.pbSetSpeechFrame("Graphics/Windowskins/" + Settings::SPEECH_WINDOWSKINS[value])
-                       }
-      ),
-      # NumberOption.new(_INTL("Menu Frame"),1,Settings::MENU_WINDOWSKINS.length,
-      #   proc { $PokemonSystem.frame },
-      #   proc { |value|
-      #     $PokemonSystem.frame = value
-      #     MessageConfig.pbSetSystemFrame("Graphics/Windowskins/" + Settings::MENU_WINDOWSKINS[value])
-      #   }
-      # ),
-      EnumOption.new(_INTL("Text Entry"), [_INTL("Cursor"), _INTL("Keyboard")],
-                     proc { $PokemonSystem.textinput },
-                     proc { |value| $PokemonSystem.textinput = value }
-      ),
-      EnumOption.new(_INTL("Screen Size"), [_INTL("S"), _INTL("M"), _INTL("L"), _INTL("XL"), _INTL("Full")],
-                     proc { [$PokemonSystem.screensize, 4].min },
-                     proc { |value|
-                       if $PokemonSystem.screensize != value
-                         $PokemonSystem.screensize = value
-                         pbSetResizeFactor($PokemonSystem.screensize)
-                       end
-                     }
-      ),
-      EnumOption.new(_INTL("Quick Surf"), [_INTL("Off"), _INTL("On")],
-                     proc { $PokemonSystem.quicksurf },
-                     proc { |value| $PokemonSystem.quicksurf = value }
       )
 
-    ]
+    if $game_switches && ($game_switches[SWITCH_NEW_GAME_PLUS] || $game_switches[SWITCH_BEAT_THE_LEAGUE]) #beat the league
+      options << EnumOption.new(_INTL("Text Speed"), [_INTL("Normal"), _INTL("Fast"), _INTL("Instant")],
+                                proc { $PokemonSystem.textspeed },
+                                proc { |value|
+                                  $PokemonSystem.textspeed = value
+                                  MessageConfig.pbSetTextSpeed(MessageConfig.pbSettingToTextSpeed(value))
+                                }
+      )
+    else
+      options << EnumOption.new(_INTL("Text Speed"), [_INTL("Normal"), _INTL("Fast")],
+                                proc { $PokemonSystem.textspeed },
+                                proc { |value|
+                                  $PokemonSystem.textspeed = value
+                                  MessageConfig.pbSetTextSpeed(MessageConfig.pbSettingToTextSpeed(value))
+                                }
+      )
+    end
 
 
+    if $game_switches
+      options <<
+        EnumOption.new(_INTL("Autosave"),[_INTL("On"),_INTL("Off")],
+                       proc {  $game_switches[AUTOSAVE_ENABLED_SWITCH] ? 0 : 1},
+                       proc {|value| $game_switches[AUTOSAVE_ENABLED_SWITCH]=value==0 }
+        )
+    end
+
     if $game_switches && ($game_switches[SWITCH_NEW_GAME_PLUS] || $game_switches[SWITCH_BEAT_THE_LEAGUE]) #beat the league
       options <<
         EnumOption.new(_INTL("Battle type"), [_INTL("1v1"), _INTL("2v2"), _INTL("3v3")],
@@ -430,8 +405,58 @@ class PokemonOption_Scene
                          $PokemonSystem.battle_type=value
                        }
         )
-
     end
+
+    options <<  EnumOption.new(_INTL("Battle Effects"), [_INTL("On"), _INTL("Off")],
+                     proc { $PokemonSystem.battlescene },
+                     proc { |value| $PokemonSystem.battlescene = value }
+      )
+
+
+    options << EnumOption.new(_INTL("Battle Style"), [_INTL("Switch"), _INTL("Set")],
+                     proc { $PokemonSystem.battlestyle },
+                     proc { |value| $PokemonSystem.battlestyle = value }
+      )
+
+    options << EnumOption.new(_INTL("Default Movement"), [_INTL("Walking"), _INTL("Running")],
+                     proc { $PokemonSystem.runstyle },
+                     proc { |value| $PokemonSystem.runstyle = value }
+      )
+
+    options << NumberOption.new(_INTL("Speech Frame"), 1, Settings::SPEECH_WINDOWSKINS.length,
+                       proc { $PokemonSystem.textskin },
+                       proc { |value|
+                         $PokemonSystem.textskin = value
+                         MessageConfig.pbSetSpeechFrame("Graphics/Windowskins/" + Settings::SPEECH_WINDOWSKINS[value])
+                       }
+      )
+      # NumberOption.new(_INTL("Menu Frame"),1,Settings::MENU_WINDOWSKINS.length,
+      #   proc { $PokemonSystem.frame },
+      #   proc { |value|
+      #     $PokemonSystem.frame = value
+      #     MessageConfig.pbSetSystemFrame("Graphics/Windowskins/" + Settings::MENU_WINDOWSKINS[value])
+      #   }
+      # ),
+    options << EnumOption.new(_INTL("Text Entry"), [_INTL("Cursor"), _INTL("Keyboard")],
+                     proc { $PokemonSystem.textinput },
+                     proc { |value| $PokemonSystem.textinput = value }
+      )
+      EnumOption.new(_INTL("Screen Size"), [_INTL("S"), _INTL("M"), _INTL("L"), _INTL("XL"), _INTL("Full")],
+                     proc { [$PokemonSystem.screensize, 4].min },
+                     proc { |value|
+                       if $PokemonSystem.screensize != value
+                         $PokemonSystem.screensize = value
+                         pbSetResizeFactor($PokemonSystem.screensize)
+                       end
+                     }
+      )
+    options << EnumOption.new(_INTL("Quick Surf"), [_INTL("Off"), _INTL("On")],
+                     proc { $PokemonSystem.quicksurf },
+                     proc { |value| $PokemonSystem.quicksurf = value }
+      )
+
+
+
     return options
   end
 
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 83c1b3b883184d1893e7e6f347b65a621a28001e..61b38b694792d1b7b8497e24fc2cfed0373e103f 100644
GIT binary patch
delta 27
jcmca`mGR<L#tnDHSQd+#vuu7Sc07QIv2*jvbaiF`t?COR

delta 26
icmcb3mGQz=#tnDHSj5>I88<%^J08F&xp`H(Ix_&A>k3`~