Save state autoload (#352)

* Add save state autoload option

* Add autoload option

* Format Rust code using rustfmt

* Update save_states.rs

* Add files via upload

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

src/static/img/save_state_autoload.svg

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="80.0px"
+   height="80.0px"
+   viewBox="0 0 80.0 80.0"
+   version="1.1"
+   id="SVGRoot"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs833" />
+  <metadata
+     id="metadata836">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer2">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 16,59 c 4,6 9,10 24,11 C 54,70 71,59 71,40 71,20 55,9 41,9 22,9 11,26 11,40"
+       id="path1411" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4,35 6,6 9,-3"
+       id="path1994" />
+    <g
+       id="g1081"
+       transform="matrix(0.72998083,0,0,0.72998083,10.443068,11.062008)"
+       style="fill-opacity:1;fill:#ffffff">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke-width:0.231235"
+         d="M 37.436485,65.300014 C 33.041939,64.653281 33.521093,65.06276 33.375173,61.829246 33.235022,58.723565 32.945821,57.710961 31.932138,56.776614 31.43851,56.321618 31.182925,56.254146 30.399313,56.371953 27.460507,56.813771 27.970242,56.976105 25.26075,54.735481 21.83863,51.90555 21.314071,50.846685 22.280091,48.718784 23.196625,46.699891 23.070694,44.812 21.749519,40.764688 c -0.862927,-2.643503 -1.159013,-4.95161 -1.013117,-7.897656 0.275377,-5.560663 2.419578,-10.270013 6.457135,-14.181936 3.991779,-3.86757 8.343884,-5.765956 13.827084,-6.03137 6.333105,-0.306553 12.061813,1.980208 16.439444,6.562222 3.105283,3.250262 5.091914,7.253125 5.779453,11.645013 0.405243,2.588632 0.143811,6.366227 -0.615096,8.88787 -1.688347,5.609939 -1.75988,6.299664 -0.908941,8.764231 0.908939,2.632559 0.743632,3.05113 -2.225214,5.634431 -3.237249,2.816851 -3.094457,2.761056 -5.712751,2.232193 -1.021754,-0.206384 -1.701748,0.186067 -2.375371,1.370922 -0.471658,0.829612 -0.561706,1.36535 -0.665384,3.958775 -0.119907,2.99932 -0.119907,2.99932 -1.854166,3.294035 -2.197868,0.3735 -9.617195,0.565753 -11.44611,0.296596 z M 45.18445,53.780182 c 0.0031,-0.299689 -2.892638,-7.201136 -3.023288,-7.205525 -0.142114,-0.0048 -2.990418,6.813381 -2.990418,7.158344 0,0.115169 1.352723,0.208287 3.00605,0.206929 1.653326,-0.0014 3.006772,-0.07325 3.007656,-0.159748 z M 34.062384,46.909968 c 2.84111,-0.897507 4.00555,-2.139028 4.00555,-4.270705 0,-0.591771 -0.164352,-1.393771 -0.365228,-1.78222 -0.77255,-1.493948 -2.812282,-2.572983 -4.246353,-2.246355 -1.24848,0.284356 -3.426389,1.108603 -4.035421,1.527237 -0.778076,0.534829 -1.582233,2.173274 -1.575602,3.210238 0.01096,1.713774 1.295952,3.419048 2.952726,3.91847 0.989572,0.298302 1.297496,0.264658 3.264328,-0.356665 z m 19.815638,0.144166 c 2.753918,-1.25066 3.376688,-4.421607 1.280156,-6.518139 -0.638684,-0.638684 -1.330646,-1.000637 -2.800875,-1.465081 -1.760934,-0.556279 -2.063375,-0.590268 -3.080721,-0.346209 -2.783895,0.667845 -3.966278,3.792399 -2.364568,6.248572 0.591993,0.907801 1.525762,1.432491 3.685102,2.070682 1.799946,0.531974 2.12967,0.532996 3.280906,0.01017 z"
+         id="path1095" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke-width:0.231235"
+         d="m 38.93951,65.425188 c -0.190769,-0.04702 -1.396814,-0.208033 -2.680101,-0.357803 -1.283288,-0.149773 -2.442817,-0.340747 -2.576733,-0.424387 -0.141733,-0.08852 -0.277944,-1.359958 -0.325947,-3.042503 -0.07614,-2.668674 -0.131896,-2.974523 -0.726762,-3.9865 -0.699974,-1.190786 -1.301985,-1.482789 -2.538138,-1.231116 -2.142083,0.436118 -2.096307,0.443466 -3.416321,-0.548349 -2.642734,-1.985664 -4.361768,-3.699455 -4.639033,-4.624883 -0.234881,-0.783964 -0.193394,-1.107468 0.340173,-2.652556 0.334223,-0.967834 0.607679,-2.065824 0.607679,-2.439975 0,-0.984245 -0.408883,-2.832256 -1.153209,-5.212112 -1.766649,-5.64856 -1.458054,-11.051576 0.91471,-16.015167 1.176674,-2.461485 2.053667,-3.732893 3.924066,-5.688854 2.706973,-2.830805 6.240339,-4.922792 10.072888,-5.963818 2.659407,-0.722368 7.977381,-0.722368 10.636789,0 3.832548,1.041026 7.365913,3.133013 10.072888,5.963818 1.870399,1.955961 2.747393,3.227369 3.924064,5.688854 2.349135,4.91416 2.681162,10.596743 0.92899,15.899549 -1.339942,4.05523 -1.433876,5.335481 -0.576579,7.858266 0.83136,2.446459 0.615095,3.023324 -1.978316,5.276964 -2.889601,2.511026 -3.535048,2.905679 -4.445719,2.718298 -2.737676,-0.563301 -3.199324,-0.409771 -4.01124,1.334024 -0.487907,1.047907 -0.556949,1.530671 -0.558928,3.908195 -0.0026,3.084916 0.307155,2.697584 -2.545839,3.183736 -1.474287,0.251218 -8.567187,0.524461 -9.249382,0.356319 z m 6.243333,-11.654695 c 0,-0.109593 -0.531627,-1.488329 -1.181392,-3.063857 -0.649764,-1.575528 -1.331612,-3.228615 -1.515215,-3.673524 -0.333824,-0.808928 -0.333824,-0.808928 -1.822544,2.774814 -0.818795,1.971057 -1.489671,3.713812 -1.490834,3.872786 -0.0016,0.216521 0.752125,0.289043 3.003936,0.289043 1.653326,0 3.006049,-0.08967 3.006049,-0.199262 z m -10.92159,-6.8503 c 1.32811,-0.419549 2.045316,-0.800129 2.652955,-1.407767 2.236743,-2.236746 1.237877,-5.956377 -1.830196,-6.815386 -0.945334,-0.264676 -1.243597,-0.241388 -2.820835,0.220255 -2.18845,0.640541 -3.005357,1.105022 -3.664997,2.083861 -1.4142,2.098532 -0.705132,4.835775 1.547471,5.973754 1.307676,0.660617 1.875044,0.653074 4.115602,-0.05472 z m 20.304946,-0.130055 c 2.172987,-1.34298 2.506536,-4.500997 0.669429,-6.338107 -1.032592,-1.032591 -4.150542,-2.082507 -5.543712,-1.866749 -1.321998,0.204735 -2.522834,1.082698 -3.093652,2.261853 -0.618839,1.27835 -0.621179,2.301068 -0.0082,3.567385 0.603932,1.247556 1.429437,1.840805 3.529483,2.536467 1.904751,0.630967 3.243809,0.58253 4.44662,-0.160849 z"
+         id="path1093" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke-width:0.231235"
+         d="m 38.93951,65.395097 c -1.963204,-0.232756 -4.550115,-0.598585 -5.006628,-0.708014 -0.470758,-0.112845 -0.5023,-0.277008 -0.58566,-3.048143 -0.07501,-2.493719 -0.166303,-3.077487 -0.614432,-3.929114 -0.733363,-1.393693 -1.701497,-1.791081 -3.100389,-1.272616 -0.560242,0.207642 -1.270707,0.31364 -1.578811,0.235552 -0.308105,-0.07809 -1.392634,-0.831337 -2.410066,-1.673886 -3.96188,-3.28089 -4.176724,-3.703284 -3.242977,-6.375872 0.853176,-2.441977 0.741007,-3.825165 -0.657664,-8.109878 -3.812885,-11.680453 3.234456,-24.302593 15.231133,-27.279723 2.908052,-0.72167 7.254781,-0.725521 10.128385,-0.009 7.725107,1.926298 13.779523,7.965702 15.695297,15.656377 0.777001,3.119185 0.721396,7.509566 -0.133249,10.521171 -1.366423,4.814999 -1.518286,5.476774 -1.51232,6.590185 0.0034,0.635894 0.170526,1.572394 0.371374,2.08111 0.516351,1.307833 0.63703,2.790333 0.294466,3.617359 -0.330254,0.797302 -4.880414,4.748304 -5.72441,4.970627 -0.294466,0.07757 -1.021377,-0.01408 -1.615359,-0.203643 -1.412181,-0.450707 -2.197731,-0.176883 -3.009411,1.049002 -0.5814,0.878097 -0.625776,1.131687 -0.700872,4.005227 -0.09144,3.498891 0.248325,3.068866 -2.81026,3.556817 -1.635755,0.26096 -7.714481,0.480994 -9.018147,0.326434 z m 6.243333,-11.673928 c 0,-0.301528 -2.748984,-6.968262 -2.967988,-7.197855 -0.117447,-0.123126 -1.841881,3.740642 -3.236805,7.252396 -0.0424,0.106724 1.336341,0.194045 3.063857,0.194045 2.085958,0 3.140936,-0.08349 3.140936,-0.248586 z M 34.388754,46.89248 c 2.814615,-0.937353 4.148311,-2.691748 3.744714,-4.925932 -0.332205,-1.838976 -2.199924,-3.489507 -3.948675,-3.489507 -0.939068,0 -4.112162,1.086243 -4.835754,1.655422 -2.32395,1.828018 -1.826533,5.68566 0.892332,6.920346 1.277598,0.580181 2.008695,0.551919 4.147383,-0.160329 z m 19.522156,0.247037 c 1.14666,-0.479104 1.662334,-0.972119 2.167535,-2.072292 0.558293,-1.215789 0.543801,-2.288204 -0.04743,-3.509516 -0.60142,-1.242365 -1.366004,-1.79422 -3.483874,-2.514555 -1.937186,-0.65888 -2.667779,-0.69895 -3.83694,-0.210442 -1.14666,0.479104 -1.662333,0.972119 -2.167535,2.072292 -0.539257,1.174338 -0.539257,2.294179 0,3.468518 0.589595,1.283955 1.134777,1.700494 3.203133,2.447312 2.069771,0.747329 2.973685,0.816492 4.165107,0.318683 z"
+         id="path1091" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke-width:0.231235"
+         d="m 38.477041,65.299385 c -0.953843,-0.09208 -2.480552,-0.293668 -3.392688,-0.44798 -1.658429,-0.280566 -1.658429,-0.280566 -1.734259,-3.210955 -0.08623,-3.332303 -0.467678,-4.442414 -1.792445,-5.216494 -0.726309,-0.424394 -0.780243,-0.424787 -1.987213,-0.01452 -0.961382,0.326785 -1.3608,0.365143 -1.774456,0.170406 -0.963159,-0.453421 -5.294962,-4.253427 -5.518294,-4.840835 -0.332618,-0.874852 -0.261018,-2.334289 0.153882,-3.136618 0.862949,-1.668759 0.697863,-3.764593 -0.630368,-8.002775 -2.473699,-7.8932 -0.550677,-15.893433 5.212969,-21.687198 6.889894,-6.925899 17.595022,-8.232719 26.083786,-3.184158 2.52762,1.503262 5.699672,4.675314 7.202935,7.202933 3.175918,5.340065 3.923423,11.880047 2.013433,17.615725 -1.296419,3.893134 -1.480847,5.927272 -0.713828,7.873212 0.543905,1.379897 0.589997,2.551167 0.13502,3.430996 -0.422581,0.81718 -4.960362,4.587691 -5.763997,4.78939 -0.373007,0.09362 -0.987485,0.005 -1.563682,-0.225572 -1.465653,-0.586439 -2.461885,-0.09411 -3.240475,1.601419 -0.336899,0.733666 -0.425784,1.505802 -0.429812,3.733825 -0.0051,2.808885 -0.0051,2.808885 -1.497801,3.068832 -3.736035,0.650601 -7.335134,0.81124 -10.762707,0.480369 z m 6.575115,-12.19676 c -0.202469,-0.476921 -0.906241,-2.192156 -1.563937,-3.811635 -0.657693,-1.619479 -1.252155,-2.946187 -1.321026,-2.94824 -0.093,-0.0028 -2.573458,5.768543 -3.189143,7.420228 -0.04302,0.115412 1.363215,0.206777 3.182578,0.206777 3.259655,0 3.259655,0 2.891528,-0.86713 z M 34.429648,46.882051 c 2.060388,-0.68262 3.121567,-1.567014 3.592527,-2.994036 0.908109,-2.751599 -1.497662,-5.682325 -4.383903,-5.340491 -1.45617,0.172461 -3.575567,0.996616 -4.445661,1.728751 -1.734189,1.459224 -1.818851,4.47442 -0.168179,5.989571 1.509892,1.385927 2.679475,1.519262 5.405216,0.616205 z m 19.481262,0.257466 c 0.468183,-0.195618 1.051842,-0.533798 1.29702,-0.751512 0.640675,-0.568902 1.295249,-2.112811 1.295249,-3.055039 0,-1.062298 -0.700446,-2.572653 -1.476032,-3.182728 -0.752838,-0.59218 -3.916767,-1.67513 -4.87355,-1.668119 -1.079276,0.0079 -2.530985,0.783656 -3.263339,1.743821 -0.580621,0.761233 -0.66686,1.073328 -0.66686,2.413323 0,2.331112 0.884814,3.325904 3.919132,4.406262 1.463999,0.521253 2.673596,0.551422 3.76838,0.09399 z"
+         id="path1089" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke-width:0.231235"
+         d="m 39.170744,65.294836 c -1.2082,-0.0934 -3.003158,-0.300746 -3.988795,-0.460776 -1.792068,-0.290967 -1.792068,-0.290967 -1.792068,-3.041484 0,-1.959495 -0.102925,-2.99685 -0.357888,-3.607062 -0.764727,-1.830249 -1.943846,-2.435135 -3.488651,-1.789676 -0.492789,0.2059 -1.137454,0.308688 -1.44769,0.230823 -0.762197,-0.191298 -5.302083,-3.989004 -5.708815,-4.775539 -0.454977,-0.879829 -0.408884,-2.051099 0.135021,-3.430996 0.759685,-1.927337 0.583539,-3.768075 -0.79169,-8.273195 -1.165263,-3.817289 -1.269399,-7.118948 -0.350046,-11.098321 1.775353,-7.684527 7.656018,-13.671937 15.416269,-15.6961 3.211894,-0.837782 7.312913,-0.839064 10.516612,-0.0033 7.575773,1.976358 13.397401,7.808794 15.374752,15.403299 0.460504,1.768673 0.576912,2.785972 0.583567,5.099829 0.0089,3.079399 -0.312868,4.936799 -1.378128,7.956281 -0.831996,2.358289 -0.965858,5.192767 -0.315874,6.688475 0.5424,1.248137 0.61862,2.38422 0.218829,3.261667 -0.290521,0.637622 -4.61619,4.334866 -5.591681,4.779329 -0.491008,0.223717 -0.795271,0.200859 -1.644753,-0.123561 -1.586613,-0.605933 -2.597804,-0.128464 -3.392354,1.601818 -0.337533,0.735043 -0.425774,1.506488 -0.429812,3.757561 -0.0028,1.557942 -0.09081,2.832623 -0.195582,2.832623 -0.10478,0 -1.223377,0.1466 -2.485772,0.325777 -3.094767,0.439255 -6.235258,0.567382 -8.885451,0.362516 z M 45.375537,53.77571 c -1.134582,-2.856334 -3.118267,-7.434648 -3.221652,-7.435522 -0.109702,-9.25e-4 -2.435094,5.394657 -3.113795,7.224907 -0.138477,0.373429 0.103184,0.40466 3.131232,0.40466 1.804712,0 3.24661,-0.08732 3.204215,-0.194045 z M 34.264518,47.013316 c 1.962181,-0.66264 2.850487,-1.308716 3.461011,-2.517231 1.093452,-2.164459 0.332397,-4.472094 -1.840664,-5.58118 -1.154333,-0.589147 -2.312009,-0.551194 -4.352077,0.142676 -2.606934,0.886676 -3.692536,2.143636 -3.692536,4.275385 0,1.327164 0.348773,2.14 1.308955,3.050599 1.287165,1.220696 2.810199,1.408197 5.115311,0.629751 z m 19.934286,0.05287 c 1.738297,-0.932259 2.589839,-2.771292 2.213093,-4.779516 -0.458536,-2.444206 -5.263233,-4.58769 -7.825772,-3.491255 -2.718821,1.163306 -3.342449,4.862148 -1.164634,6.907646 0.83352,0.782879 3.526348,1.751724 4.933229,1.774917 0.60577,0.01 1.380011,-0.162907 1.844084,-0.411792 z"
+         id="path1087" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke-width:0.231235"
+         d="m 36.164695,64.951992 c -1.081021,-0.179219 -2.14759,-0.330261 -2.370154,-0.335651 -0.363356,-0.0088 -0.40466,-0.305764 -0.40466,-2.909442 0,-2.429641 -0.07392,-3.044531 -0.456018,-3.793511 -0.679872,-1.33266 -1.551436,-1.933137 -2.547381,-1.755054 -2.767227,0.494801 -2.452315,0.597057 -5.24207,-1.702175 -1.399651,-1.153548 -2.666366,-2.364126 -2.814922,-2.690171 -0.402973,-0.88443 -0.328261,-2.017514 0.215542,-3.268882 0.727378,-1.673802 0.517931,-4.2497 -0.626718,-7.70772 -0.880228,-2.659197 -0.880228,-2.659197 -0.881336,-6.821418 -0.0011,-3.95383 0.03166,-4.260629 0.653437,-6.127715 1.967494,-5.908065 5.572351,-10.203388 10.769331,-12.832062 4.983103,-2.520494 11.331391,-2.934252 16.65512,-1.08552 7.101099,2.465945 12.540663,8.874401 13.861248,16.330204 0.312238,1.76284 0.312287,5.666923 9.2e-5,7.430185 -0.133612,0.754637 -0.544976,2.308567 -0.914142,3.453178 -1.26266,3.914926 -1.333603,5.462528 -0.357488,7.798695 0.826832,1.978893 0.360684,2.921648 -2.715861,5.492655 -2.5409,2.12338 -3.188658,2.415187 -4.312402,1.942689 -1.114775,-0.468729 -1.737869,-0.394618 -2.570135,0.305687 -1.117871,0.940628 -1.34042,1.730821 -1.398227,4.96461 -0.05175,2.894911 -0.05175,2.894911 -1.805682,3.195396 -2.594607,0.444511 -10.331113,0.51498 -12.737574,0.116022 z m 9.249382,-11.07212 c 0,-0.192857 -3.054298,-7.434813 -3.200462,-7.588516 -0.13486,-0.141821 -3.274105,7.057999 -3.274105,7.509119 0,0.0931 1.456778,0.16928 3.237284,0.16928 1.780505,0 3.237283,-0.04045 3.237283,-0.08988 z M 34.55327,46.914648 c 0.938773,-0.319298 1.992754,-0.854444 2.342178,-1.189216 2.814219,-2.696192 1.003076,-7.248391 -2.883854,-7.248391 -1.187605,0 -3.415663,0.719993 -4.475623,1.446289 -2.444567,1.675044 -2.301081,5.471693 0.264931,7.010062 1.217309,0.729797 2.567215,0.724474 4.752368,-0.01875 z m 19.601394,0.254333 c 0.710889,-0.371388 1.715573,-1.397693 2.099182,-2.144363 0.362758,-0.706079 0.323784,-2.747718 -0.06672,-3.495202 -0.581863,-1.113772 -1.624599,-1.879433 -3.366329,-2.471835 -2.746937,-0.934292 -4.226024,-0.741433 -5.5864,0.728414 -0.901939,0.97452 -1.17998,1.645555 -1.17998,2.847808 0,1.980776 1.18534,3.411396 3.555943,4.291762 1.674883,0.621998 3.62018,0.726199 4.544302,0.243416 z"
+         id="path1085" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke-width:0.231235"
+         d="m 23.87977,53.33386 c -0.287626,-0.366752 -0.279447,-0.374931 0.0873,-0.08731 0.222563,0.174547 0.40466,0.356645 0.40466,0.404661 0,0.190315 -0.189887,0.06782 -0.491964,-0.317356 z m 1.648137,-32.749182 c 0,-0.04802 0.182097,-0.230114 0.40466,-0.40466 0.366751,-0.287626 0.37493,-0.279447 0.0873,0.0873 -0.302078,0.385178 -0.491964,0.50767 -0.491964,0.317356 z M 55.5589,17.723742 c -0.287625,-0.366751 -0.279446,-0.37493 0.08731,-0.0873 0.385179,0.302078 0.507671,0.491964 0.317356,0.491964 -0.04802,0 -0.230113,-0.182097 -0.404661,-0.40466 z"
+         id="path1083" />
+    </g>
+  </g>
+</svg>

src/training/save_states.rs

@@ -191,9 +191,13 @@ pub unsafe fn save_states(module_accessor: &mut app::BattleObjectModuleAccessor)
     .contains(&fighter_kind);
 
     // Grab + Dpad up: reset state
-    if ControlModule::check_button_on(module_accessor, *CONTROL_PAD_BUTTON_CATCH)
+    if (MENU.save_state_autoload == OnOff::On
-        && ControlModule::check_button_trigger(module_accessor, *CONTROL_PAD_BUTTON_APPEAL_HI)
+        && !fighter_is_ptrainer
-        && !fighter_is_nana
+        && save_state.state == NoAction
+        && is_dead(module_accessor))
+        || (ControlModule::check_button_on(module_accessor, *CONTROL_PAD_BUTTON_CATCH)
+            && ControlModule::check_button_trigger(module_accessor, *CONTROL_PAD_BUTTON_APPEAL_HI))
+            && !fighter_is_nana
     {
         if save_state.state == NoAction {
             SAVE_STATE_PLAYER.state = KillPlayer;

training_mod_consts/src/lib.rs

@@ -987,6 +987,7 @@ url_params! {
         pub save_state_mirroring: SaveStateMirroring,
         pub frame_advantage: OnOff,
         pub save_state_enable: OnOff,
+        pub save_state_autoload: OnOff,
         pub throw_state: ThrowOption,
         pub throw_delay: MedDelay,
         pub pummel_delay: MedDelay,
@@ -1049,6 +1050,7 @@ impl TrainingModpackMenu {
             frame_advantage = OnOff::from_val(val),
             save_state_mirroring = num::FromPrimitive::from_u32(val),
             save_state_enable = OnOff::from_val(val),
+            save_state_autoload = OnOff::from_val(val),
             throw_state = ThrowOption::from_bits(val),
             throw_delay = MedDelay::from_bits(val),
             pummel_delay = MedDelay::from_bits(val),
@@ -1113,6 +1115,7 @@ pub static DEFAULTS_MENU: TrainingModpackMenu = TrainingModpackMenu {
     save_state_mirroring: SaveStateMirroring::None,
     frame_advantage: OnOff::Off,
     save_state_enable: OnOff::On,
+    save_state_autoload: OnOff::Off,
     throw_state: ThrowOption::NONE,
     throw_delay: MedDelay::empty(),
     pummel_delay: MedDelay::empty(),
@@ -1453,6 +1456,12 @@ pub unsafe fn get_menu() -> UiMenu<'static> {
         "Save States: Enable save states! Save a state with Grab+Down Taunt, load it with Grab+Up Taunt.",
         true,
     );
+    misc_tab.add_submenu_with_toggles::<OnOff>(
+        "Autoload Save States",
+        "save_state_autoload",
+        "Save States Autoload: Load save state when any fighter dies",
+        true,
+    );
     misc_tab.add_submenu_with_toggles::<OnOff>(
         "Frame Advantage",
         "frame_advantage",