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

Commit

Permalink
Chapter 144
Browse files Browse the repository at this point in the history
  • Loading branch information
@laqieer
laqieer committed Jul 20, 2020
1 parent 4663cb2 commit 7733833
Show file tree
Hide file tree
Showing 8 changed files with 2,281 additions and 0 deletions.
414 changes: 414 additions & 0 deletions res/map/new_map/S3025.json
View file

Large diffs are not rendered by default.

458 changes: 458 additions & 0 deletions res/map/new_map/event_chap_144.json
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/chapter_event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ extern const u8 * const event_chap_140[];
extern const u8 * const event_chap_141[];
extern const u8 * const event_chap_142[];
extern const u8 * const event_chap_143[];
extern const u8 * const event_chap_144[];

const u8 ** const events[0xff] = {
NULL,
Expand Down Expand Up @@ -298,8 +299,10 @@ const u8 ** const events[0xff] = {
event_chap_141,
event_chap_142,
event_chap_143,
event_chap_144,
};

extern const u8 * const event_chap_144_EN[];
extern const u8 * const event_chap_143_EN[];
extern const u8 * const event_chap_140_EN[];
extern const u8 * const event_chap_139_EN[];
Expand Down Expand Up @@ -552,6 +555,7 @@ const u8 ** const events_EN[0xff] = {
event_chap_141,
event_chap_142,
event_chap_143_EN,
event_chap_144_EN,
};

const u8 *** const pEvents = events;
Expand Down
6 changes: 6 additions & 0 deletions src/chapter_map.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,9 @@ extern const u8 S3023Pal[];
extern const u8 S3024Tiles[];
extern const u8 S3024_cfg[];
extern const u8 S3024Pal[];
extern const u8 S3025Tiles[];
extern const u8 S3025_cfg[];
extern const u8 S3025Pal[];

const u8 * const maps[0xff] = {
map_chap_pre,
Expand Down Expand Up @@ -746,6 +749,7 @@ const u8 * const tilesetImgs[] = {
S3022Tiles,
S3023Tiles,
S3024Tiles,
S3025Tiles,
};

const u8 ** const pTilesetImgs = tilesetImgs;
Expand Down Expand Up @@ -896,6 +900,7 @@ const u8 * const tilesetCfgs[] = {
S3022_cfg,
S3023_cfg,
S3024_cfg,
S3025_cfg,
};

const u8 ** const pTilesetCfgs = tilesetCfgs;
Expand Down Expand Up @@ -1046,6 +1051,7 @@ const u8 * const tilesetPals[] = {
S3022Pal,
S3023Pal,
S3024Pal,
S3025Pal,
};

const u8 ** const pTilesetPals = tilesetPals;
Expand Down
1 change: 1 addition & 0 deletions src/chapter_setting.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,7 @@ const struct Chapter chapters[0xff] = {
DEFINE_SIMPLE_CHAPTER_NEW(141, "3.2.2)141", MUSIC_FE_H_MAP_BOOK_2)
DEFINE_SIMPLE_CHAPTER_NEW(142, "3.2.3)142", MUSIC_FE_H_MAP_BOOK_2)
DEFINE_SIMPLE_CHAPTER_NEW(143, "3.2.4)143", MUSIC_FE_H_MAP_BOOK_2)
DEFINE_SIMPLE_CHAPTER_NEW(144, "3.2.5)144", MUSIC_FE8_MAP_TOWER)
};

const struct Chapter * const pChapters2 = chapters;
Expand Down
88 changes: 88 additions & 0 deletions src/res/map/event/event_chap_144.S
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
//Exported by Tiled extension: ChapterEvent.js
#include "event.h"
.section .rodata
.align 2
.global event_chap_144
event_chap_144:
.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:
LoadBeginningScene
TurnEvent(3, LoadEnemyUnitsTurn3, TURN_MOMENT_PLAYER_PHASE, 0)
TurnEvent(4, LoadEnemyUnitsTurn4, TURN_MOMENT_PLAYER_PHASE, 0)
END_MAIN
CharacterBasedEvents:
END_MAIN
LocationBasedEvents:
END_MAIN
MiscBasedEvents:
CauseGameOverIfLordDies
DefeatAll(EndingScene)
END_MAIN
BeginningScene:
MUSC MUSIC_FE_H_SERIOUS_6
TEX1 MID_SCENARIO_OPENING_S3025
REMA
ClearSpecialSkillCD
LOU1 EnemyUnitsENM
ENUN
LOU1 AllyUnitsENM
ENUN
UpdateSpecialSkillCD
MUSC MUSIC_FE_H_SERIOUS_6
TEX1 MID_SCENARIO_MAP_BEGIN_S3025
REMA
ENDA
EndingScene:
ClearSpecialSkillCD
MUSC MUSIC_FE_H_EVENT_1
TEX1 MID_SCENARIO_MAP_END_S3025
REMA
MUSC MUSIC_FE_H_SERIOUS_6
TEX1 MID_SCENARIO_ENDING_S3025
REMA
MNCH 145
ENDA
AllyUnitsENM:
UNIT_ALLY_JOINED(Veronica,VeronicaPrincess,Anna,6,0,6,0)
UNIT_ALLY_JOINED(Loki,Bishop_F,Anna,7,0,7,0)
END_UNIT
EnemyUnitsENM:
UNIT(Srasir,Skelemonk,0,10,SIDE_ENEMY,1,6,19,6,19,Fire,None,0,0,AttackInRange,DontMove,Cautious,DefaultAI4) // スラシル
UNIT(GenericHelWeak,UndeadManakete,0,10,SIDE_ENEMY,1,7,19,7,19,WretchedAir,None,0,0,AttackInRange,DelayedPursue,Cautious,DefaultAI4) // ラウアファヴニル
UNIT(GenericHelWeak,Bonewalker,0,10,SIDE_ENEMY,1,9,19,9,19,IronLance,None,0,0,AttackInRange,Pursue,Cautious,DefaultAI4) // ランスナイト
UNIT(GenericHelWeak,Bonewalker,0,10,SIDE_ENEMY,1,4,16,4,16,IronLance,None,0,0,AttackInRange,Pursue,Cautious,DefaultAI4) // ランスアーマー
END_UNIT
NPCUnits:
END_UNIT
LoadEnemyUnitsTurn3:
LOU1 EnemyUnitsTurn3
ENUN
ENDA
EnemyUnitsTurn3:
UNIT(GenericHelWeak,Bonewalker,0,10,SIDE_ENEMY,1,10,19,10,19,IronSword,None,0,0,AttackInRange,Pursue,Cautious,DefaultAI4) // ソードナイト
END_UNIT
LoadEnemyUnitsTurn4:
LOU1 EnemyUnitsTurn4
ENUN
ENDA
EnemyUnitsTurn4:
UNIT(GenericHelWeak,GhostFire,0,10,SIDE_ENEMY,1,5,19,5,19,Lightning,None,0,0,AttackInRange,Pursue,Cautious,DefaultAI4) // ブルーペガサス
END_UNIT
TrapsEliwoodMode:
TrapsHectorMode:
END_TRAP
88 changes: 88 additions & 0 deletions src/res/map/event/event_chap_144_EN.S
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
//Exported by Tiled extension: ChapterEvent.js
#include "event.h"
.section .rodata
.align 2
.global event_chap_144_EN
event_chap_144_EN:
.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:
LoadBeginningScene
TurnEvent(3, LoadEnemyUnitsTurn3, TURN_MOMENT_PLAYER_PHASE, 0)
TurnEvent(4, LoadEnemyUnitsTurn4, TURN_MOMENT_PLAYER_PHASE, 0)
END_MAIN
CharacterBasedEvents:
END_MAIN
LocationBasedEvents:
END_MAIN
MiscBasedEvents:
CauseGameOverIfLordDies
DefeatAll(EndingScene)
END_MAIN
BeginningScene:
MUSC MUSIC_FE_H_SERIOUS_6
TEX1 MID_SCENARIO_OPENING_S3025_EN
REMA
ClearSpecialSkillCD
LOU1 EnemyUnitsENM
ENUN
LOU1 AllyUnitsENM
ENUN
UpdateSpecialSkillCD
MUSC MUSIC_FE_H_SERIOUS_6
TEX1 MID_SCENARIO_MAP_BEGIN_S3025_EN
REMA
ENDA
EndingScene:
ClearSpecialSkillCD
MUSC MUSIC_FE_H_EVENT_1
TEX1 MID_SCENARIO_MAP_END_S3025_EN
REMA
MUSC MUSIC_FE_H_SERIOUS_6
TEX1 MID_SCENARIO_ENDING_S3025_EN
REMA
MNCH 145
ENDA
AllyUnitsENM:
UNIT_ALLY_JOINED(Veronica,VeronicaPrincess,Anna,6,0,6,0)
UNIT_ALLY_JOINED(Loki,Bishop_F,Anna,7,0,7,0)
END_UNIT
EnemyUnitsENM:
UNIT(Srasir,Skelemonk,0,10,SIDE_ENEMY,1,6,19,6,19,Fire,None,0,0,AttackInRange,DontMove,Cautious,DefaultAI4) // スラシル
UNIT(GenericHelWeak,UndeadManakete,0,10,SIDE_ENEMY,1,7,19,7,19,WretchedAir,None,0,0,AttackInRange,DelayedPursue,Cautious,DefaultAI4) // ラウアファヴニル
UNIT(GenericHelWeak,Bonewalker,0,10,SIDE_ENEMY,1,9,19,9,19,IronLance,None,0,0,AttackInRange,Pursue,Cautious,DefaultAI4) // ランスナイト
UNIT(GenericHelWeak,Bonewalker,0,10,SIDE_ENEMY,1,4,16,4,16,IronLance,None,0,0,AttackInRange,Pursue,Cautious,DefaultAI4) // ランスアーマー
END_UNIT
NPCUnits:
END_UNIT
LoadEnemyUnitsTurn3:
LOU1 EnemyUnitsTurn3
ENUN
ENDA
EnemyUnitsTurn3:
UNIT(GenericHelWeak,Bonewalker,0,10,SIDE_ENEMY,1,10,19,10,19,IronSword,None,0,0,AttackInRange,Pursue,Cautious,DefaultAI4) // ソードナイト
END_UNIT
LoadEnemyUnitsTurn4:
LOU1 EnemyUnitsTurn4
ENUN
ENDA
EnemyUnitsTurn4:
UNIT(GenericHelWeak,GhostFire,0,10,SIDE_ENEMY,1,5,19,5,19,Lightning,None,0,0,AttackInRange,Pursue,Cautious,DefaultAI4) // ブルーペガサス
END_UNIT
TrapsEliwoodMode:
TrapsHectorMode:
END_TRAP
Loading

0 comments on commit 7733833

Please sign in to comment.