Skip to content

Commit 6b92a39

Browse files
committed
Fix flagging so IA instructions don't mess with other games
1 parent f29d96b commit 6b92a39

File tree

5 files changed

+103
-77
lines changed

5 files changed

+103
-77
lines changed

mgs-spec-bank/data.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,19 @@ flags:
3535
new_bgmstop: yes
3636
new_bgmplay: yes
3737
new_createsurface: yes
38+
new_createthread: no
3839
new_loaddata: yes
3940
new_memberwrite: yes
41+
new_messetid: no
4042
new_playmovie: yes
4143
new_presence: yes
4244
new_pressstart: no
45+
new_resetflag: no
4346
new_save: yes
4447
new_seplay: yes
4548
new_setdic: yes
4649
new_setevflag: yes
50+
new_setflag: no
4751
new_scriptload: no
4852
new_sseplay: no
4953
new_titlemenu: yes
@@ -63,20 +67,25 @@ flags:
6367
new_bgmplay: yes
6468
new_bgmstop: yes
6569
new_createsurface: yes
70+
new_createthread: no
6671
new_ev: yes
72+
new_messetid: no
6773
new_playmovie: yes
6874
new_presence: yes
6975
new_save: yes
76+
new_resetflag: no
7077
new_scriptload: no
7178
new_seplay: yes
7279
new_setdic: yes
7380
new_setevflag: no
81+
new_setflag: no
7482
new_sseplay: no
7583
new_titlemenu: no
7684
new_voiceplay: no
7785
new_voicestop: no
7886
add_contents: no
7987

88+
achchktitle: no
8089
effyuge: no
8190
chaload: yes
8291
mescls: yes
@@ -88,21 +97,26 @@ flags:
8897

8998
new_bgmplay: yes
9099
new_bgmstop: yes
100+
new_createthread: no
91101
new_loaddata: yes
92102
new_memberwrite: yes
103+
new_messetid: no
93104
new_playmovie: yes
94105
new_presence: yes
95106
new_pressstart: no
107+
new_resetflag: no
96108
new_save: yes
97109
new_scriptload: no
98110
new_seplay: yes
99111
new_setdic: yes
100112
new_setevflag: yes
113+
new_setflag: no
101114
new_sseplay: yes
102115
new_titlemenu: yes
103116
new_voicestop: yes
104117
add_contents: yes
105118

119+
achchktitle: yes
106120
effyuge: yes
107121
bgrelease: yes
108122
chaload: yes
@@ -115,16 +129,20 @@ flags:
115129

116130
new_bgmplay: yes
117131
new_bgmstop: yes
132+
new_createthread: no
118133
new_loaddata: yes
119134
new_memberwrite: yes
135+
new_messetid: no
120136
new_playmovie: yes
121137
new_presence: yes
122138
new_pressstart: no
139+
new_resetflag: no
123140
new_save: yes
124141
new_scriptload: yes
125142
new_seplay: yes
126143
new_setdic: yes
127144
new_setevflag: yes
145+
new_setflag: no
128146
new_sseplay: yes
129147
new_titlemenu: yes
130148
new_voicestop: yes
@@ -144,14 +162,18 @@ flags:
144162
new_bgmplay: yes
145163
new_bgmstop: yes
146164
new_createsurface: yes
165+
new_createthread: no
166+
new_messetid: no
147167
new_playmovie: yes
148168
new_presence: yes
149169
new_pressstart: yes
170+
new_resetflag: no
150171
new_save: yes
151172
new_scriptload: no
152173
new_seplay: yes
153174
new_setdic: yes
154175
new_setevflag: no
176+
new_setflag: no
155177
new_sseplay: no
156178
new_titlemenu: yes
157179
new_voiceplay: no
@@ -173,12 +195,16 @@ flags:
173195

174196
new_bgmplay: yes
175197
new_bgmstop: yes
198+
new_createthread: yes
199+
new_messetid: yes
176200
new_playmovie: yes
177201
new_presence: yes
202+
new_resetflag: yes
178203
new_save: yes
179204
new_scriptload: no
180205
new_seplay: yes
181206
new_setevflag: yes
207+
new_setflag: yes
182208
new_sseplay: yes
183209
new_titlemenu: yes
184210
new_voicestop: yes

mgs-spec-bank/instructions/base/base_00.yaml

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,17 @@
66
- pattern: 00 01
77
name: CreateThread
88
operands: [expr, expr, int16]
9-
flags: [~game_ia]
9+
flags: [~new_createthread]
10+
11+
- pattern: 00 01 00
12+
name: CreateThread
13+
operands: [expr, expr, int16]
14+
flags: [new_createthread]
15+
16+
- pattern: 00 01 80
17+
name: CreateNamedThread
18+
operands: [expr, expr, int16, str]
19+
flags: [new_createthread]
1020

1121
- pattern: 00 04
1222
name: ScriptLoad
@@ -111,12 +121,42 @@
111121
- pattern: 00 12
112122
name: SetFlag
113123
operands: [expr]
114-
flags: [~game_ia]
124+
flags: [~new_setflag]
115125

