Add Lord to Hero Crest's CC list and remove force CC event

laqieer · Aug 15, 2024 · ff76e5c · ff76e5c
1 parent 75036c9
commit ff76e5c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/asset/script/make_maps.py b/asset/script/make_maps.py
@@ -1103,11 +1103,6 @@ def make_red_units_and_event_scripts():
             if 'MID_SCENARIO_MAP_END' in map_scenarios.get(map_id, {}):
                 file_scripts.write('    EvtTalk(MID_SCENARIO_MAP_END_%s)\n' % map_id)
                 file_scripts.write('    EvtClearTalk\n')
-            if map_id == 'S0405':
-                file_scripts.write('    EvtNoSkip\n')
-                file_scripts.write('    EvtSleep(60 * 1)\n')
-                file_scripts.write('    EvtFunc(func_fe6_0806D0E4)\n')
-                file_scripts.write('    EvtSleep(60 * 16)\n')
             if 'MID_SCENARIO_ENDING_BGM' in map_scenarios.get(map_id, {}):
                 file_scripts.write('    EvtSetBgm(%s_MID_SCENARIO_ENDING_BGM)\n' % map_id)
             if 'MID_SCENARIO_ENDING_IMAGE' in map_scenarios.get(map_id, {}):

diff --git a/source/eventscripts.c b/source/eventscripts.c
@@ -593,10 +593,6 @@ const EventScr EventScr_LoadUnits_S0405[] = {
 const EventScr EventScr_S0405_Victory[] = {
     EvtTalk(MID_SCENARIO_MAP_END_S0405)
     EvtClearTalk
-    EvtNoSkip
-    EvtSleep(60 * 1)
-    EvtFunc(func_fe6_0806D0E4)
-    EvtSleep(60 * 16)
     EvtFadeToBlack(16)
     EvtExitMap
     EvtBackground(BACKGROUND_003_Volcano)

diff --git a/source/itemuse.c b/source/itemuse.c
@@ -31,6 +31,7 @@
 #include "jobs.h"
 
 const u8 JList_HeroCrestPromotesNew[] = {
+    JID_ROY,
     JID_MERCENARY,
     JID_MERCENARY_F,
     JID_MYRMIDON,

diff --git a/source/texts.c b/source/texts.c
@@ -9304,9 +9304,9 @@ const char * const gMsgTableNew[][LANGUAGE_NUM] = {
     },
 
     [1550] = {
-        [LANGUAGE_JAPANESE] = "１０レベル以上の　傭兵・剣士・ソルジャー""\x01""戦士・山賊・海賊・盗賊が使います",
-        [LANGUAGE_ENGLISH] = "For mercenaries, myrmidons, soldier,""\x01""thief and axe fighters Lv. 10 and up.",
-        [LANGUAGE_CHINESE] = "等级10以上的佣兵、剑士、士兵、""\x01""战士、山贼、海贼、盗贼使用",
+        [LANGUAGE_JAPANESE] = "１０レベル以上の　ロード・傭兵・剣士・ソルジャー""\x01""戦士・山賊・海賊・盗賊が使います",
+        [LANGUAGE_ENGLISH] = "For lord, mercenaries, myrmidons, soldier,""\x01""thief and axe fighters Lv. 10 and up.",
+        [LANGUAGE_CHINESE] = "等级10以上的领主、佣兵、剑士、士兵、""\x01""战士、山贼、海贼、盗贼使用",
     },
 
     [1551] = {
@@ -10054,9 +10054,9 @@ const char * const gMsgTableNew[][LANGUAGE_NUM] = {
     },
 
     [1675] = {
-        [LANGUAGE_JAPANESE] = "傭兵　剣士　戦士　ソルジャー""\x01""山賊　海賊　盗賊を""\x01""クラスチェンジします",
-        [LANGUAGE_ENGLISH] = "Use this on a worthy""\x01""mercenary, myrmidon, soldier,""\x01""thief or wielder of axes.",
-        [LANGUAGE_CHINESE] = "佣兵 剑士 战士 士兵""\x01""山贼 海盗 盗贼""\x01""使用后转职",
+        [LANGUAGE_JAPANESE] = "ロード 傭兵　剣士　戦士""\x01""ソルジャー　山賊　海賊　盗賊を""\x01""クラスチェンジします",
+        [LANGUAGE_ENGLISH] = "Use this on a worthy""\x01""lord, mercenary, myrmidon, soldier,""\x01""thief or wielder of axes.",
+        [LANGUAGE_CHINESE] = "领主 佣兵 剑士 战士""\x01""士兵 山贼 海盗 盗贼""\x01""使用后转职",
     },
 
     [1676] = {