From 4de453b4deb7345cd9ed1899b5c86d6d8448f95d Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Wed, 27 Apr 2022 00:01:22 +0300 Subject: [PATCH] Add TextCategory enum --- include/itemMetaData.h | 4 +- include/kinstone.h | 2 +- include/message.h | 85 ++++++ src/common.c | 14 +- src/enemy/businessScrub.c | 26 +- src/enemy/likeLike.c | 6 +- src/enemy/vaatiWrath.c | 4 +- src/game.c | 6 +- src/itemMetaData.c | 227 ++++++++-------- src/manager/manager37.c | 2 +- src/menu/kinstone_menu.c | 2 +- src/npc/beedle.c | 2 +- src/npc/brocco.c | 22 +- src/npc/carpenter.c | 9 +- src/npc/castleMaid.c | 26 +- src/npc/cat.c | 120 ++++----- src/npc/cow.c | 12 +- src/npc/cucco.c | 2 +- src/npc/cuccoChick.c | 2 +- src/npc/dampe.c | 12 +- src/npc/drLeft.c | 4 +- src/npc/epona.c | 2 +- src/npc/farmers.c | 12 +- src/npc/ghostBrothers.c | 52 ++-- src/npc/gorman.c | 17 +- src/npc/goron.c | 34 ++- src/npc/goronMerchant.c | 6 +- src/npc/guardWithSpear.c | 6 +- src/npc/hurdyGurdyMan.c | 46 +++- src/npc/kingDaltus.c | 8 +- src/npc/librari.c | 11 +- src/npc/librarians.c | 24 +- src/npc/mama.c | 20 +- src/npc/marcy.c | 11 +- src/npc/mayorHagen.c | 30 +-- src/npc/melari.c | 2 +- src/npc/ministerPotho.c | 8 +- src/npc/mountainMinish.c | 2 +- src/npc/mutoh.c | 24 +- src/npc/npc9.c | 2 +- src/npc/percy.c | 18 +- src/npc/picolyteBottle.c | 10 +- src/npc/pina.c | 22 +- src/npc/pita.c | 2 +- src/npc/rem.c | 17 +- src/npc/smallTownMinish.c | 160 +++++++---- src/npc/smith.c | 48 +++- src/npc/stamp.c | 6 +- src/npc/stockwell.c | 24 +- src/npc/teachers.c | 52 ++-- src/npc/tingleSiblings.c | 16 +- src/npc/townMinish.c | 437 ++++++++++++++++++++++--------- src/npc/townsperson.c | 2 +- src/npc/vaatiReborn.c | 2 +- src/npc/windTribespeople.c | 80 ++++-- src/npcUtils.c | 4 +- src/object/cuccoMinigame.c | 10 +- src/object/figurineDevice.c | 34 +-- src/object/fourElements.c | 4 +- src/object/frozenOctorok.c | 4 +- src/object/object6A.c | 2 +- src/object/objectB.c | 4 +- src/object/swordsmanNewsletter.c | 4 +- src/playerItemUtils.c | 2 +- src/playerUtils.c | 2 +- src/subtask.c | 2 +- src/subtask2.c | 2 +- 67 files changed, 1197 insertions(+), 679 deletions(-) diff --git a/include/itemMetaData.h b/include/itemMetaData.h index 0beeb634..805a204f 100644 --- a/include/itemMetaData.h +++ b/include/itemMetaData.h @@ -30,8 +30,8 @@ typedef struct ItemMetaData { u8 unk1; u8 unk2; u8 unk3; // flags? bit 0x2 makes pickup cutscene appear every time - u8 unk4; - u8 unk5; + u8 textId; + u8 textCategory; u8 unk6; u8 unk7; } ItemMetaData; diff --git a/include/kinstone.h b/include/kinstone.h index c8a7b580..a293104a 100644 --- a/include/kinstone.h +++ b/include/kinstone.h @@ -12,7 +12,7 @@ typedef struct { u8 _3; u8 _4; u8 _5; - u16 _6; + u16 textIndex; u16 _8; u16 _a; Entity* ent; diff --git a/include/message.h b/include/message.h index 7f02d61c..344bf4ed 100644 --- a/include/message.h +++ b/include/message.h @@ -138,4 +138,89 @@ void DispMessageFrame(u16*, s32, s32, u32); void sub_08057044(u32, struct_020227E8*, u32); +typedef enum { + TEXT_SAVE, + TEXT_CREDITS, + TEXT_NAMES, + TEXT_NEWSLETTER, + TEXT_ITEMS, + TEXT_ITEM_GET, + TEXT_LOCATIONS, + TEXT_WINDCRESTS, + TEXT_FIGURINE_NAMES, + TEXT_FIGURINE_DESCRIPTIONS, + TEXT_EMPTY, + TEXT_EZLO, + TEXT_EZLO2, + TEXT_MINISH, + TEXT_KINSTONE, + TEXT_PICORI, + TEXT_PROLOGUE, + TEXT_FINDING_EZLO, + TEXT_MINISH2, + TEXT_VAATI, + TEXT_GUSTAF, + TEXT_PANEL_TUTORIAL, + TEXT_VAATI2, + TEXT_GUSTAF2, + TEXT_EMPTY2, + TEXT_EMPTY3, + TEXT_FARMERS, + TEXT_CARPENTERS, + TEXT_EZLO_ELEMENTS_DONE, + TEXT_GORONS, + TEXT_EMPTY4, + TEXT_BELARI, + TEXT_LON_LON, + TEXT_FOREST_MINISH, + TEXT_EZLO_PORTAL, + TEXT_PERCY, + TEXT_BREAK_VAATI_CURSE, + TEXT_FESTIVAL, + TEXT_EMPTY5, + TEXT_TREASURE_GUARDIAN, + TEXT_DAMPE, + TEXT_BUSINESS_SCRUB, + TEXT_EMPTY6, + TEXT_PICOLYTE, + TEXT_STOCKWELL, + TEXT_SYRUP, + TEXT_ITEM_PRICES, + TEXT_WIND_TRIBE, + TEXT_ANJU, + TEXT_GORMAN_ORACLES, + TEXT_SMITH, + TEXT_PHONOGRAPH, + TEXT_TOWN, + TEXT_TOWN2, + TEXT_TOWN3, + TEXT_TOWN4, + TEXT_TOWN5, + TEXT_TOWN6, + TEXT_TOWN7, + TEXT_MILK, + TEXT_BAKERY, + TEXT_SIMON, + TEXT_SCHOOL, + TEXT_TINGLE, + TEXT_POST, + TEXT_MUTOH, + TEXT_BURLOV, + TEXT_CARLOV, + TEXT_REM, + TEXT_HAPPY_HEARTH, + TEXT_BLADE_MASTERS, + TEXT_ANSWER_HOUSE, + TEXT_UNK_WISE, + TEXT_LIBRARY, + TEXT_TOWN_MINISH1, + TEXT_TOWN_MINISH2, + TEXT_HAGEN, + TEXT_DR_LEFT, + TEXT_TOWN8, + TEXT_CAFE, +} TextCategory; + +#define TEXT_INDEX(category, index) ((category << 8) | index) + #endif // MESSAGE_H diff --git a/src/common.c b/src/common.c index 3e9cc7c4..954ffa4e 100644 --- a/src/common.c +++ b/src/common.c @@ -422,9 +422,9 @@ u32 sub_0801DF90(u8* a1, u32 a2) { return 0; } -void sub_0801DFB4(Entity* entity, u32 a2, u32 a3, u32 a4) { +void sub_0801DFB4(Entity* entity, u32 textIndex, u32 a3, u32 a4) { MemClear(&gFuseInfo, sizeof(gFuseInfo)); - gFuseInfo._6 = a2; + gFuseInfo.textIndex = textIndex; gFuseInfo._8 = a3; gFuseInfo._a = a4; gFuseInfo.ent = entity; @@ -442,7 +442,7 @@ u32 sub_0801E00C(void) { } void sub_0801E02C(void) { - sub_0801E0E0(gFuseInfo._6); + sub_0801E0E0(gFuseInfo.textIndex); gFuseInfo._0 = 3; gFuseInfo.action = 1; } @@ -481,12 +481,12 @@ void sub_0801E0A0(void) { } } -void sub_0801E0E0(u32 idx) { - if (idx != 0) { +void sub_0801E0E0(u32 textIndex) { + if (textIndex != 0) { if (gFuseInfo.ent != NULL) { - MessageNoOverlap(idx, gFuseInfo.ent); + MessageNoOverlap(textIndex, gFuseInfo.ent); } else { - MessageFromTarget(idx); + MessageFromTarget(textIndex); } } } diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index 2f311941..c11dbce6 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -250,7 +250,7 @@ void sub_08028CE8(Entity* this) { if (offer->price <= gSave.stats.rupees) { if (sub_080291DC(this)) { /* Bag full. */ - MessageFromTarget(0x2904); + MessageFromTarget(TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x04)); SetPlayerControl(0); } else { ModRupees(-offer->price); @@ -285,7 +285,7 @@ void sub_08028CE8(Entity* this) { } } else { /* Not enough money. */ - MessageFromTarget(0x2903); + MessageFromTarget(TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x03)); SetPlayerControl(0); } } @@ -303,7 +303,7 @@ void sub_08028DE8(Entity* this) { this->field_0x80.HALF.HI = 1; } } else { - MessageFromTarget(0x2902); + MessageFromTarget(TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02)); this->action = 4; this->field_0x80.HALF.HI = 0; this->timer = 1; @@ -561,18 +561,18 @@ void sub_08029270(Entity* this) { // clang-format off const struct SalesOffering gUnk_080CC954[] = { - {0x06, 0x00, 0xffff, 0x290f, 0x2902, 0x09, 0xff, 0x0001}, - {0x04, 0x00, 0x001e, 0x290e, 0x2902, 0x6f, 0xff, 0xffff}, - {0x04, 0x00, 0x001e, 0x290b, 0x2902, 0x6c, 0xff, 0xffff}, - {0x08, 0x00, 0x0028, 0x290c, 0x2911, 0x44, 0xff, 0xffff}, - {0x00, 0x00, 0x0064, 0x290d, 0x2902, 0x5c, 0xff, 0xffff}, - {0x04, 0x00, 0x0014, 0x2910, 0x2911, 0x1c, 0xff, 0xffff}, - {0x0c, 0x00, 0xffff, 0x2912, 0x2913, 0xff, 0xff, 0x0046}, - {0x04, 0x00, 0x0064, 0x2913, 0x2902, 0x5c, 0x75, 0xffff}, + {0x06, 0x00, 0xffff, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0f), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x09, 0xff, 0x0001}, + {0x04, 0x00, 0x001e, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0e), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x6f, 0xff, 0xffff}, + {0x04, 0x00, 0x001e, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0b), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x6c, 0xff, 0xffff}, + {0x08, 0x00, 0x0028, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0c), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x11), 0x44, 0xff, 0xffff}, + {0x00, 0x00, 0x0064, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0d), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x5c, 0xff, 0xffff}, + {0x04, 0x00, 0x0014, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x10), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x11), 0x1c, 0xff, 0xffff}, + {0x0c, 0x00, 0xffff, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x12), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x13), 0xff, 0xff, 0x0046}, + {0x04, 0x00, 0x0064, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x13), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x5c, 0x75, 0xffff}, #ifdef EU - {0x00, 0x00, 0x0064, 0x290d, 0x2902, 0x5c, 0xff, 0xffff}, + {0x00, 0x00, 0x0064, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0d), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x5c, 0xff, 0xffff}, #else - {0x00, 0x00, 0x00C8, 0x290d, 0x2902, 0x5c, 0xff, 0xffff}, + {0x00, 0x00, 0x00C8, TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x0d), TEXT_INDEX(TEXT_BUSINESS_SCRUB, 0x02), 0x5c, 0xff, 0xffff}, #endif }; diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c index 0e7abeb9..1ddbaeb5 100644 --- a/src/enemy/likeLike.c +++ b/src/enemy/likeLike.c @@ -234,10 +234,10 @@ void sub_080281A0(Entity* this) { this->subtimer = 0x19; if (sub_080281E0(ITEM_MIRROR_SHIELD)) { this->field_0x80.HALF.LO = ITEM_MIRROR_SHIELD; - MessageFromTarget(0x578); + MessageFromTarget(TEXT_INDEX(TEXT_ITEM_GET, 0x78)); } else if (sub_080281E0(ITEM_SHIELD)) { this->field_0x80.HALF.LO = ITEM_SHIELD; - MessageFromTarget(0x578); + MessageFromTarget(TEXT_INDEX(TEXT_ITEM_GET, 0x78)); } else { ModHealth(-1); } @@ -269,7 +269,7 @@ void sub_08028224(u32 item) { #else InitItemGetSequence(item, 0, 1); #endif - MessageFromTarget(0x579); + MessageFromTarget(TEXT_INDEX(TEXT_ITEM_GET, 0x79)); } void (*const LikeLike_Functions[])(Entity*) = { diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index c87d199d..65c9aaf5 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -623,7 +623,7 @@ void sub_08041CD0(Entity* this) { } else { this->subAction = 2; this->timer = 0x3c; - MessageFromTarget(0x1651); + MessageFromTarget(TEXT_INDEX(TEXT_VAATI2, 0x51)); } } else { UpdateAnimationSingleFrame(this); @@ -1007,7 +1007,7 @@ void VaatiWrathType0PreAction(Entity* this) { if (gPlayerState.item == NULL) { if (gPlayerEntity.field_0x7a.HWORD == 0) { if ((gPlayerEntity.z.HALF.HI & 0x8000U) == 0 || (gPlayerState.field_0xa != 0)) { - CreateEzloHint(0xb70, 0); + CreateEzloHint(TEXT_INDEX(TEXT_EZLO, 0x70), 0); gRoomTransition.field_0x38 |= 2; } } diff --git a/src/game.c b/src/game.c index f594f02f..1917a077 100644 --- a/src/game.c +++ b/src/game.c @@ -1969,7 +1969,7 @@ void sub_08053A1C(void) { if (gMenu.transitionTimer == 0) { gMenu.overlayType++; gMenu.transitionTimer = 8; - MessageFromTarget(0xf07); + MessageFromTarget(TEXT_INDEX(TEXT_PICORI, 0x07)); gMessage.textWindowPosX = 1; gMessage.textWindowPosY = 8; SetFade(FADE_INSTANT, 8); @@ -2231,9 +2231,9 @@ void sub_08054288(s32 param_1) { MessageFromTarget(ptr[3]); } -u32 sub_0805429C(s32 param_1) { +u32 getItemMetaDataGetTextIndex(s32 itemIndex) { const ItemMetaData* ptr1 = gItemMetaData; - u16* ptr = (u16*)&((ptr1)[param_1]); + u16* ptr = (u16*)&((ptr1)[itemIndex]); return ptr[2]; } diff --git a/src/itemMetaData.c b/src/itemMetaData.c index 4a65fb77..c71f9495 100644 --- a/src/itemMetaData.c +++ b/src/itemMetaData.c @@ -1,124 +1,125 @@ #include "global.h" #include "itemMetaData.h" #include "item.h" +#include "message.h" const ItemMetaData gItemMetaData[] = { [ITEM_NONE] = { 0x63u, 0u, 0u, 0u, 0u, 0u, 0u, 0u }, - [ITEM_SMITH_SWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x1u, 0x5u, 0x1u, 0x5u }, - [ITEM_GREEN_SWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x2u, 0x5u, 0x2u, 0x5u }, - [ITEM_RED_SWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x3u, 0x5u, 0x3u, 0x5u }, - [ITEM_BLUE_SWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x4u, 0x5u, 0x4u, 0x5u }, - [ITEM_UNUSED_SWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x5u, 0x5u, 0x5u, 0x5u }, - [ITEM_FOURSWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x6u, 0x5u, 0x6u, 0x5u }, - [ITEM_BOMBS] = { MENU_SLOT_BOMBS, 0x7u, 0x63u, 0u, 0x1cu, 0x5u, 0x1cu, 0x5u }, - [ITEM_REMOTE_BOMBS] = { MENU_SLOT_BOMBS, 0x7u, 0x63u, 0u, 0x8u, 0x5u, 0x8u, 0x5u }, - [ITEM_BOW] = { MENU_SLOT_BOW, 0xbu, 0x63u, 0u, 0x9u, 0x5u, 0x9u, 0x5u }, - [ITEM_LIGHT_ARROW] = { MENU_SLOT_BOW, 0xbu, 0x63u, 0u, 0xau, 0x5u, 0xau, 0x5u }, - [ITEM_BOOMERANG] = { MENU_SLOT_BOOMERANG, 0x12u, 0u, 0u, 0xbu, 0x5u, 0xbu, 0x5u }, - [ITEM_MAGIC_BOOMERANG] = { MENU_SLOT_BOOMERANG, 0x12u, 0u, 0u, 0xcu, 0x5u, 0xcu, 0x5u }, - [ITEM_SHIELD] = { MENU_SLOT_SHIELD, 0u, 0u, 0u, 0xdu, 0x5u, 0xdu, 0x5u }, - [ITEM_MIRROR_SHIELD] = { MENU_SLOT_SHIELD, 0u, 0u, 0u, 0xeu, 0x5u, 0xeu, 0x5u }, - [ITEM_LANTERN_OFF] = { MENU_SLOT_LANTERN, 0u, 0u, 0u, 0xfu, 0x5u, 0xfu, 0x5u }, - [ITEM_LANTERN_ON] = { MENU_SLOT_LANTERN, 0u, 0u, 0u, 0x10u, 0x5u, 0x10u, 0x5u }, - [ITEM_GUST_JAR] = { MENU_SLOT_GUST_JAR, 0u, 0u, 0u, 0x11u, 0x5u, 0x11u, 0x5u }, - [ITEM_PACCI_CANE] = { MENU_SLOT_CANE, 0u, 0u, 0u, 0x12u, 0x5u, 0x12u, 0x5u }, - [ITEM_MOLE_MITTS] = { MENU_SLOT_MOLE_MITTS, 0u, 0u, 0u, 0x13u, 0x5u, 0x13u, 0x5u }, - [ITEM_ROCS_CAPE] = { MENU_SLOT_ROCS_CAPE, 0u, 0u, 0u, 0x14u, 0x5u, 0x14u, 0x5u }, - [ITEM_PEGASUS_BOOTS] = { MENU_SLOT_PEGASUS_BOOTS, 0u, 0u, 0u, 0x15u, 0x5u, 0x15u, 0x5u }, - [ITEM_FIRE_ROD] = { 0x63u, 0u, 0u, 0u, 0x16u, 0x5u, 0x16u, 0x5u }, - [ITEM_OCARINA] = { MENU_SLOT_OCARINA, 0u, 0u, 0u, 0x17u, 0x5u, 0x17u, 0x5u }, + [ITEM_SMITH_SWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x1u, TEXT_ITEM_GET, 0x1u, 0x5u }, + [ITEM_GREEN_SWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x2u, TEXT_ITEM_GET, 0x2u, 0x5u }, + [ITEM_RED_SWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x3u, TEXT_ITEM_GET, 0x3u, 0x5u }, + [ITEM_BLUE_SWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x4u, TEXT_ITEM_GET, 0x4u, 0x5u }, + [ITEM_UNUSED_SWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x5u, TEXT_ITEM_GET, 0x5u, 0x5u }, + [ITEM_FOURSWORD] = { MENU_SLOT_SWORD, 0u, 0u, 0u, 0x6u, TEXT_ITEM_GET, 0x6u, 0x5u }, + [ITEM_BOMBS] = { MENU_SLOT_BOMBS, 0x7u, 0x63u, 0u, 0x1cu, TEXT_ITEM_GET, 0x1cu, 0x5u }, + [ITEM_REMOTE_BOMBS] = { MENU_SLOT_BOMBS, 0x7u, 0x63u, 0u, 0x8u, TEXT_ITEM_GET, 0x8u, 0x5u }, + [ITEM_BOW] = { MENU_SLOT_BOW, 0xbu, 0x63u, 0u, 0x9u, TEXT_ITEM_GET, 0x9u, 0x5u }, + [ITEM_LIGHT_ARROW] = { MENU_SLOT_BOW, 0xbu, 0x63u, 0u, 0xau, TEXT_ITEM_GET, 0xau, 0x5u }, + [ITEM_BOOMERANG] = { MENU_SLOT_BOOMERANG, 0x12u, 0u, 0u, 0xbu, TEXT_ITEM_GET, 0xbu, 0x5u }, + [ITEM_MAGIC_BOOMERANG] = { MENU_SLOT_BOOMERANG, 0x12u, 0u, 0u, 0xcu, TEXT_ITEM_GET, 0xcu, 0x5u }, + [ITEM_SHIELD] = { MENU_SLOT_SHIELD, 0u, 0u, 0u, 0xdu, TEXT_ITEM_GET, 0xdu, 0x5u }, + [ITEM_MIRROR_SHIELD] = { MENU_SLOT_SHIELD, 0u, 0u, 0u, 0xeu, TEXT_ITEM_GET, 0xeu, 0x5u }, + [ITEM_LANTERN_OFF] = { MENU_SLOT_LANTERN, 0u, 0u, 0u, 0xfu, TEXT_ITEM_GET, 0xfu, 0x5u }, + [ITEM_LANTERN_ON] = { MENU_SLOT_LANTERN, 0u, 0u, 0u, 0x10u, TEXT_ITEM_GET, 0x10u, 0x5u }, + [ITEM_GUST_JAR] = { MENU_SLOT_GUST_JAR, 0u, 0u, 0u, 0x11u, TEXT_ITEM_GET, 0x11u, 0x5u }, + [ITEM_PACCI_CANE] = { MENU_SLOT_CANE, 0u, 0u, 0u, 0x12u, TEXT_ITEM_GET, 0x12u, 0x5u }, + [ITEM_MOLE_MITTS] = { MENU_SLOT_MOLE_MITTS, 0u, 0u, 0u, 0x13u, TEXT_ITEM_GET, 0x13u, 0x5u }, + [ITEM_ROCS_CAPE] = { MENU_SLOT_ROCS_CAPE, 0u, 0u, 0u, 0x14u, TEXT_ITEM_GET, 0x14u, 0x5u }, + [ITEM_PEGASUS_BOOTS] = { MENU_SLOT_PEGASUS_BOOTS, 0u, 0u, 0u, 0x15u, TEXT_ITEM_GET, 0x15u, 0x5u }, + [ITEM_FIRE_ROD] = { 0x63u, 0u, 0u, 0u, 0x16u, TEXT_ITEM_GET, 0x16u, 0x5u }, + [ITEM_OCARINA] = { MENU_SLOT_OCARINA, 0u, 0u, 0u, 0x17u, TEXT_ITEM_GET, 0x17u, 0x5u }, [ITEM_ORB_GREEN] = { 0x63u, 0u, 0u, 0u, 0u, 0u, 0u, 0u }, [ITEM_ORB_BLUE] = { 0x63u, 0u, 0u, 0u, 0u, 0u, 0u, 0u }, [ITEM_ORB_RED] = { 0x63u, 0u, 0u, 0u, 0u, 0u, 0u, 0u }, [ITEM_TRAP] = { 0x63u, 0u, 0u, 0u, 0u, 0u, 0u, 0u }, - [ITEM_BOTTLE1] = { MENU_SLOT_BOTTLE0, 0x3u, 0u, 0x1u, 0x20u, 0x5u, 0x20u, 0x5u }, - [ITEM_BOTTLE2] = { MENU_SLOT_BOTTLE1, 0x3u, 0u, 0x1u, 0x20u, 0x5u, 0x20u, 0x5u }, - [ITEM_BOTTLE3] = { MENU_SLOT_BOTTLE2, 0x3u, 0u, 0x1u, 0x20u, 0x5u, 0x20u, 0x5u }, - [ITEM_BOTTLE4] = { MENU_SLOT_BOTTLE3, 0x3u, 0u, 0x1u, 0x20u, 0x5u, 0x20u, 0x5u }, - [ITEM_BOTTLE_EMPTY] = { 0u, 0u, 0u, 0x3u, 0x20u, 0x5u, 0x20u, 0x5u }, - [ITEM_BOTTLE_BUTTER] = { 0u, 0x4u, 0u, 0x3u, 0x21u, 0x5u, 0x21u, 0x5u }, - [ITEM_BOTTLE_MILK] = { 0u, 0x4u, 0u, 0x3u, 0x22u, 0x5u, 0x22u, 0x5u }, - [ITEM_BOTTLE_HALF_MILK] = { 0u, 0x4u, 0u, 0x3u, 0x23u, 0x5u, 0x23u, 0x5u }, - [ITEM_BOTTLE_RED_POTION] = { 0u, 0x4u, 0u, 0x3u, 0x24u, 0x5u, 0x24u, 0x5u }, - [ITEM_BOTTLE_BLUE_POTION] = { 0u, 0x4u, 0u, 0x3u, 0x25u, 0x5u, 0x25u, 0x5u }, - [ITEM_BOTTLE_WATER] = { 0u, 0x4u, 0u, 0x3u, 0x26u, 0x5u, 0x26u, 0x5u }, - [ITEM_BOTTLE_MINERAL_WATER] = { 0u, 0x4u, 0u, 0x3u, 0x27u, 0x5u, 0x27u, 0x5u }, - [ITEM_BOTTLE_FAIRY] = { 0u, 0x4u, 0u, 0x3u, 0x28u, 0x5u, 0x28u, 0x5u }, - [ITEM_BOTTLE_PICOLYTE_RED] = { 0u, 0x4u, 0u, 0x3u, 0x29u, 0x5u, 0x29u, 0x5u }, - [ITEM_BOTTLE_PICOLYTE_ORANGE] = { 0u, 0x4u, 0u, 0x3u, 0x2au, 0x5u, 0x2au, 0x5u }, - [ITEM_BOTTLE_PICOLYTE_YELLOW] = { 0u, 0x4u, 0u, 0x3u, 0x2bu, 0x5u, 0x2bu, 0x5u }, - [ITEM_BOTTLE_PICOLYTE_GREEN] = { 0u, 0x4u, 0u, 0x3u, 0x2cu, 0x5u, 0x2cu, 0x5u }, - [ITEM_BOTTLE_PICOLYTE_BLUE] = { 0u, 0x4u, 0u, 0x3u, 0x2du, 0x5u, 0x2du, 0x5u }, - [ITEM_BOTTLE_PICOLYTE_WHITE] = { 0u, 0x4u, 0u, 0x3u, 0x2eu, 0x5u, 0x2eu, 0x5u }, - [BOTTLE_CHARM_NAYRU] = { 0u, 0x4u, 0u, 0x3u, 0x2fu, 0x5u, 0x2fu, 0x5u }, - [BOTTLE_CHARM_FARORE] = { 0u, 0x4u, 0u, 0x3u, 0x30u, 0x5u, 0x30u, 0x5u }, - [BOTTLE_CHARM_DIN] = { 0u, 0x4u, 0u, 0x3u, 0x31u, 0x5u, 0x31u, 0x5u }, - [ITEM_32] = { 0u, 0u, 0u, 0u, 0x32u, 0x5u, 0x32u, 0x5u }, - [ITEM_33] = { 0u, 0u, 0u, 0u, 0x33u, 0x5u, 0x33u, 0x5u }, - [ITEM_QST_SWORD] = { 0x1u, 0u, 0u, 0u, 0x34u, 0x5u, 0x34u, 0x5u }, - [ITEM_QST_BROKEN_SWORD] = { 0x1u, 0u, 0u, 0u, 0x35u, 0x5u, 0x35u, 0x5u }, - [ITEM_QST_DOGFOOD] = { 0x1u, 0u, 0u, 0u, 0x36u, 0x5u, 0x36u, 0x5u }, - [ITEM_QST_LONLON_KEY] = { 0x1u, 0u, 0u, 0x1u, 0x37u, 0x5u, 0x37u, 0x5u }, - [ITEM_QST_MUSHROOM] = { 0x1u, 0u, 0u, 0u, 0x38u, 0x5u, 0x38u, 0x5u }, - [ITEM_QST_BOOK1] = { 0x1u, 0u, 0u, 0u, 0x39u, 0x5u, 0x39u, 0x5u }, - [ITEM_QST_BOOK2] = { 0x1u, 0u, 0u, 0u, 0x3au, 0x5u, 0x3au, 0x5u }, - [ITEM_QST_BOOK3] = { 0x1u, 0u, 0u, 0u, 0x3bu, 0x5u, 0x3bu, 0x5u }, - [ITEM_QST_GRAVEYARD_KEY] = { 0x1u, 0u, 0u, 0u, 0x3du, 0x5u, 0x3du, 0x5u }, - [ITEM_QST_TINGLE_TROPHY] = { 0u, 0u, 0u, 0u, 0x95u, 0x5u, 0x95u, 0x5u }, - [ITEM_QST_CARLOV_MEDAL] = { 0x3u, 0u, 0u, 0u, 0x96u, 0x5u, 0x96u, 0x5u }, - [ITEM_SHELLS] = { 0x3u, 0xeu, 0x1u, 0u, 0x3eu, 0x5u, 0x77u, 0x5u }, - [ITEM_EARTH_ELEMENT] = { 0x9u, 0u, 0u, 0x2u, 0x40u, 0x5u, 0x40u, 0x5u }, - [ITEM_FIRE_ELEMENT] = { 0xau, 0u, 0u, 0x2u, 0x41u, 0x5u, 0x41u, 0x5u }, - [ITEM_WATER_ELEMENT] = { 0xbu, 0u, 0u, 0x2u, 0x42u, 0x5u, 0x42u, 0x5u }, - [ITEM_WIND_ELEMENT] = { 0xcu, 0u, 0u, 0x2u, 0x43u, 0x5u, 0x43u, 0x5u }, - [ITEM_GRIP_RING] = { 0xdu, 0u, 0u, 0u, 0x44u, 0x5u, 0x44u, 0x5u }, - [ITEM_POWER_BRACELETS] = { 0xeu, 0u, 0u, 0u, 0x45u, 0x5u, 0x45u, 0x5u }, - [ITEM_FLIPPERS] = { 0xfu, 0u, 0u, 0u, 0x46u, 0x5u, 0x46u, 0x5u }, - [ITEM_MAP] = { 0x63u, 0u, 0u, 0u, 0x47u, 0x5u, 0x47u, 0x5u }, - [ITEM_SKILL_SPIN_ATTACK] = { 0u, 0u, 0u, 0u, 0x48u, 0x5u, 0x48u, 0x5u }, - [ITEM_SKILL_ROLL_ATTACK] = { 0u, 0u, 0u, 0u, 0x49u, 0x5u, 0x49u, 0x5u }, - [ITEM_SKILL_DASH_ATTACK] = { 0u, 0u, 0u, 0u, 0x4au, 0x5u, 0x4au, 0x5u }, - [ITEM_SKILL_ROCK_BREAKER] = { 0u, 0u, 0u, 0u, 0x4bu, 0x5u, 0x4bu, 0x5u }, - [ITEM_SKILL_SWORD_BEAM] = { 0u, 0u, 0u, 0u, 0x4cu, 0x5u, 0x4cu, 0x5u }, - [ITEM_SKILL_GREAT_SPIN] = { 0u, 0u, 0u, 0u, 0x4du, 0x5u, 0x4du, 0x5u }, - [ITEM_SKILL_DOWN_THRUST] = { 0u, 0u, 0u, 0u, 0x4eu, 0x5u, 0x4eu, 0x5u }, - [ITEM_SKILL_PERIL_BEAM] = { 0u, 0u, 0u, 0u, 0x4fu, 0x5u, 0x4fu, 0x5u }, - [ITEM_DUNGEON_MAP] = { 0u, 0x6u, 0x1u, 0x2u, 0x50u, 0x5u, 0x50u, 0x5u }, - [ITEM_COMPASS] = { 0u, 0x6u, 0x2u, 0x2u, 0x51u, 0x5u, 0x51u, 0x5u }, - [ITEM_BIG_KEY] = { 0u, 0x6u, 0x4u, 0x2u, 0x52u, 0x5u, 0x52u, 0x5u }, - [ITEM_SMALL_KEY] = { 0u, 0x5u, 0u, 0x3u, 0x53u, 0x5u, 0x53u, 0x5u }, - [ITEM_RUPEE1] = { 0u, 0x2u, 0u, 0x1u, 0x54u, 0x5u, 0x54u, 0x5u }, - [ITEM_RUPEE5] = { 0u, 0x2u, 0x1u, 0x1u, 0x55u, 0x5u, 0x55u, 0x5u }, - [ITEM_RUPEE20] = { 0u, 0x2u, 0x2u, 0x1u, 0x56u, 0x5u, 0x56u, 0x5u }, - [ITEM_RUPEE50] = { 0u, 0x2u, 0x3u, 0u, 0x57u, 0x5u, 0x57u, 0x5u }, - [ITEM_RUPEE100] = { 0u, 0x2u, 0x4u, 0u, 0x58u, 0x5u, 0x58u, 0x5u }, - [ITEM_RUPEE200] = { 0u, 0x2u, 0x5u, 0u, 0x59u, 0x5u, 0x59u, 0x5u }, - [ITEM_5A] = { 0u, 0u, 0u, 0u, 0x5au, 0x5u, 0x5au, 0x5u }, - [ITEM_JABBERNUT] = { 0u, 0u, 0u, 0x1u, 0x5bu, 0x5u, 0x5bu, 0x5u }, - [ITEM_KINSTONE] = { 0u, 0xfu, 0u, 0x2u, 0x5cu, 0x5u, 0x5cu, 0x5u }, - [ITEM_BOMBS5] = { 0u, 0x9u, 0x5u, 0x1u, 0x5du, 0x5u, 0x5du, 0x5u }, - [ITEM_ARROWS5] = { 0u, 0xcu, 0x5u, 0x1u, 0x5eu, 0x5u, 0x5eu, 0x5u }, - [ITEM_HEART] = { 0u, 0x1u, 0x8u, 0x1u, 0x5fu, 0x5u, 0x5fu, 0x5u }, - [ITEM_FAIRY] = { 0u, 0x1u, 0x20u, 0x1u, 0x60u, 0x5u, 0x60u, 0x5u }, - [ITEM_SHELLS30] = { 0u, 0xeu, 0x1eu, 0u, 0x3fu, 0x5u, 0x3fu, 0x5u }, - [ITEM_HEART_CONTAINER] = { 0u, 0u, 0x1u, 0x2u, 0x62u, 0x5u, 0x62u, 0x5u }, - [ITEM_HEART_PIECE] = { 0u, 0u, 0x1u, 0x3u, 0x18u, 0x5u, 0x18u, 0x5u }, - [ITEM_WALLET] = { 0u, 0x10u, 0u, 0x2u, 0x64u, 0x5u, 0x64u, 0x5u }, - [ITEM_BOMBBAG] = { 0u, 0x8u, 0x63u, 0x3u, 0x7u, 0x5u, 0x63u, 0x5u }, - [ITEM_LARGE_QUIVER] = { 0u, 0xau, 0x63u, 0x3u, 0x66u, 0x5u, 0x66u, 0x5u }, - [ITEM_KINSTONE_BAG] = { 0u, 0xdu, 0u, 0u, 0x67u, 0x5u, 0x67u, 0x5u }, - [ITEM_BRIOCHE] = { 0u, 0u, 0u, 0x2u, 0x68u, 0x5u, 0x68u, 0x5u }, - [ITEM_CROISSANT] = { 0u, 0u, 0u, 0x2u, 0x69u, 0x5u, 0x69u, 0x5u }, - [ITEM_PIE] = { 0u, 0u, 0u, 0x2u, 0x6au, 0x5u, 0x6au, 0x5u }, - [ITEM_CAKE] = { 0u, 0u, 0u, 0x2u, 0x6bu, 0x5u, 0x6bu, 0x5u }, - [ITEM_BOMBS10] = { 0u, 0x9u, 0xau, 0x2u, 0x6cu, 0x5u, 0x6cu, 0x5u }, - [ITEM_BOMBS30] = { 0u, 0x9u, 0x1eu, 0x2u, 0x6du, 0x5u, 0x6du, 0x5u }, - [ITEM_ARROWS10] = { 0u, 0xcu, 0xau, 0x2u, 0x6eu, 0x5u, 0x6eu, 0x5u }, - [ITEM_ARROWS30] = { 0u, 0xcu, 0x1eu, 0x2u, 0x6fu, 0x5u, 0x6fu, 0x5u }, - [ITEM_ARROW_BUTTERFLY] = { 0x63u, 0u, 0u, 0x3u, 0x70u, 0x5u, 0x70u, 0x5u }, - [ITEM_DIG_BUTTERFLY] = { 0x63u, 0u, 0u, 0x3u, 0x71u, 0x5u, 0x71u, 0x5u }, - [ITEM_SWIM_BUTTERFLY] = { 0x63u, 0u, 0u, 0x3u, 0x72u, 0x5u, 0x72u, 0x5u }, - [ITEM_SKILL_FAST_SPIN] = { 0x63u, 0u, 0u, 0x2u, 0x73u, 0x5u, 0x73u, 0x5u }, - [ITEM_SKILL_FAST_SPLIT] = { 0x63u, 0u, 0u, 0x2u, 0x74u, 0x5u, 0x74u, 0x5u }, - [ITEM_SKILL_LONG_SPIN] = { 0x63u, 0u, 0u, 0x2u, 0x75u, 0x5u, 0x75u, 0x5u }, + [ITEM_BOTTLE1] = { MENU_SLOT_BOTTLE0, 0x3u, 0u, 0x1u, 0x20u, TEXT_ITEM_GET, 0x20u, 0x5u }, + [ITEM_BOTTLE2] = { MENU_SLOT_BOTTLE1, 0x3u, 0u, 0x1u, 0x20u, TEXT_ITEM_GET, 0x20u, 0x5u }, + [ITEM_BOTTLE3] = { MENU_SLOT_BOTTLE2, 0x3u, 0u, 0x1u, 0x20u, TEXT_ITEM_GET, 0x20u, 0x5u }, + [ITEM_BOTTLE4] = { MENU_SLOT_BOTTLE3, 0x3u, 0u, 0x1u, 0x20u, TEXT_ITEM_GET, 0x20u, 0x5u }, + [ITEM_BOTTLE_EMPTY] = { 0u, 0u, 0u, 0x3u, 0x20u, TEXT_ITEM_GET, 0x20u, 0x5u }, + [ITEM_BOTTLE_BUTTER] = { 0u, 0x4u, 0u, 0x3u, 0x21u, TEXT_ITEM_GET, 0x21u, 0x5u }, + [ITEM_BOTTLE_MILK] = { 0u, 0x4u, 0u, 0x3u, 0x22u, TEXT_ITEM_GET, 0x22u, 0x5u }, + [ITEM_BOTTLE_HALF_MILK] = { 0u, 0x4u, 0u, 0x3u, 0x23u, TEXT_ITEM_GET, 0x23u, 0x5u }, + [ITEM_BOTTLE_RED_POTION] = { 0u, 0x4u, 0u, 0x3u, 0x24u, TEXT_ITEM_GET, 0x24u, 0x5u }, + [ITEM_BOTTLE_BLUE_POTION] = { 0u, 0x4u, 0u, 0x3u, 0x25u, TEXT_ITEM_GET, 0x25u, 0x5u }, + [ITEM_BOTTLE_WATER] = { 0u, 0x4u, 0u, 0x3u, 0x26u, TEXT_ITEM_GET, 0x26u, 0x5u }, + [ITEM_BOTTLE_MINERAL_WATER] = { 0u, 0x4u, 0u, 0x3u, 0x27u, TEXT_ITEM_GET, 0x27u, 0x5u }, + [ITEM_BOTTLE_FAIRY] = { 0u, 0x4u, 0u, 0x3u, 0x28u, TEXT_ITEM_GET, 0x28u, 0x5u }, + [ITEM_BOTTLE_PICOLYTE_RED] = { 0u, 0x4u, 0u, 0x3u, 0x29u, TEXT_ITEM_GET, 0x29u, 0x5u }, + [ITEM_BOTTLE_PICOLYTE_ORANGE] = { 0u, 0x4u, 0u, 0x3u, 0x2au, TEXT_ITEM_GET, 0x2au, 0x5u }, + [ITEM_BOTTLE_PICOLYTE_YELLOW] = { 0u, 0x4u, 0u, 0x3u, 0x2bu, TEXT_ITEM_GET, 0x2bu, 0x5u }, + [ITEM_BOTTLE_PICOLYTE_GREEN] = { 0u, 0x4u, 0u, 0x3u, 0x2cu, TEXT_ITEM_GET, 0x2cu, 0x5u }, + [ITEM_BOTTLE_PICOLYTE_BLUE] = { 0u, 0x4u, 0u, 0x3u, 0x2du, TEXT_ITEM_GET, 0x2du, 0x5u }, + [ITEM_BOTTLE_PICOLYTE_WHITE] = { 0u, 0x4u, 0u, 0x3u, 0x2eu, TEXT_ITEM_GET, 0x2eu, 0x5u }, + [BOTTLE_CHARM_NAYRU] = { 0u, 0x4u, 0u, 0x3u, 0x2fu, TEXT_ITEM_GET, 0x2fu, 0x5u }, + [BOTTLE_CHARM_FARORE] = { 0u, 0x4u, 0u, 0x3u, 0x30u, TEXT_ITEM_GET, 0x30u, 0x5u }, + [BOTTLE_CHARM_DIN] = { 0u, 0x4u, 0u, 0x3u, 0x31u, TEXT_ITEM_GET, 0x31u, 0x5u }, + [ITEM_32] = { 0u, 0u, 0u, 0u, 0x32u, TEXT_ITEM_GET, 0x32u, 0x5u }, + [ITEM_33] = { 0u, 0u, 0u, 0u, 0x33u, TEXT_ITEM_GET, 0x33u, 0x5u }, + [ITEM_QST_SWORD] = { 0x1u, 0u, 0u, 0u, 0x34u, TEXT_ITEM_GET, 0x34u, 0x5u }, + [ITEM_QST_BROKEN_SWORD] = { 0x1u, 0u, 0u, 0u, 0x35u, TEXT_ITEM_GET, 0x35u, 0x5u }, + [ITEM_QST_DOGFOOD] = { 0x1u, 0u, 0u, 0u, 0x36u, TEXT_ITEM_GET, 0x36u, 0x5u }, + [ITEM_QST_LONLON_KEY] = { 0x1u, 0u, 0u, 0x1u, 0x37u, TEXT_ITEM_GET, 0x37u, 0x5u }, + [ITEM_QST_MUSHROOM] = { 0x1u, 0u, 0u, 0u, 0x38u, TEXT_ITEM_GET, 0x38u, 0x5u }, + [ITEM_QST_BOOK1] = { 0x1u, 0u, 0u, 0u, 0x39u, TEXT_ITEM_GET, 0x39u, 0x5u }, + [ITEM_QST_BOOK2] = { 0x1u, 0u, 0u, 0u, 0x3au, TEXT_ITEM_GET, 0x3au, 0x5u }, + [ITEM_QST_BOOK3] = { 0x1u, 0u, 0u, 0u, 0x3bu, TEXT_ITEM_GET, 0x3bu, 0x5u }, + [ITEM_QST_GRAVEYARD_KEY] = { 0x1u, 0u, 0u, 0u, 0x3du, TEXT_ITEM_GET, 0x3du, 0x5u }, + [ITEM_QST_TINGLE_TROPHY] = { 0u, 0u, 0u, 0u, 0x95u, TEXT_ITEM_GET, 0x95u, 0x5u }, + [ITEM_QST_CARLOV_MEDAL] = { 0x3u, 0u, 0u, 0u, 0x96u, TEXT_ITEM_GET, 0x96u, 0x5u }, + [ITEM_SHELLS] = { 0x3u, 0xeu, 0x1u, 0u, 0x3eu, TEXT_ITEM_GET, 0x77u, 0x5u }, + [ITEM_EARTH_ELEMENT] = { 0x9u, 0u, 0u, 0x2u, 0x40u, TEXT_ITEM_GET, 0x40u, 0x5u }, + [ITEM_FIRE_ELEMENT] = { 0xau, 0u, 0u, 0x2u, 0x41u, TEXT_ITEM_GET, 0x41u, 0x5u }, + [ITEM_WATER_ELEMENT] = { 0xbu, 0u, 0u, 0x2u, 0x42u, TEXT_ITEM_GET, 0x42u, 0x5u }, + [ITEM_WIND_ELEMENT] = { 0xcu, 0u, 0u, 0x2u, 0x43u, TEXT_ITEM_GET, 0x43u, 0x5u }, + [ITEM_GRIP_RING] = { 0xdu, 0u, 0u, 0u, 0x44u, TEXT_ITEM_GET, 0x44u, 0x5u }, + [ITEM_POWER_BRACELETS] = { 0xeu, 0u, 0u, 0u, 0x45u, TEXT_ITEM_GET, 0x45u, 0x5u }, + [ITEM_FLIPPERS] = { 0xfu, 0u, 0u, 0u, 0x46u, TEXT_ITEM_GET, 0x46u, 0x5u }, + [ITEM_MAP] = { 0x63u, 0u, 0u, 0u, 0x47u, TEXT_ITEM_GET, 0x47u, 0x5u }, + [ITEM_SKILL_SPIN_ATTACK] = { 0u, 0u, 0u, 0u, 0x48u, TEXT_ITEM_GET, 0x48u, 0x5u }, + [ITEM_SKILL_ROLL_ATTACK] = { 0u, 0u, 0u, 0u, 0x49u, TEXT_ITEM_GET, 0x49u, 0x5u }, + [ITEM_SKILL_DASH_ATTACK] = { 0u, 0u, 0u, 0u, 0x4au, TEXT_ITEM_GET, 0x4au, 0x5u }, + [ITEM_SKILL_ROCK_BREAKER] = { 0u, 0u, 0u, 0u, 0x4bu, TEXT_ITEM_GET, 0x4bu, 0x5u }, + [ITEM_SKILL_SWORD_BEAM] = { 0u, 0u, 0u, 0u, 0x4cu, TEXT_ITEM_GET, 0x4cu, 0x5u }, + [ITEM_SKILL_GREAT_SPIN] = { 0u, 0u, 0u, 0u, 0x4du, TEXT_ITEM_GET, 0x4du, 0x5u }, + [ITEM_SKILL_DOWN_THRUST] = { 0u, 0u, 0u, 0u, 0x4eu, TEXT_ITEM_GET, 0x4eu, 0x5u }, + [ITEM_SKILL_PERIL_BEAM] = { 0u, 0u, 0u, 0u, 0x4fu, TEXT_ITEM_GET, 0x4fu, 0x5u }, + [ITEM_DUNGEON_MAP] = { 0u, 0x6u, 0x1u, 0x2u, 0x50u, TEXT_ITEM_GET, 0x50u, 0x5u }, + [ITEM_COMPASS] = { 0u, 0x6u, 0x2u, 0x2u, 0x51u, TEXT_ITEM_GET, 0x51u, 0x5u }, + [ITEM_BIG_KEY] = { 0u, 0x6u, 0x4u, 0x2u, 0x52u, TEXT_ITEM_GET, 0x52u, 0x5u }, + [ITEM_SMALL_KEY] = { 0u, 0x5u, 0u, 0x3u, 0x53u, TEXT_ITEM_GET, 0x53u, 0x5u }, + [ITEM_RUPEE1] = { 0u, 0x2u, 0u, 0x1u, 0x54u, TEXT_ITEM_GET, 0x54u, 0x5u }, + [ITEM_RUPEE5] = { 0u, 0x2u, 0x1u, 0x1u, 0x55u, TEXT_ITEM_GET, 0x55u, 0x5u }, + [ITEM_RUPEE20] = { 0u, 0x2u, 0x2u, 0x1u, 0x56u, TEXT_ITEM_GET, 0x56u, 0x5u }, + [ITEM_RUPEE50] = { 0u, 0x2u, 0x3u, 0u, 0x57u, TEXT_ITEM_GET, 0x57u, 0x5u }, + [ITEM_RUPEE100] = { 0u, 0x2u, 0x4u, 0u, 0x58u, TEXT_ITEM_GET, 0x58u, 0x5u }, + [ITEM_RUPEE200] = { 0u, 0x2u, 0x5u, 0u, 0x59u, TEXT_ITEM_GET, 0x59u, 0x5u }, + [ITEM_5A] = { 0u, 0u, 0u, 0u, 0x5au, TEXT_ITEM_GET, 0x5au, 0x5u }, + [ITEM_JABBERNUT] = { 0u, 0u, 0u, 0x1u, 0x5bu, TEXT_ITEM_GET, 0x5bu, 0x5u }, + [ITEM_KINSTONE] = { 0u, 0xfu, 0u, 0x2u, 0x5cu, TEXT_ITEM_GET, 0x5cu, 0x5u }, + [ITEM_BOMBS5] = { 0u, 0x9u, 0x5u, 0x1u, 0x5du, TEXT_ITEM_GET, 0x5du, 0x5u }, + [ITEM_ARROWS5] = { 0u, 0xcu, 0x5u, 0x1u, 0x5eu, TEXT_ITEM_GET, 0x5eu, 0x5u }, + [ITEM_HEART] = { 0u, 0x1u, 0x8u, 0x1u, 0x5fu, TEXT_ITEM_GET, 0x5fu, 0x5u }, + [ITEM_FAIRY] = { 0u, 0x1u, 0x20u, 0x1u, 0x60u, TEXT_ITEM_GET, 0x60u, 0x5u }, + [ITEM_SHELLS30] = { 0u, 0xeu, 0x1eu, 0u, 0x3fu, TEXT_ITEM_GET, 0x3fu, 0x5u }, + [ITEM_HEART_CONTAINER] = { 0u, 0u, 0x1u, 0x2u, 0x62u, TEXT_ITEM_GET, 0x62u, 0x5u }, + [ITEM_HEART_PIECE] = { 0u, 0u, 0x1u, 0x3u, 0x18u, TEXT_ITEM_GET, 0x18u, 0x5u }, + [ITEM_WALLET] = { 0u, 0x10u, 0u, 0x2u, 0x64u, TEXT_ITEM_GET, 0x64u, 0x5u }, + [ITEM_BOMBBAG] = { 0u, 0x8u, 0x63u, 0x3u, 0x7u, TEXT_ITEM_GET, 0x63u, 0x5u }, + [ITEM_LARGE_QUIVER] = { 0u, 0xau, 0x63u, 0x3u, 0x66u, TEXT_ITEM_GET, 0x66u, 0x5u }, + [ITEM_KINSTONE_BAG] = { 0u, 0xdu, 0u, 0u, 0x67u, TEXT_ITEM_GET, 0x67u, 0x5u }, + [ITEM_BRIOCHE] = { 0u, 0u, 0u, 0x2u, 0x68u, TEXT_ITEM_GET, 0x68u, 0x5u }, + [ITEM_CROISSANT] = { 0u, 0u, 0u, 0x2u, 0x69u, TEXT_ITEM_GET, 0x69u, 0x5u }, + [ITEM_PIE] = { 0u, 0u, 0u, 0x2u, 0x6au, TEXT_ITEM_GET, 0x6au, 0x5u }, + [ITEM_CAKE] = { 0u, 0u, 0u, 0x2u, 0x6bu, TEXT_ITEM_GET, 0x6bu, 0x5u }, + [ITEM_BOMBS10] = { 0u, 0x9u, 0xau, 0x2u, 0x6cu, TEXT_ITEM_GET, 0x6cu, 0x5u }, + [ITEM_BOMBS30] = { 0u, 0x9u, 0x1eu, 0x2u, 0x6du, TEXT_ITEM_GET, 0x6du, 0x5u }, + [ITEM_ARROWS10] = { 0u, 0xcu, 0xau, 0x2u, 0x6eu, TEXT_ITEM_GET, 0x6eu, 0x5u }, + [ITEM_ARROWS30] = { 0u, 0xcu, 0x1eu, 0x2u, 0x6fu, TEXT_ITEM_GET, 0x6fu, 0x5u }, + [ITEM_ARROW_BUTTERFLY] = { 0x63u, 0u, 0u, 0x3u, 0x70u, TEXT_ITEM_GET, 0x70u, 0x5u }, + [ITEM_DIG_BUTTERFLY] = { 0x63u, 0u, 0u, 0x3u, 0x71u, TEXT_ITEM_GET, 0x71u, 0x5u }, + [ITEM_SWIM_BUTTERFLY] = { 0x63u, 0u, 0u, 0x3u, 0x72u, TEXT_ITEM_GET, 0x72u, 0x5u }, + [ITEM_SKILL_FAST_SPIN] = { 0x63u, 0u, 0u, 0x2u, 0x73u, TEXT_ITEM_GET, 0x73u, 0x5u }, + [ITEM_SKILL_FAST_SPLIT] = { 0x63u, 0u, 0u, 0x2u, 0x74u, TEXT_ITEM_GET, 0x74u, 0x5u }, + [ITEM_SKILL_LONG_SPIN] = { 0x63u, 0u, 0u, 0x2u, 0x75u, TEXT_ITEM_GET, 0x75u, 0x5u }, }; diff --git a/src/manager/manager37.c b/src/manager/manager37.c index 5bd9d594..884bd8b7 100644 --- a/src/manager/manager37.c +++ b/src/manager/manager37.c @@ -88,7 +88,7 @@ void sub_0805DF4C(Manager* this) { if (--this->unk_0e == 0) { this->action = 3; this->unk_0e = 0x1e; - MessageFromTarget(0x164f); + MessageFromTarget(TEXT_INDEX(TEXT_VAATI2, 0x4f)); } } } diff --git a/src/menu/kinstone_menu.c b/src/menu/kinstone_menu.c index 6956a86e..c9815810 100644 --- a/src/menu/kinstone_menu.c +++ b/src/menu/kinstone_menu.c @@ -311,7 +311,7 @@ void KinstoneMenu_Type5_Overlay0(void) { } KinstoneMenu_080A4468(); SoundReq(SFX_TASK_COMPLETE); - MessageAtHeight(0x702, 0xe); + MessageAtHeight(TEXT_INDEX(TEXT_WINDCRESTS, 0x2), 0xe); gMenu.overlayType = 1; gMenu.transitionTimer = 0x78; } diff --git a/src/npc/beedle.c b/src/npc/beedle.c index 3660b074..68f6d30c 100644 --- a/src/npc/beedle.c +++ b/src/npc/beedle.c @@ -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); diff --git a/src/npc/brocco.c b/src/npc/brocco.c index 80aa132d..d5dbb1f2 100644 --- a/src/npc/brocco.c +++ b/src/npc/brocco.c @@ -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]); diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c index cf0eaec8..d8572d1d 100644 --- a/src/npc/carpenter.c +++ b/src/npc/carpenter.c @@ -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); } diff --git a/src/npc/castleMaid.c b/src/npc/castleMaid.c index 50b1009d..257bc451 100644 --- a/src/npc/castleMaid.c +++ b/src/npc/castleMaid.c @@ -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]); } diff --git a/src/npc/cat.c b/src/npc/cat.c index 5fa32b1f..541721c8 100644 --- a/src/npc/cat.c +++ b/src/npc/cat.c @@ -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]); } diff --git a/src/npc/cow.c b/src/npc/cow.c index cb1efc31..d867d0ed 100644 --- a/src/npc/cow.c +++ b/src/npc/cow.c @@ -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]); } diff --git a/src/npc/cucco.c b/src/npc/cucco.c index c1d20510..8a7110d8 100644 --- a/src/npc/cucco.c +++ b/src/npc/cucco.c @@ -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) }; diff --git a/src/npc/cuccoChick.c b/src/npc/cuccoChick.c index c7496ee6..ffabb4dc 100644 --- a/src/npc/cuccoChick.c +++ b/src/npc/cuccoChick.c @@ -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) { diff --git a/src/npc/dampe.c b/src/npc/dampe.c index a058d42d..dbdff1e9 100644 --- a/src/npc/dampe.c +++ b/src/npc/dampe.c @@ -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; diff --git a/src/npc/drLeft.c b/src/npc/drLeft.c index 28ae056d..4168d951 100644 --- a/src/npc/drLeft.c +++ b/src/npc/drLeft.c @@ -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; diff --git a/src/npc/epona.c b/src/npc/epona.c index 6b566b12..5ac95ddb 100644 --- a/src/npc/epona.c +++ b/src/npc/epona.c @@ -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]); } diff --git a/src/npc/farmers.c b/src/npc/farmers.c index c6a23274..86838460 100644 --- a/src/npc/farmers.c +++ b/src/npc/farmers.c @@ -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]); } diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c index c626f8a3..5c385f86 100644 --- a/src/npc/ghostBrothers.c +++ b/src/npc/ghostBrothers.c @@ -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) { diff --git a/src/npc/gorman.c b/src/npc/gorman.c index c4294df9..cbac8031 100644 --- a/src/npc/gorman.c +++ b/src/npc/gorman.c @@ -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; } diff --git a/src/npc/goron.c b/src/npc/goron.c index cde65f8e..497b8ab3 100644 --- a/src/npc/goron.c +++ b/src/npc/goron.c @@ -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]); } diff --git a/src/npc/goronMerchant.c b/src/npc/goronMerchant.c index 96125b1e..1f897e93 100644 --- a/src/npc/goronMerchant.c +++ b/src/npc/goronMerchant.c @@ -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; diff --git a/src/npc/guardWithSpear.c b/src/npc/guardWithSpear.c index 507c6e62..45174b26 100644 --- a/src/npc/guardWithSpear.c +++ b/src/npc/guardWithSpear.c @@ -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; diff --git a/src/npc/hurdyGurdyMan.c b/src/npc/hurdyGurdyMan.c index 838bb544..64a4df9b 100644 --- a/src/npc/hurdyGurdyMan.c +++ b/src/npc/hurdyGurdyMan.c @@ -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; diff --git a/src/npc/kingDaltus.c b/src/npc/kingDaltus.c index 401ba7d6..796f86d4 100644 --- a/src/npc/kingDaltus.c +++ b/src/npc/kingDaltus.c @@ -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) { diff --git a/src/npc/librari.c b/src/npc/librari.c index fc7be731..5f0b6786 100644 --- a/src/npc/librari.c +++ b/src/npc/librari.c @@ -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; diff --git a/src/npc/librarians.c b/src/npc/librarians.c index 90b8631a..b87985db 100644 --- a/src/npc/librarians.c +++ b/src/npc/librarians.c @@ -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; diff --git a/src/npc/mama.c b/src/npc/mama.c index bf703fb8..205c8e5a 100644 --- a/src/npc/mama.c +++ b/src/npc/mama.c @@ -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]); } diff --git a/src/npc/marcy.c b/src/npc/marcy.c index 8fa1f14b..d91dde22 100644 --- a/src/npc/marcy.c +++ b/src/npc/marcy.c @@ -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; diff --git a/src/npc/mayorHagen.c b/src/npc/mayorHagen.c index 76a86205..5550feb6 100644 --- a/src/npc/mayorHagen.c +++ b/src/npc/mayorHagen.c @@ -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; diff --git a/src/npc/melari.c b/src/npc/melari.c index fe4f9c71..e08032d0 100644 --- a/src/npc/melari.c +++ b/src/npc/melari.c @@ -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)); } } diff --git a/src/npc/ministerPotho.c b/src/npc/ministerPotho.c index 05da19f4..d35408c9 100644 --- a/src/npc/ministerPotho.c +++ b/src/npc/ministerPotho.c @@ -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) { diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c index ca72be22..4c93569c 100644 --- a/src/npc/mountainMinish.c +++ b/src/npc/mountainMinish.c @@ -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)); } } diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c index f69b56a1..5eb9bdba 100644 --- a/src/npc/mutoh.c +++ b/src/npc/mutoh.c @@ -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]); } diff --git a/src/npc/npc9.c b/src/npc/npc9.c index 087b8c2d..76a69b93 100644 --- a/src/npc/npc9.c +++ b/src/npc/npc9.c @@ -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++; } } diff --git a/src/npc/percy.c b/src/npc/percy.c index be9683d6..d713957c 100644 --- a/src/npc/percy.c +++ b/src/npc/percy.c @@ -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: diff --git a/src/npc/picolyteBottle.c b/src/npc/picolyteBottle.c index 0f22d9b5..240473db 100644 --- a/src/npc/picolyteBottle.c +++ b/src/npc/picolyteBottle.c @@ -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)); } } diff --git a/src/npc/pina.c b/src/npc/pina.c index 7f9c6ddf..fecc2bf3 100644 --- a/src/npc/pina.c +++ b/src/npc/pina.c @@ -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]); } diff --git a/src/npc/pita.c b/src/npc/pita.c index 030bb1f1..37cbd77d 100644 --- a/src/npc/pita.c +++ b/src/npc/pita.c @@ -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; } diff --git a/src/npc/rem.c b/src/npc/rem.c index 2fbfdc08..9e3d238a 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -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; } diff --git a/src/npc/smallTownMinish.c b/src/npc/smallTownMinish.c index e0fd0c7c..207fcfdf 100644 --- a/src/npc/smallTownMinish.c +++ b/src/npc/smallTownMinish.c @@ -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) { diff --git a/src/npc/smith.c b/src/npc/smith.c index 18b960cb..f0de3132 100644 --- a/src/npc/smith.c +++ b/src/npc/smith.c @@ -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; diff --git a/src/npc/stamp.c b/src/npc/stamp.c index 9d48c06c..fe32b0e1 100644 --- a/src/npc/stamp.c +++ b/src/npc/stamp.c @@ -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)) { diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c index eec88d55..f7fec8f2 100644 --- a/src/npc/stockwell.c +++ b/src/npc/stockwell.c @@ -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); } diff --git a/src/npc/teachers.c b/src/npc/teachers.c index 45a9e551..4ff317ad 100644 --- a/src/npc/teachers.c +++ b/src/npc/teachers.c @@ -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; diff --git a/src/npc/tingleSiblings.c b/src/npc/tingleSiblings.c index 476a53d5..825f507b 100644 --- a/src/npc/tingleSiblings.c +++ b/src/npc/tingleSiblings.c @@ -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 }; diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index a7bafa74..abf4c69c 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -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)) { diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c index ff763c57..b1f4bf79 100644 --- a/src/npc/townsperson.c +++ b/src/npc/townsperson.c @@ -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)); } } diff --git a/src/npc/vaatiReborn.c b/src/npc/vaatiReborn.c index b52e4262..c4b59a64 100644 --- a/src/npc/vaatiReborn.c +++ b/src/npc/vaatiReborn.c @@ -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; diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c index baddcd73..0cf6e3a0 100644 --- a/src/npc/windTribespeople.c +++ b/src/npc/windTribespeople.c @@ -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); } diff --git a/src/npcUtils.c b/src/npcUtils.c index 65735394..9e7fb73e 100644 --- a/src/npcUtils.c +++ b/src/npcUtils.c @@ -14,7 +14,7 @@ extern u32 (*gUnk_08114EFC[])(Entity*); extern u32 (*gUnk_08114F0C[])(Entity*, u8*); typedef struct { - u16 _0; + u16 textIndex; u16 _2; u16 _4; } NPCData; @@ -307,7 +307,7 @@ void CollideFollowers(void) { void sub_0806F118(Entity* ent) { u32 idx = sub_08002632(ent); NPCData* data = gUnk_08001A7C[idx]; - sub_0801DFB4(ent, data->_0, data->_2, data->_4); + sub_0801DFB4(ent, data->textIndex, data->_2, data->_4); gPlayerState.controlMode = CONTROL_DISABLED; } diff --git a/src/object/cuccoMinigame.c b/src/object/cuccoMinigame.c index 1c3ebbeb..98ac7aff 100644 --- a/src/object/cuccoMinigame.c +++ b/src/object/cuccoMinigame.c @@ -169,10 +169,10 @@ void CuccoMinigame_Cleanup(ObjectB9Entity* this) { void sub_080A13B4(ObjectB9Entity* this, ScriptExecutionContext* context) { if (this->unk6a >= this->unk6c) { - MessageFromTarget(0x300c); + MessageFromTarget(TEXT_INDEX(TEXT_ANJU, 0xc)); context->condition = 1; } else { - MessageFromTarget(0x3005); + MessageFromTarget(TEXT_INDEX(TEXT_ANJU, 0x5)); context->condition = 0; } } @@ -229,7 +229,7 @@ void sub_080A1460(ObjectB9Entity* this) { pcVar1++; } ModRupees(rupees); - MessageNoOverlap(0x3007, super); + MessageNoOverlap(TEXT_INDEX(TEXT_ANJU, 0x7), super); gMessage.rupees = (u16)rupees; } @@ -329,9 +329,9 @@ void sub_080A1608(void) { u16 messageIndex; const u16* ptr; - messageIndex = 0x3002; + messageIndex = TEXT_INDEX(TEXT_ANJU, 0x2); if (CheckRoomFlag(1)) { - messageIndex = 0x3006; + messageIndex = TEXT_INDEX(TEXT_ANJU, 0x6); } MessageFromTarget(messageIndex); gMessage.textWindowPosX = 1; diff --git a/src/object/figurineDevice.c b/src/object/figurineDevice.c index 741548a7..d17525d6 100644 --- a/src/object/figurineDevice.c +++ b/src/object/figurineDevice.c @@ -298,7 +298,7 @@ void FigurineDevice_Action4(FigurineDeviceEntity* this) { this->unk_7a = 0; this->unk_7b = 4; SetRoomFlag(3); - MessageFromTarget(0x431a); + MessageFromTarget(TEXT_INDEX(TEXT_CARLOV, 0x1a)); #ifndef EU gMessage.textWindowPosX = 1; gMessage.textWindowPosY = 0xc; @@ -406,7 +406,7 @@ void sub_080882A8(FigurineDeviceEntity* this) { 206, 79, 3, 2, 0, 208, 0, 6, 0, 13, 0, 2, 0, 0, 0, 0, 128, 240, 208, 139, 2, 0, 1, 0, }; #endif - static const u16 gUnk_08120AE4[] = { 0x4318, 0x4319 }; + static const u16 gUnk_08120AE4[] = { TEXT_INDEX(TEXT_CARLOV, 0x18), TEXT_INDEX(TEXT_CARLOV, 0x19) }; u8* ptr; sub_08050384(); sub_08057044(this->unk_81, gUnk_020227E8, 0x202020); @@ -447,26 +447,26 @@ void sub_08088478(void) { bool32 set0x10 = FALSE; if (!CheckRoomFlag(8)) { if (!CheckRoomFlag(7)) { - messageIndex = 0x4322; + messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x22); set0x10 = TRUE; } else { - messageIndex = 0x4325; + messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x25); } } else { switch (gSave.stats.filler[0]) { case 0x88: gSave.stats.filler[1] = 0xff; - messageIndex = 0x4329; + messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x29); break; case 0x82: if (gSave.saw_staffroll) { - messageIndex = 0x4327; + messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x27); } else { - messageIndex = 0x4328; + messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x28); } break; default: - messageIndex = 0x4327; + messageIndex = TEXT_INDEX(TEXT_CARLOV, 0x27); } } MessageFromTarget(messageIndex); @@ -484,13 +484,13 @@ void sub_08088504(void) { u32 index; switch (gSave.stats.filler[0]) { case 0x88: - index = 0x432f; + index = TEXT_INDEX(TEXT_CARLOV, 0x2f); break; case 0x82: - index = 0x4314; + index = TEXT_INDEX(TEXT_CARLOV, 0x14); break; default: - index = 0x4311; + index = TEXT_INDEX(TEXT_CARLOV, 0x11); break; } MessageFromTarget(index); @@ -501,9 +501,9 @@ void sub_08088504(void) { void sub_08088544(void) { u32 index; if (gSave.stats.filler[0] != 0x82) { - index = 0x430e; + index = TEXT_INDEX(TEXT_CARLOV, 0xe); } else { - index = 0x4315; + index = TEXT_INDEX(TEXT_CARLOV, 0x15); } MessageFromTarget(index); gMessage.textWindowPosX = 1; @@ -518,12 +518,12 @@ void sub_08088574(void) { if (CheckRoomFlag(9)) { #endif if (CheckLocalFlag(SHOP07_COMPLETE)) { - index = 0x4313; + index = TEXT_INDEX(TEXT_CARLOV, 0x13); } else { - index = 0x430c; + index = TEXT_INDEX(TEXT_CARLOV, 0x0c); } } else { - index = 0x430b; + index = TEXT_INDEX(TEXT_CARLOV, 0x0b); } MessageFromTarget(index); gMessage.textWindowPosX = 1; @@ -534,7 +534,7 @@ void sub_080885B0(void) { if (!CheckRoomFlag(8)) { if (!CheckRoomFlag(7)) { ModRupees(5); - MessageFromTarget(0x4326); + MessageFromTarget(TEXT_INDEX(TEXT_CARLOV, 0x26)); gMessage.textWindowPosX = 1; gMessage.textWindowPosY = 0xc; } diff --git a/src/object/fourElements.c b/src/object/fourElements.c index 24141d89..3b4b8d97 100644 --- a/src/object/fourElements.c +++ b/src/object/fourElements.c @@ -20,7 +20,7 @@ typedef struct { /*0x6a*/ u8 unk_6a; } FourElementsEntity; -extern u32 sub_0805429C(u32); +extern u32 getItemMetaDataGetTextIndex(u32); extern void sub_0807DF50(void); extern u16 script_PlayerGetElement[]; @@ -133,7 +133,7 @@ void FourElements_Action5(FourElementsEntity* this) { RequestPriorityDuration(NULL, 10); if (--this->unk_68 == 0) { super->action = 6; - index = sub_0805429C(super->type); + index = getItemMetaDataGetTextIndex(super->type); MessageNoOverlap(index, super); } } diff --git a/src/object/frozenOctorok.c b/src/object/frozenOctorok.c index ac86fb65..82db2f4b 100644 --- a/src/object/frozenOctorok.c +++ b/src/object/frozenOctorok.c @@ -92,7 +92,7 @@ void FrozenOctorok_Action1SubAction0(FrozenOctorokEntity* this) { } } if (this->unk_79-- == 0) { - MessageFromTarget(0xb43); + MessageFromTarget(TEXT_INDEX(TEXT_EZLO, 0x43)); super->subAction = 1; this->unk_79 = 8; } @@ -238,7 +238,7 @@ void FrozenOctorok_Action1SubAction6(FrozenOctorokEntity* this) { void FrozenOctorok_Action1SubAction7(FrozenOctorokEntity* this) { if ((gRoomControls.scroll_flags & 4) == 0) { - CreateEzloHint(0xb44, 0); + CreateEzloHint(TEXT_INDEX(TEXT_EZLO, 0x44), 0); DeleteThisEntity(); } } diff --git a/src/object/object6A.c b/src/object/object6A.c index 67ccf719..d1296659 100644 --- a/src/object/object6A.c +++ b/src/object/object6A.c @@ -448,7 +448,7 @@ void sub_08095088(Object6AEntity* this) { super->interactType = 0; super->action = 2; sub_080788E0(super); - CreateEzloHint(0x1F1F, 0); + CreateEzloHint(TEXT_INDEX(TEXT_BELARI, 0x1F), 0); } break; case 2: diff --git a/src/object/objectB.c b/src/object/objectB.c index 8c500500..c2681b4a 100644 --- a/src/object/objectB.c +++ b/src/object/objectB.c @@ -81,7 +81,7 @@ void ObjectB_Action1(ObjectBEntity* this) { tmp = GetInventoryValue((u32)super->type); ptr = &gItemMetaData[super->type]; if (tmp == 0) { - this->unk_68 = *(u16*)&ptr->unk4; + this->unk_68 = *(u16*)&ptr->textId; } else { this->unk_68 = *(u16*)&ptr->unk6; } @@ -114,7 +114,7 @@ void ObjectB_Action2(ObjectBEntity* this) { break; case 0x3f: if (super->type2 > 1) { - if (messageIndex == 0x577) { + if (messageIndex == TEXT_INDEX(TEXT_ITEM_GET, 0x77)) { messageIndex--; } else { messageIndex++; diff --git a/src/object/swordsmanNewsletter.c b/src/object/swordsmanNewsletter.c index 344ea110..4c9fdd8f 100644 --- a/src/object/swordsmanNewsletter.c +++ b/src/object/swordsmanNewsletter.c @@ -26,7 +26,9 @@ void sub_080933D8(Entity* this) { void sub_080933FC(Entity* this) { static const u16 messageIndices[] = { - 0x301, 0x302, 0x303, 0x304, 0x305, 0x306, 0x307, 0x308, + TEXT_INDEX(TEXT_NEWSLETTER, 1), TEXT_INDEX(TEXT_NEWSLETTER, 2), TEXT_INDEX(TEXT_NEWSLETTER, 3), + TEXT_INDEX(TEXT_NEWSLETTER, 4), TEXT_INDEX(TEXT_NEWSLETTER, 5), TEXT_INDEX(TEXT_NEWSLETTER, 6), + TEXT_INDEX(TEXT_NEWSLETTER, 7), TEXT_INDEX(TEXT_NEWSLETTER, 8), }; if (this->interactType != 0) { this->interactType = 0; diff --git a/src/playerItemUtils.c b/src/playerItemUtils.c index 6bd45d51..8364caf3 100644 --- a/src/playerItemUtils.c +++ b/src/playerItemUtils.c @@ -75,7 +75,7 @@ void sub_080A7C8C(u32 pos, u32 layer) { } u32 sub_080A7CFC(u32 a1) { - u32 msg = 0x600; + u32 msg = TEXT_INDEX(TEXT_LOCATIONS, 0x0); bool32 hint = FALSE; TileEntity* t = GetCurrentRoomProperty(3); diff --git a/src/playerUtils.c b/src/playerUtils.c index c1752134..3e236f6a 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -807,7 +807,7 @@ bool32 sub_080782C0(void) { *(u8*)(*(int*)(gUnk_03003DF0.unk_4 + 8) + 0x39) = 2; gPlayerState.queued_action = 7; } else { - CreateEzloHint(0xb65, 0); + CreateEzloHint(TEXT_INDEX(TEXT_EZLO, 0x65), 0); } ForceSetPlayerState(0x13); return TRUE; diff --git a/src/subtask.c b/src/subtask.c index f00b4870..2c847d87 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -851,7 +851,7 @@ void sub_08055D9C(void) { void sub_08055DC0(void) { if (gFadeControl.active == 0) { - MessageFromTarget(0xa01); + MessageFromTarget(TEXT_INDEX(TEXT_EMPTY, 0x01)); gMenu.overlayType++; gMenu.transitionTimer = 0x78; } diff --git a/src/subtask2.c b/src/subtask2.c index daad4998..1de50305 100644 --- a/src/subtask2.c +++ b/src/subtask2.c @@ -1484,7 +1484,7 @@ void sub_080A6CD8(void) { case START_BUTTON: gMenu.field_0x0 = 2; SetMenuType(2); - MessageFromTarget(0x704); + MessageFromTarget(TEXT_INDEX(TEXT_WINDCRESTS, 0x04)); break; case B_BUTTON: gMenu.field_0x0 = 3;