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

Commit

Permalink
add chapter 2 event & story; balance
Browse files Browse the repository at this point in the history 
Signed-off-by: laqieer <[email protected]>
  • Loading branch information
@laqieer
laqieer committed Feb 20, 2020
1 parent e4273d6 commit 782e025
Show file tree
Hide file tree
Showing 8 changed files with 230 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ process_gfx_portrait(GFX_SRCS_PORTRAIT portrait_alfonse.grit portrait_Anna_comma
add_executable(${PROJECT_NAME} ${DIR_SRCS} ${GFX_SRCS} ${GFX_SRCS_PORTRAIT}
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/map/event/event_chap_template.s src/res/map/event/event_chap_pre.s src/res/map/event/event_chap_1.s src/res/map/event/event_chap_2.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
src/res/music/native_instrument_map.s src/res/music/music_event_plain_1.s src/res/music/music_event_serious_1.s src/res/music/music_event_serious_3.s src/res/music/music_map_fe3.s
src/res/animation/character/animation_Sharena.s src/res/animation/character/animation_Sharena_disarmed.s
Expand Down
2 changes: 1 addition & 1 deletion res/map/event/event_chap_1.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ ENDA
EndingScene:
TEX1 TEXT_CHAP_1_ED_1
TEX1 TEXT_CHAP_1_ED_2
MNCH 0
MNCH 2
ENDA

AllyUnitsENM:
Expand Down
71 changes: 71 additions & 0 deletions res/map/event/event_chap_2.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
// Chapter prologue event

#include EAStdlib.event
#include "Project Definition.txt"

PointerList:
POIN TurnBasedEvents
POIN CharacterBasedEvents
POIN LocationBasedEvents
POIN MiscBasedEvents
POIN TrapsEliwoodMode
POIN TrapsHectorMode
POIN EnemyUnitsENM
POIN EnemyUnitsENM
POIN EnemyUnitsENM
POIN EnemyUnitsENM
POIN AllyUnitsENM
POIN AllyUnitsENM
POIN AllyUnitsENM
POIN AllyUnitsENM
POIN BeginningScene
POIN EndingScene

TurnBasedEvents:
TURN 0x0 BeginningScene [1,0] 0x0 0x0
TURN 0x0 EndingScene [7,0] 0x8 0x0 // Xander is hard to defeat now :(, so you can wait until 7th turn :)
END_MAIN

CharacterBasedEvents:
END_MAIN

LocationBasedEvents:
END_MAIN

MiscBasedEvents:
CauseGameOverIfLordDies
DefeatBoss(EndingScene)
WORD 2
END_MAIN

BeginningScene:
LOU1 EnemyUnitsENM
ENUN
LOU1 AllyUnitsENM
ENUN
TEX1 TEXT_CHAP_2_OP
ENDA

EndingScene:
TEX1 TEXT_CHAP_2_ED
MNCH 0
ENDA

AllyUnitsENM:
UNIT Alfonse AlfonseLord Anna 0x8 [1,19] [1,19] [0x0,0x0,0x0,0x0] [0x0,0x0,0x0,0x0]
UNIT Anna AnnaLord 0x0 0x8 [0,19] [0,19] [0x0,0x0,0x0,0x0] [0x0,0x0,0x0,0x0]
UNIT Sharena SharenaLord Anna 0x8 [0,18] [0,18] [0x0,0x0,0x0,0x0] [0x0,0x0,0x0,0x0]
UNIT

EnemyUnitsENM:
UNIT Xander Cavalier 0x0 0x1c [12,2] [12,2] [SteelSword,0x0,0x0,0x0] [0x0,0x20,0x0,0x0]
UNIT GenericSoldierEmblianSuperWeak Myrmidon Xander 0x15 [11,2] [11,2] [IronSword,0x0,0x0,0x0] [0x0,0x0,0x0,0x0]
UNIT GenericSoldierEmblianSuperWeak Troubadour Xander 0x15 [13,2] [13,2] [Heal,0x0,0x0,0x0] [0xe,0x0,0x0,0x0]
UNIT GenericSoldierEmblianSuperWeak Archer Xander 0x15 [12,4] [12,4] [IronBow,0x0,0x0,0x0] [0x0,0x0,0x0,0x0]
UNIT

TrapsEliwoodMode:
ENDTRAP

TrapsHectorMode:
ENDTRAP
2 changes: 2 additions & 0 deletions src/chapter_event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@
extern const u8 * const event_chap_template[];
extern const u8 * const event_chap_pre[];
extern const u8 * const event_chap_1[];
extern const u8 * const event_chap_2[];

const u8 ** const events[] = {
NULL,
event_chap_template,
event_chap_pre,
event_chap_1,
event_chap_2,
};

const u8 *** const pEvents = events;
2 changes: 1 addition & 1 deletion src/character.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ const struct Character characters[] = {

{1333, 527, 89, 62, 130, 0, 0, 0, 13, 30, 16, 19, 11, 9, 15, 10, 0, 181, 0, 0, 0, 0, 0, 0, 0, 85, 50, 10, 10, 10, 15, 30, 0, 13, 0, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 4} , // 0x59 Jerme

{1334, 528, 90, 42, 131, 0, 0, 0, 11, 20, 8 - 4, 5 - 4, 5 - 4, 9 - 4, 4 - 4, 5, 0, 181, 0, 0, 0, 0, 0, 0, 0, 44 * 2, 32 * 1.5, 30 * 1.5, 24 * 1.5, 37 * 1.2, 17 * 1.2, 25 * 1.2, 0x7c, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4} , // 0x5A Xander
{1334, 528, 90, 42, 0x116, 0, 0, 0, 11, 20, 8 - 4, 5 - 4, 5 - 4, 9 - 4, 4 - 4, 5, 1, 181, 0, 0, 0, 0, 0, 0, 0, 44 * 2, 32 * 1.5, 30 * 1.5, 24 * 1.5, 37 * 1.2, 17 * 1.2, 25 * 1.2, 0x7c, 76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 4} , // 0x5A Xander

{1335, 529, 91, 90, 99, 0, 0, 0, 17, 25, 16, 14, 16, 17, 18, 0, 0, 0, 0, 0, 0, 181, 181, 0, 0, 85, 50, 10, 10, 10, 15, 30, 0, 86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0} , // 0x5B Sonia

Expand Down
2 changes: 1 addition & 1 deletion src/res/map/event/event_chap_1.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ BeginningScene:
EndingScene:
.byte 0x0D, 0x00, 0x00, 0x00, 0x4A, 0x12, 0x00, 0x00
.byte 0x0D, 0x00, 0x00, 0x00, 0x4B, 0x12, 0x00, 0x00
.byte 0x7F, 0x00, 0x00, 0x00
.byte 0x7F, 0x00, 0x02, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
AllyUnitsENM:
.byte 0x01, 0x01, 0x02, 0x08, 0x07, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
Expand Down
67 changes: 67 additions & 0 deletions src/res/map/event/event_chap_2.s
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
.section .rodata
.align 2
.global event_chap_2
event_chap_2:
PointerList:
.word TurnBasedEvents
.word CharacterBasedEvents
.word LocationBasedEvents
.word MiscBasedEvents
.word TrapsEliwoodMode
.word TrapsHectorMode
.word EnemyUnitsENM
.word EnemyUnitsENM
.word EnemyUnitsENM
.word EnemyUnitsENM
.word AllyUnitsENM
.word AllyUnitsENM
.word AllyUnitsENM
.word AllyUnitsENM
.word BeginningScene
.word EndingScene
TurnBasedEvents:
.byte 0x02, 0x00, 0x00, 0x00
.word BeginningScene
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x00, 0x00, 0x00
.word EndingScene
.byte 0x07, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
CharacterBasedEvents:
.byte 0x00, 0x00, 0x00, 0x00
LocationBasedEvents:
.byte 0x00, 0x00, 0x00, 0x00
MiscBasedEvents:
.byte 0x01, 0x00, 0x00, 0x00, 0x1C, 0xF7, 0xD6, 0x08, 0x65, 0x00, 0x00, 0x00
.byte 0x01, 0x00, 0x00, 0x00
.word EndingScene
.byte 0x02, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
BeginningScene:
.byte 0x30, 0x00, 0x00, 0x00
.word EnemyUnitsENM
.byte 0x39, 0x00, 0x00, 0x00
.byte 0x30, 0x00, 0x00, 0x00
.word AllyUnitsENM
.byte 0x39, 0x00, 0x00, 0x00
.byte 0x0D, 0x00, 0x00, 0x00, 0x4D, 0x12, 0x00, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
EndingScene:
.byte 0x0D, 0x00, 0x00, 0x00, 0x4E, 0x12, 0x00, 0x00
.byte 0x7F, 0x00, 0x00, 0x00
.byte 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
AllyUnitsENM:
.byte 0x01, 0x01, 0x02, 0x08, 0x01, 0x13, 0x01, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x02, 0x03, 0x00, 0x08, 0x00, 0x13, 0x00, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x03, 0x02, 0x02, 0x08, 0x00, 0x12, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
EnemyUnitsENM:
.byte 0x5A, 0x28, 0x00, 0x1C, 0x0C, 0x02, 0x0C, 0x02, 0x03, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00
.byte 0x88, 0x0E, 0x5A, 0x15, 0x0B, 0x02, 0x0B, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x88, 0x2C, 0x5A, 0x15, 0x0D, 0x02, 0x0D, 0x02, 0x4A, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00
.byte 0x88, 0x18, 0x5A, 0x15, 0x0C, 0x04, 0x0C, 0x04, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
TrapsEliwoodMode:
.byte 0x00
TrapsHectorMode:
.byte 0x00
87 changes: 86 additions & 1 deletion src/text.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,92 @@ const char* const texts[] = {
// Chapter 2 goal
[TEXT_CHAP_STATUS_GOAL_DEFEAT_BOSS_XANDER] = "敵隊長マークスを倒す",


// Chapter 2 opening
[TEXT_CHAP_2_OP] = TCC_OPEN_LEFT
TCC_LOAD_FACE PORTARIT_VERONICA
"いい子ね、あたしの英雄たち。。。" TCC_NEWLINE
"もっと奪って、もっと壊して。。。" TCC_NEWLINE
"邪魔する人は殺していいの。" TCC_NEWLINE TCC_PUSH_A
"この国さえなくなれば、" TCC_NEWLINE
"邪魔者はだれもいなくなる。。。" TCC_NEWLINE
"私は全部の英雄を手に出来る。" TCC_PUSH_A
TCC_OPEN_RIGHT
TCC_LOAD_FACE PORTRAIT_ALFONSE
"そうはさせない！" TCC_NEWLINE
"エンブラ帝国ヴェロニカ皇女。。。" TCC_NEWLINE
"国を蹂躙すること、僕たちが許しはしない。" TCC_PUSH_A
TCC_OPEN_LEFT
"もう戻ってきたの。。。？" TCC_NEWLINE
"せっかく遊び相手を用意してあげたのに、" TCC_NEWLINE
"面倒な人たち。。。" TCC_NEWLINE TCC_PUSH_A
"。。。？あなたは。。。" TCC_NEWLINE
"その神器、まさか。。。" TCC_NEWLINE
"伝承の召喚師なの。。。？" TCC_NEWLINE TCC_PUSH_A
"そう。。。それなら、" TCC_NEWLINE
"あなたを最初に殺すわ。。。" TCC_PUSH_A
TCC_OPEN_MID_LEFT
TCC_LOAD_FACE PORTARIT_XANDER
"。。。承知した、ヴェロニカ皇女。" TCC_NEWLINE
"私が行こう。" TCC_PUSH_A
TCC_OPEN_LEFT
TCC_CLEAR_FACE
TCC_OPEN_RIGHT
"あれは暗夜の英雄、マークス！？" TCC_NEWLINE
"厄介だな。。。" TCC_NEWLINE
"彼は圧倒的な力を持っている。" TCC_PUSH_A
TCC_OPEN_MID_RIGHT
TCC_LOAD_FACE PORTRAIT_SHARENA
"で、でも大丈夫です！" TCC_NEWLINE
TCC_TACTICIAN_NAME"さんは、" TCC_NEWLINE
"私たちが守って見せますから！" TCC_PUSH_A
TCC_OPEN_FAR_RIGHT
TCC_LOAD_FACE PORTRAIT_ANNA
"行くわよ、みんあ。" TCC_NEWLINE
"アスク王国特務機関の力。。。" TCC_NEWLINE
"あの皇女サマに見つけてやりましょ！" TCC_PUSH_A
,

// Chapter 2 ending
[TEXT_CHAP_2_ED] = TCC_OPEN_LEFT
TCC_LOAD_FACE PORTARIT_VERONICA
"つまんないの。。。" TCC_NEWLINE
"私はまた、ひとりぼっち。。。" TCC_NEWLINE TCC_PUSH_A
"むしろに帰って、" TCC_NEWLINE
"暖かい紅茶でも飲もうっと。。。" TCC_NEWLINE TCC_PUSH_A
TCC_CLEAR_FACE
TCC_OPEN_RIGHT
TCC_LOAD_FACE PORTRAIT_ANNA
"。。。。。。。。。" TCC_NEWLINE
"なんとか撤退してくれたみたいね。" TCC_NEWLINE
"皇女サマも、英雄たちも。" TCC_PUSH_A
TCC_OPEN_MID_RIGHT
TCC_LOAD_FACE PORTRAIT_ALFONSE
"ああ。" TCC_NEWLINE
"だが、これで終わるとは思えない。" TCC_NEWLINE
"彼らはまた、この地に侵攻して来るだろう。" TCC_PUSH_A
TCC_OPEN_FAR_RIGHT
TCC_LOAD_FACE PORTRAIT_SHARENA
"とにかくしつこいんですよね。" TCC_NEWLINE
"話し合おうって言ってるのに、" TCC_NEWLINE
"何度も何度も攻め込んでくるし！" TCC_NEWLINE TCC_PUSH_A
"大体、エンブラ帝国の皇帝は" TCC_NEWLINE
"いつになったらちゃんとした" TCC_NEWLINE
"外交をしてくださるんでしょう！" TCC_PUSH_A
TCC_OPEN_RIGHT
"シャロン、感情的になってはだめよ。" TCC_NEWLINE
"そうれじゃ平和なんて夢のまた夢。" TCC_NEWLINE
"機関の人間は、いつも冷静に。いい？" TCC_PUSH_A
TCC_OPEN_FAR_RIGHT
"はあい。" TCC_NEWLINE
"わかりました、アンナ隊長。" TCC_PUSH_A
TCC_OPEN_MID_RIGHT
"すまない。。。"TCC_TACTICIAN_NAME"。" TCC_NEWLINE
"こんな戦いに巻き込んでしまって、" TCC_NEWLINE
"でも僕たちは、君が必要なんだ。" TCC_NEWLINE TCC_PUSH_A
"どうかこれからも力を貸して欲しい。" TCC_NEWLINE
"特務機関。。。" TCC_NEWLINE
"「ヴァイス・ブレイヴ」の一員として。" TCC_PUSH_A
,
};

extern int lastTextID;
Expand Down

0 comments on commit 782e025

Please sign in to comment.