Skip to content

Commit fc73cb0

Browse files
committed
Merge pull request #2 from CommitteeOfZero/update-inst-set
Updated instruction sets for chlcc, cc, cclcc
2 parents 45ca694 + f278c4a commit fc73cb0

File tree

7 files changed

+381
-25
lines changed

7 files changed

+381
-25
lines changed

mgs-spec-bank/data.yaml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ instructions:
99
- instructions/memories_off_6.yaml
1010
- instructions/memories_off_7.yaml
1111
- instructions/memories_off_8.yaml
12+
- instructions/chaos_child_lcc.yaml
13+
- instructions/chaos_child.yaml
14+
- instructions/chaos_head_lcc.yaml
1215

1316
macros:
1417
- macros/chaos_head_noah.yaml
@@ -43,7 +46,9 @@ flags:
4346
new_sseplay: no
4447
new_titlemenu: yes
4548
new_voicestop: yes
49+
add_contents: yes
4650

51+
effyuge: yes
4752
bgrelease: yes
4853
chaload: yes
4954
mescls: yes
@@ -68,7 +73,9 @@ flags:
6873
new_titlemenu: no
6974
new_voiceplay: no
7075
new_voicestop: no
76+
add_contents: no
7177

78+
effyuge: no
7279
chaload: yes
7380
mescls: yes
7481
movie_01_27: yes
@@ -92,7 +99,9 @@ flags:
9299
new_sseplay: yes
93100
new_titlemenu: yes
94101
new_voicestop: yes
102+
add_contents: yes
95103

104+
effyuge: yes
96105
bgrelease: yes
97106
chaload: yes
98107
mescls: yes
@@ -117,32 +126,38 @@ flags:
117126
new_sseplay: yes
118127
new_titlemenu: yes
119128
new_voicestop: yes
129+
add_contents: yes
120130

131+
effyuge: yes
121132
bgrelease: yes
122133
chaload: yes
123134
mescls: yes
124135
movie_01_27: yes
125136
return_labels: yes
126137

127138
chaos_child_lcc_ps4:
139+
cc_common: yes
128140
game_cclcc: yes
129141

130142
new_bgmplay: yes
131143
new_bgmstop: yes
132144
new_createsurface: yes
133-
new_ev: yes
134145
new_playmovie: yes
135146
new_presence: yes
147+
new_pressstart: yes
136148
new_save: yes
137149
new_scriptload: no
138150
new_seplay: yes
139151
new_setdic: yes
140152
new_setevflag: no
141153
new_sseplay: no
142-
new_titlemenu: no
154+
new_titlemenu: yes
143155
new_voiceplay: no
144-
new_voicestop: no
156+
new_voicestop: yes
157+
add_contents: no
158+
bgrelease: yes
145159

160+
effyuge: no
146161
chaload: yes
147162
mescls: yes
148163
movie_01_27: yes

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

Lines changed: 52 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@
138138
operands: [expr, expr, int16]
139139
flags: []
140140

141+
- pattern: 00 16 00
142+
name: KeyWait_00
143+
operands: [expr,expr]
144+
flags: []
145+
141146
- pattern: 00 16 02
142147
name: Unk_00_16_02
143148
operands: [expr, expr]
@@ -213,31 +218,36 @@
213218
operands: []
214219
flags: [new_bgmstop]
215220

216-
- pattern: 00 23 00
221+
- pattern: 00 23 00 00
217222
name: SEplay
218223
operands: [expr, expr]
219-
flags: [~new_seplay]
220-
221-
- pattern: 00 23 01
222-
name: SEplay2
223-
operands: [expr, expr]
224-
flags: [~new_seplay]
224+
flags: [new_seplay]
225225

226-
- pattern: 00 23 02
227-
name: SEplay3
226+
- pattern: 00 23 00 01
227+
name: SEplay_01
228228
operands: [expr, expr]
229-
flags: [~new_seplay]
229+
flags: [new_seplay]
230230

231-
- pattern: 00 23 00 00
232-
name: SEplay
233-
operands: [expr, expr]
231+
- pattern: 00 23 00 02
232+
name: SEplay_02
233+
operands: []
234234
flags: [new_seplay]
235235

236236
- pattern: 00 23 01 00
237237
name: SEplay2
238238
operands: [expr, expr]
239239
flags: [new_seplay]
240240

241+
- pattern: 00 23 01 01
242+
name: SEplay2_01
243+
operands: [expr, expr]
244+
flags: [new_seplay]
245+
246+
- pattern: 00 23 01 02
247+
name: SEplay2_02
248+
operands: []
249+
flags: [new_seplay]
250+
241251
- pattern: 00 23 02 00
242252
name: SEplay3
243253
operands: [expr, expr]
@@ -820,13 +830,18 @@
820830
flags: [~new_pressstart]
821831

