Change Anna's portrait to Feh's. #5.

laqieer · Aug 21, 2022 · cbf1064 · cbf1064
1 parent 9c183df
commit cbf1064
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 13 deletions.
diff --git a/content/portraits.c b/content/portraits.c
@@ -274,3 +274,17 @@ const struct Portrait newPortraits[] = {
  DEFINE_FACE(ch00_18_Srasir_F_Normal, 4, 2)
  DEFINE_FACE(ch00_17_Lif_M_Normal, 4, 0)
 };
+
+// Anna -> Feh
+const struct Portrait FehPortrait = {
+ FehTiles,
+ NULL,
+ FehPal,
+ NULL,
+ NULL,
+ 0,
+ 0,
+ 0,
+ 0,
+ NULL
+};
diff --git a/content/texts_jp.c b/content/texts_jp.c
@@ -5,8 +5,9 @@
 
 const char * const textsJP[] = {
  [TID_START] = NULL,
- #include "../locale/JPJA/scenario.txt"
+ #include "../locale/JPJA/FE7.txt"
  #include "../locale/JPJA/character_messages.txt"
+ #include "../locale/JPJA/scenario.txt"
  #include "../locale/JPJA/misc.txt"
  #include "../locale/JPJA/unit.txt"
  #include "../locale/JPJA/skill.txt"

diff --git a/graphic/Feh.grit b/graphic/Feh.grit
@@ -0,0 +1,4 @@
+# For Feh's face.
+
+-gB4 -gzl
+-pn16
diff --git a/graphic/Feh.png b/graphic/Feh.png
diff --git a/include/text.h b/include/text.h
@@ -82,6 +82,8 @@ extern const char * const Texts[];
 
 /* Portraits. */
 
+#define Feh "\xdf\x1"
+
 #define ch00_01_Alfons_M_Normal "\x1\x2"
 #define ch00_01_Alfons_MF_Pair "\x2\x2"
 #define ch00_01_Alfons_M_SpringFes18 "\x3\x2"

diff --git a/linkerscript/portrait.lds b/linkerscript/portrait.lds
@@ -72,3 +72,5 @@
 .text.startFaceFadeIn : {*(.text.startFaceFadeIn)}
 . = 0x80073f4;
 .text.startFaceFadeOut : {*(.text.startFaceFadeOut)}
+. = 0x8d5e23c + 28 * 0xdf;
+.rodata.FehPortrait : {*(.rodata.FehPortrait)}
diff --git a/locale/CNZH/FE7.txt b/locale/CNZH/FE7.txt
@@ -266,27 +266,27 @@ TEXT_GOLD_AMOUNT"
 "����Ǯ�������ɡ�"TEXT_PUSH_A"",
 
 [0x004A] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE"�ж���Ϸ��"TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "�ж���Ϸ��"TEXT_NEWLINE
 ""TEXT_YES"",
 
 [0x004B] =
 ""TEXT_OPEN_LEFT"��Ҫ������Ϸ�Ļ�,"TEXT_NEWLINE
 "��ѡ�񡸴��жϿ�ʼ����"TEXT_PUSH_A"",
 
 [0x004C] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE"Ͷ����"TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "Ͷ����"TEXT_NEWLINE
 ""TEXT_YES"",
 
 [0x004D] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE"��������˺�"TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "��������˺�"TEXT_NEWLINE
 "�Ƿ������ "TEXT_YES"",
 
 [0x004E] =
 ""TEXT_OPEN_LEFT"��ʼ����ؿ��ķ���,"TEXT_NEWLINE
 "���������� "TEXT_YES"",
 
 [0x004F] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE"׼����"TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "׼����"TEXT_NEWLINE
 "���Ժ�",
 
 [0x0050] =
@@ -304,7 +304,7 @@ TEXT_GOLD_AMOUNT"
 "������ֹ�ص��˵�",
 
 [0x0054] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE"��¼����ȫ��ɾ��,"TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "��¼����ȫ��ɾ��,"TEXT_NEWLINE
 "���������� "TEXT_NO"",
 
 [0x0055] =
@@ -315,7 +315,7 @@ TEXT_GOLD_AMOUNT"
 ""TEXT_OPEN_LEFT"��ɾ��"TEXT_PUSH_A"",
 
 [0x0057] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE""TEXT_NEWLINE2"TEXT_NEWLINE�ţ�Ҫ����ѵ���ˣ�"TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "�ţ�Ҫ����ѵ���ˣ�"TEXT_NEWLINE
 ""TEXT_YES"",
 
 [0x0058] =

diff --git a/locale/JPJA/FE7.txt b/locale/JPJA/FE7.txt
@@ -0,0 +1,23 @@
+[0x004A] =
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "���f���܂����H"TEXT_NEWLINE
+""TEXT_YES"",
+
+[0x004C] =
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "�~�����܂����H"TEXT_NEWLINE
+""TEXT_YES"",
+
+[0x004D] =
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "�_���[�W���^�����܂���"TEXT_NEWLINE
+"�I�����܂����H "TEXT_YES"",
+
+[0x004F] =
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "�������ł�"TEXT_NEWLINE
+"���΂炭���҂���������",
+
+[0x0054] =
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "�Z�[�u�f�[�^��S���������܂�"TEXT_NEWLINE
+"��낵���ł����H "TEXT_NO"",
+
+[0x0057] =
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh "����@�P�����I������̂�����H"TEXT_NEWLINE
+""TEXT_YES"",
diff --git a/locale/USEN/FE7.txt b/locale/USEN/FE7.txt
@@ -270,7 +270,7 @@
 "Try again later."TEXT_PUSH_A"",
 
 [0x004A] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE""TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh ""TEXT_NEWLINE
 "Do you want to quit?"TEXT_NEWLINE
 ""TEXT_YES"",
 
@@ -279,12 +279,12 @@
 "Chapter to finish this battle."TEXT_PUSH_A"",
 
 [0x004C] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE""TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh ""TEXT_NEWLINE
 "Do you surrender?"TEXT_PAUSE_SHORT_WITH_SFX""TEXT_NEWLINE
 ""TEXT_YES"",
 
 [0x004D] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE""TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh ""TEXT_NEWLINE
 "You can do no damage."TEXT_PAUSE_SHORT_WITH_SFX""TEXT_NEWLINE
 "Would you like to quit?"TEXT_PAUSE_SHORT_WITH_SFX""TEXT_YES"",
 
@@ -293,7 +293,7 @@
 "trial map?"TEXT_YES"",
 
 [0x004F] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE""TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh ""TEXT_NEWLINE
 "Loading."TEXT_NEWLINE
 "Please wait a moment.",
 
@@ -312,7 +312,7 @@
 "Ending map send and returning to menu.",
 
 [0x0054] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE""TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh ""TEXT_NEWLINE
 "All your saved data will be erased."TEXT_PAUSE_SHORT_WITH_SFX""TEXT_NEWLINE
 "Shall I continue?"TEXT_PAUSE_SHORT_WITH_SFX""TEXT_NO"",
 
@@ -324,7 +324,7 @@
 ""TEXT_OPEN_LEFT"The data's been erased."TEXT_PAUSE_SHORT_WITH_SFX""TEXT_PUSH_A"",
 
 [0x0057] =
-""TEXT_OPEN_LEFT""TEXT_LOAD_FACE"\xdf"TEXT_NEWLINE""TEXT_NEWLINE
+""TEXT_OPEN_LEFT""TEXT_LOAD_FACE Feh ""TEXT_NEWLINE
 "Are you finished training?"TEXT_NEWLINE
 ""TEXT_YES"",