mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-21 08:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add TextCategory enum

Browse Source
This commit is contained in:
Tal Hayon
2022-04-27 00:01:22 +03:00
parent f899598843
commit 4de453b4de
67 changed files with 1197 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/beedle.c
+1 -1
View File
@@ -77,7 +77,7 @@ void sub_08063314(Entity* this) {
InitializeAnimation(this, offset);
}
if (this->interactType != 0) {
MessageFromTarget(this->timer + 0xA01);
MessageFromTarget(this->timer + TEXT_INDEX(TEXT_EMPTY, 0x01));
this->action++;
}
sub_0806ED78(this);
src/npc/brocco.c
+11 -11
View File
@@ -53,7 +53,7 @@ void sub_08063584(Entity* this) {
if (this->interactType != 0) {
this->action = 2;
InitAnimationForceUpdate(this, GetAnimationState(this) + 4);
MessageFromTarget(this->timer + 0xa01);
MessageFromTarget(this->timer + TEXT_INDEX(TEXT_EMPTY, 0x01));
}
sub_0806ED78(this);
}
@@ -99,16 +99,16 @@ void sub_0806362C(Entity* this) {
void sub_080636D8(Entity* this) {
static const Dialog gUnk_0810CAAC[] = {
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x2510 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x2510 } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3424, 0x3423 } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3424, 0x3423 } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x351f, 0x351e } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x361e, 0x361d } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x371f, 0x371e } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x381f, 0x381e } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3919, 0x3918 } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3919, 0x3918 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_FESTIVAL, 0x10) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_FESTIVAL, 0x10) } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x24), TEXT_INDEX(TEXT_TOWN, 0x23) } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x24), TEXT_INDEX(TEXT_TOWN, 0x23) } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN2, 0x1f), TEXT_INDEX(TEXT_TOWN2, 0x1e) } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN3, 0x1e), TEXT_INDEX(TEXT_TOWN3, 0x1d) } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN4, 0x1f), TEXT_INDEX(TEXT_TOWN4, 0x1e) } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN5, 0x1f), TEXT_INDEX(TEXT_TOWN5, 0x1e) } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN6, 0x19), TEXT_INDEX(TEXT_TOWN6, 0x18) } },
{ 5, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN6, 0x19), TEXT_INDEX(TEXT_TOWN6, 0x18) } },
};
ShowNPCDialogue(this, &gUnk_0810CAAC[gSave.global_progress]);
src/npc/carpenter.c
+7 -2
View File
@@ -69,7 +69,10 @@ void sub_080672B0(Entity* this, ScriptExecutionContext* context) {
void sub_080672C8(Entity* this) {
static const u16 messageIndices[] = {
0x1b0d, 0x1b0e, 0x0, 0x1b18, 0x1b19, 0x0, 0x1b23, 0x1b23, 0x0, 0x1b26, 0x1b26, 0x0,
TEXT_INDEX(TEXT_CARPENTERS, 0xd), TEXT_INDEX(TEXT_CARPENTERS, 0xe), 0x0,
TEXT_INDEX(TEXT_CARPENTERS, 0x18), TEXT_INDEX(TEXT_CARPENTERS, 0x19), 0x0,
TEXT_INDEX(TEXT_CARPENTERS, 0x23), TEXT_INDEX(TEXT_CARPENTERS, 0x23), 0x0,
TEXT_INDEX(TEXT_CARPENTERS, 0x26), TEXT_INDEX(TEXT_CARPENTERS, 0x26), 0x0,
};
u32 dialog = 0;
u32 tmp;
@@ -82,7 +85,9 @@ void sub_080672C8(Entity* this) {
}
void sub_08067304(Entity* this) {
static const Dialog dialog = { 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x3642, 0x3641 } };
static const Dialog dialog = {
0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { TEXT_INDEX(TEXT_TOWN3, 0x42), TEXT_INDEX(TEXT_TOWN3, 0x41) }
};
ShowNPCDialogue(this, &dialog);
}
src/npc/castleMaid.c
+13 -13
View File
@@ -107,9 +107,9 @@ void CastleMaid_SetDialogFunc(CastleMaidEntity* this, ScriptExecutionContext* co
void sub_0806464C(Entity* this) {
static const u16 messageIndices[] = {
0x105f,
0x1060,
0x1061,
TEXT_INDEX(TEXT_PROLOGUE, 0X5f),
TEXT_INDEX(TEXT_PROLOGUE, 0X60),
TEXT_INDEX(TEXT_PROLOGUE, 0X61),
0,
};
s32 tmp;
@@ -126,16 +126,16 @@ void sub_0806464C(Entity* this) {
void sub_08064688(Entity* this) {
static const Dialog gUnk_0810F894[] = {
{ 7, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3426, 0x3425 } },
{ 7, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3426, 0x3425 } },
{ 7, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3426, 0x3425 } },
{ 7, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3426, 0x3425 } },
{ 7, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3521, 0x3520 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x361f } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3720 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3820 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3820 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3820 } },
{ 7, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x26), TEXT_INDEX(TEXT_TOWN, 0x25) } },
{ 7, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x26), TEXT_INDEX(TEXT_TOWN, 0x25) } },
{ 7, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x26), TEXT_INDEX(TEXT_TOWN, 0x25) } },
{ 7, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x26), TEXT_INDEX(TEXT_TOWN, 0x25) } },
{ 7, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN2, 0x21), TEXT_INDEX(TEXT_TOWN2, 0x20) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TOWN3, 0x1f) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TOWN4, 0x20) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TOWN5, 0x20) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TOWN5, 0x20) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TOWN5, 0x20) } },
};
ShowNPCDialogue(this, &gUnk_0810F894[gSave.global_progress]);
}
src/npc/cat.c
+60 -60
View File
@@ -35,66 +35,66 @@ extern Hitbox* gUnk_08111154[8];
void sub_08067790(Entity* this) {
static const Dialog dialogs[][10] = {
{ { 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3503, 0x3504 },
{ 0, 0, DIALOG_MINISH, 1, 0x3603, 0x3604 },
{ 0, 0, DIALOG_MINISH, 1, 0x3703, 0x3704 },
{ 0, 0, DIALOG_MINISH, 1, 0x3803, 0x3804 },
{ 0, 0, DIALOG_MINISH, 1, 0x3902, 0x3903 },
{ 0, 0, DIALOG_MINISH, 1, 0x3902, 0x3903 } },
{ { 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3503, 0x3504 },
{ 0, 0, DIALOG_MINISH, 1, 0x3603, 0x3604 },
{ 0, 0, DIALOG_MINISH, 1, 0x3703, 0x3704 },
{ 0, 0, DIALOG_MINISH, 1, 0x3803, 0x3804 },
{ 0, 0, DIALOG_MINISH, 1, 0x3902, 0x3903 },
{ 0, 0, DIALOG_MINISH, 1, 0x3902, 0x3903 } },
{ { 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3503, 0x3504 },
{ 0, 0, DIALOG_MINISH, 1, 0x3603, 0x3604 },
{ 0, 0, DIALOG_MINISH, 1, 0x3703, 0x3704 },
{ 0, 0, DIALOG_MINISH, 1, 0x3803, 0x3804 },
{ 0, 0, DIALOG_MINISH, 1, 0x3902, 0x3903 },
{ 0, 0, DIALOG_MINISH, 1, 0x3902, 0x3903 } },
{ { 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3503, 0x3504 },
{ 0, 0, DIALOG_MINISH, 1, 0x3603, 0x3604 },
{ 0, 0, DIALOG_MINISH, 1, 0x3703, 0x3704 },
{ 0, 0, DIALOG_MINISH, 1, 0x3803, 0x3804 },
{ 0, 0, DIALOG_MINISH, 1, 0x3902, 0x3903 },
{ 0, 0, DIALOG_MINISH, 1, 0x3902, 0x3903 } },
{ { 0, 0, DIALOG_MINISH, 1, 0x4e17, 0x4e18 },
{ 0, 0, DIALOG_MINISH, 1, 0x4e17, 0x4e18 },
{ 0, 0, DIALOG_MINISH, 1, 0x4e17, 0x4e18 },
{ 0, 0, DIALOG_MINISH, 1, 0x4e17, 0x4e18 },
{ 0, 0, DIALOG_MINISH, 1, 0x4e17, 0x4e18 },
{ 0, 0, DIALOG_MINISH, 1, 0x4e17, 0x4e18 },
{ 0, 0, DIALOG_MINISH, 1, 0x4e17, 0x4e18 },
{ 0, 0, DIALOG_MINISH, 1, 0x4e17, 0x4e18 },
{ 0, 0, DIALOG_MINISH, 1, 0x4e17, 0x4e18 },
{ 0, 0, DIALOG_MINISH, 1, 0x4e17, 0x4e18 } },
{ { 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3407, 0x3408 },
{ 0, 0, DIALOG_MINISH, 1, 0x3503, 0x3504 },
{ 0, 0, DIALOG_MINISH, 1, 0x3603, 0x3604 },
{ 0, 0, DIALOG_MINISH, 1, 0x3703, 0x3704 },
{ 0, 0, DIALOG_MINISH, 1, 0x3803, 0x3804 },
{ 0, 0, DIALOG_MINISH, 1, 0x3902, 0x3903 },
{ 0, 0, DIALOG_MINISH, 1, 0x3902, 0x3903 } },
{ { 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN2, 0x03), TEXT_INDEX(TEXT_TOWN2, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN3, 0x03), TEXT_INDEX(TEXT_TOWN3, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN4, 0x03), TEXT_INDEX(TEXT_TOWN4, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN5, 0x03), TEXT_INDEX(TEXT_TOWN5, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN6, 0x02), TEXT_INDEX(TEXT_TOWN6, 0x03) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN6, 0x02), TEXT_INDEX(TEXT_TOWN6, 0x03) } },
{ { 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN2, 0x03), TEXT_INDEX(TEXT_TOWN2, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN3, 0x03), TEXT_INDEX(TEXT_TOWN3, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN4, 0x03), TEXT_INDEX(TEXT_TOWN4, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN5, 0x03), TEXT_INDEX(TEXT_TOWN5, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN6, 0x02), TEXT_INDEX(TEXT_TOWN6, 0x03) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN6, 0x02), TEXT_INDEX(TEXT_TOWN6, 0x03) } },
{ { 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN2, 0x03), TEXT_INDEX(TEXT_TOWN2, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN3, 0x03), TEXT_INDEX(TEXT_TOWN3, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN4, 0x03), TEXT_INDEX(TEXT_TOWN4, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN5, 0x03), TEXT_INDEX(TEXT_TOWN5, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN6, 0x02), TEXT_INDEX(TEXT_TOWN6, 0x03) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN6, 0x02), TEXT_INDEX(TEXT_TOWN6, 0x03) } },
{ { 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN2, 0x03), TEXT_INDEX(TEXT_TOWN2, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN3, 0x03), TEXT_INDEX(TEXT_TOWN3, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN4, 0x03), TEXT_INDEX(TEXT_TOWN4, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN5, 0x03), TEXT_INDEX(TEXT_TOWN5, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN6, 0x02), TEXT_INDEX(TEXT_TOWN6, 0x03) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN6, 0x02), TEXT_INDEX(TEXT_TOWN6, 0x03) } },
{ { 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN8, 0x17), TEXT_INDEX(TEXT_TOWN8, 0x18) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN8, 0x17), TEXT_INDEX(TEXT_TOWN8, 0x18) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN8, 0x17), TEXT_INDEX(TEXT_TOWN8, 0x18) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN8, 0x17), TEXT_INDEX(TEXT_TOWN8, 0x18) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN8, 0x17), TEXT_INDEX(TEXT_TOWN8, 0x18) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN8, 0x17), TEXT_INDEX(TEXT_TOWN8, 0x18) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN8, 0x17), TEXT_INDEX(TEXT_TOWN8, 0x18) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN8, 0x17), TEXT_INDEX(TEXT_TOWN8, 0x18) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN8, 0x17), TEXT_INDEX(TEXT_TOWN8, 0x18) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN8, 0x17), TEXT_INDEX(TEXT_TOWN8, 0x18) } },
{ { 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN, 0x07), TEXT_INDEX(TEXT_TOWN, 0x08) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN2, 0x03), TEXT_INDEX(TEXT_TOWN2, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN3, 0x03), TEXT_INDEX(TEXT_TOWN3, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN4, 0x03), TEXT_INDEX(TEXT_TOWN4, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN5, 0x03), TEXT_INDEX(TEXT_TOWN5, 0x04) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN6, 0x02), TEXT_INDEX(TEXT_TOWN6, 0x03) },
{ 0, 0, DIALOG_MINISH, 1, TEXT_INDEX(TEXT_TOWN6, 0x02), TEXT_INDEX(TEXT_TOWN6, 0x03) } },
};
ShowNPCDialogue(this, &dialogs[this->type][gSave.global_progress]);
}
src/npc/cow.c
+7 -5
View File
@@ -189,11 +189,13 @@ void sub_080691E0(Entity* ent) {
// Show dialogue
void Cow_ShowDialogue(Entity* ent) {
static const Dialog gUnk_08111938[] = { { 0x0, 0x0, DIALOG_MINISH, 1, { 0x2018, 0x3f34 } },
{ 0x0, 0x0, DIALOG_MINISH, 1, { 0x2018, 0x3f35 } },
{ 0x0, 0x0, DIALOG_MINISH, 1, { 0x2018, 0x3f36 } },
{ 0x0, 0x0, DIALOG_MINISH, 1, { 0x2018, 0x3f37 } },
{ 0x0, 0x0, DIALOG_MINISH, 1, { 0x2018, 0x3f38 } } };
static const Dialog gUnk_08111938[] = {
{ 0x0, 0x0, DIALOG_MINISH, 1, { TEXT_INDEX(TEXT_LON_LON, 0X18), TEXT_INDEX(TEXT_TINGLE, 0x34) } },
{ 0x0, 0x0, DIALOG_MINISH, 1, { TEXT_INDEX(TEXT_LON_LON, 0X18), TEXT_INDEX(TEXT_TINGLE, 0x35) } },
{ 0x0, 0x0, DIALOG_MINISH, 1, { TEXT_INDEX(TEXT_LON_LON, 0X18), TEXT_INDEX(TEXT_TINGLE, 0x36) } },
{ 0x0, 0x0, DIALOG_MINISH, 1, { TEXT_INDEX(TEXT_LON_LON, 0X18), TEXT_INDEX(TEXT_TINGLE, 0x37) } },
{ 0x0, 0x0, DIALOG_MINISH, 1, { TEXT_INDEX(TEXT_LON_LON, 0X18), TEXT_INDEX(TEXT_TINGLE, 0x38) } }
};
ShowNPCDialogue(ent, &gUnk_08111938[ent->type]);
}
src/npc/cucco.c
+1 -1
View File
@@ -135,4 +135,4 @@ void (*const Cucco_Actions[])(Entity*) = {
};
const u16 Cucco_Sounds[] = { SFX_VO_CUCCO1, SFX_VO_CUCCO2, SFX_VO_CUCCO3, SFX_VO_CUCCO4 };
const u16 Cucco_Messages[] = { 0xdb4, 0xdb5 };
const u16 Cucco_Messages[] = { TEXT_INDEX(TEXT_MINISH, 0Xb4), TEXT_INDEX(TEXT_MINISH, 0xb5) };
src/npc/cuccoChick.c
+1 -1
View File
@@ -91,7 +91,7 @@ void sub_0806E838(Entity* this) {
}
void sub_0806E884(Entity* this) {
MessageNoOverlap(0xdb6, this);
MessageNoOverlap(TEXT_INDEX(TEXT_MINISH, 0Xb6), this);
}
void CuccoChick_Fusion(Entity* this) {
src/npc/dampe.c
+6 -6
View File
@@ -50,9 +50,9 @@ void Dampe_Fusion(Entity* this) {
void sub_0806BE84(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[] = {
0x2801,
0x2808,
0x2804,
TEXT_INDEX(TEXT_DAMPE, 0x1),
TEXT_INDEX(TEXT_DAMPE, 0x8),
TEXT_INDEX(TEXT_DAMPE, 0x4),
};
u32 msgIndex;
@@ -72,9 +72,9 @@ void sub_0806BE84(Entity* this, ScriptExecutionContext* context) {
void sub_0806BEC8(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[] = {
0x2802,
0x2803,
0x2804,
TEXT_INDEX(TEXT_DAMPE, 0x2),
TEXT_INDEX(TEXT_DAMPE, 0x3),
TEXT_INDEX(TEXT_DAMPE, 0x4),
};
u32 hasGraveyardKey;
u32 msgIndex;
src/npc/drLeft.c
+3 -1
View File
@@ -49,7 +49,9 @@ void sub_0806C028(Entity* this, ScriptExecutionContext* context) {
void sub_0806C038(Entity* this) {
static const u16 messageIndices[] = {
0x4d07, 0x4d08, 0x4d09, 0x4d0a, 0x4d0a, 0x4d05, 0x4d06, 0x4d0f,
TEXT_INDEX(TEXT_DR_LEFT, 0x7), TEXT_INDEX(TEXT_DR_LEFT, 0x8), TEXT_INDEX(TEXT_DR_LEFT, 0x9),
TEXT_INDEX(TEXT_DR_LEFT, 0xa), TEXT_INDEX(TEXT_DR_LEFT, 0xa), TEXT_INDEX(TEXT_DR_LEFT, 0x5),
TEXT_INDEX(TEXT_DR_LEFT, 0x6), TEXT_INDEX(TEXT_DR_LEFT, 0xf),
};
s32 index;
src/npc/epona.c
+1 -1
View File
@@ -57,7 +57,7 @@ void sub_08065A34(Entity* this) {
void sub_08065A50(Entity* this) {
static const Dialog typeDialogs[] = {
{ 0, 0, DIALOG_MINISH, 1, { 0x2017, 0x3f3c } },
{ 0, 0, DIALOG_MINISH, 1, { TEXT_INDEX(TEXT_LON_LON, 0X17), TEXT_INDEX(TEXT_TINGLE, 0x3c) } },
};
ShowNPCDialogue(this, &typeDialogs[this->type]);
}
src/npc/farmers.c
+10 -2
View File
@@ -65,8 +65,16 @@ void sub_0806BCD4(Entity* this) {
void sub_0806BCE8(Entity* this) {
static const Dialog gUnk_08113158[] = {
{ 0x29, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x1a07, 0x1a02 } },
{ 0x29, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x1a11, 0x1a0d } },
{ 0x29,
DIALOG_KINSTONE,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_FARMERS, 0X7), TEXT_INDEX(TEXT_FARMERS, 0x2) } },
{ 0x29,
DIALOG_KINSTONE,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_FARMERS, 0X11), TEXT_INDEX(TEXT_FARMERS, 0xd) } },
};
ShowNPCDialogue(this, &gUnk_08113158[this->type]);
}
src/npc/ghostBrothers.c
+36 -16
View File
@@ -239,22 +239,42 @@ void sub_08065F20(Entity* this) {
void sub_08065F64(Entity* this) {
static const Dialog dialogs[][8] = {
{ { 0, 0, DIALOG_NORMAL, 1, { 0, 0x3f31 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3f31 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3f31 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3f31 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3f31 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3f31 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3f31 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3f31 } } },
{ { 4, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3417, 0x3416 } },
{ 4, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3417, 0x3416 } },
{ 4, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3513, 0x3512 } },
{ 4, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3613, 0x3612 } },
{ 4, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3713, 0x3712 } },
{ 4, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3813, 0x3812 } },
{ 4, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3912, 0x3911 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3A03 } } },
{ { 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TINGLE, 0x31) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TINGLE, 0x31) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TINGLE, 0x31) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TINGLE, 0x31) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TINGLE, 0x31) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TINGLE, 0x31) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TINGLE, 0x31) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TINGLE, 0x31) } } },
{ { 4, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x17), TEXT_INDEX(TEXT_TOWN, 0x16) } },
{ 4, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x17), TEXT_INDEX(TEXT_TOWN, 0x16) } },
{ 4,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN2, 0x13), TEXT_INDEX(TEXT_TOWN2, 0x12) } },
{ 4,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN3, 0x13), TEXT_INDEX(TEXT_TOWN3, 0x12) } },
{ 4,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN4, 0x13), TEXT_INDEX(TEXT_TOWN4, 0x12) } },
{ 4,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN5, 0x13), TEXT_INDEX(TEXT_TOWN5, 0x12) } },
{ 4,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN6, 0x12), TEXT_INDEX(TEXT_TOWN6, 0x11) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TOWN7, 0x3) } } },
};
s32 tmp = gSave.global_progress - 2;
if (tmp < 0) {
src/npc/gorman.c
+9 -8
View File
@@ -86,18 +86,19 @@ void sub_08069838(Entity* this) {
void sub_08069888(Entity* this) {
s32 index;
if (CheckGlobalFlag(0x47) == 0) {
if (CheckGlobalFlag(GOMAN_RENTED_HOUSE) == 0) {
index = 0;
SetGlobalFlag(0x47);
} else if (((CheckGlobalFlag(0x2b) == 0) && (CheckGlobalFlag(0x2c) == 0)) && (CheckGlobalFlag(0x2d) == 0)) {
SetGlobalFlag(GOMAN_RENTED_HOUSE);
} else if (((CheckGlobalFlag(RENTED_HOUSE_DIN) == 0) && (CheckGlobalFlag(RENTED_HOUSE_NAYRU) == 0)) &&
(CheckGlobalFlag(RENTED_HOUSE_FARORE) == 0)) {
index = 1;
} else if (CheckGlobalFlag(0x18) == 0) {
} else if (CheckGlobalFlag(TATEKAKE_HOUSE) == 0) {
index = 2;
} else if (CheckGlobalFlag(0x48) == 0) {
} else if (CheckGlobalFlag(GOMAN_NEW_HOUSE) == 0) {
index = 3;
SetGlobalFlag(0x48);
} else if ((CheckGlobalFlag(0x2e) == 0) && (CheckGlobalFlag(0x2f) == 0)) {
index = CheckGlobalFlag(0x30) ? 5 : 4;
SetGlobalFlag(GOMAN_NEW_HOUSE);
} else if ((CheckGlobalFlag(NEW_HOUSE_DIN) == 0) && (CheckGlobalFlag(NEW_HOUSE_NAYRU) == 0)) {
index = CheckGlobalFlag(NEW_HOUSE_FARORE) ? 5 : 4;
} else {
index = 5;
}
src/npc/goron.c
+27 -7
View File
@@ -52,7 +52,7 @@ void sub_08069328(Entity* this) {
this->action = 2;
RequestPriority(this);
InitAnimationForceUpdate(this, 8);
MessageFromTarget(this->timer + (0x90 << 5));
MessageFromTarget(this->timer + TEXT_INDEX(TEXT_MINISH2, 0x0));
}
}
@@ -124,12 +124,32 @@ void sub_080694B0(Entity* this) {
void sub_080694D8(Entity* this) {
static const Dialog gUnk_08111A94[] = {
{ 0x2f, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x3f13, 0x3f0e } },
{ 0x2f, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x3f14, 0x3f0f } },
{ 0x2f, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x3f15, 0x3f10 } },
{ 0x2f, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x3f16, 0x3f11 } },
{ 0x2f, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x3f17, 0x3f12 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3f18 } },
{ 0x2f,
DIALOG_KINSTONE,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TINGLE, 0x13), TEXT_INDEX(TEXT_TINGLE, 0x0e) } },
{ 0x2f,
DIALOG_KINSTONE,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TINGLE, 0x14), TEXT_INDEX(TEXT_TINGLE, 0x0f) } },
{ 0x2f,
DIALOG_KINSTONE,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TINGLE, 0x15), TEXT_INDEX(TEXT_TINGLE, 0x10) } },
{ 0x2f,
DIALOG_KINSTONE,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TINGLE, 0x16), TEXT_INDEX(TEXT_TINGLE, 0x11) } },
{ 0x2f,
DIALOG_KINSTONE,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TINGLE, 0x17), TEXT_INDEX(TEXT_TINGLE, 0x12) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_TINGLE, 0x18) } },
};
ShowNPCDialogue(this, &gUnk_08111A94[this->type]);
}
src/npc/goronMerchant.c
+3 -3
View File
@@ -76,7 +76,7 @@ void sub_08069654(Entity* this) {
}
void sub_08069660(Entity* this) {
MessageNoOverlap(0x2c1c, this);
MessageNoOverlap(TEXT_INDEX(TEXT_STOCKWELL, 0x1c), this);
gMessage.rupees = (u16)GoronMerchant_GetSalePrice(this);
}
@@ -139,11 +139,11 @@ void GoronMerchant_TryToBuyKinstone(Entity* this, ScriptExecutionContext* contex
gRoomVars.shopItemType2 = 0;
context->condition = 1;
} else {
MessageNoOverlap(0x2c1f, this);
MessageNoOverlap(TEXT_INDEX(TEXT_STOCKWELL, 0x1f), this);
context->condition = 0;
}
} else {
MessageNoOverlap(0x2c1e, this);
MessageNoOverlap(TEXT_INDEX(TEXT_STOCKWELL, 0x1e), this);
context->condition = 0;
}
gActiveScriptInfo.flags |= 1;
src/npc/guardWithSpear.c
+4 -2
View File
@@ -210,8 +210,10 @@ void sub_080642B8(GuardWithSpearEntity* this) {
void sub_080643D8(GuardWithSpearEntity* this) {
static const u16 messageIndices[][4] = {
{ 0x1062, 0x1328, 0x132b, 0x132b },
{ 0x1062, 0x1328, 0x132c, 0x132c },
{ TEXT_INDEX(TEXT_PROLOGUE, 0x62), TEXT_INDEX(TEXT_VAATI, 0x28), TEXT_INDEX(TEXT_VAATI, 0x2b),
TEXT_INDEX(TEXT_VAATI, 0x2b) },
{ TEXT_INDEX(TEXT_PROLOGUE, 0x62), TEXT_INDEX(TEXT_VAATI, 0x28), TEXT_INDEX(TEXT_VAATI, 0x2c),
TEXT_INDEX(TEXT_VAATI, 0x2c) },
};
u32 iVar1;
src/npc/hurdyGurdyMan.c
+38 -8
View File
@@ -55,14 +55,44 @@ void HurdyGurdyMan_Head(Entity* this) {
}
void sub_0806E418(Entity* this) {
static const Dialog dialogs[] = { { 0x59, DIALOG_LOCAL_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f52, 0x4f51 } },
{ 0x59, DIALOG_LOCAL_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f52, 0x4f51 } },
{ 0x59, DIALOG_LOCAL_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f54, 0x4f53 } },
{ 0x59, DIALOG_LOCAL_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f56, 0x4f55 } },
{ 0x59, DIALOG_LOCAL_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f58, 0x4f57 } },
{ 0x59, DIALOG_LOCAL_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f5a, 0x4f59 } },
{ 0x59, DIALOG_LOCAL_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f5c, 0x4f5b } },
{ 0x59, DIALOG_LOCAL_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f5e, 0x4f5d } } };
static const Dialog dialogs[] = {
{ 0x59,
DIALOG_LOCAL_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x52), TEXT_INDEX(TEXT_CAFE, 0x51) } },
{ 0x59,
DIALOG_LOCAL_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x52), TEXT_INDEX(TEXT_CAFE, 0x51) } },
{ 0x59,
DIALOG_LOCAL_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x54), TEXT_INDEX(TEXT_CAFE, 0x53) } },
{ 0x59,
DIALOG_LOCAL_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x56), TEXT_INDEX(TEXT_CAFE, 0x55) } },
{ 0x59,
DIALOG_LOCAL_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x58), TEXT_INDEX(TEXT_CAFE, 0x57) } },
{ 0x59,
DIALOG_LOCAL_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x5a), TEXT_INDEX(TEXT_CAFE, 0x59) } },
{ 0x59,
DIALOG_LOCAL_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x5c), TEXT_INDEX(TEXT_CAFE, 0x5b) } },
{ 0x59, DIALOG_LOCAL_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x5e), TEXT_INDEX(TEXT_CAFE, 0x5d) } }
};
s32 tmp = gSave.global_progress - 2;
if (tmp < 0) {
tmp = 0;
src/npc/kingDaltus.c
+4 -4
View File
@@ -92,10 +92,10 @@ void sub_0806672C(Entity* this) {
void sub_0806673C(Entity* this) {
static const u16 messageIndices[] = {
0x1058,
0x1326,
0x1329,
0x132e,
TEXT_INDEX(TEXT_PROLOGUE, 0x58),
TEXT_INDEX(TEXT_VAATI, 0x26),
TEXT_INDEX(TEXT_VAATI, 0x29),
TEXT_INDEX(TEXT_VAATI, 0x2e),
};
u32 index;
if (CheckGlobalFlag(2) == 0) {
src/npc/librari.c
+6 -5
View File
@@ -34,10 +34,10 @@ void Librari(Entity* this) {
void sub_0806B260(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[] = {
0x4a19,
0x4a1a,
0x4a22,
0x4a27,
TEXT_INDEX(TEXT_TOWN_MINISH1, 0X19),
TEXT_INDEX(TEXT_TOWN_MINISH1, 0X1a),
TEXT_INDEX(TEXT_TOWN_MINISH1, 0X22),
TEXT_INDEX(TEXT_TOWN_MINISH1, 0X27),
};
u32 index;
@@ -60,7 +60,8 @@ void sub_0806B260(Entity* this, ScriptExecutionContext* context) {
void sub_0806B2B4(Entity* this) {
static const u16 messageIndices[] = {
0xdad, 0xdae, 0xdaf, 0xdb0, 0xdb1,
TEXT_INDEX(TEXT_MINISH, 0xad), TEXT_INDEX(TEXT_MINISH, 0xae), TEXT_INDEX(TEXT_MINISH, 0xaf),
TEXT_INDEX(TEXT_MINISH, 0xb0), TEXT_INDEX(TEXT_MINISH, 0xb1),
};
u32 index;
src/npc/librarians.c
+12 -12
View File
@@ -25,43 +25,43 @@ void sub_0806BA34(Entity* this, ScriptExecutionContext* context) {
u32 gotBook1;
u32 gotBook2;
u32 gotBook3;
u32 message = 0x4912;
u32 message = TEXT_INDEX(TEXT_LIBRARY, 0x12);
context->condition = 0;
if (CheckLocalFlag(0x73)) {
message = 0x4913;
message = TEXT_INDEX(TEXT_LIBRARY, 0x13);
} else {
gotBook1 = GetInventoryValue(ITEM_QST_BOOK1);
gotBook2 = GetInventoryValue(ITEM_QST_BOOK2);
gotBook3 = GetInventoryValue(ITEM_QST_BOOK3);
if (gotBook1 == 1) {
message = 0x4906;
message = TEXT_INDEX(TEXT_LIBRARY, 0x6);
context->condition = 1;
SetLocalFlag(0x6b);
SetLocalFlag(0x6a);
} else if (gotBook2 == 1) {
message = 0x4907;
message = TEXT_INDEX(TEXT_LIBRARY, 0x7);
context->condition = 1;
SetLocalFlag(0x6b);
SetLocalFlag(0x6a);
} else if (gotBook3 == 1) {
message = 0x4908;
message = TEXT_INDEX(TEXT_LIBRARY, 0x8);
context->condition = 1;
SetLocalFlag(0x6b);
SetLocalFlag(0x6a);
} else {
if (CheckLocalFlag(0x6a)) {
if (!CheckLocalFlag(0x6b)) {
message = 0x4901;
message = TEXT_INDEX(TEXT_LIBRARY, 0x1);
SetLocalFlag(0x6b);
} else {
if (gotBook1 == 0) {
message = 0x4902;
message = TEXT_INDEX(TEXT_LIBRARY, 0x2);
SetLocalFlag(0x6b);
} else if (gotBook2 == 0) {
message = 0x4903;
message = TEXT_INDEX(TEXT_LIBRARY, 0x3);
SetLocalFlag(0x6d);
} else if (gotBook3 == 0) {
message = 0x4904;
message = TEXT_INDEX(TEXT_LIBRARY, 0x4);
SetLocalFlag(0x70);
}
}
@@ -105,9 +105,9 @@ void sub_0806BB7C(Entity* this, ScriptExecutionContext* context) {
void sub_0806BBB0(Entity* this) {
static const u16 messageIndices[] = {
0x490f,
0x4910,
0x4912,
TEXT_INDEX(TEXT_LIBRARY, 0xf),
TEXT_INDEX(TEXT_LIBRARY, 0x10),
TEXT_INDEX(TEXT_LIBRARY, 0x12),
};
u32 tmp;
src/npc/mama.c
+10 -10
View File
@@ -78,16 +78,16 @@ void sub_0806C4A8(Entity* this, ScriptExecutionContext* context) {
void sub_0806C4DC(Entity* this) {
static const Dialog dialogs[] = {
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f03, 0x4f02 } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f03, 0x4f02 } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f03, 0x4f02 } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f03, 0x4f02 } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f0d, 0x4f0c } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f1b, 0x4f1a } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f27, 0x4f26 } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f33, 0x4f32 } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f3f, 0x4f3e } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f49, 0x4f48 } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x03), TEXT_INDEX(TEXT_CAFE, 0x02) } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x03), TEXT_INDEX(TEXT_CAFE, 0x02) } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x03), TEXT_INDEX(TEXT_CAFE, 0x02) } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x03), TEXT_INDEX(TEXT_CAFE, 0x02) } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x0d), TEXT_INDEX(TEXT_CAFE, 0x0c) } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x1b), TEXT_INDEX(TEXT_CAFE, 0x1a) } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x27), TEXT_INDEX(TEXT_CAFE, 0x26) } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x33), TEXT_INDEX(TEXT_CAFE, 0x32) } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x3f), TEXT_INDEX(TEXT_CAFE, 0x3e) } },
{ 1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_CAFE, 0x49), TEXT_INDEX(TEXT_CAFE, 0x48) } },
};
ShowNPCDialogue(this, &dialogs[gSave.global_progress]);
}
src/npc/marcy.c
+10 -1
View File
@@ -14,7 +14,16 @@ void Marcy(Entity* this) {
}
void sub_08062D18(Entity* this, ScriptExecutionContext* context) {
static const u16 msgIndices[] = { 0x4004, 0x400b, 0x4009, 0x400a, 0, 0, 0, 0, 0, 0 };
static const u16 msgIndices[] = { TEXT_INDEX(TEXT_POST, 0x4),
TEXT_INDEX(TEXT_POST, 0xb),
TEXT_INDEX(TEXT_POST, 0x9),
TEXT_INDEX(TEXT_POST, 0xa),
0,
0,
0,
0,
0,
0 };
u8 tmp = 0;
if ((GetInventoryValue(ITEM_SKILL_PERIL_BEAM) != 0) && (CheckLocalFlag(0x26) == 0)) {
tmp = 7;
src/npc/mayorHagen.c
+15 -15
View File
@@ -50,21 +50,21 @@ void sub_0806CE5C(Entity* this) {
void sub_0806CE80(Entity* this) {
static const Dialog dialogs[] = {
{ 0x89, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, 0x4c0d, 0x4c01 },
{ 0x89, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, 0x4c0d, 0x4c01 },
{ 0x89, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, 0x4c0d, 0x4c01 },
{ 0x89, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, 0x4c0d, 0x4c01 },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c0e },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c0e },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c0f },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c10 },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c11 },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c12 },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c14 },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c02 },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c0c },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c03 },
{ 0, 0, DIALOG_NORMAL, 1, 0, 0x4c04 },
{ 0x89, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, TEXT_INDEX(TEXT_HAGEN, 0xd), TEXT_INDEX(TEXT_HAGEN, 0x1) },
{ 0x89, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, TEXT_INDEX(TEXT_HAGEN, 0xd), TEXT_INDEX(TEXT_HAGEN, 0x1) },
{ 0x89, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, TEXT_INDEX(TEXT_HAGEN, 0xd), TEXT_INDEX(TEXT_HAGEN, 0x1) },
{ 0x89, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, TEXT_INDEX(TEXT_HAGEN, 0xd), TEXT_INDEX(TEXT_HAGEN, 0x1) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0xe) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0xe) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0xf) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0x10) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0x11) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0x12) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0x14) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0x2) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0xc) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0x3) },
{ 0, 0, DIALOG_NORMAL, 1, 0, TEXT_INDEX(TEXT_HAGEN, 0x4) },
};
u32 v;
u32 v2;
src/npc/melari.c
+1 -1
View File
@@ -49,7 +49,7 @@ void sub_08068730(Entity* this) {
}
if (this->interactType != 0) {
this->interactType = 0;
MessageFromTarget(this->timer + 0x1200);
MessageFromTarget(this->timer + TEXT_INDEX(TEXT_MINISH2, 0x0));
}
}
src/npc/ministerPotho.c
+4 -4
View File
@@ -87,10 +87,10 @@ void sub_080668F0(Entity* this) {
void sub_08066904(Entity* this) {
static const u16 messageIndices[] = {
0x105a,
0x1327,
0x132a,
0x132f,
TEXT_INDEX(TEXT_PROLOGUE, 0x5a),
TEXT_INDEX(TEXT_VAATI, 0x27),
TEXT_INDEX(TEXT_VAATI, 0x2a),
TEXT_INDEX(TEXT_VAATI, 0x2f),
};
u32 index;
if (CheckGlobalFlag(2) == 0) {
src/npc/mountainMinish.c
+1 -1
View File
@@ -82,7 +82,7 @@ void sub_08067E88(Entity* this) {
if (this->interactType != 0) {
this->interactType = 0;
this->action = 2;
MessageFromTarget(this->timer + 0x1200);
MessageFromTarget(this->timer + TEXT_INDEX(TEXT_MINISH2, 0x0));
}
}
src/npc/mutoh.c
+12 -12
View File
@@ -52,8 +52,8 @@ void Mutoh_Head(Entity* this) {
void sub_080670B4(Entity* this) {
static const u16 messageIndices[] = {
0x1b02,
0x1b03,
TEXT_INDEX(TEXT_CARPENTERS, 0x2),
TEXT_INDEX(TEXT_CARPENTERS, 0x3),
};
u32 uVar2;
@@ -68,16 +68,16 @@ void sub_080670B4(Entity* this) {
void sub_080670E4(Entity* this) {
static const Dialog dialogs[] = {
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4101, 0x4100 } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4101, 0x4100 } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4101, 0x4100 } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4101, 0x4100 } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4101, 0x4100 } },
{ 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x4104, 0x4102 } },
{ 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x4104, 0x4103 } },
{ 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x4104, 0x4103 } },
{ 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x4104, 0x4105 } },
{ 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { 0x4104, 0x4105 } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_MUTOH, 0x1), TEXT_INDEX(TEXT_MUTOH, 0x0) } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_MUTOH, 0x1), TEXT_INDEX(TEXT_MUTOH, 0x0) } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_MUTOH, 0x1), TEXT_INDEX(TEXT_MUTOH, 0x0) } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_MUTOH, 0x1), TEXT_INDEX(TEXT_MUTOH, 0x0) } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_MUTOH, 0x1), TEXT_INDEX(TEXT_MUTOH, 0x0) } },
{ 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { TEXT_INDEX(TEXT_MUTOH, 0x4), TEXT_INDEX(TEXT_MUTOH, 0x2) } },
{ 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { TEXT_INDEX(TEXT_MUTOH, 0x4), TEXT_INDEX(TEXT_MUTOH, 0x3) } },
{ 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { TEXT_INDEX(TEXT_MUTOH, 0x4), TEXT_INDEX(TEXT_MUTOH, 0x3) } },
{ 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { TEXT_INDEX(TEXT_MUTOH, 0x4), TEXT_INDEX(TEXT_MUTOH, 0x5) } },
{ 0xb, DIALOG_KINSTONE, DIALOG_CHECK_FLAG, 1, { TEXT_INDEX(TEXT_MUTOH, 0x4), TEXT_INDEX(TEXT_MUTOH, 0x5) } },
};
ShowNPCDialogue(this, &dialogs[gSave.global_progress]);
}
src/npc/npc9.c
+1 -1
View File
@@ -39,7 +39,7 @@ void sub_08062B14(Entity* this) {
void sub_08062B48(Entity* this) {
GetNextFrame(this);
if (this->frame & ANIM_DONE) {
MessageFromTarget(0xa01); // invalid
MessageFromTarget(TEXT_INDEX(TEXT_EMPTY, 0x01)); // invalid
this->action++;
}
}
src/npc/percy.c
+9 -9
View File
@@ -91,9 +91,9 @@ void sub_0806B41C(Entity* this) {
void sub_0806B4F0(Entity* this) {
static const Dialog gUnk_08112E2C[5] = {
{ 0, 0, DIALOG_CALL_FUNC, 0, { .func = sub_0806B504 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x2312 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x2311 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x2519 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_PERCY, 0x12) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_PERCY, 0x11) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_FESTIVAL, 0x19) } },
{ 0, 0, DIALOG_CALL_FUNC, 0, { .func = sub_0806B540 } },
};
ShowNPCDialogue(this, &gUnk_08112E2C[this->type2]);
@@ -101,10 +101,10 @@ void sub_0806B4F0(Entity* this) {
void sub_0806B504(Entity* this) {
static const u16 messageIndices[4] = {
0x230c,
0x230d,
0x230e,
0x2310,
TEXT_INDEX(TEXT_PERCY, 0x0c),
TEXT_INDEX(TEXT_PERCY, 0x0d),
TEXT_INDEX(TEXT_PERCY, 0x0e),
TEXT_INDEX(TEXT_PERCY, 0x10),
};
int idx;
@@ -125,7 +125,7 @@ void sub_0806B540(Entity* this) {
context = *(ScriptExecutionContext**)&this->cutsceneBeh;
switch (context->unk_18) {
case 0:
MessageNoOverlap(0x2312, this);
MessageNoOverlap(TEXT_INDEX(TEXT_PERCY, 0x12), this);
if (CheckLocalFlag(0x3f) != 0) {
return;
}
@@ -135,7 +135,7 @@ void sub_0806B540(Entity* this) {
case 1:
if ((gMessage.doTextBox & 0x7f) == 0) {
context->unk_18 = 2;
MessageNoOverlap(0x2315, this);
MessageNoOverlap(TEXT_INDEX(TEXT_PERCY, 0x15), this);
}
break;
case 2:
src/npc/picolyteBottle.c
+5 -5
View File
@@ -172,16 +172,16 @@ void sub_0806E140(PicolyteBottleEntity* this, ScriptExecutionContext* context) {
if ((this->unk76) >= 1000) {
this->unk76 = 999;
context->condition = 0;
MessageFromTarget(0x421b);
MessageFromTarget(TEXT_INDEX(TEXT_BURLOV, 0x1b));
} else {
MessageFromTarget(0x4218);
MessageFromTarget(TEXT_INDEX(TEXT_BURLOV, 0x18));
gMessage.rupees = this->unk76;
}
} else {
context->condition = 0;
this->unk74 = 0;
this->unk76 = 0;
MessageFromTarget(0x421c);
MessageFromTarget(TEXT_INDEX(TEXT_BURLOV, 0x1c));
}
gRoomTransition.field_0x6 = this->unk76;
gActiveScriptInfo.flags |= 1;
@@ -200,10 +200,10 @@ void sub_0806E1FC(PicolyteBottleEntity* this) {
void sub_0806E20C(void) {
if (gRoomTransition.field_0x6 != 0) {
MessageFromTarget(0x421f);
MessageFromTarget(TEXT_INDEX(TEXT_BURLOV, 0x1f));
gMessage.rupees = gRoomTransition.field_0x6;
} else {
MessageFromTarget(0x4220);
MessageFromTarget(TEXT_INDEX(TEXT_BURLOV, 0x20));
}
}
src/npc/pina.c
+11 -11
View File
@@ -55,7 +55,7 @@ void sub_08063AC0(Entity* this) {
if (this->interactType != 0) {
this->action = 2;
InitAnimationForceUpdate(this, GetAnimationState(this) + 4);
MessageFromTarget(this->timer + 0xa01);
MessageFromTarget(this->timer + TEXT_INDEX(TEXT_EMPTY, 0x01));
}
sub_0806ED78(this);
}
@@ -136,16 +136,16 @@ void sub_08063C74(void) {
void sub_08063C90(Entity* this) {
static const Dialog gUnk_0810CE04[] = {
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3422, 0x3421 } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3422, 0x3421 } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3422, 0x3421 } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3422, 0x3421 } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x351d, 0x351c } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x361c, 0x361b } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x371d, 0x371c } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x381d, 0x381c } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3917, 0x3916 } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3917, 0x3916 } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x22), TEXT_INDEX(TEXT_TOWN, 0x21) } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x22), TEXT_INDEX(TEXT_TOWN, 0x21) } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x22), TEXT_INDEX(TEXT_TOWN, 0x21) } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN, 0x22), TEXT_INDEX(TEXT_TOWN, 0x21) } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN2, 0x1d), TEXT_INDEX(TEXT_TOWN2, 0x1c) } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN3, 0x1c), TEXT_INDEX(TEXT_TOWN3, 0x1b) } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN4, 0x1d), TEXT_INDEX(TEXT_TOWN4, 0x1c) } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN5, 0x1d), TEXT_INDEX(TEXT_TOWN5, 0x1c) } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN6, 0x17), TEXT_INDEX(TEXT_TOWN6, 0x16) } },
{ 6, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_TOWN6, 0x17), TEXT_INDEX(TEXT_TOWN6, 0x16) } },
};
ShowNPCDialogue(this, &gUnk_0810CE04[gSave.global_progress]);
}
src/npc/pita.c
+1 -1
View File
@@ -70,7 +70,7 @@ bool32 sub_08062EDC(Entity* this, ScriptExecutionContext* context) {
tmp = GetRandomByWeight(gUnk_0810C435);
tmp2 = gUnk_0810C43D[tmp];
InitItemGetSequence(ITEM_KINSTONE, tmp2, 1);
MessageNoOverlap(0x3c05, this);
MessageNoOverlap(TEXT_INDEX(TEXT_BAKERY, 0x5), this);
context->condition = TRUE;
return TRUE;
}
src/npc/rem.c
+10 -7
View File
@@ -381,19 +381,22 @@ void sub_0806AA10(Entity* this) {
void sub_0806AA18(Entity* this) {
u32 index;
if (this->field_0x6a.HWORD != 0) {
index = 0x4408;
index = TEXT_INDEX(TEXT_REM, 0x8);
} else if ((gRoomTransition.frameCount & 1) == 0) {
index = 0x4407;
index = TEXT_INDEX(TEXT_REM, 0x7);
} else {
index = 0x440d;
index = TEXT_INDEX(TEXT_REM, 0xd);
}
MessageNoOverlap(index, this);
}
void sub_0806AA50(Entity* this, ScriptExecutionContext* context) {
static const u16 gUnk_081122A8[] = { 0x441c, 0x441d, 0x441e, 0 };
static const u16 gUnk_081122B0[] = { 0x441f, 0x4420, 0x4421, 0 };
static const u16 gUnk_081122B8[] = { 0x4410, 0x4411, 0x4412, 0 };
static const u16 gUnk_081122A8[] = { TEXT_INDEX(TEXT_REM, 0x1c), TEXT_INDEX(TEXT_REM, 0x1d),
TEXT_INDEX(TEXT_REM, 0x1e), 0 };
static const u16 gUnk_081122B0[] = { TEXT_INDEX(TEXT_REM, 0x1f), TEXT_INDEX(TEXT_REM, 0x20),
TEXT_INDEX(TEXT_REM, 0x21), 0 };
static const u16 gUnk_081122B8[] = { TEXT_INDEX(TEXT_REM, 0x10), TEXT_INDEX(TEXT_REM, 0x11),
TEXT_INDEX(TEXT_REM, 0x12), 0 };
s32 messageIndex;
Entity* pEnt;
@@ -429,7 +432,7 @@ void sub_0806AA50(Entity* this, ScriptExecutionContext* context) {
pEnt->zVelocity = Q_16_16(1.5);
break;
}
if (messageIndex == 0x441e) {
if (messageIndex == TEXT_INDEX(TEXT_REM, 0x1e)) {
SetLocalFlag(0x8f);
context->condition = 1;
}
src/npc/smallTownMinish.c
+104 -56
View File
@@ -27,62 +27,110 @@ void SmallTownMinish(Entity* this) {
void sub_0806E2DC(Entity* this) {
static const Dialog gUnk_08114308[][8] = {
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3539 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3539 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3539 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3638 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3737 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3839 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x392c } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x392c } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x353a } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x353a } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x353a } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3639 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3738 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x383a } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x392d } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x392d } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x353b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x353b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x353b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x363a } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3739 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x383b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x392e } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x392e } } },
{ { ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x363c, 0x363b } },
{ ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x363c, 0x363b } },
{ ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x363c, 0x363b } },
{ ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x363c, 0x363b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x373a } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x383c } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x392f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x392f } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x373b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x373b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x373b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x373b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x373b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x383d } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3930 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x3930 } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e1c } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e1c } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e1c } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e1c } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e1c } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e1c } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e1c } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e1c } } },
{ { ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4e1e, 0x4e1d } },
{ ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4e1e, 0x4e1d } },
{ ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4e1e, 0x4e1d } },
{ ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4e1e, 0x4e1d } },
{ ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4e1e, 0x4e1d } },
{ ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4e1e, 0x4e1d } },
{ ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4e1e, 0x4e1d } },
{ ITEM_POWER_BRACELETS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4e1e, 0x4e1d } } }
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN2, 0x39) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN2, 0x39) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN2, 0x39) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN3, 0x38) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN4, 0x37) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN5, 0x39) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN6, 0x2c) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN6, 0x2c) } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN2, 0x3a) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN2, 0x3a) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN2, 0x3a) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN3, 0x39) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN4, 0x38) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN5, 0x3a) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN6, 0x2d) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN6, 0x2d) } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN2, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN2, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN2, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN3, 0x3a) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN4, 0x39) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN5, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN6, 0x2e) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN6, 0x2e) } } },
{ { ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN3, 0x3c), TEXT_INDEX(TEXT_TOWN3, 0x3b) } },
{ ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN3, 0x3c), TEXT_INDEX(TEXT_TOWN3, 0x3b) } },
{ ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN3, 0x3c), TEXT_INDEX(TEXT_TOWN3, 0x3b) } },
{ ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN3, 0x3c), TEXT_INDEX(TEXT_TOWN3, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN4, 0x3a) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN5, 0x3c) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN6, 0x2f) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN6, 0x2f) } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN4, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN4, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN4, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN4, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN4, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN5, 0x3d) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN6, 0x30) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN6, 0x30) } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x1c) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x1c) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x1c) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x1c) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x1c) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x1c) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x1c) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x1c) } } },
{ { ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x1e), TEXT_INDEX(TEXT_TOWN8, 0x1d) } },
{ ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x1e), TEXT_INDEX(TEXT_TOWN8, 0x1d) } },
{ ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x1e), TEXT_INDEX(TEXT_TOWN8, 0x1d) } },
{ ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x1e), TEXT_INDEX(TEXT_TOWN8, 0x1d) } },
{ ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x1e), TEXT_INDEX(TEXT_TOWN8, 0x1d) } },
{ ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x1e), TEXT_INDEX(TEXT_TOWN8, 0x1d) } },
{ ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x1e), TEXT_INDEX(TEXT_TOWN8, 0x1d) } },
{ ITEM_POWER_BRACELETS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x1e), TEXT_INDEX(TEXT_TOWN8, 0x1d) } } }
};
s32 dialog = gSave.global_progress - 2;
if (dialog < 0) {
src/npc/smith.c
+40 -8
View File
@@ -144,14 +144,46 @@ void sub_08066218(Entity* this) {
void sub_0806622C(Entity* this) {
static const Dialog dialogs[] = {
{ TABIDACHI, DIALOG_GLOBAL_FLAG, DIALOG_CHECK_FLAG, 1, { 0x3201, 0x100e } },
{ TABIDACHI, DIALOG_GLOBAL_FLAG, DIALOG_CHECK_FLAG, 1, { 0x3201, 0x100e } },
{ TABIDACHI, DIALOG_GLOBAL_FLAG, DIALOG_CHECK_FLAG, 1, { 0x3202, 0x100e } },
{ TABIDACHI, DIALOG_GLOBAL_FLAG, DIALOG_CHECK_FLAG, 1, { 0x3203, 0x100e } },
{ TABIDACHI, DIALOG_GLOBAL_FLAG, DIALOG_CHECK_FLAG, 1, { 0x3204, 0x100e } },
{ TABIDACHI, DIALOG_GLOBAL_FLAG, DIALOG_CHECK_FLAG, 1, { 0x3205, 0x100e } },
{ TABIDACHI, DIALOG_GLOBAL_FLAG, DIALOG_CHECK_FLAG, 1, { 0x3206, 0x100e } },
{ TABIDACHI, DIALOG_GLOBAL_FLAG, DIALOG_CHECK_FLAG, 1, { 0x3206, 0x100e } },
{ TABIDACHI,
DIALOG_GLOBAL_FLAG,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_SMITH, 0x01), TEXT_INDEX(TEXT_PROLOGUE, 0x0e) } },
{ TABIDACHI,
DIALOG_GLOBAL_FLAG,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_SMITH, 0x01), TEXT_INDEX(TEXT_PROLOGUE, 0x0e) } },
{ TABIDACHI,
DIALOG_GLOBAL_FLAG,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_SMITH, 0x02), TEXT_INDEX(TEXT_PROLOGUE, 0x0e) } },
{ TABIDACHI,
DIALOG_GLOBAL_FLAG,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_SMITH, 0x03), TEXT_INDEX(TEXT_PROLOGUE, 0x0e) } },
{ TABIDACHI,
DIALOG_GLOBAL_FLAG,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_SMITH, 0x04), TEXT_INDEX(TEXT_PROLOGUE, 0x0e) } },
{ TABIDACHI,
DIALOG_GLOBAL_FLAG,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_SMITH, 0x05), TEXT_INDEX(TEXT_PROLOGUE, 0x0e) } },
{ TABIDACHI,
DIALOG_GLOBAL_FLAG,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_SMITH, 0x06), TEXT_INDEX(TEXT_PROLOGUE, 0x0e) } },
{ TABIDACHI,
DIALOG_GLOBAL_FLAG,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_SMITH, 0x06), TEXT_INDEX(TEXT_PROLOGUE, 0x0e) } },
};
u32 index;
src/npc/stamp.c
+3 -3
View File
@@ -51,7 +51,7 @@ void sub_08062C24(Entity* ent) {
GetNextFrame(ent);
if ((ent->frame & 128) != 0) {
InitializeAnimation(ent, 4);
MessageFromTarget(2561);
MessageFromTarget(TEXT_INDEX(TEXT_EMPTY, 0x01));
ent->action++;
}
}
@@ -80,8 +80,8 @@ void sub_08062CA4(Entity* ent) {
void sub_08062CBC(Entity* ent) {
static const Dialog gUnk_0810C2E4[2] = {
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4001, 0x4000 } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4003, 0x4002 } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_POST, 0x1), TEXT_INDEX(TEXT_POST, 0x0) } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { TEXT_INDEX(TEXT_POST, 0x3), TEXT_INDEX(TEXT_POST, 0x2) } },
};
u32 uVar1;
if (CheckKinstoneFused(44)) {
src/npc/stockwell.c
+12 -12
View File
@@ -73,7 +73,7 @@ void sub_080650CC(Entity* this) {
this->action++;
InitializeAnimation(this, 7);
if (gRoomVars.shopItemType == 0) {
confirmMsgId = 0x2c01;
confirmMsgId = TEXT_INDEX(TEXT_STOCKWELL, 0x1);
} else {
confirmMsgId = GetSaleItemConfirmMessageID(gRoomVars.shopItemType);
itemPrice = GetItemPrice(gRoomVars.shopItemType);
@@ -123,7 +123,7 @@ void sub_080651F8(Entity* this) {
void sub_0806522C(Entity* this) {
if (--this->timer == 0) {
++this->subAction;
MessageNoOverlap(0x2c16, this);
MessageNoOverlap(TEXT_INDEX(TEXT_STOCKWELL, 0x16), this);
}
}
@@ -146,7 +146,7 @@ void sub_08065250(Entity* this) {
void sub_0806528C(Entity* this) {
if (--this->timer == 0) {
++this->subAction;
MessageNoOverlap(0x2c18, this);
MessageNoOverlap(TEXT_INDEX(TEXT_STOCKWELL, 0x18), this);
}
}
@@ -165,7 +165,7 @@ void sub_080652E4(Entity* this) {
} else {
if (gPlayerEntity.action != PLAYER_ITEMGET) {
this->subAction += 1;
MessageNoOverlap(0x2c19, this);
MessageNoOverlap(TEXT_INDEX(TEXT_STOCKWELL, 0x19), this);
}
}
}
@@ -204,20 +204,20 @@ void sub_08065370(Entity* this, ScriptExecutionContext* context) {
case ITEM_ARROWS10:
case ITEM_ARROWS30:
if (gQuiverSizes[gSave.stats.quiverType] <= gSave.stats.arrowCount) {
messageIndex = 0x2c0e;
messageIndex = TEXT_INDEX(TEXT_STOCKWELL, 0xe);
goto showmsg;
}
break;
case ITEM_SHIELD:
if (GetInventoryValue(ITEM_SHIELD) || GetInventoryValue(ITEM_MIRROR_SHIELD)) {
messageIndex = 0x2c0b;
messageIndex = TEXT_INDEX(TEXT_STOCKWELL, 0xb);
goto showmsg;
}
break;
case ITEM_BOMBS10:
case ITEM_BOMBS30:
if (gBombBagSizes[gSave.stats.bombBagType] <= gSave.stats.bombCount) {
messageIndex = 0x2c0e;
messageIndex = TEXT_INDEX(TEXT_STOCKWELL, 0xe);
goto showmsg;
}
break;
@@ -234,7 +234,7 @@ void sub_08065370(Entity* this, ScriptExecutionContext* context) {
#endif
case ITEM_SHELLS30:
if (999 <= gSave.stats.shells) {
MessageNoOverlap(0x2c0e, this);
MessageNoOverlap(TEXT_INDEX(TEXT_STOCKWELL, 0xe), this);
bVar1 = 0;
}
break;
@@ -256,17 +256,17 @@ void sub_08065370(Entity* this, ScriptExecutionContext* context) {
}
if (gSave.unk5C >= 10) {
context->intVariable = 0x2c11;
context->intVariable = TEXT_INDEX(TEXT_STOCKWELL, 0x11);
} else {
if (itemPrice >= 100) {
context->intVariable = 0x2c10;
context->intVariable = TEXT_INDEX(TEXT_STOCKWELL, 0x10);
} else {
context->intVariable = 0x2c0f;
context->intVariable = TEXT_INDEX(TEXT_STOCKWELL, 0xf);
}
}
return;
}
messageIndex = 0x2c0d;
messageIndex = TEXT_INDEX(TEXT_STOCKWELL, 0xd);
showmsg:
MessageNoOverlap(messageIndex, this);
}
src/npc/teachers.c
+36 -16
View File
@@ -72,22 +72,42 @@ void Teachers_Head(Entity* this) {
void sub_0806C70C(Entity* this) {
static const Dialog gUnk_08113930[][8] = {
{ { 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e01 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e01 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e01 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e01 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e01 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e01 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e09 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e09 } } },
{ { 0xa, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3435, 0x3434 } },
{ 0xa, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3435, 0x3434 } },
{ 0xa, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3528, 0x3527 } },
{ 0xa, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3625, 0x3624 } },
{ 0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x3e03, 0x3e02 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e06 } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e0a } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, 0x3e0a } } },
{ { 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0x1) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0x1) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0x1) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0x1) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0x1) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0x1) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0x9) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0x9) } } },
{ { 0xa,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN, 0x35), TEXT_INDEX(TEXT_TOWN, 0x34) } },
{ 0xa,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN, 0x35), TEXT_INDEX(TEXT_TOWN, 0x34) } },
{ 0xa,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN2, 0x28), TEXT_INDEX(TEXT_TOWN2, 0x27) } },
{ 0xa,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN3, 0x25), TEXT_INDEX(TEXT_TOWN3, 0x24) } },
{ 0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_SCHOOL, 0x3), TEXT_INDEX(TEXT_SCHOOL, 0x2) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0x6) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0xa) } },
{ 0, 0, DIALOG_NORMAL, 1, { 0, TEXT_INDEX(TEXT_SCHOOL, 0xa) } } },
};
int offset;
src/npc/tingleSiblings.c
+12 -4
View File
@@ -203,10 +203,18 @@ void (*const TingleSiblings_Actions[])(Entity*) = {
};
const u16 TingleSiblings_MessageIndices[][9] = {
{ 0x3f01, 0x3f02, 0x3f03, 0x3f04, 0x3f1b, 0x3f1c, 0x3f1d, 0x3f1e, 0x3f1f },
{ 0x3f05, 0x3f06, 0x3f07, 0x3f07, 0x3f20, 0x3f21, 0x3f22, 0x3f23, 0x3f24 },
{ 0x3f08, 0x3f09, 0x3f09, 0x3f09, 0x3f25, 0x3f26, 0x3f27, 0x3f28, 0x3f29 },
{ 0x3f0a, 0x3f0b, 0x3f0c, 0x3f0d, 0x3f2a, 0x3f2b, 0x3f2c, 0x3f2d, 0x3f2e },
{ TEXT_INDEX(TEXT_TINGLE, 0x1), TEXT_INDEX(TEXT_TINGLE, 0x2), TEXT_INDEX(TEXT_TINGLE, 0x3),
TEXT_INDEX(TEXT_TINGLE, 0x4), TEXT_INDEX(TEXT_TINGLE, 0x1b), TEXT_INDEX(TEXT_TINGLE, 0x1c),
TEXT_INDEX(TEXT_TINGLE, 0x1d), TEXT_INDEX(TEXT_TINGLE, 0x1e), TEXT_INDEX(TEXT_TINGLE, 0x1f) },
{ TEXT_INDEX(TEXT_TINGLE, 0x5), TEXT_INDEX(TEXT_TINGLE, 0x6), TEXT_INDEX(TEXT_TINGLE, 0x7),
TEXT_INDEX(TEXT_TINGLE, 0x7), TEXT_INDEX(TEXT_TINGLE, 0x20), TEXT_INDEX(TEXT_TINGLE, 0x21),
TEXT_INDEX(TEXT_TINGLE, 0x22), TEXT_INDEX(TEXT_TINGLE, 0x23), TEXT_INDEX(TEXT_TINGLE, 0x24) },
{ TEXT_INDEX(TEXT_TINGLE, 0x8), TEXT_INDEX(TEXT_TINGLE, 0x9), TEXT_INDEX(TEXT_TINGLE, 0x9),
TEXT_INDEX(TEXT_TINGLE, 0x9), TEXT_INDEX(TEXT_TINGLE, 0x25), TEXT_INDEX(TEXT_TINGLE, 0x26),
TEXT_INDEX(TEXT_TINGLE, 0x27), TEXT_INDEX(TEXT_TINGLE, 0x28), TEXT_INDEX(TEXT_TINGLE, 0x29) },
{ TEXT_INDEX(TEXT_TINGLE, 0xa), TEXT_INDEX(TEXT_TINGLE, 0xb), TEXT_INDEX(TEXT_TINGLE, 0xc),
TEXT_INDEX(TEXT_TINGLE, 0xd), TEXT_INDEX(TEXT_TINGLE, 0x2a), TEXT_INDEX(TEXT_TINGLE, 0x2b),
TEXT_INDEX(TEXT_TINGLE, 0x2c), TEXT_INDEX(TEXT_TINGLE, 0x2d), TEXT_INDEX(TEXT_TINGLE, 0x2e) },
};
const u8 gUnk_0810FC50[] = { 0, 0, 0, 0 };
src/npc/townMinish.c
+317 -120
View File
@@ -371,46 +371,150 @@ void sub_0806AFBC(Entity* this, ScriptExecutionContext* context) {
{ 0x0, 0x0, DIALOG_CALL_FUNC, 0, { .func = (EntityActionPtr)sub_0806B064 } },
{ 0x0, 0x0, DIALOG_CALL_FUNC, 0, { .func = (EntityActionPtr)sub_0806B064 } },
{ 0x0, 0x0, DIALOG_CALL_FUNC, 0, { .func = (EntityActionPtr)sub_0806B064 } } },
{ { ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b0a, 0x4b04 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b0a, 0x4b04 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b0a, 0x4b04 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b0a, 0x4b04 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b0a, 0x4b04 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b0a, 0x4b04 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b0a, 0x4b04 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b0a, 0x4b04 } } },
{ { ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b07, 0x4b01 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b07, 0x4b01 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b07, 0x4b01 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b07, 0x4b01 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b07, 0x4b01 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b07, 0x4b01 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b07, 0x4b01 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b07, 0x4b01 } } },
{ { ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b08, 0x4b02 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b08, 0x4b02 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b08, 0x4b02 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b08, 0x4b02 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b08, 0x4b02 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b08, 0x4b02 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b08, 0x4b02 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4b08, 0x4b02 } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c05 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c05 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c05 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4c0a, 0x4c05 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c05 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c05 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c05 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c05 } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c06 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c06 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c06 } },
{ ITEM_FLIPPERS, DIALOG_INVENTORY, DIALOG_CHECK_FLAG, 1, { 0x4c0b, 0x4c06 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c06 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c06 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c06 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4c06 } } },
{ { ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x0a), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x04) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x0a), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x04) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x0a), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x04) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x0a), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x04) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x0a), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x04) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x0a), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x04) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x0a), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x04) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x0a), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x04) } } },
{ { ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x07), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x01) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x07), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x01) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x07), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x01) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x07), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x01) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x07), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x01) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x07), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x01) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x07), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x01) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x07), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x01) } } },
{ { ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x08), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x02) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x08), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x02) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x08), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x02) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x08), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x02) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x08), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x02) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x08), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x02) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x08), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x02) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x08), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x02) } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x5) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x5) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x5) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_HAGEN, 0xa), TEXT_INDEX(TEXT_HAGEN, 0x5) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x5) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x5) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x5) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x5) } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x6) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x6) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x6) } },
{ ITEM_FLIPPERS,
DIALOG_INVENTORY,
DIALOG_CHECK_FLAG,
1,
{ TEXT_INDEX(TEXT_HAGEN, 0xb), TEXT_INDEX(TEXT_HAGEN, 0x6) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x6) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x6) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x6) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_HAGEN, 0x6) } } },
{ { 0x0, 0x0, DIALOG_CALL_FUNC, 0, { .func = (EntityActionPtr)sub_0806B098 } },
{ 0x0, 0x0, DIALOG_CALL_FUNC, 0, { .func = (EntityActionPtr)sub_0806B098 } },
{ 0x0, 0x0, DIALOG_CALL_FUNC, 0, { .func = (EntityActionPtr)sub_0806B098 } },
@@ -443,78 +547,166 @@ void sub_0806AFBC(Entity* this, ScriptExecutionContext* context) {
{ 0x0, 0x0, DIALOG_CALL_FUNC, 0, { .func = (EntityActionPtr)sub_0806B134 } },
{ 0x0, 0x0, DIALOG_CALL_FUNC, 0, { .func = (EntityActionPtr)sub_0806B134 } },
{ 0x0, 0x0, DIALOG_CALL_FUNC, 0, { .func = (EntityActionPtr)sub_0806B134 } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e2f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e2f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e2f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e2f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e30 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e31 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e32 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e33 } } },
{ { 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f15, 0x4f14 } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f15, 0x4f14 } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f15, 0x4f14 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4f22 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4f2e } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4f3a } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4f3a } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4f3a } } },
{ { 0x1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f17, 0x4f16 } },
{ 0x1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f17, 0x4f16 } },
{ 0x1, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4f17, 0x4f16 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4f23 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4f2f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4f3b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4f3b } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4f3b } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0d } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0d } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0d } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0d } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b11 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b11 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b15 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b15 } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0e } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0e } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0e } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0e } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b12 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b12 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b16 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b16 } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b0f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b13 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b13 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b17 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b17 } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b10 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b10 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b10 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b10 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b14 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b14 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b18 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4b18 } } },
{ { 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e26, 0x4e25 } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e26, 0x4e25 } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e26, 0x4e25 } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e26, 0x4e25 } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e26, 0x4e25 } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e26, 0x4e25 } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e26, 0x4e25 } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e26, 0x4e25 } } },
{ { 0x9c, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, { 0x4e28, 0x4e27 } },
{ 0x9c, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, { 0x4e28, 0x4e27 } },
{ 0x9c, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, { 0x4e28, 0x4e27 } },
{ 0x9c, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, { 0x4e28, 0x4e27 } },
{ 0x9c, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, { 0x4e28, 0x4e27 } },
{ 0x9c, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, { 0x4e28, 0x4e27 } },
{ 0x9c, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, { 0x4e28, 0x4e27 } },
{ 0x9c, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, { 0x4e28, 0x4e27 } } }
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x2f) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x2f) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x2f) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x2f) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x30) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x31) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x32) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x33) } } },
{ { 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x15), TEXT_INDEX(TEXT_CAFE, 0x14) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x15), TEXT_INDEX(TEXT_CAFE, 0x14) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x15), TEXT_INDEX(TEXT_CAFE, 0x14) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_CAFE, 0x22) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_CAFE, 0x2e) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_CAFE, 0x3a) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_CAFE, 0x3a) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_CAFE, 0x3a) } } },
{ { 0x1,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x17), TEXT_INDEX(TEXT_CAFE, 0x16) } },
{ 0x1,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x17), TEXT_INDEX(TEXT_CAFE, 0x16) } },
{ 0x1,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_CAFE, 0x17), TEXT_INDEX(TEXT_CAFE, 0x16) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_CAFE, 0x23) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_CAFE, 0x2f) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_CAFE, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_CAFE, 0x3b) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_CAFE, 0x3b) } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xd) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xd) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xd) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xd) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x11) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x11) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x15) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x15) } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xe) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xe) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xe) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xe) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x12) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x12) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x16) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x16) } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xf) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xf) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xf) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0xf) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x13) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x13) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x17) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x17) } } },
{ { 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x10) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x10) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x10) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x10) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x14) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x14) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x18) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN_MINISH2, 0x18) } } },
{ { 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x26), TEXT_INDEX(TEXT_TOWN8, 0x25) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x26), TEXT_INDEX(TEXT_TOWN8, 0x25) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x26), TEXT_INDEX(TEXT_TOWN8, 0x25) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x26), TEXT_INDEX(TEXT_TOWN8, 0x25) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x26), TEXT_INDEX(TEXT_TOWN8, 0x25) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x26), TEXT_INDEX(TEXT_TOWN8, 0x25) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x26), TEXT_INDEX(TEXT_TOWN8, 0x25) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x26), TEXT_INDEX(TEXT_TOWN8, 0x25) } } },
{ { 0x9c,
DIALOG_LOCAL_FLAG,
DIALOG_SET_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x28), TEXT_INDEX(TEXT_TOWN8, 0x27) } },
{ 0x9c,
DIALOG_LOCAL_FLAG,
DIALOG_SET_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x28), TEXT_INDEX(TEXT_TOWN8, 0x27) } },
{ 0x9c,
DIALOG_LOCAL_FLAG,
DIALOG_SET_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x28), TEXT_INDEX(TEXT_TOWN8, 0x27) } },
{ 0x9c,
DIALOG_LOCAL_FLAG,
DIALOG_SET_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x28), TEXT_INDEX(TEXT_TOWN8, 0x27) } },
{ 0x9c,
DIALOG_LOCAL_FLAG,
DIALOG_SET_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x28), TEXT_INDEX(TEXT_TOWN8, 0x27) } },
{ 0x9c,
DIALOG_LOCAL_FLAG,
DIALOG_SET_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x28), TEXT_INDEX(TEXT_TOWN8, 0x27) } },
{ 0x9c,
DIALOG_LOCAL_FLAG,
DIALOG_SET_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x28), TEXT_INDEX(TEXT_TOWN8, 0x27) } },
{ 0x9c,
DIALOG_LOCAL_FLAG,
DIALOG_SET_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x28), TEXT_INDEX(TEXT_TOWN8, 0x27) } } }
};
int idx = gSave.global_progress - 2;
if (idx < 0)
@@ -534,7 +726,9 @@ void sub_0806AFE8(Entity* this, ScriptExecutionContext* context) {
}
void sub_0806B004(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[5] = { 0x4a11, 0x4a01, 0x4a03, 0x4a05, 0x4a13 };
static const u16 messageIndices[5] = { TEXT_INDEX(TEXT_TOWN_MINISH1, 0x11), TEXT_INDEX(TEXT_TOWN_MINISH1, 0x01),
TEXT_INDEX(TEXT_TOWN_MINISH1, 0x03), TEXT_INDEX(TEXT_TOWN_MINISH1, 0x05),
TEXT_INDEX(TEXT_TOWN_MINISH1, 0x13) };
int idx = 0;
if (CheckGlobalFlag(MIZUKAKI_START)) {
@@ -559,9 +753,9 @@ void sub_0806B004(Entity* this, ScriptExecutionContext* context) {
void sub_0806B064(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[3] = {
0x4a09,
0x4a0b,
0x4a0c,
TEXT_INDEX(TEXT_TOWN_MINISH1, 0x9),
TEXT_INDEX(TEXT_TOWN_MINISH1, 0xb),
TEXT_INDEX(TEXT_TOWN_MINISH1, 0xc),
};
int idx = 0;
@@ -576,8 +770,10 @@ void sub_0806B064(Entity* this, ScriptExecutionContext* context) {
void sub_0806B098(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[][3] = {
{ 0x4b1f, 0x4b20, 0x4b21 },
{ 0x4b22, 0x4b23, 0x4b24 },
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x1f), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x20),
TEXT_INDEX(TEXT_TOWN_MINISH2, 0x21) },
{ TEXT_INDEX(TEXT_TOWN_MINISH2, 0x22), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x23),
TEXT_INDEX(TEXT_TOWN_MINISH2, 0x24) },
};
int idx = 2;
@@ -593,7 +789,7 @@ void sub_0806B098(Entity* this, ScriptExecutionContext* context) {
}
void sub_0806B0E0(Entity* this, ScriptExecutionContext* context) {
static const u16 gUnk_08112C5C[2] = { 0x4b25, 0x4b26 };
static const u16 gUnk_08112C5C[2] = { TEXT_INDEX(TEXT_TOWN_MINISH2, 0x25), TEXT_INDEX(TEXT_TOWN_MINISH2, 0x26) };
int idx = 0;
if (sub_080B1AC8(0x38, 0xb8, 1) == 0x57 && sub_080B1AC8(0x48, 0xb8, 1) == 0x57 &&
@@ -605,7 +801,8 @@ void sub_0806B0E0(Entity* this, ScriptExecutionContext* context) {
}
void sub_0806B134(Entity* this, ScriptExecutionContext* context) {
static const u16 gUnk_08112C60[4] = { 0x4d0b, 0x4d0c, 0x4d0d, 0x4d0e };
static const u16 gUnk_08112C60[4] = { TEXT_INDEX(TEXT_DR_LEFT, 0xb), TEXT_INDEX(TEXT_DR_LEFT, 0xc),
TEXT_INDEX(TEXT_DR_LEFT, 0xd), TEXT_INDEX(TEXT_DR_LEFT, 0xe) };
int idx;
if (GetInventoryValue(ITEM_POWER_BRACELETS)) {
src/npc/townsperson.c
+1 -1
View File
@@ -60,7 +60,7 @@ void sub_08061C00(Entity* this) {
sub_0806ED78(this);
if (this->interactType != 0) {
this->interactType = 0;
MessageFromTarget(this->type2 + 0xa01);
MessageFromTarget(this->type2 + TEXT_INDEX(TEXT_EMPTY, 0x01));
}
}
src/npc/vaatiReborn.c
+1 -1
View File
@@ -99,7 +99,7 @@ void VaatiRebornAction1(Entity* this) {
break;
}
CopyPosition(this, entity);
MessageFromTarget(0x1634);
MessageFromTarget(TEXT_INDEX(TEXT_VAATI2, 0x34));
this->subAction = this->subAction + 1;
DeleteThisEntity();
return;
src/npc/windTribespeople.c
+51 -29
View File
@@ -128,25 +128,41 @@ void sub_0806C90C(Entity* this, ScriptExecutionContext* context) {
void sub_0806C928(Entity* this, ScriptExecutionContext* context) {
static const Dialog gUnk_08113ABC[] = {
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e20, 0x4e1f } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e20, 0x4e1f } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e20, 0x4e1f } },
{ 0x0, DIALOG_ROOM_FLAG, DIALOG_TOGGLE_FLAG, 1, { 0x4e20, 0x4e1f } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e21 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e22 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e23 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e23 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e24 } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, 0x4e24 } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x20), TEXT_INDEX(TEXT_TOWN8, 0x1f) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x20), TEXT_INDEX(TEXT_TOWN8, 0x1f) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x20), TEXT_INDEX(TEXT_TOWN8, 0x1f) } },
{ 0x0,
DIALOG_ROOM_FLAG,
DIALOG_TOGGLE_FLAG,
1,
{ TEXT_INDEX(TEXT_TOWN8, 0x20), TEXT_INDEX(TEXT_TOWN8, 0x1f) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x21) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x22) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x23) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x23) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x24) } },
{ 0x0, 0x0, DIALOG_NORMAL, 1, { 0x0, TEXT_INDEX(TEXT_TOWN8, 0x24) } },
};
ShowNPCDialogue(this, &gUnk_08113ABC[gSave.global_progress]);
}
void sub_0806C944(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[] = {
0x2f02,
0x2f0e,
0x2f14,
TEXT_INDEX(TEXT_WIND_TRIBE, 0x02),
TEXT_INDEX(TEXT_WIND_TRIBE, 0x0e),
TEXT_INDEX(TEXT_WIND_TRIBE, 0x14),
};
int iVar1;
int iVar2;
@@ -166,8 +182,8 @@ void sub_0806C944(Entity* this, ScriptExecutionContext* context) {
void sub_0806C978(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[] = {
0x2f05,
0x2f11,
TEXT_INDEX(TEXT_WIND_TRIBE, 0x05),
TEXT_INDEX(TEXT_WIND_TRIBE, 0x11),
};
u32 flagAsBool = 0;
if (CheckGlobalFlag(WARP_EVENT_END)) {
@@ -178,10 +194,10 @@ void sub_0806C978(Entity* this, ScriptExecutionContext* context) {
void sub_0806C99C(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[] = {
0x2f03,
0x2f0a,
0x2f15,
0x2f0f,
TEXT_INDEX(TEXT_WIND_TRIBE, 0x03),
TEXT_INDEX(TEXT_WIND_TRIBE, 0x0a),
TEXT_INDEX(TEXT_WIND_TRIBE, 0x15),
TEXT_INDEX(TEXT_WIND_TRIBE, 0x0f),
};
u32 flagAsBool = 0;
@@ -196,8 +212,8 @@ void sub_0806C99C(Entity* this, ScriptExecutionContext* context) {
void sub_0806C9D0(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[] = {
0x2f12,
0x2f13,
TEXT_INDEX(TEXT_WIND_TRIBE, 0x12),
TEXT_INDEX(TEXT_WIND_TRIBE, 0x13),
};
u32 tmp = 0;
if (CheckLocalFlag(100) == 0) {
@@ -208,8 +224,8 @@ void sub_0806C9D0(Entity* this, ScriptExecutionContext* context) {
void sub_0806C9F8(Entity* this, ScriptExecutionContext* context) {
static const u16 messageIndices[] = {
0x2f04,
0x2f10,
TEXT_INDEX(TEXT_WIND_TRIBE, 0x04),
TEXT_INDEX(TEXT_WIND_TRIBE, 0x10),
0x0,
};
u32 flagAsBool = 0;
@@ -220,22 +236,28 @@ void sub_0806C9F8(Entity* this, ScriptExecutionContext* context) {
}
void sub_0806CA1C(Entity* this, ScriptExecutionContext* context) {
MessageNoOverlap(0x251b, this);
MessageNoOverlap(TEXT_INDEX(TEXT_FESTIVAL, 0x1b), this);
}
void sub_0806CA2C(Entity* this, ScriptExecutionContext* context) {
MessageNoOverlap(0x2527, this);
MessageNoOverlap(TEXT_INDEX(TEXT_FESTIVAL, 0x27), this);
}
void sub_0806CA3C(Entity* this, ScriptExecutionContext* context) {
static const Dialog gUnk_08113B28 = { KUMOUE_GIRL_TALK, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, { 0x2f19, 0x2f16 } };
static const Dialog gUnk_08113B28 = { KUMOUE_GIRL_TALK,
DIALOG_LOCAL_FLAG,
DIALOG_SET_FLAG,
1,
{ TEXT_INDEX(TEXT_WIND_TRIBE, 0x19), TEXT_INDEX(TEXT_WIND_TRIBE, 0x16) } };
ShowNPCDialogue(this, &gUnk_08113B28);
}
void sub_0806CA4C(Entity* this, ScriptExecutionContext* context) {
static const Dialog gUnk_08113B30 = {
KUMOUE_UNCLE_TALK, DIALOG_LOCAL_FLAG, DIALOG_SET_FLAG, 1, { 0x2f18, 0x2f17 }
};
static const Dialog gUnk_08113B30 = { KUMOUE_UNCLE_TALK,
DIALOG_LOCAL_FLAG,
DIALOG_SET_FLAG,
1,
{ TEXT_INDEX(TEXT_WIND_TRIBE, 0x18), TEXT_INDEX(TEXT_WIND_TRIBE, 0x17) } };
ShowNPCDialogue(this, &gUnk_08113B30);
}