Skip to content
This repository was archived by the owner on Sep 26, 2024. It is now read-only.

Commit f4cbbbf

Browse files
laqieerlaqieer
committed
Chapter 333.
1 parent cf53a20 commit f4cbbbf

File tree

11 files changed

+1569
-12
lines changed

11 files changed

+1569
-12
lines changed

‎res/map/map.tiled-session‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"height": 4300,
44
"width": 2
55
},
6-
"activeFile": "new_map/event_chap_332.tmx",
6+
"activeFile": "new_map/event_chap_333.tmx",
77
"expandedProjectPaths": [
8-
"new_map",
9-
"event/unit"
8+
"event/unit",
9+
"new_map"
1010
],
1111
"file.lastUsedOpenFilter": "全部文件 (*)",
1212
"fileStates": {
@@ -385,6 +385,10 @@
385385
"scaleInDock": 1,
386386
"scaleInEditor": 2
387387
},
388+
"new_map/S6011.tsx": {
389+
"scaleInDock": 1,
390+
"scaleInEditor": 2
391+
},
388392
"new_map/event_chap_126.json": {
389393
"scale": 2.1760937499999997,
390394
"selectedLayer": 0,
@@ -1099,7 +1103,15 @@
10991103
"selectedLayer": 2,
11001104
"viewCenter": {
11011105
"x": 120.39922452789547,
1102-
"y": 160.14935018309762
1106+
"y": 160.60888920801324
1107+
}
1108+
},
1109+
"new_map/event_chap_333.tmx": {
1110+
"scale": 2.1760937499999997,
1111+
"selectedLayer": 2,
1112+
"viewCenter": {
1113+
"x": 120.39922452789547,
1114+
"y": 183.1263014288792
11031115
}
11041116
},
11051117
"new_map/event_chap_85.json": {
@@ -1124,12 +1136,14 @@
11241136
"map.tileWidth": 16,
11251137
"map.width": 15,
11261138
"openFiles": [
1127-
"new_map/event_chap_332.tmx"
1139+
"new_map/event_chap_333.tmx"
11281140
],
11291141
"project": "map.tiled-project",
11301142
"property.type": "Unit",
11311143
"recentFiles": [
1144+
"new_map/event_chap_333.tmx",
11321145
"new_map/event_chap_332.tmx",
1146+
"new_map/S6011.tsx",
11331147
"new_map/S5135.tsx",
11341148
"new_map/event_chap_331.tmx",
11351149
"new_map/event_chap_330.tmx",
@@ -1138,9 +1152,7 @@
11381152
"new_map/event_chap_329.tmx",
11391153
"new_map/S5132.tsx",
11401154
"new_map/event_chap_328.tmx",
1141-
"event/unit/enemy_unit_set.json",
1142-
"event/unit/player_unit_set.json",
1143-
"new_map/event_chap_327.tmx"
1155+
"event/unit/enemy_unit_set.json"
11441156
],
11451157
"tileset.lastUsedFormat": "tsx",
11461158
"tileset.tileSize": {

‎res/map/new_map/S6011.tsx‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<tileset version="1.9" tiledversion="1.9.0" name="S6011" tilewidth="16" tileheight="16" tilecount="300" columns="15">
3+
<image source="S6011.png" width="240" height="320"/>
4+
<wangsets>
5+
<wangset name="围墙" type="corner" tile="-1">
6+
<wangcolor name="" color="#ff0000" tile="-1" probability="1"/>
7+
<wangtile tileid="163" wangid="0,1,0,1,0,1,0,1"/>
8+
<wangtile tileid="164" wangid="0,1,0,1,0,1,0,1"/>
9+
<wangtile tileid="178" wangid="0,1,0,1,0,1,0,1"/>
10+
<wangtile tileid="179" wangid="0,1,0,1,0,1,0,1"/>
11+
</wangset>
12+
<wangset name="悬崖" type="corner" tile="-1">
13+
<wangcolor name="" color="#ff0000" tile="-1" probability="1"/>
14+
<wangtile tileid="74" wangid="0,1,0,1,0,1,0,1"/>
15+
<wangtile tileid="75" wangid="0,1,0,1,0,1,0,1"/>
16+
<wangtile tileid="76" wangid="0,1,0,1,0,1,0,1"/>
17+
<wangtile tileid="77" wangid="0,1,0,1,0,1,0,1"/>
18+
<wangtile tileid="87" wangid="0,1,0,1,0,1,0,1"/>
19+
<wangtile tileid="88" wangid="0,1,0,1,0,1,0,1"/>
20+
<wangtile tileid="102" wangid="0,1,0,1,0,1,0,1"/>
21+
</wangset>
22+
<wangset name="森林" type="corner" tile="-1">
23+
<wangcolor name="" color="#ff0000" tile="-1" probability="1"/>
24+
<wangtile tileid="209" wangid="0,1,0,1,0,1,0,1"/>
25+
<wangtile tileid="224" wangid="0,1,0,1,0,1,0,1"/>
26+
<wangtile tileid="284" wangid="0,1,0,1,0,1,0,1"/>
27+
<wangtile tileid="299" wangid="0,1,0,1,0,1,0,1"/>
28+
</wangset>
29+
<wangset name="建筑" type="corner" tile="-1">
30+
<wangcolor name="" color="#ff0000" tile="-1" probability="1"/>
31+
<wangtile tileid="3" wangid="0,1,0,1,0,1,0,1"/>
32+
<wangtile tileid="4" wangid="0,1,0,1,0,1,0,1"/>
33+
<wangtile tileid="5" wangid="0,1,0,1,0,1,0,1"/>
34+
<wangtile tileid="6" wangid="0,1,0,1,0,1,0,1"/>
35+
<wangtile tileid="7" wangid="0,1,0,1,0,1,0,1"/>
36+
<wangtile tileid="8" wangid="0,1,0,1,0,1,0,1"/>
37+
<wangtile tileid="9" wangid="0,1,0,1,0,1,0,1"/>
38+
<wangtile tileid="10" wangid="0,1,0,1,0,1,0,1"/>
39+
<wangtile tileid="11" wangid="0,1,0,1,0,1,0,1"/>
40+
<wangtile tileid="18" wangid="0,1,0,1,0,1,0,1"/>
41+
<wangtile tileid="19" wangid="0,1,0,1,0,1,0,1"/>
42+
<wangtile tileid="20" wangid="0,1,0,1,0,1,0,1"/>
43+
<wangtile tileid="21" wangid="0,1,0,1,0,1,0,1"/>
44+
<wangtile tileid="22" wangid="0,1,0,1,0,1,0,1"/>
45+
<wangtile tileid="23" wangid="0,1,0,1,0,1,0,1"/>
46+
<wangtile tileid="24" wangid="0,1,0,1,0,1,0,1"/>
47+
<wangtile tileid="25" wangid="0,1,0,1,0,1,0,1"/>
48+
<wangtile tileid="26" wangid="0,1,0,1,0,1,0,1"/>
49+
<wangtile tileid="33" wangid="0,1,0,1,0,1,0,1"/>
50+
<wangtile tileid="34" wangid="0,1,0,1,0,1,0,1"/>
51+
<wangtile tileid="35" wangid="0,1,0,1,0,1,0,1"/>
52+
<wangtile tileid="36" wangid="0,1,0,1,0,1,0,1"/>
53+
<wangtile tileid="37" wangid="0,1,0,1,0,1,0,1"/>
54+
<wangtile tileid="38" wangid="0,1,0,1,0,1,0,1"/>
55+
<wangtile tileid="39" wangid="0,1,0,1,0,1,0,1"/>
56+
<wangtile tileid="40" wangid="0,1,0,1,0,1,0,1"/>
57+
<wangtile tileid="41" wangid="0,1,0,1,0,1,0,1"/>
58+
<wangtile tileid="49" wangid="0,1,0,1,0,1,0,1"/>
59+
<wangtile tileid="50" wangid="0,1,0,1,0,1,0,1"/>
60+
<wangtile tileid="51" wangid="0,1,0,1,0,1,0,1"/>
61+
<wangtile tileid="52" wangid="0,1,0,1,0,1,0,1"/>
62+
<wangtile tileid="53" wangid="0,1,0,1,0,1,0,1"/>
63+
<wangtile tileid="54" wangid="0,1,0,1,0,1,0,1"/>
64+
<wangtile tileid="55" wangid="0,1,0,1,0,1,0,1"/>
65+
<wangtile tileid="66" wangid="0,1,0,1,0,1,0,1"/>
66+
<wangtile tileid="67" wangid="0,1,0,1,0,1,0,1"/>
67+
<wangtile tileid="68" wangid="0,1,0,1,0,1,0,1"/>
68+
</wangset>
69+
</wangsets>
70+
</tileset>

‎res/map/new_map/event_chap_333.tmx‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="15" height="20" tilewidth="16" tileheight="16" infinite="0" nextlayerid="4" nextobjectid="6">
3+
<tileset firstgid="1" source="S6011.tsx"/>
4+
<tileset firstgid="301" source="../event/unit/player_unit_set.json"/>
5+
<tileset firstgid="327" source="../event/unit/enemy_unit_set.json"/>
6+
<layer id="1" name="图块层 1" width="15" height="20">
7+
<data encoding="csv">
8+
1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,
9+
16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,
10+
31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,
11+
46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,
12+
61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,
13+
76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,
14+
91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,
15+
106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,
16+
121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,
17+
136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,
18+
151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,
19+
166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,
20+
181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,
21+
196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,
22+
211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,
23+
226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,
24+
241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,
25+
256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,
26+
271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,
27+
286,287,288,289,290,291,292,293,294,295,296,297,298,299,300
28+
</data>
29+
</layer>
30+
<objectgroup id="2" name="Enemy">
31+
<object id="2" name="Sword Fighter" gid="361" x="176.735" y="112.86" width="16" height="16">
32+
<properties>
33+
<property name="Unit" type="class" propertytype="Unit">
34+
<properties>
35+
<property name="AutoLevel" type="bool" value="true"/>
36+
<property name="Character" propertytype="Character" value="GenericEmblian"/>
37+
<property name="Equip" propertytype="Item" value="IronSword"/>
38+
<property name="Level" type="int" propertytype="Level" value="15"/>
39+
</properties>
40+
</property>
41+
</properties>
42+
</object>
43+
<object id="4" name="Green Mage" gid="381" x="48" y="112.86" width="15" height="16">
44+
<properties>
45+
<property name="Unit" type="class" propertytype="Unit">
46+
<properties>
47+
<property name="AutoLevel" type="bool" value="true"/>
48+
<property name="Character" propertytype="Character" value="GenericEmblian"/>
49+
<property name="Equip" propertytype="Item" value="Fire"/>
50+
<property name="Level" type="int" propertytype="Level" value="15"/>
51+
</properties>
52+
</property>
53+
</properties>
54+
</object>
55+
<object id="3" name="Lance Dragon" gid="397" x="80.73" y="65.86" width="16" height="21">
56+
<properties>
57+
<property name="Unit" type="class" propertytype="Unit">
58+
<properties>
59+
<property name="AutoLevel" type="bool" value="true"/>
60+
<property name="Character" propertytype="Character" value="GenericEmblian"/>
61+
<property name="Equip" propertytype="Item" value="IronLance"/>
62+
<property name="Level" type="int" propertytype="Level" value="15"/>
63+
</properties>
64+
</property>
65+
</properties>
66+
</object>
67+
</objectgroup>
68+
<objectgroup id="3" name="Player">
69+
<object id="5" name="Gustav" gid="319" x="112.58" y="320.46" width="15" height="20"/>
70+
</objectgroup>
71+
</map>

‎src/chapter_event.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,7 @@ extern const u8 * const event_chap_329[];
339339
extern const u8 * const event_chap_330[];
340340
extern const u8 * const event_chap_331[];
341341
extern const u8 * const event_chap_332[];
342+
extern const u8 * const event_chap_333[];
342343

343344
const u8 ** const events[] = {
344345
NULL,
@@ -675,6 +676,7 @@ const u8 ** const events[] = {
675676
event_chap_330,
676677
event_chap_331,
677678
event_chap_332,
679+
event_chap_333,
678680

679681
//[0x100 + 244 + 1] = event_chap_233,
680682
};

‎src/chapter_map.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1088,6 +1088,9 @@ extern const u8 S5134Pal[];
10881088
extern const u8 S5135Tiles[];
10891089
extern const u8 S5135_cfg[];
10901090
extern const u8 S5135Pal[];
1091+
extern const u8 S6011Tiles[];
1092+
extern const u8 S6011_cfg[];
1093+
extern const u8 S6011Pal[];
10911094

10921095
const u8 * const maps[] = {
10931096
map_chap_pre,
@@ -1516,6 +1519,7 @@ const u8 * const tilesetImgs[] = {
15161519
S5133Tiles,
15171520
S5134Tiles,
15181521
S5135Tiles,
1522+
S6011Tiles,
15191523

15201524
//[0x100 + 244 + 1] = S4074Tiles,
15211525
};
@@ -1855,6 +1859,7 @@ const u8 * const tilesetCfgs[] = {
18551859
S5133_cfg,
18561860
S5134_cfg,
18571861
S5135_cfg,
1862+
S6011_cfg,
18581863

18591864
//[0x100 + 244 + 1] = S4074_cfg,
18601865
};
@@ -2194,6 +2199,7 @@ const u8 * const tilesetPals[] = {
21942199
S5133Pal,
21952200
S5134Pal,
21962201
S5135Pal,
2202+
S6011Pal,
21972203

21982204
//[0x100 + 244 + 1] = S4074Pal,
21992205
};

‎src/chapter_setting.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,7 @@ const struct Chapter chapters[] = {
850850
DEFINE_SIMPLE_EXT_CHAPTER(330, "5.13.3)330", MUSIC_FE_PATH_OF_RADIANCE_LIFE_RETURNS)
851851
DEFINE_SIMPLE_EXT_CHAPTER(331, "5.13.4)331", MUSIC_FE_PATH_OF_RADIANCE_HIS_FATHERS_SON)
852852
DEFINE_SIMPLE_EXT_CHAPTER(332, "5.13.5)332", MUSIC_FE_PATH_OF_RADIANCE_BITTERSWEET_VICTORY)
853+
DEFINE_SIMPLE_EXT_CHAPTER(333, "6.1.1)333", MUSIC_FE_H_FAN_FEST)
853854

854855
//[0x100 + 244] = DEFINE_SIMPLE_EXT_CHAPTER_WITH_MAP_CHANGE(233, "4.7.4)233", MUSIC_FE_PATH_OF_RADIANCE_POWER_HUNGRY_FOOL, 36)
855856
};

‎src/res/map/event/event_chap_333.S‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
//Exported by Tiled extension: ChapterEvent.js
2+
#include "event.h"
3+
.section .rodata
4+
.align 2
5+
.global event_chap_333
6+
event_chap_333:
7+
.word TurnBasedEvents
8+
.word CharacterBasedEvents
9+
.word LocationBasedEvents
10+
.word MiscBasedEvents
11+
.word TrapsEliwoodMode
12+
.word TrapsHectorMode
13+
.word EnemyUnitsENM
14+
.word EnemyUnitsENM
15+
.word EnemyUnitsENM
16+
.word EnemyUnitsENM
17+
.word AllyUnitsENM
18+
.word AllyUnitsENM
19+
.word AllyUnitsENM
20+
.word AllyUnitsENM
21+
.word BeginningScene
22+
.word EndingScene
23+
TurnBasedEvents:
24+
LoadBeginningScene
25+
END_MAIN
26+
CharacterBasedEvents:
27+
END_MAIN
28+
LocationBasedEvents:
29+
END_MAIN
30+
MiscBasedEvents:
31+
CauseGameOverIfLordDies
32+
DefeatAll(EndingScene)
33+
END_MAIN
34+
BeginningScene:
35+
MUSC MUSIC_FE_H_SERIOUS_6
36+
ShowBG(BG002_PlainForestInside)
37+
TEX1 MID_SCENARIO_OPENING_S6011
38+
REMA
39+
ClearSpecialSkillCD
40+
LOU1 EnemyUnitsENM
41+
ENUN
42+
LOU1 AllyUnitsENM
43+
ENUN
44+
UpdateSpecialSkillCD
45+
MUSC MUSIC_FE_H_SERIOUS_6
46+
TEX1 MID_SCENARIO_MAP_BEGIN_S6011
47+
REMA
48+
ENDA
49+
EndingScene:
50+
ClearSpecialSkillCD
51+
MUSC MUSIC_FE_H_EVENT_1
52+
TEX1 MID_SCENARIO_MAP_END_S6011
53+
REMA
54+
MUSC MUSIC_FE_H_SERIOUS_6
55+
ShowBG(BG002_PlainForestInside)
56+
TEX1 MID_SCENARIO_ENDING_S6011
57+
REMA
58+
MoveToChapter(334)
59+
ENDA
60+
AllyUnitsENM:
61+
UNIT_ALLY_JOINED(Gustav,Paladin,Anna,7,19,7,19)
62+
END_UNIT
63+
EnemyUnitsENM:
64+
UNIT(GenericEmblian,Hero,0,15,SIDE_ENEMY,1,11,6,11,6,1,0,0,0,0,0,0,0) // Sword Fighter
65+
UNIT(GenericEmblian,Sage,0,15,SIDE_ENEMY,1,3,6,3,6,55,0,0,0,0,0,0,0) // Green Mage
66+
UNIT(GenericEmblian,WyvernLord,0,15,SIDE_ENEMY,1,5,3,5,3,20,0,0,0,0,0,0,0) // Lance Dragon
67+
END_UNIT
68+
NPCUnits:
69+
END_UNIT
70+
TrapsEliwoodMode:
71+
TrapsHectorMode:
72+
END_TRAP

0 commit comments

Comments
 (0)