Skip to content

Commit

Permalink
Select hero by talking to NPC unit. #6. #22.
Browse files Browse the repository at this point in the history
  • Loading branch information
laqieer committed Aug 18, 2022
1 parent caefeb6 commit 05c6e68
Show file tree
Hide file tree
Showing 18 changed files with 6,531 additions and 11 deletions.
14 changes: 11 additions & 3 deletions content/chapter_event/X0004Event.S
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "AI.h"
#include "background_id.h"
#include "music_id.h"

#include "event_text_id.h"

.section .rodata
.align 2
.global X0004Event
Expand All @@ -16,8 +16,6 @@ X0004Event:
TurnBasedEvents:
LoadBeginningScene
END_MAIN
CharacterBasedEvents:
END_MAIN
LocationBasedEvents:
END_MAIN
MiscBasedEvents:
Expand Down Expand Up @@ -58,5 +56,15 @@ NPCUnits:
NPC_UNIT(セリス, 1, 2, AUTO_LEVEL, 2, 0, 钢剑, 0, 0, 0, 0, DoNotMove, 0, GuardTile)
NPC_UNIT(ユリア, 33, 2, AUTO_LEVEL, 3, 0, 闪光, 0, 0, 0, 0, DoNotMove, 0, GuardTile)
END_UNIT
CharacterBasedEvents:
SelectHero(EPHRAIM)
SelectHero(EIRIK)
SelectHero(CELICE)
SelectHero(YURIA)
END_MAIN
Select(EPHRAIM)
Select(EIRIK)
Select(CELICE)
Select(YURIA)
Traps:
END_TRAP
1 change: 1 addition & 0 deletions content/texts_cn.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

