diff --git a/mgs-spec-bank/data.yaml b/mgs-spec-bank/data.yaml index 348a178..4bd7b2c 100644 --- a/mgs-spec-bank/data.yaml +++ b/mgs-spec-bank/data.yaml @@ -103,6 +103,7 @@ flags: new_releasesurface: no add_contents: yes option_default_arg: no + new_voiceplay: yes effyuge: yes bgrelease: yes @@ -114,7 +115,7 @@ flags: stringid_16: no chaos_head_lcc_ps3: - game_chlcc: yes + game_chlcc_ps3: yes new_bgmplay: yes new_bgmstop: yes @@ -122,9 +123,9 @@ flags: new_createthread: no old_ev: yes new_messetid: no - new_playmovie: yes + new_playmovie: no new_presence: yes - new_save: yes + new_save: no new_resetflag: no new_scriptload: no new_seplay: yes @@ -138,6 +139,7 @@ flags: new_voicestop: no new_releasesurface: no add_contents: no + bgloadex: yes achchktitle: no bgrelease: no @@ -175,6 +177,7 @@ flags: new_voicestop: yes new_releasesurface: no add_contents: yes + new_voiceplay: yes achchktitle: yes effyuge: yes @@ -212,6 +215,7 @@ flags: new_voicestop: yes new_releasesurface: no add_contents: yes + new_voiceplay: yes achchktitle: true effyuge: yes @@ -247,11 +251,14 @@ flags: new_sseplay: no new_sseinit: no new_titlemenu: yes - new_voiceplay: no + new_voiceplay: yes new_voicestop: yes new_releasesurface: no add_contents: no bgrelease: yes + nonameid: no + new_maptrigger: no + multisystemmes2: no achchktitle: yes effyuge: no @@ -290,6 +297,7 @@ flags: new_voicestop: yes new_releasesurface: no bgrelease: yes + new_voiceplay: yes chaload: yes mescls: yes @@ -301,7 +309,7 @@ flags: iwakura_aria_windows: game_ia: yes - game_chlcc: no + game_chlcc_ps3: no new_bgmplay: yes new_bgmstop: yes @@ -323,6 +331,7 @@ flags: new_voicestop: yes new_releasesurface: no bgrelease: yes + new_voiceplay: yes chaload: yes mescls: yes @@ -353,11 +362,12 @@ flags: new_setdic: yes new_setevflag: yes new_setflag: no - new_sseplay: yes + new_sseplay: no new_titlemenu: yes new_voicestop: yes new_releasesurface: no add_contents: yes + new_voiceplay: yes achchktitle: yes effyuge: no @@ -373,65 +383,86 @@ flags: chaos_child_lcc_switch: cc_common: yes game_cclcc: yes + game_chlcc_ps3: no + has_mouse: no + new_voicetable: yes + new_bgload: yes new_bgmplay: yes new_bgmstop: yes new_createthread: yes + new_loaddata: yes new_calc: yes new_messetid: yes new_playmovie: yes new_presence: yes new_resetflag: yes new_save: yes - new_scriptload: no + new_scriptload: yes new_seplay: yes new_setevflag: yes new_setflag: yes - new_sseplay: yes + new_sseplay: no new_sseinit: yes new_titlemenu: yes new_voicestop: yes new_releasesurface: yes + new_cpuboost: yes + new_maptrigger: yes bgrelease: yes + new_voiceplay: yes + nonameid: no chaload: yes mescls: yes movie_01_27: yes return_labels: yes - multisystemmes: no + multisystemmes: yes + multisystemmes2: yes option_default_arg: no - stringid_16: no + option_default_arg2: yes + stringid_16: yes + achchktitle: yes chaos_head_lcc_switch: + game_chlcc_ps3: no game_chlcc: yes + has_mouse: no + new_voicetable: yes + new_bgload: yes new_bgmplay: yes new_bgmstop: yes new_createthread: yes + new_loaddata: yes new_calc: yes new_messetid: yes new_playmovie: yes new_presence: yes new_resetflag: yes new_save: yes - new_scriptload: no + new_scriptload: yes new_seplay: yes new_setevflag: yes new_setflag: yes - new_sseplay: yes + new_sseplay: no new_sseinit: yes new_titlemenu: yes new_voicestop: yes new_releasesurface: yes + new_cpuboost: yes bgrelease: yes + new_voiceplay: yes chaload: yes mescls: yes movie_01_27: yes return_labels: yes - multisystemmes: no + multisystemmes: yes option_default_arg: no + option_default_arg2: yes stringid_16: no + new_del_trigger: yes steins_gate_hd: game_sghd: yes diff --git a/mgs-spec-bank/instructions/base/base_00.yaml b/mgs-spec-bank/instructions/base/base_00.yaml index e2c58c4..cbd591c 100644 --- a/mgs-spec-bank/instructions/base/base_00.yaml +++ b/mgs-spec-bank/instructions/base/base_00.yaml @@ -188,9 +188,9 @@ operands: [expr, expr] flags: [] -- pattern: 00 17 02 - name: Unk_00_17_02 - operands: [expr, expr, expr] +- pattern: 00 17 + name: KeyWaitTimer + operands: [int8, expr, expr, expr] flags: [] - pattern: 00 18 @@ -349,6 +349,56 @@ operands: [] flags: [] +- pattern: 00 2A 1E + name: Save_1E + operands: [] + flags: [] + +- pattern: 00 2A 1F + name: Save_1F + operands: [] + flags: [] + +- pattern: 00 2A 20 + name: Save_20 + operands: [] + flags: [] + +- pattern: 00 2A 21 + name: Save_21 + operands: [] + flags: [] + +- pattern: 00 2A 22 + name: Save_22 + operands: [] + flags: [] + +- pattern: 00 2A 23 + name: Save_23 + operands: [] + flags: [] + +- pattern: 00 2A 24 + name: Save_24 + operands: [] + flags: [] + +- pattern: 00 2A 25 + name: Save_25 + operands: [] + flags: [] + +- pattern: 00 2A 32 + name: Save_32 + operands: [] + flags: [] + +- pattern: 00 2A 33 + name: Save_33 + operands: [] + flags: [] + - pattern: 00 2A 00 name: DeviceCheck operands: [] @@ -444,16 +494,6 @@ operands: [] flags: [new_save] -- pattern: 00 2A 1E - name: Save_1E - operands: [] - flags: [new_save] - -- pattern: 00 2A 1F - name: Save_1F - operands: [] - flags: [new_save] - - pattern: 00 2A 28 name: Save_28 operands: [] @@ -474,16 +514,6 @@ operands: [] flags: [new_save] -- pattern: 00 2A 32 - name: Save_32 - operands: [] - flags: [new_save] - -- pattern: 00 2A 33 - name: Save_33 - operands: [] - flags: [new_save] - - pattern: 00 2A 3C name: SaveAllStart operands: [] @@ -539,6 +569,26 @@ operands: [] flags: [new_save] +- pattern: 00 2A D2 + name: SaveD2 + operands: [] + flags: [new_save] + +- pattern: 00 2A D3 + name: SaveD3 + operands: [] + flags: [new_save] + +- pattern: 00 2A C8 + name: SaveC8 + operands: [] + flags: [new_save] + +- pattern: 00 2A C9 + name: SaveC9 + operands: [] + flags: [new_save] + - pattern: 00 2B name: SaveIconLoad operands: [expr] @@ -582,7 +632,12 @@ - pattern: 00 31 name: VoiceTableLoad operands: [expr] - flags: [] + flags: [~new_voicetable] + +- pattern: 00 31 + name: VoiceTableLoadNew + operands: [int8, expr] + flags: [new_voicetable] - pattern: 00 32 name: SetPadCustom @@ -607,22 +662,27 @@ - pattern: 00 37 00 name: VoicePlay operands: [expr, expr] - flags: [] + flags: [new_voiceplay] - pattern: 00 37 01 name: VoicePlay2 operands: [expr, expr] - flags: [] + flags: [new_voiceplay] - pattern: 00 37 02 name: VoicePlay3 operands: [expr, expr] - flags: [] + flags: [new_voiceplay] - pattern: 00 37 03 name: VoicePlay4 operands: [expr, expr] - flags: [] + flags: [new_voiceplay] + +- pattern: 00 37 + name: VoicePlay + operands: [int8, expr] + flags: [~new_voiceplay] - pattern: 00 38 00 name: VoiceStop @@ -674,6 +734,16 @@ operands: [] flags: [] +- pattern: 00 3B 02 + name: ADXstartEX + operands: [] + flags: [] + +- pattern: 00 3B 03 + name: ADXpauseEX + operands: [] + flags: [] + - pattern: 00 3C 00 name: SEplayWait operands: [] @@ -719,19 +789,50 @@ operands: [int8] flags: [multisystemmes] +- pattern: 00 43 11 + name: SystemMesInitTitle11 + operands: [int8] + flags: [multisystemmes] + - pattern: 00 43 02 name: SystemMesInit2 operands: [int8,expr] flags: [multisystemmes] +- pattern: 00 43 12 81 00 00 00 + name: SystemMesInit2_12 + operands: [] + flags: [multisystemmes] + - pattern: 00 43 03 name: SystemMesSetMesScx operands: [int8,int16] + flags: [multisystemmes, ~multisystemmes2] + +- pattern: 00 43 93 00 00 + name: SystemMesSetMesScx93_0 + operands: [expr] + flags: [multisystemmes] + + +- pattern: 00 43 93 00 01 + name: SystemMesSetMesScx93_1 + operands: [expr, expr] flags: [multisystemmes] - pattern: 00 43 04 name: SystemMesSetSelScx operands: [int8,int16] + flags: [multisystemmes, ~multisystemmes2] + +- pattern: 00 43 94 00 01 + name: SystemMesSetSelScx94_1 + operands: [expr] + flags: [multisystemmes] + +- pattern: 00 43 94 00 00 + name: SystemMesSetSelScx94_0 + operands: [expr] flags: [multisystemmes] - pattern: 00 43 05 @@ -739,16 +840,31 @@ operands: [int8] flags: [multisystemmes] +- pattern: 00 43 15 + name: SystemMesMain2 + operands: [int8] + flags: [multisystemmes] + - pattern: 00 43 06 name: SystemMesFadeIn operands: [int8] flags: [multisystemmes] +- pattern: 00 43 16 + name: SystemMesFadeIn_16 + operands: [int8] + flags: [multisystemmes] + - pattern: 00 43 07 name: SystemMesFadeOut operands: [int8] flags: [multisystemmes] +- pattern: 00 43 17 + name: SystemMesFadeOut_17 + operands: [int8] + flags: [multisystemmes] + - pattern: 00 43 09 name: SystemMes_09 operands: [int8,expr] @@ -784,9 +900,28 @@ operands: [int8] flags: [multisystemmes] -- pattern: 00 43 11 - name: SystemMes_11 - operands: [int8] +- pattern: 00 43 82 + name: SystemMes_82 + operands: [int8,expr] + flags: [multisystemmes] + +- pattern: 00 43 83 00 + name: SystemMesSetMesMsb_00 + operands: [int8,expr] + flags: [multisystemmes] +- pattern: 00 43 83 01 + name: SystemMesSetMesMsb_01 + operands: [expr] + flags: [multisystemmes] + + +- pattern: 00 43 84 00 + name: SystemMesSetSelMsb_00 + operands: [int8,expr] + flags: [multisystemmes] +- pattern: 00 43 84 01 + name: SystemMesSetSelMsb_01 + operands: [expr] flags: [multisystemmes] - pattern: 00 43 00 @@ -933,6 +1068,11 @@ name: SysSEinit operands: [] flags: [new_sseinit] + +- pattern: 00 4B 01 + name: SysSEinit1 + operands: [] + flags: [new_sseinit] - pattern: 00 4B name: SysSEinit @@ -1039,6 +1179,19 @@ operands: [int16] flags: [] +- pattern: 00 5B 00 + name: SaveIconShow + operands: [] + flags: [] +- pattern: 00 5B 01 + name: SaveIconShowAt + operands: [expr, expr] + flags: [] +- pattern: 00 5B 0A + name: SaveIconHide + operands: [] + flags: [] + - pattern: 00 5C name: FlagOffReturn operands: [int8, expr] @@ -1050,9 +1203,19 @@ flags: [multilang] - pattern: 00 5E - name: Unk_00_5E + name: CPUBoostMode operands: [expr] - flags: [] + flags: [~new_cpuboost] + +- pattern: 00 5E 00 + name: CPUBoostModeOff + operands: [] + flags: [new_cpuboost] + +- pattern: 00 5E 01 + name: CPUBoostModeOn + operands: [] + flags: [new_cpuboost] - pattern: 00 5F name: PackFileAddBind diff --git a/mgs-spec-bank/instructions/base/base_01.yaml b/mgs-spec-bank/instructions/base/base_01.yaml index f16a64a..651f568 100644 --- a/mgs-spec-bank/instructions/base/base_01.yaml +++ b/mgs-spec-bank/instructions/base/base_01.yaml @@ -308,6 +308,11 @@ name: MesRevVoiceStop operands: [] flags: [] + +- pattern: 01 10 0A + name: MesRevInit2 + operands: [] + flags: [] - pattern: 01 11 00 name: MessWindowClose @@ -454,39 +459,39 @@ operands: [expr, int16] flags: [] -#- pattern: 01 22 00 -# name: PlayMovieNoBGM -# operands: [expr, expr] -# flags: [~new_playmovie] +- pattern: 01 22 00 + name: PlayMovieNoBGM + operands: [int8, expr, expr] + flags: [~new_playmovie] - pattern: 01 22 01 name: PlayMovie - operands: [expr, expr] + operands: [int8, expr, expr] flags: [~new_playmovie] - pattern: 01 22 03 name: PlayMovieLoop - operands: [expr, expr] + operands: [int8, expr, expr] flags: [~new_playmovie] - pattern: 01 22 05 name: PlayMovieLoopNoAudio - operands: [expr, expr] + operands: [int8, expr, expr] flags: [~new_playmovie] - pattern: 01 22 09 name: PlayMovieMask - operands: [expr, expr] + operands: [int8, expr, expr] flags: [~new_playmovie] - pattern: 01 22 0B name: PlayMovieMaskLoop - operands: [expr, expr] + operands: [int8, expr, expr] flags: [~new_playmovie] - pattern: 01 22 0D name: PlayAlphaMovieLoopNoAudio - operands: [expr, expr] + operands: [int8, expr, expr] flags: [~new_playmovie] #- pattern: 01 22 00 00 @@ -592,27 +597,7 @@ - pattern: 01 27 name: Unk_01_27 operands: [] - flags: [~movie_01_27, ~game_chlcc] - -- pattern: 01 27 00 - name: MovieRestart - operands: [] - flags: [movie_01_27] - -- pattern: 01 27 01 - name: MoviePause - operands: [] - flags: [movie_01_27, ~game_chlcc] - -- pattern: 01 27 01 00 - name: Unk_01_27_01_00 - operands: [expr, expr] - flags: [game_chlcc] - -- pattern: 01 27 05 00 - name: Unk_01_27_05_00 - operands: [expr, expr] - flags: [] + flags: [~movie_01_27, ~game_chlcc_ps3] - pattern: 01 28 00 name: MovieMain_00 @@ -631,7 +616,67 @@ operands: [] flags: [] +- pattern: 01 29 + name: LoadMovie2 + operands: [expr] + flags: [] + +- pattern: 01 2A 05 00 + name: PlayMovieMemoryLoopNoAudio2 + operands: [expr] + flags: [] + +- pattern: 01 2A 63 + name: PlayMovieMemoryRecover2 + operands: [expr, expr, expr] + flags: [] + +- pattern: 01 27 00 + name: MovieRestart2 + operands: [int8, expr, expr] + flags: [~new_playmovie, movie_01_27] + +- pattern: 01 27 01 + name: MoviePause2 + operands: [int8, expr, expr] + flags: [~new_playmovie, movie_01_27] + +- pattern: 01 27 03 + name: PlayMovieLoop2 + operands: [int8, expr, expr] + flags: [~new_playmovie, movie_01_27] + +- pattern: 01 27 05 + name: PlayMovieLoopNoAudio2 + operands: [int8, expr, expr] + flags: [~new_playmovie, movie_01_27] + +- pattern: 01 27 09 + name: PlayMovieMask2 + operands: [int8, expr, expr] + flags: [~new_playmovie, movie_01_27] + +- pattern: 01 27 0B + name: PlayMovieMaskLoop2 + operands: [int8, expr, expr] + flags: [~new_playmovie, movie_01_27] + +- pattern: 01 27 0D + name: PlayAlphaMovieLoopNoAudio2 + operands: [int8, expr, expr] + flags: [~new_playmovie, movie_01_27] + +- pattern: 01 27 63 + name: PlayMovieRecover2 + operands: [expr, expr, expr, expr] + flags: [~new_playmovie, movie_01_27] + - pattern: 01 2B name: SFDpause operands: [int8] + flags: [] + +- pattern: 01 30 + name: LoadFontMeta + operands: [int8, expr, expr, expr] flags: [] \ No newline at end of file diff --git a/mgs-spec-bank/instructions/base/base_10.yaml b/mgs-spec-bank/instructions/base/base_10.yaml index 9b1e433..37f976c 100644 --- a/mgs-spec-bank/instructions/base/base_10.yaml +++ b/mgs-spec-bank/instructions/base/base_10.yaml @@ -6,7 +6,12 @@ - pattern: 10 01 name: BGload operands: [expr, expr] - flags: [] + flags: [~new_bgload] + +- pattern: 10 01 00 + name: BGload + operands: [expr, expr] + flags: [new_bgload] - pattern: 10 02 name: BGswap @@ -111,7 +116,7 @@ - pattern: 10 0F name: EVload operands: [expr, expr, expr] - flags: [~oldev, ~bgrelease] + flags: [~old_ev, ~bgrelease] - pattern: 10 0F name: BGsetAnime @@ -121,7 +126,7 @@ - pattern: 10 10 name: EVinit operands: [expr, expr] - flags: [~oldev, ~bgrelease] + flags: [~old_ev, ~bgrelease] - pattern: 10 10 name: BGrelease @@ -131,12 +136,12 @@ - pattern: 10 11 00 name: EVset operands: [expr, expr, expr] - flags: [~oldev, ~bgrelease] + flags: [~old_ev, ~bgrelease] - pattern: 10 11 01 name: EVsetEx operands: [expr, expr, expr, expr, expr, expr, expr] - flags: [~oldev, ~bgrelease] + flags: [~old_ev, ~bgrelease] - pattern: 10 11 name: CHArelease @@ -146,7 +151,7 @@ - pattern: 10 12 name: EVend operands: [] - flags: [~oldev, ~bgrelease] + flags: [~old_ev, ~bgrelease] - pattern: 10 0F 00 name: EVload @@ -201,7 +206,12 @@ - pattern: 10 13 04 name: OptionDefault operands: [] - flags: [~option_default_arg] + flags: [~option_default_arg, ~option_default_arg2] + +- pattern: 10 13 04 + name: OptionDefault + operands: [int8] + flags: [~option_default_arg, option_default_arg2] - pattern: 10 13 04 name: OptionDefault @@ -213,6 +223,11 @@ operands: [] flags: [] +- pattern: 10 13 0A + name: OptionInit2 + operands: [ ] + flags: [ ] + - pattern: 10 14 01 name: SystemDataAllReset operands: [] @@ -233,13 +248,23 @@ operands: [] flags: [] +- pattern: 10 1A 02 + name: ManualInit_02 + operands: [] + flags: [] + +- pattern: 10 1A 03 + name: ManualMain_03 + operands: [] + flags: [] + - pattern: 10 1A 0A - name: ManualInit + name: ManualInit_0A operands: [] flags: [] - pattern: 10 1A 0B - name: ManualMain + name: ManualMain_0B operands: [] flags: [] @@ -253,6 +278,11 @@ operands: [] flags: [] +- pattern: 10 1B 0A + name: AchievementInit2 + operands: [] + flags: [] + - pattern: 10 1C 00 name: ActorVoiceInit operands: [] @@ -293,6 +323,11 @@ operands: [] flags: [] +- pattern: 10 1F 0A + name: AlbumInit2 + operands: [] + flags: [] + - pattern: 10 20 00 name: MovieModeInit operands: [] @@ -317,6 +352,11 @@ name: ClistInit2 operands: [] flags: [] + +- pattern: 10 21 0A + name: ClistInitA + operands: [] + flags: [] - pattern: 10 21 14 name: SetSceneTitleViewFlag @@ -368,6 +408,11 @@ operands: [] flags: [] +- pattern: 10 22 28 + name: AutoSave_28 + operands: [] + flags: [] + - pattern: 10 22 FF name: AutoSave_FF operands: [] @@ -402,6 +447,26 @@ name: SaveMenuLockCancel operands: [] flags: [] + +- pattern: 10 23 0A 00 + name: QLoadMenuInit2 + operands: [] + flags: [] + +- pattern: 10 23 0A 01 + name: SaveMenuInit2 + operands: [] + flags: [] + +- pattern: 10 23 0A 02 + name: LoadMenuInit2 + operands: [] + flags: [] + +- pattern: 10 23 0B + name: SaveMenu0B + operands: [] + flags: [] - pattern: 10 24 name: LoadData @@ -533,6 +598,11 @@ operands: [] flags: [] +- pattern: 10 33 05 + name: EncycMenuInit2 + operands: [] + flags: [] + - pattern: 10 34 name: TitleMenu operands: [] @@ -591,144 +661,144 @@ - pattern: 10 3F 00 name: MouseModeInit operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 01 name: MouseModeSetTitleMenu operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 02 name: MouseModeResetTitleMenu operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 03 name: MouseModeSetSaveMenu operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 04 name: MouseModeResetSaveMenu operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 05 name: MouseModeSetTips operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 06 name: MouseModeResetTips operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 07 name: MouseModeSetCGlibrary operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 08 name: MouseModeResetCGlibrary operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 09 name: MouseModeSetMovieMenu operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 0A name: MouseModeResetMovieMenu operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 0B name: MouseModeSetMusicMenu operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 0C name: MouseModeResetMusicMenu operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 0D name: MouseModeSetGameMain operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 0E name: MouseModeResetGameMain operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 0F name: MouseMode_0F operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 10 name: MouseMode_10 operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 11 name: MouseModeSetSysMenu operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 12 name: MouseModeResetSysMenu operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 13 name: MouseModeSetBacklog operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 14 name: MouseModeResetBacklog operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 15 name: MouseModeSetConfig operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 16 name: MouseModeResetConfig operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 17 name: MouseModeSetHelp operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 18 name: MouseModeResetHelp operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 19 name: MouseMode_19 operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 1A name: MouseMode_1A operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 1B name: MouseModeSetClearList operands: [] - flags: [] + flags: [has_mouse] - pattern: 10 3F 1C name: MouseModeResetClearList operands: [] - flags: [] + flags: [has_mouse] diff --git a/mgs-spec-bank/instructions/chaos_child.yaml b/mgs-spec-bank/instructions/chaos_child.yaml index 8db7029..270dac9 100644 --- a/mgs-spec-bank/instructions/chaos_child.yaml +++ b/mgs-spec-bank/instructions/chaos_child.yaml @@ -6,182 +6,182 @@ - pattern: 10 37 01 name: MapInit operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 02 name: MapSetFadein operands: [expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 03 name: MapSetGroup operands: [expr,expr,expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 04 name: MapSetFadeout operands: [expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 05 name: MapSetDisp operands: [expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 06 name: MapSetHide operands: [expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 07 name: MapFadeEndChk_Wait operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 08 name: MapMoveAnimeInit operands: [expr,expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 09 name: MapMoveAnimeMain operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 0A name: MapGetPos operands: [expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 0B name: MapSetPool operands: [expr,expr,expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 0C name: MapResetPoolAll operands: [expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 0D name: MapFadeEndChk_Wait0D operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 0E name: MapPoolShuffle operands: [expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 0F name: MapPoolSetDisp operands: [expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 10 name: MapPoolSetHide operands: [expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 11 name: MapPoolSetFadein operands: [expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 12 name: MapPoolSetFadeout operands: [expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 13 name: MapPlayerPhotoSelect operands: [expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 14 name: MapResetPool operands: [expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 15 name: MapSetGroupEx operands: [expr,expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 16 name: MapZoomInit operands: [expr,expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 17 name: MapZoomMain operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 18 name: MapZoomInit2 operands: [expr,expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 19 name: MapZoomMain3 operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 1A name: MapZoomInit3 operands: [expr,expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 1B name: MapMoveAnimeInit2 operands: [expr,expr,expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 1C name: MapMoveAnimeMain2 operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 1E name: MapPlayerPotalSelectInit operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 1F name: MapPlayerPotalSelect operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 37 28 name: MapSystem_28 operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 38 00 name: MtrgStart operands: [expr, expr, expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 38 01 name: MtrgEnd operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 38 02 name: MtrgMain operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 38 03 name: MtrgStop_Wait operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 38 04 name: MtrgStart_Wait operands: [] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 38 05 name: MtrgSetEvent operands: [expr] - flags: [cc_common] + flags: [cc_common, ~new_maptrigger] - pattern: 10 40 name: ScreenChange operands: [] @@ -190,3 +190,183 @@ name: ExitGame operands: [] flags: [] + +- pattern: 10 38 01 + name: MapInit + operands: [] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 02 + name: MapSetFadein + operands: [expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 03 + name: MapSetGroup + operands: [expr,expr,expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 04 + name: MapSetFadeout + operands: [expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 05 + name: MapSetDisp + operands: [expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 06 + name: MapSetHide + operands: [expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 07 + name: MapFadeEndChk_Wait + operands: [] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 08 + name: MapMoveAnimeInit + operands: [expr,expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 09 + name: MapMoveAnimeMain + operands: [] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 0A + name: MapGetPos + operands: [expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 0B + name: MapSetPool + operands: [expr,expr,expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 0C + name: MapResetPoolAll + operands: [expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 0D + name: MapFadeEndChk_Wait0D + operands: [] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 0E + name: MapPoolShuffle + operands: [expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 0F + name: MapPoolSetDisp + operands: [expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 10 + name: MapPoolSetHide + operands: [expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 11 + name: MapPoolSetFadein + operands: [expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 12 + name: MapPoolSetFadeout + operands: [expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 13 + name: MapPlayerPhotoSelect + operands: [expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 14 + name: MapResetPool + operands: [expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 15 + name: MapSetGroupEx + operands: [expr,expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 16 + name: MapZoomInit + operands: [expr,expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 17 + name: MapZoomMain + operands: [] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 18 + name: MapZoomInit2 + operands: [expr,expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 19 + name: MapZoomMain3 + operands: [] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 1A + name: MapZoomInit3 + operands: [expr,expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 1B + name: MapMoveAnimeInit2 + operands: [expr,expr,expr] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 1C + name: MapMoveAnimeMain2 + operands: [] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 1E + name: MapPlayerPotalSelectInit + operands: [] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 1F + name: MapPlayerPotalSelect + operands: [] + flags: [cc_common, new_maptrigger] + +- pattern: 10 38 28 + name: MapSystem_28 + operands: [] + flags: [cc_common, new_maptrigger] + +- pattern: 10 37 00 + name: MtrgStart + operands: [expr, expr, expr] + flags: [cc_common, new_maptrigger] +- pattern: 10 37 01 + name: MtrgEnd + operands: [] + flags: [cc_common, new_maptrigger] +- pattern: 10 37 02 + name: MtrgMain + operands: [] + flags: [cc_common, new_maptrigger] +- pattern: 10 37 03 + name: MtrgStop_Wait + operands: [] + flags: [cc_common, new_maptrigger] +- pattern: 10 37 04 + name: MtrgStart_Wait + operands: [] + flags: [cc_common, new_maptrigger] +- pattern: 10 37 05 + name: MtrgSetEvent + operands: [expr] + flags: [cc_common, new_maptrigger] \ No newline at end of file diff --git a/mgs-spec-bank/instructions/chaos_child_lcc.yaml b/mgs-spec-bank/instructions/chaos_child_lcc.yaml index ee64ec9..959a9c0 100644 --- a/mgs-spec-bank/instructions/chaos_child_lcc.yaml +++ b/mgs-spec-bank/instructions/chaos_child_lcc.yaml @@ -38,3 +38,11 @@ name: YesNo_0A operands: [] flags: [game_cclcc] +- pattern: 10 3A 14 + name: YesNo_14 + operands: [] + flags: [game_cclcc] +- pattern: 10 3F + name: Switch_LaunchApp + operands: [ expr ] + flags: [ ~has_mouse ] diff --git a/mgs-spec-bank/instructions/chaos_head_lcc.yaml b/mgs-spec-bank/instructions/chaos_head_lcc.yaml index 3959479..c572526 100644 --- a/mgs-spec-bank/instructions/chaos_head_lcc.yaml +++ b/mgs-spec-bank/instructions/chaos_head_lcc.yaml @@ -2,34 +2,74 @@ - pattern: 10 2D 01 name: DelusionTrigger_01 operands: [] - flags: [game_chlcc] + flags: [game_chlcc_ps3] - pattern: 10 2D 02 name: DelusionTrigger_02 operands: [] - flags: [game_chlcc] + flags: [game_chlcc_ps3] - pattern: 10 2D 03 name: DelusionTrigger_03 operands: [] - flags: [game_chlcc] + flags: [game_chlcc_ps3] - pattern: 10 2D 04 name: DelusionTrigger_04 operands: [] - flags: [game_chlcc] + flags: [game_chlcc_ps3] - pattern: 10 2D 05 name: DelusionTrigger_05 operands: [] - flags: [game_chlcc] + flags: [game_chlcc_ps3] - pattern: 10 2D 06 name: DelusionTrigger_06 operands: [] - flags: [game_chlcc] + flags: [game_chlcc_ps3] - pattern: 10 2D 07 name: DelusionTrigger_07 operands: [] - flags: [game_chlcc] + flags: [game_chlcc_ps3] + +- pattern: 10 35 + name: AllClearChk + operands: [ ] + flags: [game_chlcc_ps3] + +- pattern: 10 37 01 + name: DelusionTrigger_01 + operands: [] + flags: [~game_chlcc_ps3, new_del_trigger] + +- pattern: 10 37 02 + name: DelusionTrigger_02 + operands: [] + flags: [~game_chlcc_ps3, new_del_trigger] + +- pattern: 10 37 03 + name: DelusionTrigger_03 + operands: [] + flags: [~game_chlcc_ps3, new_del_trigger] + +- pattern: 10 37 04 + name: DelusionTrigger_04 + operands: [] + flags: [~game_chlcc_ps3, new_del_trigger] + +- pattern: 10 37 05 + name: DelusionTrigger_05 + operands: [] + flags: [~game_chlcc_ps3, new_del_trigger] + +- pattern: 10 37 06 + name: DelusionTrigger_06 + operands: [] + flags: [~game_chlcc_ps3, new_del_trigger] + +- pattern: 10 37 07 + name: DelusionTrigger_07 + operands: [] + flags: [~game_chlcc_ps3, new_del_trigger] diff --git a/mgs-spec-bank/instructions/memories_off_6_old.yaml b/mgs-spec-bank/instructions/memories_off_6_old.yaml index 44c9785..7f2b666 100644 --- a/mgs-spec-bank/instructions/memories_off_6_old.yaml +++ b/mgs-spec-bank/instructions/memories_off_6_old.yaml @@ -12,12 +12,12 @@ - pattern: 10 35 00 name: Unk1035_00 operands: [] - flags: [] + flags: [game_mo6tw] - pattern: 10 35 01 name: Unk1035_01 operands: [int16] - flags: [] + flags: [game_mo6tw] - pattern: 10 37 01 name: Unk1037_01 diff --git a/src/MagesScriptTool/SpecBank.cs b/src/MagesScriptTool/SpecBank.cs index 4ed5c5d..7687666 100644 --- a/src/MagesScriptTool/SpecBank.cs +++ b/src/MagesScriptTool/SpecBank.cs @@ -219,7 +219,11 @@ public bool CheckFlags(ImmutableDictionary flags) { } else { (name, value) = (flag, true); } - if (!flags.ContainsKey(name) || flags[name] != value) { + if(!flags.ContainsKey(name)) { + if(value) return false; + else continue; + } + if (flags[name] != value) { return false; } }