Skip to content

Commit

Permalink
increment version to 2.1.1 and update codeset
Browse files Browse the repository at this point in the history
  • Loading branch information
@JLaferri
JLaferri committed Jun 30, 2020
1 parent bddf414 commit 2f71dc8
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 51 deletions.
75 changes: 50 additions & 25 deletions Overwrite/Sys/GameSettings/GALE01r2.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,12 +610,12 @@ C216D30C 00000013 #Recording/SendGameEnd.asm
BA810008 800100B4
382100B0 7C0803A6
8001003C 00000000
C216E74C 000000B2 #Recording/SendGameInfo.asm
C216E74C 000000B6 #Recording/SendGameInfo.asm
7C0802A6 90010004
9421FF50 BE810008
3D808000 618C5604
7D8903A6 4E800421
2C030000 41820554
2C030000 41820574
386006DE 3D808037
618CF1E4 7D8903A6
4E800421 7C7E1B78
Expand Down Expand Up @@ -650,6 +650,10 @@ B07E0015 3860003D
7FE4FB78 38A00138
3D808000 618C31F4
7D8903A6 4E800421
38600000 907E0066
907E006A 907E006E
907E0072 907E0076
907E007A 907E007E
387E0022 3AA30060
3A800000 1ED40024
7ED6AA14 88760001
Expand Down Expand Up @@ -1168,21 +1172,21 @@ BA810008 800100B4
800100B4 382100B0
7C0803A6 7C7D1B78
60000000 00000000
C216E748 0000007E #Online/Core/InitOnlinePlay.asm
C216E748 00000050 #Online/Core/InitOnlinePlay.asm
3D808022 618C54B8
7D8903A6 4E800421
7C0802A6 90010004
9421FF50 BE810008
3C608048 80639D30
5463443E 2C030208
408203AC 386006FD
4082023C 386006FD
3D808037 618CF1E4
7D8903A6 4E800421
7C7B1B78 388006FD
3D808000 618CC160
7D8903A6 4E800421
936DB61C 38600001
907B0003 4800021D
907B0003 480001ED
7C6802A6 907B06EE
38600012 3D808037
618CF1E4 7D8903A6
Expand Down Expand Up @@ -1235,35 +1239,50 @@ C216E748 0000007E #Online/Core/InitOnlinePlay.asm
38800007 38A00000
3D808039 618C01F0
7D8903A6 4E800421
48000051 7C8802A6
48000021 7C8802A6
38A00000 3D808038
618CFD54 7D8903A6
4E800421 887F0002
54630739 41820028
48000065 7C6802A6
907F0040 38600000
986DAFC8 887F0002
38800000 50831F38
987F0002 48000180
4E800421 48000040
4E800021 3C608048
80639D60 5464803E
806DB61C 80630007
7C841A14 3C60804D
90835F90 4E800020
4E800021 808DB61C
806406EA 9062F228
4E800020 4E800021
7C0802A6 90010004
9421FF50 BE810008
806DB61C 8BC30000
3C80804C 60841FAC
1C7E0044 7FE32214
886DAFC8 2C030000
418200A0 807F0000
4E800020 BA810008
800100B4 382100B0
7C0803A6 00000000
C216E904 0000003B #Online/Core/InitPause.asm
3C608048 80639D30
5463443E 2C030208
408201BC 3D808046
618CDB68 886C0002
54630739 41820028
48000029 7C6802A6
906C0040 38600000
986DAFC8 886C0002
38800000 50831F38
986C0002 48000180
4E800021 7C0802A6
90010004 9421FF50
BE810008 806DB61C
88630001 3C80804C
60841FAC 1C630044
7C632214 80630000
54600673 4182001C
546006B5 41820014
546005EF 4182000C
546004E7 40820014
546004E7 4082005C
806DB61C 8BC30000
3C80804C 60841FAC
1C7E0044 7FE32214
807F0000 54600673
4182001C 546006B5
41820014 546005EF
4182000C 546004E7
40820020 886DAFC8
2C030000 4182007C
807F0008 546004E7
40820040 480000C0
38600002 3D808002
Expand Down Expand Up @@ -1292,9 +1311,8 @@ C216E748 0000007E #Online/Core/InitOnlinePlay.asm
48000004 3860FFFF
BA810008 800100B4
382100B0 7C0803A6
4E800020 BA810008
800100B4 382100B0
7C0803A6 00000000
4E800020 881F0001
60000000 00000000
C21A5014 00000052 #Online/Core/LoopEngineForRollback.asm
41A20014 3D80801A
618C5024 7D8903A6
Expand Down Expand Up @@ -1876,6 +1894,13 @@ A0650000 7C1B1800
800100B4 382100B0
7C0803A6 2C1A0000
60000000 00000000
C2266BC4 00000006 #Online/Menus/CSS/DisableLRA.asm
3C608048 80639D30
5463443E 2C030008
40820014 3D808026
618C6BF4 7D8903A6
4E800420 38600000
60000000 00000000
C2261E5C 00000006 #Online/Menus/CSS/DisableNametagBox.asm
3C608048 80639D30
5463443E 2C030008
Expand Down
75 changes: 50 additions & 25 deletions Overwrite/Sys/GameSettings/GALJ01r2.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -610,12 +610,12 @@ C216D30C 00000013 #Recording/SendGameEnd.asm
BA810008 800100B4
382100B0 7C0803A6
8001003C 00000000
C216E74C 000000B2 #Recording/SendGameInfo.asm
C216E74C 000000B6 #Recording/SendGameInfo.asm
7C0802A6 90010004
9421FF50 BE810008
3D808000 618C5604
7D8903A6 4E800421
2C030000 41820554
2C030000 41820574
386006DE 3D808037
618CF1E4 7D8903A6
4E800421 7C7E1B78
Expand Down Expand Up @@ -650,6 +650,10 @@ B07E0015 3860003D
7FE4FB78 38A00138
3D808000 618C31F4
7D8903A6 4E800421
38600000 907E0066
907E006A 907E006E
907E0072 907E0076
907E007A 907E007E
387E0022 3AA30060
3A800000 1ED40024
7ED6AA14 88760001
Expand Down Expand Up @@ -1168,21 +1172,21 @@ BA810008 800100B4
800100B4 382100B0
7C0803A6 7C7D1B78
60000000 00000000
C216E748 0000007E #Online/Core/InitOnlinePlay.asm
C216E748 00000050 #Online/Core/InitOnlinePlay.asm
3D808022 618C54B8
7D8903A6 4E800421
7C0802A6 90010004
9421FF50 BE810008
3C608048 80639D30
5463443E 2C030208
408203AC 386006FD
4082023C 386006FD
3D808037 618CF1E4
7D8903A6 4E800421
7C7B1B78 388006FD
3D808000 618CC160
7D8903A6 4E800421
936DB61C 38600001
907B0003 4800021D
907B0003 480001ED
7C6802A6 907B06EE
38600012 3D808037
618CF1E4 7D8903A6
Expand Down Expand Up @@ -1235,35 +1239,50 @@ C216E748 0000007E #Online/Core/InitOnlinePlay.asm
38800007 38A00000
3D808039 618C01F0
7D8903A6 4E800421
48000051 7C8802A6
48000021 7C8802A6
38A00000 3D808038
618CFD54 7D8903A6
4E800421 887F0002
54630739 41820028
48000065 7C6802A6
907F0040 38600000
986DAFC8 887F0002
38800000 50831F38
987F0002 48000180
4E800421 48000040
4E800021 3C608048
80639D60 5464803E
806DB61C 80630007
7C841A14 3C60804D
90835F90 4E800020
4E800021 808DB61C
806406EA 9062F228
4E800020 4E800021
7C0802A6 90010004
9421FF50 BE810008
806DB61C 8BC30000
3C80804C 60841FAC
1C7E0044 7FE32214
886DAFC8 2C030000
418200A0 807F0000
4E800020 BA810008
800100B4 382100B0
7C0803A6 00000000
C216E904 0000003B #Online/Core/InitPause.asm
3C608048 80639D30
5463443E 2C030208
408201BC 3D808046
618CDB68 886C0002
54630739 41820028
48000029 7C6802A6
906C0040 38600000
986DAFC8 886C0002
38800000 50831F38
986C0002 48000180
4E800021 7C0802A6
90010004 9421FF50
BE810008 806DB61C
88630001 3C80804C
60841FAC 1C630044
7C632214 80630000
54600673 4182001C
546006B5 41820014
546005EF 4182000C
546004E7 40820014
546004E7 4082005C
806DB61C 8BC30000
3C80804C 60841FAC
1C7E0044 7FE32214
807F0000 54600673
4182001C 546006B5
41820014 546005EF
4182000C 546004E7
40820020 886DAFC8
2C030000 4182007C
807F0008 546004E7
40820040 480000C0
38600002 3D808002
Expand Down Expand Up @@ -1292,9 +1311,8 @@ C216E748 0000007E #Online/Core/InitOnlinePlay.asm
48000004 3860FFFF
BA810008 800100B4
382100B0 7C0803A6
4E800020 BA810008
800100B4 382100B0
7C0803A6 00000000
4E800020 881F0001
60000000 00000000
C21A5014 00000052 #Online/Core/LoopEngineForRollback.asm
41A20014 3D80801A
618C5024 7D8903A6
Expand Down Expand Up @@ -1876,6 +1894,13 @@ A0650000 7C1B1800
800100B4 382100B0
7C0803A6 2C1A0000
60000000 00000000
C2266BC4 00000006 #Online/Menus/CSS/DisableLRA.asm
3C608048 80639D30
5463443E 2C030008
40820014 3D808026
618C6BF4 7D8903A6
4E800420 38600000
60000000 00000000
C2261E5C 00000006 #Online/Menus/CSS/DisableNametagBox.asm
3C608048 80639D30
5463443E 2C030008
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Common/Version.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
//#else
//" " BUILD_TYPE_STR " " SCM_DESC_STR;
//#endif
#define SLIPPI_REV_STR "2.1.1-dev.1"
#define SLIPPI_REV_STR "2.1.1"
const std::string scm_rev_str = "Faster Melee - Slippi (" SLIPPI_REV_STR ")";
const std::string scm_slippi_semver_str = SLIPPI_REV_STR;

Expand Down

0 comments on commit 2f71dc8

Please sign in to comment.