116126
- pattern: 00 13
117127
name: ResetFlag
118128
operands: [expr]
119-
flags: [~game_ia]
129+
flags: [~new_resetflag]
130+
131+
- pattern: 00 12 00
132+
name: SetFlag
133+
operands: [expr]
134+
flags: [new_setflag]
135+
136+
- pattern: 00 12 01
137+
name: SetNFlagsFrom
138+
operands: [expr, expr]
139+
flags: [new_setflag]
140+
141+
- pattern: 00 12 02
142+
name: SetFlagsThru
143+
operands: [expr, expr]
144+
flags: [new_setflag]
145+
146+
- pattern: 00 13 00
147+
name: ResetFlag
148+
operands: [expr]
149+
flags: [new_resetflag]
150+
151+
- pattern: 00 13 01
152+
name: ResetNFlagsFrom
153+
operands: [expr, expr]
154+
flags: [new_resetflag]
155+
156+
- pattern: 00 13 02
157+
name: ResetFlagsThru
158+
operands: [expr, expr]
159+
flags: [new_resetflag]
120160

121161
- pattern: 00 14
122162
name: CopyFlag

mgs-spec-bank/instructions/base/base_01.yaml

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,47 @@
111111
- pattern: 01 09 00
112112
name: MesSetSavePointRL
113113
operands: [int16]
114-
flags: [return_labels, ~game_ia]
114+
flags: [return_labels, ~new_messetid]
115115

116116
- pattern: 01 09 01
117117
name: MesSSetSavePointRL
118118
operands: [int16, expr]
119-
flags: [return_labels, ~game_ia]
119+
flags: [return_labels, ~new_messetid]
120120

121121
- pattern: 01 09 02
122122
name: MesSSetSavePoint
123123
operands: [expr]
124-
flags: [return_labels, ~game_ia]
124+
flags: [return_labels, ~new_messetid]
125+
126+
- pattern: 01 09 80
127+
name: MesSetSavePointRL
128+
operands: [int16]
129+
flags: [return_labels, new_messetid]
130+
131+
- pattern: 01 09 81
132+
name: MesSSetSavePointRL
133+
operands: [int16, expr]
134+
flags: [return_labels, new_messetid]
135+
136+
- pattern: 01 09 82
137+
name: MesSSetSavePoint
138+
operands: [expr]
139+
flags: [return_labels, new_messetid]
140+
141+
- pattern: 01 09 00
142+
name: MesSetIdRL
143+
operands: [int16]
144+
flags: [return_labels, new_messetid]
145+
146+
- pattern: 01 09 01
147+
name: MesSSetIdRL
148+
operands: [expr]
149+
flags: [return_labels, new_messetid]
150+
151+
- pattern: 01 09 02
152+
name: MesSetId
153+
operands: [expr]
154+
flags: [return_labels, new_messetid]
125155

126156
- pattern: 01 0A 03
127157
name: CalcSinL

mgs-spec-bank/instructions/base/base_10.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@
431431
- pattern: 10 2D
432432
name: AchChkTitle
433433
operands: []
434-
flags: [~game_chlcc]
434+
flags: [achchktitle]
435435

436436
- pattern: 10 2E
437437
name: Unk_10_2E

mgs-spec-bank/instructions/iwakura_aria.yaml

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,3 @@
1-
- pattern: 00 01 00
2-
name: CreateThread
3-
operands: [expr, expr, int16]
4-
flags: [game_ia]
5-
6-
- pattern: 00 01 80
7-
name: CreateNamedThread
8-
operands: [expr, expr, int16, str]
9-
flags: [game_ia]
10-
11-
- pattern: 00 12 00
12-
name: SetFlag
13-
operands: [expr]
14-
flags: [game_ia]
15-
16-
- pattern: 00 12 01
17-
name: SetNFlagsFrom
18-
operands: [expr, expr]
19-
flags: [game_ia]
20-
21-
- pattern: 00 12 02
22-
name: SetFlagsThru
23-
operands: [expr, expr]
24-
flags: [game_ia]
25-
26-
- pattern: 00 13 00
27-
name: ResetFlag
28-
operands: [expr]
29-
flags: [game_ia]
30-
31-
- pattern: 00 13 01
32-
name: ResetNFlagsFrom
33-
operands: [expr, expr]
34-
flags: [game_ia]
35-
36-
- pattern: 00 13 02
37-
name: ResetFlagsThru
38-
operands: [expr, expr]
39-
flags: [game_ia]
40-
411
- pattern: 00 26 00
422
name: SSEplayEx
433
operands: [expr]
@@ -78,36 +38,6 @@
7838
operands: [expr]
7939
flags: [game_ia]
8040

81-
- pattern: 01 09 80
82-
name: MesSetSavePointRL
83-
operands: [int16]
84-
flags: [return_labels, game_ia]
85-
86-
- pattern: 01 09 81
87-
name: MesSSetSavePointRL
88-
operands: [int16, expr]
89-
flags: [return_labels, game_ia]
90-
91-
- pattern: 01 09 82
92-
name: MesSSetSavePoint
93-
operands: [expr]
94-
flags: [return_labels, game_ia]
95-
96-
- pattern: 01 09 00
97-
name: MesSetIdRL
98-
operands: [int16]
99-
flags: [return_labels, game_ia]
100-
101-
- pattern: 01 09 01
102-
name: MesSSetIdRL
103-
operands: [expr]
104-
flags: [return_labels, game_ia]
105-
106-
- pattern: 01 09 02
107-
name: MesSetId
108-
operands: [expr]
109-
flags: [return_labels, game_ia]
110-
11141
- pattern: 10 22 28
11242
name: AutoSave_28
11343
operands: []

0 commit comments

Comments
 (0)