Skip to content

Commit

Permalink
set init state for stage event codes
Browse files Browse the repository at this point in the history 
prior to this sometimes you could get an event early in the game based on the state of a previous game. this wouldn't have been problematic necessarily but it'd be weird why sometimes you'd get an early event and other times you wouldn't and could make people make bad assumptions when using the events.

I also cleaned up the FoD check for if the platform heights are being initialized to no longer look at the link register.
  • Loading branch information
@JLaferri
JLaferri committed Jan 27, 2025
1 parent bb01e0e commit 17b04d9
Show file tree
Hide file tree
Showing 11 changed files with 211 additions and 159 deletions.
45 changes: 24 additions & 21 deletions Output/Console/GALE01r2.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,12 @@ C216D884 00000030 #Recording/SendGameEnd.asm
BA8100B0 800100E4
382100E0 7C0803A6
819F2514 00000000
C216E74C 00000110 #Recording/SendGameInfo.asm
C216E74C 00000111 #Recording/SendGameInfo.asm
7C0802A6 90010004
9421FF20 BE8100B0
3D808000 618C5604
7D8903A6 4E800421
2C030000 41820844
2C030000 4182084C
38600005 3D808037
618CF1E4 7D8903A6
4E800421 7C7B1B78
Expand All @@ -148,7 +148,8 @@ C216E74C 00000110 #Recording/SendGameInfo.asm
618CF1E4 7D8903A6
4E800421 7C7E1B78
93DB0000 38600000
906DB650 3C608000
906DB650 3860FF84
906DB654 3C608000
60635600 80630000
38630008 38800000
3D808000 618C55FC
Expand Down Expand Up @@ -530,28 +531,30 @@ C208D698 00000005 #Recording/GetLCancelStatus/GetLCancelStatus.asm
C206C324 00000002 #Recording/GetLCancelStatus/ResetLCancelStatus.asm
38600000 987E25FF
807E00B0 00000000
C2211BF8 0000000F #Recording/Stages/SendDreamlandInfo.asm
C2211BF8 00000012 #Recording/Stages/SendDreamlandInfo.asm
4800000C 4E800021
00000000 3D808000
618C5604 7D8903A6
4E800421 2C030000
41820050 4BFFFFE1
7C6802A6 80830000
80BF00DC 7C042800
41820038 90A30000
806DB64C 81630000
818DB650 7D6B6214
38600040 986B0000
806DB654 906B0001
98AB0005 818DB650
398C0006 918DB650
BB4100E8 00000000
C21CC998 0000000E #Recording/Stages/SendFountainInfo.asm
7C0802A6 3C60801C
6063C908 7C001A79
41820058 3D808000
618C5604 7D8903A6
4E800421 2C030000
41820064 4BFFFFE1
7C6802A6 808DB654
2C04FF84 4082000C
38800000 90830000
80830000 80BF00DC
7C042800 41820038
90A30000 806DB64C
81630000 818DB650
7D6B6214 38600040
986B0000 806DB654
906B0001 98AB0005
818DB650 398C0006
918DB650 BB4100E8
60000000 00000000
C21CC998 0000000D #Recording/Stages/SendFountainInfo.asm
3D808000 618C5604
7D8903A6 4E800421
2C030000 4182004C
806DB654 2C03FF84
41820040 806DB64C
81630000 818DB650
7D6B6214 3860003F
Expand Down
Binary file modified Output/Console/g_core.bin
View file
Binary file not shown.
Binary file modified Output/Console/g_core_porta.bin
View file
Binary file not shown.
72 changes: 39 additions & 33 deletions Output/Netplay/GALE01r2.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -772,12 +772,12 @@ C216D884 00000030 #Recording/SendGameEnd.asm
BA8100B0 800100E4
382100E0 7C0803A6
819F2514 00000000
C216E74C 00000110 #Recording/SendGameInfo.asm
C216E74C 00000111 #Recording/SendGameInfo.asm
7C0802A6 90010004
9421FF20 BE8100B0
3D808000 618C5604
7D8903A6 4E800421
2C030000 41820844
2C030000 4182084C
38600005 3D808037
618CF1E4 7D8903A6
4E800421 7C7B1B78
Expand All @@ -788,7 +788,8 @@ C216E74C 00000110 #Recording/SendGameInfo.asm
618CF1E4 7D8903A6
4E800421 7C7E1B78
93DB0000 38600000
906DB650 3C608000
906DB650 3860FF84
906DB654 3C608000
60635600 80630000
38630008 38800000
3D808000 618C55FC
Expand Down Expand Up @@ -1170,28 +1171,30 @@ C208D698 00000005 #Recording/GetLCancelStatus/GetLCancelStatus.asm
C206C324 00000002 #Recording/GetLCancelStatus/ResetLCancelStatus.asm
38600000 987E25FF
807E00B0 00000000
C2211BF8 0000000F #Recording/Stages/SendDreamlandInfo.asm
C2211BF8 00000012 #Recording/Stages/SendDreamlandInfo.asm
4800000C 4E800021
00000000 3D808000
618C5604 7D8903A6
4E800421 2C030000
41820050 4BFFFFE1
7C6802A6 80830000
80BF00DC 7C042800
41820038 90A30000
806DB64C 81630000
818DB650 7D6B6214
38600040 986B0000
806DB654 906B0001
98AB0005 818DB650
398C0006 918DB650
BB4100E8 00000000
C21CC998 0000000E #Recording/Stages/SendFountainInfo.asm
7C0802A6 3C60801C
6063C908 7C001A79
41820058 3D808000
618C5604 7D8903A6
4E800421 2C030000
41820064 4BFFFFE1
7C6802A6 808DB654
2C04FF85 4082000C
38800000 90830000
80830000 80BF00DC
7C042800 41820038
90A30000 806DB64C
81630000 818DB650
7D6B6214 38600040
986B0000 806DB654
906B0001 98AB0005
818DB650 398C0006
918DB650 BB4100E8
60000000 00000000
C21CC998 0000000D #Recording/Stages/SendFountainInfo.asm
3D808000 618C5604
7D8903A6 4E800421
2C030000 4182004C
806DB654 2C03FF84
41820040 806DB64C
81630000 818DB650
7D6B6214 3860003F
Expand All @@ -1201,22 +1204,25 @@ C21CC998 0000000E #Recording/Stages/SendFountainInfo.asm
D3EB0006 818DB650
398C000A 918DB650
D3FB003C 00000000
C21D4FD8 0000000F #Recording/Stages/SendStadiumInfo.asm
C21D4FD8 00000012 #Recording/Stages/SendStadiumInfo.asm
4800000C 4E800021
00000005 3D808000
618C5604 7D8903A6
4E800421 2C030000
41820050 4BFFFFE1
7C6802A6 80830000
80BF00DC 7C042800
41820038 90A30000
806DB64C 81630000
818DB650 7D6B6214
38600041 986B0000
806DB654 906B0001
90AB0005 818DB650
398C0009 918DB650
BB610084 00000000
41820064 4BFFFFE1
7C6802A6 808DB654
2C04FFD9 4082000C
38800005 90830000
80830000 80BF00DC
7C042800 41820038
90A30000 806DB64C
81630000 818DB650
7D6B6214 38600041
986B0000 806DB654
906B0001 90AB0005
818DB650 398C0009
918DB650 BB610084
60000000 00000000
C21A4CB4 00000004 #Common/AllocBuffer.asm
38600080 3D808037
618CF1E4 7D8903A6
Expand Down
72 changes: 39 additions & 33 deletions Output/Netplay/GALJ01r2.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -771,12 +771,12 @@ C216D884 00000030 #Recording/SendGameEnd.asm
BA8100B0 800100E4
382100E0 7C0803A6
819F2514 00000000
C216E74C 00000110 #Recording/SendGameInfo.asm
C216E74C 00000111 #Recording/SendGameInfo.asm
7C0802A6 90010004
9421FF20 BE8100B0
3D808000 618C5604
7D8903A6 4E800421
2C030000 41820844
2C030000 4182084C
38600005 3D808037
618CF1E4 7D8903A6
4E800421 7C7B1B78
Expand All @@ -787,7 +787,8 @@ C216E74C 00000110 #Recording/SendGameInfo.asm
618CF1E4 7D8903A6
4E800421 7C7E1B78
93DB0000 38600000
906DB650 3C608000
906DB650 3860FF84
906DB654 3C608000
60635600 80630000
38630008 38800000
3D808000 618C55FC
Expand Down Expand Up @@ -1169,28 +1170,30 @@ C208D698 00000005 #Recording/GetLCancelStatus/GetLCancelStatus.asm
C206C324 00000002 #Recording/GetLCancelStatus/ResetLCancelStatus.asm
38600000 987E25FF
807E00B0 00000000
C2211BF8 0000000F #Recording/Stages/SendDreamlandInfo.asm
C2211BF8 00000012 #Recording/Stages/SendDreamlandInfo.asm
4800000C 4E800021
00000000 3D808000
618C5604 7D8903A6
4E800421 2C030000
41820050 4BFFFFE1
7C6802A6 80830000
80BF00DC 7C042800
41820038 90A30000
806DB64C 81630000
818DB650 7D6B6214
38600040 986B0000
806DB654 906B0001
98AB0005 818DB650
398C0006 918DB650
BB4100E8 00000000
C21CC998 0000000E #Recording/Stages/SendFountainInfo.asm
7C0802A6 3C60801C
6063C908 7C001A79
41820058 3D808000
618C5604 7D8903A6
4E800421 2C030000
41820064 4BFFFFE1
7C6802A6 808DB654
2C04FF85 4082000C
38800000 90830000
80830000 80BF00DC
7C042800 41820038
90A30000 806DB64C
81630000 818DB650
7D6B6214 38600040
986B0000 806DB654
906B0001 98AB0005
818DB650 398C0006
918DB650 BB4100E8
60000000 00000000
C21CC998 0000000D #Recording/Stages/SendFountainInfo.asm
3D808000 618C5604
7D8903A6 4E800421
2C030000 4182004C
806DB654 2C03FF84
41820040 806DB64C
81630000 818DB650
7D6B6214 3860003F
Expand All @@ -1200,22 +1203,25 @@ C21CC998 0000000E #Recording/Stages/SendFountainInfo.asm
D3EB0006 818DB650
398C000A 918DB650
D3FB003C 00000000
C21D4FD8 0000000F #Recording/Stages/SendStadiumInfo.asm
C21D4FD8 00000012 #Recording/Stages/SendStadiumInfo.asm
4800000C 4E800021
00000005 3D808000
618C5604 7D8903A6
4E800421 2C030000
41820050 4BFFFFE1
7C6802A6 80830000
80BF00DC 7C042800
41820038 90A30000
806DB64C 81630000
818DB650 7D6B6214
38600041 986B0000
806DB654 906B0001
90AB0005 818DB650
398C0009 918DB650
BB610084 00000000
41820064 4BFFFFE1
7C6802A6 808DB654
2C04FFD9 4082000C
38800005 90830000
80830000 80BF00DC
7C042800 41820038
90A30000 806DB64C
81630000 818DB650
7D6B6214 38600041
986B0000 806DB654
906B0001 90AB0005
818DB650 398C0009
918DB650 BB610084
60000000 00000000
C21A4CB4 00000004 #Common/AllocBuffer.asm
38600080 3D808037
618CF1E4 7D8903A6
Expand Down
Loading

0 comments on commit 17b04d9

Please sign in to comment.