822832
- pattern: 00 50 00
823-
name: PressStart
824-
operands: [expr, expr]
833+
name: PressStart_00
834+
operands: [int16, int16]
835+
flags: [new_pressstart]
836+
837+
- pattern: 00 50 03
838+
name: PressStart_03
839+
operands: [int16]
825840
flags: [new_pressstart]
826841

827842
- pattern: 00 50 05
828843
name: PressStart_05
829-
operands: [expr, expr]
844+
operands: []
830845
flags: [new_pressstart]
831846

832847
- pattern: 00 50 07
@@ -879,12 +894,32 @@
879894
operands: [int16]
880895
flags: []
881896

897+
- pattern: 00 5C
898+
name: FlagOffReturn
899+
operands: [int8,expr]
900+
flags: []
901+
882902
- pattern: 00 5E
883903
name: Unk_00_5E
884904
operands: [expr]
885905
flags: []
886906

907+
- pattern: 00 5F
908+
name: PackFileAddBind
909+
operands: []
910+
flags: [~add_contents]
911+
912+
- pattern: 00 5F 01
913+
name: AddContentsCheckDownloadComp
914+
operands: [expr]
915+
flags: [add_contents]
916+
917+
- pattern: 00 5F 02
918+
name: AddContentsOpenContents
919+
operands: [expr]
920+
flags: [add_contents]
921+
887922
- pattern: 00 5F 03
888923
name: AddContentsCloseContents
889924
operands: []
890-
flags: []
925+
flags: [add_contents]

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

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,11 +358,46 @@
358358
operands: []
359359
flags: []
360360

361+
- pattern: 01 14 02
362+
name: SysSelAddMesScx
363+
operands: [int16]
364+
flags: []
365+
366+
- pattern: 01 15 00
367+
name: SysSelectInit
368+
operands: [expr,expr]
369+
flags: []
370+
371+
- pattern: 01 15 01
372+
name: SysSelect01
373+
operands: []
374+
flags: []
375+
376+
- pattern: 01 15 02
377+
name: SysSelect02
378+
operands: [expr]
379+
flags: []
380+
381+
- pattern: 01 15 03
382+
name: SysSelect03
383+
operands: [expr]
384+
flags: []
385+
361386
- pattern: 01 15 04
362387
name: SysSelectEnd
363388
operands: []
364389
flags: []
365390

391+
- pattern: 01 15 05
392+
name: SysSelectEnd05
393+
operands: []
394+
flags: []
395+
396+
- pattern: 01 1F
397+
name: LoadFontWidths
398+
operands: [expr,expr,expr]
399+
flags: []
400+
366401
- pattern: 01 20
367402
name: SCcapture
368403
operands: [expr]
@@ -423,6 +458,11 @@
423458
operands: [expr, expr]
424459
flags: [new_playmovie]
425460

461+
- pattern: 01 22 04 00
462+
name: PlayMovie_04
463+
operands: [expr, expr]
464+
flags: [new_playmovie]
465+
426466
- pattern: 01 22 05 00
427467
name: PlayMovieLoopNoAudio
428468
operands: [expr, expr]
@@ -438,6 +478,11 @@
438478
operands: [expr, expr]
439479
flags: [new_playmovie]
440480

481+
- pattern: 01 22 0C 00
482+
name: PlayMovie_0C
483+
operands: [expr, expr]
484+
flags: [new_playmovie]
485+
441486
- pattern: 01 22 0D 00
442487
name: PlayAlphaMovieLoopNoAudio
443488
operands: [expr, expr]
@@ -524,11 +569,18 @@
524569
flags: []
525570

526571
- pattern: 01 28 00
527-
name: Unk_01_28_00
572+
name: MovieMain_00
573+
operands: []
574+
flags: []
575+
- pattern: 01 28 01
576+
name: MovieMain_01
528577
operands: []
529578
flags: []
530-
531579
- pattern: 01 28 02
532-
name: Unk_01_28_02
580+
name: MovieMain_02
533581
operands: []
534582
flags: []
583+
- pattern: 01 28 03
584+
name: MovieMain_03
585+
operands: []
586+
flags: []

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

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

436436
- pattern: 10 2E
437437
name: Unk_10_2E
@@ -521,7 +521,7 @@
521521
- pattern: 10 38
522522
name: EFFyuge
523523
operands: [expr, expr]
524-
flags: []
524+
flags: [effyuge]
525525

526526
- pattern: 10 3B 00
527527
name: EndRollSetup

0 commit comments

Comments
 (0)