const char * const textsCN[] = {
#include "../locale/CNZH/FE7.txt"
#include "../locale/CNZH/character_messages.txt"
#include "../locale/CNZH/scenario.txt"
#include "../locale/CNZH/misc.txt"
#include "../locale/CNZH/unit.txt"
Expand Down
1 change: 1 addition & 0 deletions content/texts_en.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

const char * const textsEN[] = {
#include "../locale/USEN/FE7.txt"
#include "../locale/USEN/character_messages.txt"
#include "../locale/USEN/scenario.txt"
#include "../locale/USEN/misc.txt"
#include "../locale/USEN/unit.txt"
Expand Down
1 change: 1 addition & 0 deletions content/texts_jp.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
const char * const textsJP[] = {
[TID_START] = NULL,
#include "../locale/JPJA/scenario.txt"
#include "../locale/JPJA/character_messages.txt"
#include "../locale/JPJA/misc.txt"
#include "../locale/JPJA/unit.txt"
#include "../locale/JPJA/skill.txt"
Expand Down
252 changes: 251 additions & 1 deletion include/character_id.h
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,257 @@
#define Zefhyr_winter03 249
#define Zero_halloween02 250

#define CHARA_ID_ALFONS 1
#define CHARA_ID_ALFONS_PAIR01 2
#define CHARA_ID_ALFONS_SPRING02 3
#define CHARA_ID_AMELIA 4
#define CHARA_ID_ANNA 5
#define CHARA_ID_ANNA_NEWYEAR03 6
#define CHARA_ID_AQUA_DANCE 7
#define CHARA_ID_AQUA_NEWYEAR01 8
#define CHARA_ID_ARDEN 9
#define CHARA_ID_ARUM 10
#define CHARA_ID_ARUM_PAIR01 11
#define CHARA_ID_ARUM_POPULARITY05 12
#define CHARA_ID_ATHENA 13
#define CHARA_ID_AZUR_DANCE 14
#define CHARA_ID_BARTR_SPRING04 15
#define CHARA_ID_BELETH_PAIR01 16
#define CHARA_ID_BERKUT_DANCE02 17
#define CHARA_ID_BRIGID_PIRATE01 18
#define CHARA_ID_BRUNO_SPRING03 19
#define CHARA_ID_CAMILLA 20
#define CHARA_ID_CAMILLA_DREAM01 21
#define CHARA_ID_CAMILLA_NEWYEAR01 22
#define CHARA_ID_CAMILLA_ONSEN01 23
#define CHARA_ID_CAMILLA_POPULARITY05 24
#define CHARA_ID_CAMILLA_SPRING01 25
#define CHARA_ID_CAMILLA_SUMMER04 26
#define CHARA_ID_CECILIA_WINTER02 27
#define CHARA_ID_CELICE 28
#define CHARA_ID_CELINA_SUMMER07 29
#define CHARA_ID_CELLICA_POPULARITY03 30
#define CHARA_ID_CERISE_NEWYEAR02 31
#define CHARA_ID_CERISE_SUMMER06 32
#define CHARA_ID_CHARLOTTE_BRIDE01 33
#define CHARA_ID_CHROM 34
#define CHARA_ID_CHROM_SPRING01 35
#define CHARA_ID_CHROM_WINTER01 36
#define CHARA_ID_CONRAD_VALENTINE03 37
#define CHARA_ID_CREA 38
#define CHARA_ID_CUAN_DANCE03 39
#define CHARA_ID_DAROS_PIRATE01 40
#define CHARA_ID_DIADORA 41
#define CHARA_ID_DORCAS 42
#define CHARA_ID_DORCAS_HALLOWEEN02 43
#define CHARA_ID_DOROTHEA_SUMMER08 44
#define CHARA_ID_DOZZLA_HALLOWEEN03 45
#define CHARA_ID_EFI 46
#define CHARA_ID_EFI_VALENTINE03 47
#define CHARA_ID_EIRIK 48
#define CHARA_ID_EIRIK_WINTER02 49
#define CHARA_ID_EIR_NEWYEAR03 50
#define CHARA_ID_ELEONORA 51
#define CHARA_ID_ELISE 52
#define CHARA_ID_ELISE_ONSEN01 53
#define CHARA_ID_ELISE_SUMMER02 54
#define CHARA_ID_ELIWOD_POPULARITY05 55
#define CHARA_ID_ELIWOD_VALENTINE01 56
#define CHARA_ID_ELTSHAN 57
#define CHARA_ID_ELTSHAN_DANCE03 58
#define CHARA_ID_EPHRAIM 59
#define CHARA_ID_EPHRAM_POPULARITY03 60
#define CHARA_ID_EPHRAM_WINTER02 61
#define CHARA_ID_ERASE_HALLOWEEN03 62
#define CHARA_ID_ERINCIA_BON01 63
#define CHARA_ID_EST_SPRING04 64
#define CHARA_ID_ETHLIN_DANCE03 65
#define CHARA_ID_EUDES 66
#define CHARA_ID_FA_WINTER02 67
#define CHARA_ID_FERICIA_PICNIC01 68
#define CHARA_ID_FIORA_SUMMER06 69
#define CHARA_ID_FIR_SPRING04 70
#define CHARA_ID_FJORM_BRIDE03 71
#define CHARA_ID_FJORM_NEWYEAR02 72
#define CHARA_ID_FLORA_PICNIC01 73
#define CHARA_ID_FREDERIK_SUMMER01 74
#define CHARA_ID_FREEZE_NEWYEAR02 75
#define CHARA_ID_GEESE_PIRATE01 76
#define CHARA_ID_GREIL_VALENTINE02 77
#define CHARA_ID_GUIRE_SUMMER01 78
#define CHARA_ID_HEANIUS 79
#define CHARA_ID_HEANIUS_SUMMER03 80
#define CHARA_ID_HECTOR 81
#define CHARA_ID_HECTOR_PAIR01 82
#define CHARA_ID_HECTOR_POPULARITY03 83
#define CHARA_ID_HECTOR_VALENTINE01 84
#define CHARA_ID_HELBINDI_SUMMER06 85
#define CHARA_ID_HENRI_HALLOWEEN01 86
#define CHARA_ID_HINATA_BRIDE04 87
#define CHARA_ID_HINOKA_ONSEN01 88
#define CHARA_ID_IDENN_PAIR01 89
#define CHARA_ID_IKE 90
#define CHARA_ID_IKE_LEGEND01 91
#define CHARA_ID_IKE_POPULARITY01 92
#define CHARA_ID_IKE_VALENTINE02 93
#define CHARA_ID_INGRID_SUMMER08 94
#define CHARA_ID_INVERSE 95
#define CHARA_ID_IRA 96
#define CHARA_ID_ISHTAR_DANCE02 97
#define CHARA_ID_ITSUKI 98
#define CHARA_ID_JAFFAR 99
#define CHARA_ID_JAFFAR_WINTER03 100
#define CHARA_ID_JENNY_PICNIC01 101
#define CHARA_ID_JHOSUA 102
#define CHARA_ID_JHOSUA_SUMMER07 103
#define CHARA_ID_JOKER_HALLOWEEN01 104
#define CHARA_ID_KAGEROU_HALLOWEEN02 105
#define CHARA_ID_KAGEROU_SPRING02 106
#define CHARA_ID_KAMUI_F_DREAM01 107
#define CHARA_ID_KAMUI_F_SUMMER02 108
#define CHARA_ID_KAMUI_M_DREAM01 109
#define CHARA_ID_KAMUI_M_NEWYEAR01 110
#define CHARA_ID_KAREL 111
#define CHARA_ID_KATARINA 112
#define CHARA_ID_KATUA_SPRING02 113
#define CHARA_ID_KILROY_SUMMER07 114
#define CHARA_ID_KINU_NEWYEAR03 115
#define CHARA_ID_KIRIA 116
#define CHARA_ID_KLEIN 117
#define CHARA_ID_KLEINE 118
#define CHARA_ID_LAEGJARN_NEWYEAR02 119
#define CHARA_ID_LAEGJARN_SUMMER06 120
#define CHARA_ID_LAEVATEIN_NEWYEAR02 121
#define CHARA_ID_LAEVATEIN_SUMMER06 122
#define CHARA_ID_LARCHEL_HALLOWEEN03 123
#define CHARA_ID_LEON 124
#define CHARA_ID_LEON_PICNIC01 125
#define CHARA_ID_LEON_SUMMER02 126
#define CHARA_ID_LEYVAN 127
#define CHARA_ID_LILINA_SUMMER06 128
#define CHARA_ID_LILINA_VALENTINE01 129
#define CHARA_ID_LIN 130
#define CHARA_ID_LINNEA_DANCE02 131
#define CHARA_ID_LIN_BRIDE01 132
#define CHARA_ID_LIN_POPULARITY01 133
#define CHARA_ID_LIN_SUMMER06 134
#define CHARA_ID_LIN_VALENTINE01 135
#define CHARA_ID_LIZ_WINTER01 136
#define CHARA_ID_LOFA_HALLOWEEN03 137
#define CHARA_ID_LOKI_MIKATA01 138
#define CHARA_ID_LOKI_SPRING03 139
#define CHARA_ID_LORENZ_SUMMER08 140
#define CHARA_ID_LUCINA 141
#define CHARA_ID_LUCINA_POPULARITY01 142
#define CHARA_ID_LUCINA_SPRING01 143
#define CHARA_ID_LUISE_BRIDE03 144
#define CHARA_ID_LUKA 145
#define CHARA_ID_LUKA_PICNIC01 146
#define CHARA_ID_LUTE 147
#define CHARA_ID_LUTE_SUMMER07 148
#define CHARA_ID_MAMORI 149
#define CHARA_ID_MARICA_SPRING03 150
#define CHARA_ID_MARICH_BEFORE01 151
#define CHARA_ID_MARKS 152
#define CHARA_ID_MARKS_BON01 153
#define CHARA_ID_MARKS_SPRING01 154
#define CHARA_ID_MARKS_SUMMER02 155
#define CHARA_ID_MARTH_BEFORE01 156
#define CHARA_ID_MARTH_BRIDE02 157
#define CHARA_ID_MARTH_PAIR01 158
#define CHARA_ID_MICAIAH_BON01 159
#define CHARA_ID_MICAIAH_PAIR01 160
#define CHARA_ID_MICAIAH_POPULARITY05 161
#define CHARA_ID_MIKOTO_DREAM01 162
#define CHARA_ID_MINERBA_BEFORE01 163
#define CHARA_ID_MISHEIL 164
#define CHARA_ID_MIST_VALENTINE02 165
#define CHARA_ID_MYRRH 166
#define CHARA_ID_MYRRH_HALLOWEEN02 167
#define CHARA_ID_NACIEN_SPRING04 168
#define CHARA_ID_NEPENEE_DANCE02 169
#define CHARA_ID_NIKE_BRIDE04 170
#define CHARA_ID_NINIAN 171
#define CHARA_ID_NINIAN_BRIDE02 172
#define CHARA_ID_NINO 173
#define CHARA_ID_NINO_WINTER03 174
#define CHARA_ID_NOIR_SUMMER03 175
#define CHARA_ID_NONO_HALLOWEEN01 176
#define CHARA_ID_OBORO_BRIDE04 177
#define CHARA_ID_OLIVIE_DANCE 178
#define CHARA_ID_OLWEN 179
#define CHARA_ID_PANT_BRIDE03 180
#define CHARA_ID_PAORA_PAIR01 181
#define CHARA_ID_PAORA_SPRING03 182
#define CHARA_ID_PRISCILLA 183
#define CHARA_ID_QULYF 184
#define CHARA_ID_RACKESIS 185
#define CHARA_ID_RACKESIS_DANCE03 186
#define CHARA_ID_RAPHAEL_BRIDE04 187
#define CHARA_ID_REBACCA 188
#define CHARA_ID_REFLET_F_SUMMER01 189
#define CHARA_ID_REFLET_M_WINTER01 190
#define CHARA_ID_REINHARDT 191
#define CHARA_ID_REINHARDT_DANCE02 192
#define CHARA_ID_RETHE_NEWYEAR03 193
#define CHARA_ID_RINDA_SUMMER04 194
#define CHARA_ID_RODY 195
#define CHARA_ID_RORO 196
#define CHARA_ID_ROY_POPULARITY01 197
#define CHARA_ID_ROY_VALENTINE01 198
#define CHARA_ID_RUDLF_VALENTINE03 199
#define CHARA_ID_RUKE 200
#define CHARA_ID_RUTHEA 201
#define CHARA_ID_RYOUMA_BON01 202
#define CHARA_ID_RYOUMA_ONSEN01 203
#define CHARA_ID_SAKURA_HALLOWEEN01 204
#define CHARA_ID_SAKURA_ONSEN01 205
#define CHARA_ID_SALLYA_BRIDE02 206
#define CHARA_ID_SALLYA_WINTER01 207
#define CHARA_ID_SANAKI 208
#define CHARA_ID_SANAKI_BRIDE02 209
#define CHARA_ID_SENERIO_VALENTINE02 210
#define CHARA_ID_SETH 211
#define CHARA_ID_SHARON 212
#define CHARA_ID_SHARON_SPRING02 213
#define CHARA_ID_SHEEDA_BEFORE01 214
#define CHARA_ID_SHEEDA_BRIDE01 215
#define CHARA_ID_SHIGURE_DANCE 216
#define CHARA_ID_SIGLUD 217
#define CHARA_ID_SIGLUD_PAIR01 218
#define CHARA_ID_SIGRUN_BRIDE03 219
#define CHARA_ID_SILQUE_VALENTINE03 220
#define CHARA_ID_SOTHIS_WINTER03 221
#define CHARA_ID_SYLVAIN_SUMMER08 222
#define CHARA_ID_TAILTO 223
#define CHARA_ID_TAKUMI_NEWYEAR01 224
#define CHARA_ID_TAKUMI_SUMMER04 225
#define CHARA_ID_TANIS_BRIDE03 226
#define CHARA_ID_TIAMAT_VALENTINE02 227
#define CHARA_ID_TIAMO_BRIDE01 228
#define CHARA_ID_TIAMO_SUMMER03 229
#define CHARA_ID_TIBARN_PIRATE01 230
#define CHARA_ID_TIKI 231
#define CHARA_ID_TIKI_A_SUMMER01 232
#define CHARA_ID_TIKI_SUMMER04 233
#define CHARA_ID_TSUBASA 234
#define CHARA_ID_TURNER 235
#define CHARA_ID_TURNER_SUMMER03 236
#define CHARA_ID_URSULA 237
#define CHARA_ID_URSULA_SUMMER06 238
#define CHARA_ID_VERONICA_PAIR01 239
#define CHARA_ID_VERONICA_POPULARITY03 240
#define CHARA_ID_VERONICA_SPRING03 241
#define CHARA_ID_WALT_SUMMER06 242
#define CHARA_ID_WAYU 243
#define CHARA_ID_WAYU_HALLOWEEN02 244
#define CHARA_ID_WAYU_PAIR01 245
#define CHARA_ID_YURG_SUMMER06 246
#define CHARA_ID_YURIA 247
#define CHARA_ID_ZEFHYR 248
#define CHARA_ID_ZEFHYR_WINTER03 249
#define CHARA_ID_ZERO_HALLOWEEN02 250

#define アルフォンス 1
#define 比翼アルフォンス 2
#define 春祭アルフォンス 3
Expand Down Expand Up @@ -505,4 +756,3 @@
#define 雑魚 251
#define ザコ 251
#define 杂兵 251

9 changes: 9 additions & 0 deletions include/event.h
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,15 @@
#define ChangeUnitSide(character, side) CUSI character, side
#define CharacterJoin(character) ChangeUnitSide(character, 0)

// Select heroes.
#define SelectHero(character) CharacterEvent(Anna, CHARA_ID_##character, 10, Select_##character, 0)
#define Select(character) Select_##character: \
MUSC BGM_JOIN_US; \
TEXT EvTx_MID_##character##_JOIN; \
REMA; \
CharacterJoin(CHARA_ID_##character); \
ENDA

// Move to chapter
#define MNCH .hword 0x7f,

Expand Down
Loading

0 comments on commit 05c6e68

Please sign in to comment.