Add scenarios in chapter events. #22.

laqieer · Aug 11, 2022 · 4178662 · 4178662
1 parent 955e726
commit 4178662
Show file tree

Hide file tree

Showing 9 changed files with 1,096 additions and 4 deletions.
diff --git a/content/chapter_event/X0001Event.S b/content/chapter_event/X0001Event.S
@@ -7,6 +7,7 @@
 	#include "background_id.h"
 	#include "music_id.h"
 
+	#include "event_text_id.h"
 	.section .rodata
 	.align 2
 	.global X0001Event
@@ -24,12 +25,18 @@ MiscBasedEvents:
 	DefeatAll(EndingScene)
 	END_MAIN
 BeginningScene:
+	ShowBG(BG001_Brave)
+	MUSC BGM_EVENT_PLAIN_01
+	TEX1 EvTx_X0001_MID_SCENARIO_OPENING
 	LOU1 EnemyUnits
 	ENUN
 	LOU1 AllyUnits
 	ENUN
+	MUSC BGM_MAP_FES_01
+	TEX1 EvTx_X0001_MID_SCENARIO_MAP_BEGIN
 	ENDB
 EndingScene:
+	TEX1 EvTx_X0001_MID_SCENARIO_MAP_END
 	MNCH X0001Next
 	ENDA
 AllyUnits:

diff --git a/content/chapter_event/XX001Event.S b/content/chapter_event/XX001Event.S
@@ -7,6 +7,7 @@
 	#include "background_id.h"
 	#include "music_id.h"
 
+	#include "event_text_id.h"
 	.section .rodata
 	.align 2
 	.global XX001Event
@@ -28,8 +29,14 @@ BeginningScene:
 	ENUN
 	LOU1 AllyUnits
 	ENUN
+	MUSC BGM_EVENT_SERIOUS_02
+	TEX1 EvTx_XX001_MID_SCENARIO_MAP_BEGIN
 	ENDB
 EndingScene:
+	TEX1 EvTx_XX001_MID_SCENARIO_MAP_END
+	ShowBG(BG005_Castle)
+	MUSC BGM_EVENT_SERIOUS_03
+	TEX1 EvTx_XX001_MID_SCENARIO_ENDING
 	MNCH XX001Next
 	ENDA
 AllyUnits:

diff --git a/content/texts_cn.c b/content/texts_cn.c
@@ -5,8 +5,8 @@
 
 const char * const textsCN[] = {
     #include "../locale/CNZH/FE7.txt"
-    #include "../locale/CNZH/misc.txt"
     #include "../locale/CNZH/scenario.txt"
+    #include "../locale/CNZH/misc.txt"
     #include "../locale/CNZH/unit.txt"
     #include "../locale/CNZH/skill.txt"
     #include "../locale/CNZH/stage.txt"

diff --git a/content/texts_en.c b/content/texts_en.c
@@ -5,8 +5,8 @@
 
 const char * const textsEN[] = {
     #include "../locale/USEN/FE7.txt"
-    #include "../locale/USEN/misc.txt"
     #include "../locale/USEN/scenario.txt"
+    #include "../locale/USEN/misc.txt"
     #include "../locale/USEN/unit.txt"
     #include "../locale/USEN/skill.txt"
     #include "../locale/USEN/stage.txt"

diff --git a/content/texts_jp.c b/content/texts_jp.c
@@ -5,8 +5,8 @@
 
 const char * const textsJP[] = {
     [TID_START] = NULL,
-    #include "../locale/JPJA/misc.txt"
     #include "../locale/JPJA/scenario.txt"
+    #include "../locale/JPJA/misc.txt"
     #include "../locale/JPJA/unit.txt"
     #include "../locale/JPJA/skill.txt"
     #include "../locale/JPJA/stage.txt"

diff --git a/include/event_text_id.h b/include/event_text_id.h
diff --git a/include/music_id.h b/include/music_id.h
@@ -1008,6 +1008,30 @@
 #define BGM_MNS_FE08_04 1004
 #define BGM_MNS_FE15_01_1 1005
 #define BGM_MNS_FE15_01_2 1006
+#define BGM_MNS_FE15_01 BGM_MNS_FE15_01_1
 #define BGM_MNS_FE16_02 1007
 
 #define BGM_MNS_FE07_03 SONG065
+#define BGM_MENU_TITLE SONG090
+
+#define BGM_NULL 0
+
+#define BGM_AMB_USERNAME BGM_NULL
+#define BGM_EVENT_PLAIN_02 BGM_EVENT_PLAIN_01
+#define BGM_EVENT_PLAIN_03 BGM_EVENT_PLAIN_01
+#define BGM_EVENT_PLAIN_03_2 BGM_EVENT_PLAIN_03
+#define BGM_EVENT_SERIOUS_01 SONG050
+#define BGM_EVENT_SERIOUS_02 SONG082
+#define BGM_EVENT_SERIOUS_03 SONG081
+#define BGM_EVENT_SERIOUS_04 SONG074
+#define BGM_MAP_FE14_05 BGM_NULL
+#define BGM_MNS_FE14_07 BGM_NULL
+#define BGM_MAP_FE14_14 BGM_MNS_FE14_07
+#define BGM_MAP_FES_02 BGM_NULL
+#define BGM_MAP_FES_03 BGM_NULL
+#define BGM_MAP_FES_04 BGM_NULL
+#define BGM_MENU_TENRO BGM_NULL
+#define BGM_MAP_FE04_08 BGM_NULL
+#define BGM_MNS_FE04_02 BGM_MAP_FE04_08
+#define BGM_MNS_FE10_01 BGM_NULL
+#define BGM_MNS_FE14_06 BGM_NULL
diff --git a/include/text_id.h b/include/text_id.h
@@ -3,8 +3,8 @@
 enum TEXT_ID {
     TID_START = 0x1236,
 
-    #include "../locale/key/misc.txt"
     #include "../locale/key/scenario.txt"
+    #include "../locale/key/misc.txt"
     #include "../locale/key/unit.txt"
     #include "../locale/key/skill.txt"
     #include "../locale/key/stage.txt"