From e4273d647c9cdd371ead50e7df05339321163f67 Mon Sep 17 00:00:00 2001
From: laqieer <laqieer@126.com>
Date: Wed, 19 Feb 2020 21:06:23 +0800
Subject: [PATCH] add chapter 2 title

Signed-off-by: laqieer <laqieer@126.com>
---
 CMakeLists.txt                   |   2 +-
 res/gfx/chapter-title/chap_2.png | Bin 0 -> 700 bytes
 src/chapter_title.c              |   3 +-
 src/chapter_title_2.s            |  65 +++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 res/gfx/chapter-title/chap_2.png
 create mode 100644 src/chapter_title_2.s

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87fafdf7..c4f58f05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ process_gfx(GFX_SRCS font.grit title_screen.grit standing_sprite_Alfonse.grit mo
 process_gfx_portrait(GFX_SRCS_PORTRAIT portrait_alfonse.grit portrait_Anna_commander.grit portrait_Sharena_princess.grit portrait_Bruno.grit portrait_Xander.grit portrait_Veronica.grit)
 
 add_executable(${PROJECT_NAME} ${DIR_SRCS} ${GFX_SRCS} ${GFX_SRCS_PORTRAIT}
-        src/chapter_title_pre.s src/chapter_title_1.s
+        src/chapter_title_pre.s src/chapter_title_1.s src/chapter_title_2.s
         src/res/map/map/map_chap_pre.s src/res/map/map/map_chap_1.s src/res/map/map/map_chap_2.s
         src/res/map/event/event_chap_template.s src/res/map/event/event_chap_pre.s src/res/map/event/event_chap_1.s
         src/res/character_palette/character_palette_Alfonse.s src/res/character_palette/character_palette_Anna.s src/res/character_palette/character_palette_Sharena.s src/res/character_palette/character_palette_Xander.s
diff --git a/res/gfx/chapter-title/chap_2.png b/res/gfx/chapter-title/chap_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d585a735dc02ac2069655c2e07e1855fb9d6240
GIT binary patch
literal 700
zcmV;t0z>_YP)<h;3K|Lk000e1NJLTq00961000mO0{{R3&J9s}0000mP)t-soYl>X
zYBB%+N&o-=|NsBh|K9)q|D^V`AQ%`qVmV5KQfj1PgS2~l&5M-gq?G2QwTdT40000G
zbW%=J|NsC0|NsC0|NsC0|NsC0%^|Xs0006jNkl<ZScTPB(Q?Ef2=oC*gTViPZWk~Y
zlT4rP#oKATvz5&3vVbk+D=_fg8-5GScgD<G^*<3rN>N|VjW}{6kCVFWRLid5Mu1Ja
z%wr58!(uN9z>%simTbudAfXfhA5sGnTl#1NSOiMh58#h<Ynuvir4zLs4+X#tzxESO
z5<<WW_~v@R79{?-KA{W6X`7)UhOjLKpvt~l$L0XWpeBrGjNV^m5LvZMxj9{M#81!z
zK`PS<nSW3F3{=_G0oE8x3c%ws0MMl04+neCd(<~tMNzN~%TEWS4#k}@-I8(n-nyd#
zNVD_j5Wq~RnV<s><k##e060)Q8kx4q7?ibo($5l5hg3YI=0~FgNW^UjuF2oku*(3}
z`%3_Kx5kt0PpqcV<yHc#k790I@f!jL7-zNf;sASgfUvoe&QI@x#j*qpZeN;U<h!~)
zv=;uJ0(=S}HnODdA%NZTDo8z~nB6bzV6x;q$t$fdussFv0+=(O58>m$OpxxlD`43J
zYjnXJd^9Y_pk?CMF*vctZ`lHH5#WB<2(o<3vi9d;a4@vH$fH(w!7Ks)iwjVu&tp>1
zI{DlzJ5B*mZv8k~Hhe}d&2SUIYBC-II0q1pRWr%e@*Z$DNQ9+6>izKw&3n+62AGq-
zonyeAk6qw?6eXM-eBPgpuGV?O`ILaB0QZX@<lK_}Wc*;uuNzR};-K@JmG!EZ8~yxq
iWbaq}2%fqBHT(e@uOd!*f7j3e0000<MNUMnLSTZAK2K%<

literal 0
HcmV?d00001

diff --git a/src/chapter_title.c b/src/chapter_title.c
index 220f3eae..a1f0a2f7 100644
--- a/src/chapter_title.c
+++ b/src/chapter_title.c
@@ -6,11 +6,12 @@
 
 extern u8 chapter_title_pre[];
 extern u8 chapter_title_1[];
+extern u8 chapter_title_2[];
 
 const u8 * chapterTitles[] = {
         chapter_title_pre, //0x84090a4,
         chapter_title_1, //0x8409464,
-        0x84097c4,
+        chapter_title_2, //0x84097c4,
         0x8409b1c,
         0x8409ef0,
         0x840a280,
diff --git a/src/chapter_title_2.s b/src/chapter_title_2.s
new file mode 100644
index 00000000..aa52a641
--- /dev/null
+++ b/src/chapter_title_2.s
@@ -0,0 +1,65 @@
+/* Generated by BIN2S - please don't edit directly */
+	.section .rodata
+	.balign 4
+	.global chapter_title_2_size
+	.global chapter_title_2
+chapter_title_2:
+	.byte  16,  0,  8,  0, 63,  0,  0,240,  1,240,  1,240,  1,240,  1,240
+	.byte   1,240,  1,224,240,  1,240,  1,240,  1,  0,  0,160,170,  0,  0
+	.byte   0,122, 68,  0,160, 71,173,  0,  0,160, 84, 10,  0,160,126, 10
+	.byte   0, 37,  0,136,  0, 19,  0,160, 16, 29,170,  0, 13,  2, 68,174
+	.byte   0,  0,218,231,  0, 26,228, 16,  8,  0,234,  0,  3, 78,174,  8
+	.byte   0, 48,229,138, 32, 60,  0, 39,160,218,  0,170,  0,187,203,  0
+	.byte  90, 68, 68,153,153,  0,187,116,186, 69, 68, 68,234,206,  2,116
+	.byte 206,128,232, 68, 68, 16, 68,213,  0,170,170,  0,228,187,236,170
+	.byte  68,  0, 68, 84,151,172,116,188,139, 68,  1, 68, 68,116,170,186
+	.byte  78,236,  0,  7,101,142,144,133,  0,102,  0,168,  0,  3,140,  0
+	.byte   3,171, 16, 24,136,176,164,192,  0,  3, 80,240,187,  0,  1,  0
+	.byte 204,  0,205,204, 84,204, 76, 85,  0, 68, 85, 68,  0,204,204,236
+	.byte 204,  0,204, 78,205, 76, 84, 68, 84, 76, 20, 12, 76, 13, 16, 30
+	.byte  12,  0, 59,206,204,  0,  0, 64, 84,197,192, 76, 12,  0,  0,192
+	.byte  78,204, 13,  0, 93, 68, 13, 24,192,196, 76,  0,  3, 32, 31,192
+	.byte 204,204,  0, 12,192,196,196,205, 92,197,228,  0,204, 76,228, 68
+	.byte  13, 77, 12,197, 67,206,  0,156,196,236,197, 84, 64, 96,  0, 66
+	.byte   0, 76, 12,204,208, 76,220,206, 78, 16, 68, 68,  0,  0,  7,196
+	.byte 208, 69,196, 48,204,192,  0, 11, 64,130, 92, 85, 85,197,  3, 76
+	.byte 204,204,196, 76,  0,  0, 87,  0, 58,192, 80, 11, 64, 63, 13,  0
+	.byte 192, 68,204,  0, 16, 76, 84, 85,  0,  6,204,192, 92, 85,  3, 68
+	.byte 208,221,221, 92, 64,  0, 99, 96,194,128,  0, 97, 68, 14,  0,  0
+	.byte  84,204,  0, 65,  0,  0,197,  0,221, 76,237,  0,  0, 70,160, 48
+	.byte  28,221,  0,  3, 78,197,204,  0,204, 68, 78,  0,123,204,204,204
+	.byte   1, 95, 76,197, 29,204,204,205,129,  2,  0, 62, 96,  3,197,  0
+	.byte   3,127, 68,  0,249,  0,236,241, 43,240,  1,240,  1,240,  1,240
+	.byte   1,255,240,  1,240,  1,240,  1,240,  1,240,  1,240,  1,240,  1
+	.byte 240,  1,255,240,  1,240,  1,240,  1,240,  1,240,  1,240,  1,240
+	.byte   1,240,  1,255,240,  1,240,  1,240,  1,240,  1,240,  1,240,  1
+	.byte 240,  1,240,  1,213,240,  1, 80,  1,234,  3,191, 78,  0,  3,229
+	.byte   4,  3, 64,164,  0, 10,135,  0,160, 69, 68,  0, 44,128,136, 35
+	.byte 126,180,  3,144,  3,234,  0,138,128,  3,200,152,190, 10,  0,153
+	.byte 231,  8,  1,  0, 68,116,  8,  0,136,136,  0, 20,128, 16,  1,202
+	.byte 116,206,  0,202, 68, 68,  4,160,201,154,169,160,  3, 27,160,204
+	.byte  56,238,190,  0, 28, 19,198, 52, 59,186, 78,174,130,  2,230,172
+	.byte 228,140,136,136,  0,  7,212,  0,116,238,238,188,116,136,136,136
+	.byte 126,199,  0, 62,147,223, 19,251, 16, 81, 64, 85,144,  1,208,212
+	.byte  18,253,  0,  3,206,128, 15,238, 68, 15,  0, 76, 16,220, 77,221
+	.byte   0, 87, 68,204,236, 84,  0,212,224, 76,222, 69,236,228, 12,  3
+	.byte 236, 68,220,  0,208,220, 64, 44,  0, 31, 10,204, 68,196, 92,  3
+	.byte 142,208,  3, 14,208,  0,197,228,220,192, 68, 76,196,192, 65,204
+	.byte  80, 32,212,224, 12,197,221,  4,137,  0, 76,235,197,228, 92,236
+	.byte  12,197,  0, 68,229,228, 68,204, 85,197,204, 32,224,192, 67, 60
+	.byte  94, 69,220,196, 76,  8, 76,236,204,206,  0, 62,224, 76, 12,110
+	.byte 206, 20,  7, 35, 89,205, 32, 32, 35,231,131,239, 76, 35,238, 94
+	.byte   0, 11,220,196,204,  3,168, 36,180,205,  3,173,  4,157, 78,  0
+	.byte   0, 36,  0,  7, 77,  0, 22, 18, 94,  0,208, 19,216,204,236, 35
+	.byte 247, 78,183,  3,214, 77,  3,175,  3,243,204, 32, 49,240,  1,  0
+	.byte   1, 66,224, 48,255,205, 78,  0,236,  0, 59,238,235,  4, 79, 80
+	.byte 223,  0,133, 78,  0,  3,212, 67,247, 96, 24,255,240,  1,240,  1
+	.byte 240,  1,240,  1,240,  1,240,  1,240,  1,240,  1,255,240,  1,240
+	.byte   1,240,  1,240,  1,240,  1,240,  1,240,  1,240,  1,252,240,  1
+	.byte 240,  1,240,  1,240,  1,240,  1,160,  1,  0,  0
+
+	.global chapter_title_2_end
+chapter_title_2_end:
+
+	.balign 4
+chapter_title_2_size: .int 844