Proper solution to right-click name title corruption

Instead of trying to avoid assignments to name_chapter_r_click and name_chapter_save, back them up and restore just as all the other loggen variables. This provides a natural fix to answering the last enj quiz blasting the rmenu title when loggen triggers. This also fixes accidental initialisation removal of %bern_game_mode in umi8_9 causing broken log generation. REF: https://forum.umineko-project.org/viewtopic.php?p=4155#p4155
umineko-project · Dec 21, 2020 · 85148c3 · 85148c3
1 parent d12270d
commit 85148c3
Show file tree

Hide file tree

Showing 82 changed files with 11 additions and 168 deletions.
diff --git a/extraction/ps3snr/snrparser.php b/extraction/ps3snr/snrparser.php
@@ -3259,10 +3259,8 @@ function section_convertor( &$inst ) {
 
 			logstr('*teatime_'.$g['episode_num']);
 			logstr('log_reset');
-			logstr('if %process_chapters != 1 jskip_s');
 			logstr('mov $name_chapter_r_click,r_click_chapters_'.$g['episode_num'].'_tea');
 			logstr('mov $name_chapter_save, "'.$g['episode_num'].'_tea"');
-			logstr('~');
 			logstr('new_tea '.$g['episode_num']);
 		} else if ($sectionName == '????') {
 			finish_section('ura');
@@ -3278,10 +3276,8 @@ function section_convertor( &$inst ) {
 
 			logstr('*ura_teatime_'.$g['episode_num']);
 			logstr('log_reset');
-			logstr('if %process_chapters != 1 jskip_s');
 			logstr('mov $name_chapter_r_click,r_click_chapters_'.$g['episode_num'].'_ura');
 			logstr('mov $name_chapter_save, "'.$g['episode_num'].'_ura"');
-			logstr('~');
 			logstr('new_ura '.$g['episode_num']);
 		} else {
 			finish_section();
@@ -3295,10 +3291,8 @@ function section_convertor( &$inst ) {
 			logstr('*umi'.$g['episode_num'].'_'.$id);
 			logstr(';'.$sectionName);
 			logstr('log_reset');
-			logstr('if %process_chapters != 1 jskip_s');
 			logstr('mov $name_chapter_r_click,r_click_chapters_'.$g['episode_num'].'_'.$id);
 			logstr('mov $name_chapter_save, "'.$g['episode_num'].'_'.str_pad($id,2,'0',STR_PAD_LEFT).'"');
-			logstr('~');
 
 			if ($id != 'op') {
 				logstr('new_chapter date_scenario_'.$g['episode_num'].'_'.$id.',scenario_'.$g['episode_num'].'_'.$id);

diff --git a/game/main/umi5_1.txt b/game/main/umi5_1.txt
@@ -1,10 +1,8 @@
 *umi5_1
 ;奇跡の魔法
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_1
 mov $name_chapter_save, "5_01"
-~
 new_chapter date_scenario_5_1,scenario_5_1
 gstc 2
 textoff

diff --git a/game/main/umi5_10.txt b/game/main/umi5_10.txt
@@ -1,10 +1,8 @@
 *umi5_10
 ;10/5（日）07:00 惨劇の朝
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_10
 mov $name_chapter_save, "5_10"
-~
 new_chapter date_scenario_5_10,scenario_5_10
 gstc 13
 meplay 1,12,1

diff --git a/game/main/umi5_11.txt b/game/main/umi5_11.txt
@@ -1,10 +1,8 @@
 *umi5_11
 ;10/5（日）08:04 魔女を貫く十の楔
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_11
 mov $name_chapter_save, "5_11"
-~
 new_chapter date_scenario_5_11,scenario_5_11
 gstc 17
 textoff

diff --git a/game/main/umi5_12.txt b/game/main/umi5_12.txt
@@ -1,10 +1,8 @@
 *umi5_12
 ;10/5（日）11:00 推理と検証
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_12
 mov $name_chapter_save, "5_12"
-~
 new_chapter date_scenario_5_12,scenario_5_12
 gstc 21
 textoff

diff --git a/game/main/umi5_13.txt b/game/main/umi5_13.txt
@@ -1,10 +1,8 @@
 *umi5_13
 ;10/5（日）12:33 クローゼット
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_13
 mov $name_chapter_save, "5_13"
-~
 new_chapter date_scenario_5_13,scenario_5_13
 gstc 22
 meplay 1,13,70

diff --git a/game/main/umi5_14.txt b/game/main/umi5_14.txt
@@ -1,10 +1,8 @@
 *umi5_14
 ;10/5（日）24:00 幻想大法廷
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_14
 mov $name_chapter_save, "5_14"
-~
 new_chapter date_scenario_5_14,scenario_5_14
 gstc 24
 textoff

diff --git a/game/main/umi5_15.txt b/game/main/umi5_15.txt
@@ -1,10 +1,8 @@
 *umi5_15
 ;10/5（日）--:-- １９年越しの復讐
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_15
 mov $name_chapter_save, "5_15"
-~
 new_chapter date_scenario_5_15,scenario_5_15
 gstc 27
 gstt 2

diff --git a/game/main/umi5_16.txt b/game/main/umi5_16.txt
@@ -1,9 +1,7 @@
 *teatime_5
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_tea
 mov $name_chapter_save, "5_tea"
-~
 new_tea 5
 flush 10,167
 textoff

diff --git a/game/main/umi5_17.txt b/game/main/umi5_17.txt
@@ -1,9 +1,7 @@
 *ura_teatime_5
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_ura
 mov $name_chapter_save, "5_ura"
-~
 new_ura 5
 gstc 180
 flush 10,167

diff --git a/game/main/umi5_2.txt b/game/main/umi5_2.txt
@@ -1,10 +1,8 @@
 *umi5_2
 ;正式なミステリー
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_2
 mov $name_chapter_save, "5_02"
-~
 new_chapter date_scenario_5_2,scenario_5_2
 gstc 3
 textoff

diff --git a/game/main/umi5_3.txt b/game/main/umi5_3.txt
@@ -1,10 +1,8 @@
 *umi5_3
 ;密室結界
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_3
 mov $name_chapter_save, "5_03"
-~
 new_chapter date_scenario_5_3,scenario_5_3
 gstc 4
 textoff

diff --git a/game/main/umi5_4.txt b/game/main/umi5_4.txt
@@ -1,10 +1,8 @@
 *umi5_4
 ;10/4（土）11:00 古戸ヱリカ
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_4
 mov $name_chapter_save, "5_04"
-~
 new_chapter date_scenario_5_4,scenario_5_4
 gstc 6
 textoff

diff --git a/game/main/umi5_5.txt b/game/main/umi5_5.txt
@@ -1,10 +1,8 @@
 *umi5_5
 ;10/4（土）19:00 奇跡の魔女
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_5
 mov $name_chapter_save, "5_05"
-~
 new_chapter date_scenario_5_5,scenario_5_5
 gstc 8
 textoff

diff --git a/game/main/umi5_6.txt b/game/main/umi5_6.txt
@@ -1,10 +1,8 @@
 *umi5_6
 ;10/4（土）22:00 辿り着きし者
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_6
 mov $name_chapter_save, "5_06"
-~
 new_chapter date_scenario_5_6,scenario_5_6
 gstc 9
 textoff

diff --git a/game/main/umi5_7.txt b/game/main/umi5_7.txt
@@ -1,10 +1,8 @@
 *umi5_7
 ;10/4（土）22:47 黄金狂乱劇
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_7
 mov $name_chapter_save, "5_07"
-~
 new_chapter date_scenario_5_7,scenario_5_7
 gstc 10
 textoff

diff --git a/game/main/umi5_8.txt b/game/main/umi5_8.txt
@@ -1,10 +1,8 @@
 *umi5_8
 ;10/4（土）23:49 本当の親族会議
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_8
 mov $name_chapter_save, "5_08"
-~
 new_chapter date_scenario_5_8,scenario_5_8
 gstc 11
 meplay 1,12,70

diff --git a/game/main/umi5_9.txt b/game/main/umi5_9.txt
@@ -1,10 +1,8 @@
 *umi5_9
 ;１９年前の復讐
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_9
 mov $name_chapter_save, "5_09"
-~
 new_chapter date_scenario_5_9,scenario_5_9
 gstc 12
 textoff

diff --git a/game/main/umi5_op.txt b/game/main/umi5_op.txt
@@ -1,10 +1,8 @@
 *umi5_op
 ;オープニング
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_5_op
 mov $name_chapter_save, "5_op"
-~
 new_episode 5
 gstc 0
 flush 10,167

diff --git a/game/main/umi6_1.txt b/game/main/umi6_1.txt
@@ -1,10 +1,8 @@
 *umi6_1
 ;観劇の魔女
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_1
 mov $name_chapter_save, "6_01"
-~
 new_chapter date_scenario_6_1,scenario_6_1
 gstc 29
 meplay 1,16,0

diff --git a/game/main/umi6_10.txt b/game/main/umi6_10.txt
@@ -1,10 +1,8 @@
 *umi6_10
 ;10/5（日）00:07 恋愛の後悔
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_10
 mov $name_chapter_save, "6_10"
-~
 new_chapter date_scenario_6_10,scenario_6_10
 gstc 46
 meplay 1,12,70

diff --git a/game/main/umi6_11.txt b/game/main/umi6_11.txt
@@ -1,10 +1,8 @@
 *umi6_11
 ;10/5（日）00:12 戦わぬ者の末路
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_11
 mov $name_chapter_save, "6_11"
-~
 new_chapter date_scenario_6_11,scenario_6_11
 gstc 47
 meplay 1,12,70

diff --git a/game/main/umi6_12.txt b/game/main/umi6_12.txt
@@ -1,10 +1,8 @@
 *umi6_12
 ;10/5（日）01:11 現場巡り
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_12
 mov $name_chapter_save, "6_12"
-~
 new_chapter date_scenario_6_12,scenario_6_12
 gstc 48
 meplay 1,13,70

diff --git a/game/main/umi6_13.txt b/game/main/umi6_13.txt
@@ -1,10 +1,8 @@
 *umi6_13
 ;探偵宣言
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_13
 mov $name_chapter_save, "6_13"
-~
 new_chapter date_scenario_6_13,scenario_6_13
 gstc 50
 textoff

diff --git a/game/main/umi6_14.txt b/game/main/umi6_14.txt
@@ -1,10 +1,8 @@
 *umi6_14
 ;10/5（日）02:22 小さな矛盾
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_14
 mov $name_chapter_save, "6_14"
-~
 new_chapter date_scenario_6_14,scenario_6_14
 gstc 51
 meplay 1,13,70

diff --git a/game/main/umi6_15.txt b/game/main/umi6_15.txt
@@ -1,10 +1,8 @@
 *umi6_15
 ;10/5（日）02:34 ロジックエラー
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_15
 mov $name_chapter_save, "6_15"
-~
 new_chapter date_scenario_6_15,scenario_6_15
 gstc 52
 meplay 1,12,70

diff --git a/game/main/umi6_16.txt b/game/main/umi6_16.txt
@@ -1,10 +1,8 @@
 *umi6_16
 ;悪魔の結婚式
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_16
 mov $name_chapter_save, "6_16"
-~
 new_chapter date_scenario_6_16,scenario_6_16
 gstc 54
 textoff

diff --git a/game/main/umi6_17.txt b/game/main/umi6_17.txt
@@ -1,10 +1,8 @@
 *umi6_17
 ;恋人達の決闘
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_17
 mov $name_chapter_save, "6_17"
-~
 new_chapter date_scenario_6_17,scenario_6_17
 gstc 55
 meplay 1,16,50

diff --git a/game/main/umi6_18.txt b/game/main/umi6_18.txt
@@ -1,10 +1,8 @@
 *umi6_18
 ;赤と青の真実
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_18
 mov $name_chapter_save, "6_18"
-~
 new_chapter date_scenario_6_18,scenario_6_18
 gstc 56
 textoff

diff --git a/game/main/umi6_19.txt b/game/main/umi6_19.txt
@@ -1,9 +1,7 @@
 *teatime_6
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_tea
 mov $name_chapter_save, "6_tea"
-~
 new_tea 6
 gstc 177
 flush 10,167

diff --git a/game/main/umi6_2.txt b/game/main/umi6_2.txt
@@ -1,10 +1,8 @@
 *umi6_2
 ;ゲームマスター
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_2
 mov $name_chapter_save, "6_02"
-~
 new_chapter date_scenario_6_2,scenario_6_2
 gstc 34
 textoff

diff --git a/game/main/umi6_20.txt b/game/main/umi6_20.txt
@@ -1,9 +1,7 @@
 *ura_teatime_6
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_ura
 mov $name_chapter_save, "6_ura"
-~
 new_ura 6
 gstc 182
 flush 10,167

diff --git a/game/main/umi6_3.txt b/game/main/umi6_3.txt
@@ -1,10 +1,8 @@
 *umi6_3
 ;偽らざる気持ち
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_3
 mov $name_chapter_save, "6_03"
-~
 new_chapter date_scenario_6_3,scenario_6_3
 gstc 36
 textoff

diff --git a/game/main/umi6_4.txt b/game/main/umi6_4.txt
@@ -1,10 +1,8 @@
 *umi6_4
 ;迷惑な客人
 log_reset
-if %process_chapters != 1 jskip_s
 mov $name_chapter_r_click,r_click_chapters_6_4
 mov $name_chapter_save, "6_04"
-~
 new_chapter date_scenario_6_4,scenario_6_4
 gstc 37
 textoff