mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-05 11:33:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add furniture enum, use enum for defines & replace most constants

Browse Source 
There are probably more hardcoded values I missed.
This commit is contained in:
Cuyler36
2025-07-09 06:02:59 -04:00
parent b22740e70d
commit 8620018ea9
35 changed files with 3586 additions and 1825 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actor/ac_intro_demo_move.c_inc
+1 -1
View File
@@ -170,7 +170,7 @@ static void aID_retire_rcn_guide_wait(INTRO_DEMO_ACTOR* intro_demo, GAME_PLAY* p
mHS_set_use(Common_Get(player_no), intro_demo->house_idx);
mPr_SetItemCollectBit(Now_Private->cloth.item);
mPr_SetItemCollectBit(FTR_TAPEDECK);
mPr_SetItemCollectBit(FTR_START(FTR_SUM_CASSE01));
mPr_SetItemCollectBit(ITM_CARPET_START +
Save_Get(homes[intro_demo->house_idx]).floors[0].wall_floor.flooring_idx);
mPr_SetItemCollectBit(ITM_WALL_START +
src/actor/ac_museum_picture.c
+2 -2
View File
@@ -183,8 +183,8 @@ static void Museum_Picture_Actor_move(ACTOR* actorx, GAME* game) {
: ((donator == mMmd_DONATOR_DELETED_PLAYER) ? MSG_12192 : MSG_12191);
if (mDemo_Request(mDemo_TYPE_SPEAK, actorx, &aMP_SetTalkInfo) && mMmd_IS_DONATED(donator)) {
mActor_name_t item = (i >= 0 && i < mMmd_ART_NUM)
? (mActor_name_t)(FTR_PAINTING0 + (mActor_name_t)(i << 2))
: FTR_PAINTING0;
? (mActor_name_t)(FTR_START(FTR_SUM_ART01) + (mActor_name_t)(i << 2))
: FTR_START(FTR_SUM_ART01);
/* Copy the art item's name */
mIN_copy_name_str(item_name, item);
src/actor/ac_my_room.c
+24 -24
View File
@@ -268,7 +268,7 @@ static int aMR_ItemPutInFurniture(FTR_ACTOR* ftr_actor, mActor_name_t item) {
static int aMR_ItemNo2IconNo(mActor_name_t item_no) {
if (ITEM_IS_FTR(item_no)) {
if (item_no >= FTR_COLLEGERULE && item_no <= FTR_CALLIGRAPHY_PAD_WEST) {
if (item_no >= FTR_START(FTR_NOG_COLLEGENOTE) && item_no <= FTR_END(FTR_IKE_NIKKI_WAFU1)) {
return aMR_ICON_DIARY;
}
@@ -2130,7 +2130,7 @@ static void aMR_CallSitDownOngenPosSE(const xyz_t* pos) {
/* Check for massage chair */
switch (ftr_actor->name) {
case 0x152:
case FTR_KON_MASAJI:
sAdo_OngenPos((u32)ftr_actor, 39, &ftr_actor->position);
break;
}
@@ -2286,27 +2286,27 @@ extern s16 aMR_GetParentAngleOffset(FTR_ACTOR* ftr_actor, ACTOR* actorx) {
extern u8 aMR_GetAlphaEdge(u16 ftr_name) {
switch (ftr_name) {
case 0x41: // classic cabinet
case 0x120: // violin
case 0x121: // bass (instrument)
case 0x122: // cello
case FTR_SUM_CLASSICWARDROPE01: // classic cabinet
case FTR_SUM_VIOLA01: // violin
case FTR_SUM_BASS01: // bass (instrument)
case FTR_SUM_CELLO01: // cello
return 11;
case 0x393: // kitschy clock
case 0x394: // antique clock
case FTR_KON_AMECLOCK: // kitschy clock
case FTR_KON_ATQCLOCK: // antique clock
return 250;
case 0x3FC: // red balloon
case 0x3FD: // yellow balloon
case 0x3FE: // blue balloon
case 0x3FF: // green balloon
case 0x400: // purple balloon
case 0x401: // bunny p. balloon
case 0x402: // bunny b. balloon
case 0x403: // bunny o. balloon
case FTR_NOG_BALLOON_COMMON0: // red balloon
case FTR_NOG_BALLOON_COMMON1: // yellow balloon
case FTR_NOG_BALLOON_COMMON2: // blue balloon
case FTR_NOG_BALLOON_COMMON3: // green balloon
case FTR_NOG_BALLOON_COMMON4: // purple balloon
case FTR_NOG_BALLOON_COMMON5: // bunny p. balloon
case FTR_NOG_BALLOON_COMMON6: // bunny b. balloon
case FTR_NOG_BALLOON_COMMON7: // bunny o. balloon
return 96;
case 0x415:
case FTR_IKE_K_TANABATA01:
return 127; // tanabata palm
case 0x4CC:
return 20; // harvest bureau
case FTR_YOS_WHEEL:
return 20; // wagon wheel
default:
return 127;
}
@@ -2314,11 +2314,11 @@ extern u8 aMR_GetAlphaEdge(u16 ftr_name) {
extern int aMR_DrawDolphinMode(u16 ftr_name) {
switch (ftr_name) {
case 0x406: // stone coin
case 0x49D: // hamster cage
case 0x4CF: // neutral corner
case 0x4D0: // red corner
case 0x4D1: // blue corner
case FTR_TAK_MONEY: // stone coin
case FTR_TAK_HAM1: // hamster cage
case FTR_IKE_PRORES_LING01: // neutral corner
case FTR_IKE_PRORES_LING02: // red corner
case FTR_IKE_PRORES_LING03: // blue corner
return TRUE;
default:
return FALSE;
src/actor/ac_my_room_action.c_inc
+2 -2
View File
@@ -195,7 +195,7 @@ static void aMR_SetMoveSE(FTR_ACTOR* ftr_actor) {
int floor_idx;
switch (ftr_actor->name) {
case 0x406: /* stone coin */
case FTR_TAK_MONEY: /* stone coin */
contact_layer = aMR_GetContactInfoLayer1();
if (ftr_actor->state == aFTR_STATE_WAIT_PUSH || ftr_actor->state == aFTR_STATE_WAIT_PUSH2 ||
@@ -215,7 +215,7 @@ static void aMR_SetMoveSE(FTR_ACTOR* ftr_actor) {
}
}
break;
case 0x4E8: /* lawn mower */
case FTR_NOG_LAWNMOWER: /* lawn mower */
floor_idx = Common_Get(floor_idx);
if (floor_idx == FLOOR_NPC026 || floor_idx == FLOOR_NPC048) {
src/actor/ac_my_room_draw.c_inc
+4 -4
View File
@@ -218,7 +218,7 @@ static void aMR_DrawOneFurniture(FTR_ACTOR* ftr_actor, ACTOR* actorx, GAME* game
Matrix_RotateY(angle, MTX_MULT);
Matrix_translate(fit_ftr_p->base_position.x, fit_ftr_p->base_position.y, fit_ftr_p->base_position.z, MTX_MULT);
if (ftr_actor->name == 0x9A) { /* lower alarm clock ftr's height */
if (ftr_actor->name == FTR_SUM_MEZACLOCK) { /* lower alarm clock ftr's height */
Matrix_translate(pos->x, pos->y - 4.0f, pos->z, MTX_MULT);
} else {
Matrix_translate(pos->x, pos->y, pos->z, MTX_MULT);
@@ -237,7 +237,7 @@ static void aMR_DrawOneFurniture(FTR_ACTOR* ftr_actor, ACTOR* actorx, GAME* game
}
Matrix_scale(scale, scale, scale, MTX_MULT);
} else {
if (ftr_actor->name == 0x9A) { /* lower alarm clock ftr's height */
if (ftr_actor->name == FTR_SUM_MEZACLOCK) { /* lower alarm clock ftr's height */
Matrix_translate(ftr_actor->position.x, ftr_actor->position.y - 4.0f, ftr_actor->position.z, MTX_LOAD);
} else {
Matrix_translate(ftr_actor->position.x, ftr_actor->position.y, ftr_actor->position.z, MTX_LOAD);
@@ -372,7 +372,7 @@ static void My_Room_Actor_draw(ACTOR* actorx, GAME* game) {
MY_ROOM_ACTOR* my_room = (MY_ROOM_ACTOR*)actorx;
GAME_PLAY* play = (GAME_PLAY*)game;
aMR_DrawFurniture(my_room, play, FALSE, 0x41C); /* lighthouse model */
aMR_DrawFurniture(my_room, play, TRUE, 0x41C); /* lighthouse model */
aMR_DrawFurniture(my_room, play, FALSE, FTR_TAK_TOUDAI); /* lighthouse model */
aMR_DrawFurniture(my_room, play, TRUE, FTR_TAK_TOUDAI); /* lighthouse model */
aMR_DrawLeaf(my_room, play);
}
src/actor/ac_my_room_move.c_inc
+23 -23
View File
@@ -1047,18 +1047,18 @@ static int aMR_ManageMoveBottun(MY_ROOM_ACTOR* my_room, GAME* game, aMR_contact_
return TRUE;
}
}
} else if (ftr_idx == 0x4A0) { /* Super Tortimer */
} else if (ftr_idx == FTR_TAK_NES01) { /* Super Tortimer */
if (aMR_FtrIdx2ChangeFtrSwitch(actorx, contact->ftrID)) {
my_room->requested_msg_type = aMR_MSG_STATE_HITOKOTO2;
return TRUE;
}
} else if (ftr_idx == 0x411) { /* lovely phone */
} else if (ftr_idx == FTR_IKE_K_OTOME01) { /* lovely phone */
if (aMR_FtrIdx2ChangeFtrSwitch(actorx, contact->ftrID)) {
my_room->requested_msg_type = aMR_MSG_STATE_HITOKOTO;
sAdo_OngenTrgStart(NA_SE_166, &ftr_actor->position);
return TRUE;
}
} else if (ftr_idx == 0x415) { /* tanabata palm */
} else if (ftr_idx == FTR_IKE_K_TANABATA01) { /* tanabata palm */
if (aMR_FtrIdx2ChangeFtrSwitch(actorx, contact->ftrID)) {
my_room->requested_msg_type = aMR_MSG_STATE_HITOKOTO1;
return TRUE;
@@ -1124,7 +1124,7 @@ static int aMR_ManageMoveBottun(MY_ROOM_ACTOR* my_room, GAME* game, aMR_contact_
return TRUE;
}
}
} else if (ftr_actor->name == 0x3F6) { /* Mouth of Truth */
} else if (ftr_actor->name == FTR_IKE_JNY_TRUTH01) { /* Mouth of Truth */
if (contact->contact_direction == aMR_CONTACT_DIR_FRONT &&
aMR_FtrIdx2ChangeFtrSwitch(actorx, contact->ftrID)) {
my_room->state = 0;
@@ -1467,7 +1467,7 @@ static mActor_name_t aMR_GetBirthFurniture(u16 ftr_no, int angle_idx) {
return mRmTp_FtrIdx2FtrItemNo(ftr_no, angle_idx & 3);
}
return FTR_FAN;
return FTR_START(FTR_NOG_FAN01);
}
static int aMR_CheckPlaceSituation(int ut, int target_ut, u16 ftr_no, u16 angle_idx) {
@@ -1891,10 +1891,10 @@ static int aMR_JudgeBreedNewFurniture(GAME* game, u16 ftr_no, int* ut_x, int* ut
angle_idx = mRmTp_DIRECT_WEST;
}
if (ftr_no == 0x3C4 || (ftr_no >= 0x3FC && ftr_no <= 0x403)) {
if (ftr_no == FTR_DIN_STEGO_HEAD || (ftr_no >= FTR_NOG_BALLOON_COMMON0 && ftr_no <= FTR_NOG_BALLOON_COMMON7)) {
/* Add a rotation for stego skull & the balloon furniture items */
angle_idx++;
} else if (ftr_no == 0x33B) {
} else if (ftr_no == FTR_NOG_KAERU) {
/* Add two rotations for the frog furniture */
angle_idx += 2;
}
@@ -2832,37 +2832,37 @@ static void aMR_MakeClockInfo(MY_ROOM_ACTOR* my_room, GAME* game) {
static u16 aMR_Fname2ConpoIndex(u16 fname) {
switch (fname) {
case 0x055: /* retro stereo */
case FTR_SUM_STEREO01: /* retro stereo */
return 1;
case 0x37E: /* phonograph */
case FTR_SUM_CHIKUON01: /* phonograph */
return 2;
case 0x37F: /* turntable */
case FTR_SUM_CHIKUON02: /* turntable */
return 3;
case 0x380: /* jukebox */
case FTR_SUM_JUKEBOX: /* jukebox */
return 4;
case 0x385: /* lovely stereo */
case FTR_SUM_LV_STEREO: /* lovely stereo */
return 5;
case 0x381: /* red boom box */
case FTR_SUM_RADIO01: /* red boom box */
return 6;
case 0x382: /* white boom box */
case FTR_SUM_RADIO02: /* white boom box */
return 7;
case 0x396: /* tape deck */
case FTR_SUM_CASSE01: /* tape deck */
return 8;
case 0x395: /* reel-to-reel */
case FTR_SUM_RECO01: /* reel-to-reel */
return 9;
case 0x079: /* gold stereo */
case FTR_SUM_CONPO01: /* gold stereo */
return 10;
case 0x383: /* high-end stereo */
case FTR_SUM_CONPO02: /* high-end stereo */
return 11;
case 0x384: /* hi-fi stereo */
case FTR_SUM_STEREO02: /* hi-fi stereo */
return 12;
case 0x38F: /* robo-stereo */
case FTR_SUM_ROBOCONPO: /* robo-stereo */
return 13;
case 0x390: /* dice stereo */
case FTR_SUM_SAICONPO: /* dice stereo */
return 14;
case 0x397: /* CD player */
case FTR_SUM_MD01: /* CD player */
return 15;
case 0x3B4: /* kiddie stereo */
case FTR_NOG_TRI_AUDIO01: /* kiddie stereo */
return 16;
default:
return 1;
src/actor/ac_present_demo_move.c_inc
+1 -1
View File
@@ -4,7 +4,7 @@ static void aPRD_setup_present(PRESENT_DEMO_ACTOR* present_demo) {
if (Common_Get(time.rtc_time.month) == Now_Private->birthday.month && Common_Get(time.rtc_time.day) == Now_Private->birthday.day && Now_Private->birthday_present_npc != EMPTY_NO) {
type = aPRD_TYPE_BIRTHDAY;
present = FTR_FAMICOM_DONKEY_KONG;
present = FTR_START(FTR_FAMICOM_COMMON02);
} else if (mSC_LightHouse_Event_Check(Common_Get(player_no)) != mSC_LIGHTHOUSE_EVENT_NONE) {
switch (mSC_LightHouse_Event_Check(Common_Get(player_no))) {
case mSC_LIGHTHOUSE_EVENT_JAN_CONTRIBUTED:
src/actor/ac_snowman.c
+10 -10
View File
@@ -200,16 +200,16 @@ static void aSMAN_GetSnowmanPresentMail(Mail_c* mail) {
int header_back_start;
// clang-format off
static mActor_name_t snow_item_table[] = {
FTR_SNOWMAN_FRIDGE,
FTR_SNOWMAN_TABLE,
FTR_SNOWMAN_BED,
FTR_SNOWMAN_CHAIR,
FTR_SNOWMAN_LAMP,
FTR_SNOWMAN_SOFA,
FTR_SNOWMAN_TV,
FTR_SNOWMAN_DRESSER,
FTR_SNOWMAN_WARDROBE,
FTR_SNOWMAN_CLOCK,
FTR_START(FTR_KON_SNOWFREEZER),
FTR_START(FTR_KON_SNOWTABLE),
FTR_START(FTR_KON_SNOWBED),
FTR_START(FTR_TAK_SNOWISU),
FTR_START(FTR_TAK_SNOWLAMP),
FTR_START(FTR_KON_SNOWSOFA),
FTR_START(FTR_KON_SNOWTV),
FTR_START(FTR_KON_SNOWTANSU),
FTR_START(FTR_KON_SNOWBOX),
FTR_START(FTR_KON_SNOWCLOCK),
ITM_CARPET25,
ITM_WALL25,
};
src/actor/npc/ac_halloween_npc_talk.c_inc
+1 -1
View File
@@ -13,7 +13,7 @@ static int aHWN_get_trick_type(void) {
int ftr_idx = mRmTp_FtrItemNo2FtrIdx(*pockets_p);
// check furniture is not jack-o'-lantern nor jack-in-the-box
if (ftr_idx != 0x127 && ftr_idx != 0x131) {
if (ftr_idx != FTR_SUM_HAL_PKIN && ftr_idx != FTR_SUM_HAL_BOX01) {
idx[count++] = i;
}
}
src/actor/npc/ac_npc_curator_move.c_inc
+56 -54
View File
@@ -173,15 +173,15 @@ enum {
};
static int aCR_get_fossil_type(mActor_name_t item) {
static int fossil_ftr_start[aCR_FOSSIL_TYPE_NUM] = { FTR_DINO_TRICERA_SKULL, FTR_DINO_TREX_SKULL,
FTR_DINO_APATO_SKULL, FTR_DINO_STEGO_SKULL,
FTR_DINO_PTERA_SKULL, FTR_DINO_PLESIO_SKULL,
FTR_DINO_MAMMOTH_SKULL };
static int fossil_ftr_start[aCR_FOSSIL_TYPE_NUM] = {
FTR_START(FTR_DIN_TRIKERA_HEAD), FTR_START(FTR_DIN_TREX_HEAD), FTR_START(FTR_DIN_BRONT_HEAD), FTR_START(FTR_DIN_STEGO_HEAD),
FTR_START(FTR_DIN_PTERA_HEAD), FTR_START(FTR_DIN_HUTABA_HEAD), FTR_START(FTR_DIN_MAMMOTH_HEAD),
};
static int fossil_ftr_end[aCR_FOSSIL_TYPE_NUM] = { FTR_DINO_TRICERA_BODY + 3, FTR_DINO_TREX_BODY + 3,
FTR_DINO_APATO_BODY + 3, FTR_DINO_STEGO_BODY + 3,
FTR_DINO_PTERA_LEFT_WING + 3, FTR_DINO_PLESIO_TORSO + 3,
FTR_DINO_MAMMOTH_TORSO + 3 };
static int fossil_ftr_end[aCR_FOSSIL_TYPE_NUM] = {
FTR_END(FTR_DIN_TRIKERA_BODY), FTR_END(FTR_DIN_TREX_BODY), FTR_END(FTR_DIN_BRONT_BODY), FTR_END(FTR_DIN_STEGO_BODY),
FTR_END(FTR_DIN_PTERA_LWING), FTR_END(FTR_DIN_HUTABA_BODY), FTR_END(FTR_DIN_MAMMOTH_BODY),
};
int res = -1;
int i;
@@ -204,9 +204,9 @@ typedef struct {
#define aCR_GetFossilPartDonator(item_no) \
mMmd_FossilInfo( \
((item_no) >= FTR_DINO_START && (item_no) <= FTR_DINO_END) ? FTR_IDX_2_NO((item_no - FTR_DINO_START)) : 0)
#define aCR_GetArtDonator(item_no) \
mMmd_ArtInfo(((item_no) >= FTR_PAINTING0 && (item_no) <= FTR_PAINTING14_WEST) \
? FTR_IDX_2_NO((item_no - FTR_PAINTING0)) \
#define aCR_GetArtDonator(item_no) \
mMmd_ArtInfo(((item_no) >= FTR_START(FTR_SUM_ART01) && (item_no) <= FTR_END(FTR_SUM_ART15)) \
? FTR_IDX_2_NO((item_no - FTR_START(FTR_SUM_ART01))) \
: 0)
#define aCR_GetInsectDonator(item_no) \
mMmd_InsectInfo(((item_no) >= ITM_INSECT_START && (item_no) < ITM_INSECT_END) ? (item_no - ITM_INSECT_START) : 0)
@@ -214,13 +214,13 @@ typedef struct {
mMmd_FishInfo(((item_no) >= ITM_FISH_START && (item_no) <= ITM_FISH_END) ? (item_no - ITM_FISH_START) : 0)
static int aCR_chk_fossil_parts_complete_sub(int type) {
static mActor_name_t trikera_parts[] = { FTR_DINO_TRICERA_SKULL, FTR_DINO_TRICERA_TAIL, FTR_DINO_TRICERA_BODY };
static mActor_name_t trex_parts[] = { FTR_DINO_TREX_SKULL, FTR_DINO_TREX_TAIL, FTR_DINO_TREX_BODY };
static mActor_name_t bront_parts[] = { FTR_DINO_APATO_SKULL, FTR_DINO_APATO_TAIL, FTR_DINO_APATO_BODY };
static mActor_name_t stego_parts[] = { FTR_DINO_STEGO_SKULL, FTR_DINO_STEGO_TAIL, FTR_DINO_STEGO_BODY };
static mActor_name_t ptera_parts[] = { FTR_DINO_PTERA_SKULL, FTR_DINO_PTERA_RIGHT_WING, FTR_DINO_PTERA_LEFT_WING };
static mActor_name_t hutaba_parts[] = { FTR_DINO_PLESIO_SKULL, FTR_DINO_PLESIO_NECK, FTR_DINO_PLESIO_TORSO };
static mActor_name_t mammoth_parts[] = { FTR_DINO_MAMMOTH_SKULL, FTR_DINO_MAMMOTH_TORSO };
static mActor_name_t trikera_parts[] = { FTR_START(FTR_DIN_TRIKERA_HEAD), FTR_START(FTR_DIN_TRIKERA_TAIL), FTR_START(FTR_DIN_TRIKERA_BODY) };
static mActor_name_t trex_parts[] = { FTR_START(FTR_DIN_TREX_HEAD), FTR_START(FTR_DIN_TREX_TAIL), FTR_START(FTR_DIN_TREX_BODY) };
static mActor_name_t bront_parts[] = { FTR_START(FTR_DIN_BRONT_HEAD), FTR_START(FTR_DIN_BRONT_TAIL), FTR_START(FTR_DIN_BRONT_BODY) };
static mActor_name_t stego_parts[] = { FTR_START(FTR_DIN_STEGO_HEAD), FTR_START(FTR_DIN_STEGO_TAIL), FTR_START(FTR_DIN_STEGO_BODY) };
static mActor_name_t ptera_parts[] = { FTR_START(FTR_DIN_PTERA_HEAD), FTR_START(FTR_DIN_PTERA_RWING), FTR_START(FTR_DIN_PTERA_LWING) };
static mActor_name_t hutaba_parts[] = { FTR_START(FTR_DIN_HUTABA_HEAD), FTR_START(FTR_DIN_HUTABA_NECK), FTR_START(FTR_DIN_HUTABA_BODY) };
static mActor_name_t mammoth_parts[] = { FTR_START(FTR_DIN_MAMMOTH_HEAD), FTR_START(FTR_DIN_MAMMOTH_BODY) };
static aCR_fossil_part_c fossil_parts[aCR_FOSSIL_TYPE_NUM] = {
{ ARRAY_COUNT(trikera_parts), trikera_parts }, { ARRAY_COUNT(trex_parts), trex_parts },
{ ARRAY_COUNT(bront_parts), bront_parts }, { ARRAY_COUNT(stego_parts), stego_parts },
@@ -388,15 +388,15 @@ static int aCR_get_idx_to_donate_fossil(mActor_name_t item) {
switch (donator) {
case mMmd_DONATOR_NONE: {
switch (item) {
case FTR_FOSSIL_TRILOBITE:
case FTR_START(FTR_DIN_TRILOBITE):
return 17;
case FTR_FOSSIL_AMMONITE:
case FTR_START(FTR_DIN_AMMONITE):
return 18;
case FTR_FOSSIL_EGG:
case FTR_START(FTR_DIN_EGG):
return 19;
case FTR_FOSSIL_TRACK:
case FTR_START(FTR_DIN_STUMP):
return 20;
case FTR_FOSSIL_AMBER:
case FTR_START(FTR_DIN_AMBER):
return 21;
default:
return 16;
@@ -415,8 +415,8 @@ static int aCR_get_idx_to_donate_art(mActor_name_t item) {
int donator = aCR_GetArtDonator(item);
switch (item) {
case FTR_PAINTING15_UNUSED:
case FTR_PAINTING16_UNUSED:
case FTR_START(FTR_SUM_ART02):
case FTR_START(FTR_SUM_ART03):
return 1;
}
@@ -604,7 +604,7 @@ static void aCR_get_demo_end_wait(NPC_CURATOR_ACTOR* curator, GAME_PLAY* play) {
#define aCR_IS_FOSSIL(item) ((item) >= FTR_DINO_START && (item) <= FTR_DINO_END)
#define aCR_IS_ART(item) ((item) >= FTR_PAINTING0 && (item) <= FTR_PAINTING14_WEST)
#define aCR_IS_ART(item) ((item) >= FTR_START(FTR_SUM_ART01) && (item) <= FTR_END(FTR_SUM_ART15))
#define aCR_IS_INSECT(item) ((item) >= ITM_INSECT_START && (item) < ITM_INSECT_END)
@@ -616,34 +616,36 @@ typedef struct {
} aCR_donate_act_c;
static void aCR_msg_win_open_wait(NPC_CURATOR_ACTOR* curator, GAME_PLAY* play) {
static aCR_donate_act_c donate_act[] = { { 0x2F63, aCR_TALK_END_WAIT },
{ 0x3A83, aCR_TALK_RETURN_DEMO_START_WAIT },
{ 0x2F64, aCR_TALK_RETURN_DEMO_START_WAIT },
{ 0x2F65, aCR_TALK_RETURN_DEMO_START_WAIT },
{ 0x2F6B, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F6C, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F6D, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F6E, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F67, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F68, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F69, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F6A, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F90, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F91, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F92, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F93, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F8F, aCR_TALK_PUTAWAY_DEMO_START_WAIT2 },
{ 0x2F7F, aCR_TALK_PUTAWAY_DEMO_START_WAIT3 },
{ 0x2F80, aCR_TALK_PUTAWAY_DEMO_START_WAIT3 },
{ 0x2F81, aCR_TALK_PUTAWAY_DEMO_START_WAIT3 },
{ 0x2F82, aCR_TALK_PUTAWAY_DEMO_START_WAIT3 },
{ 0x2F83, aCR_TALK_PUTAWAY_DEMO_START_WAIT3 },
{ 0x2F70, aCR_TALK_PUTAWAY_DEMO_START_WAIT },
{ 0x2F71, aCR_TALK_PUTAWAY_DEMO_START_WAIT },
{ 0x2F72, aCR_TALK_PUTAWAY_DEMO_START_WAIT },
{ 0x2F86, aCR_TALK_PUTAWAY_DEMO_START_WAIT5 },
{ 0x2F87, aCR_TALK_PUTAWAY_DEMO_START_WAIT4 },
{ 0x2F89, aCR_TALK_PUTAWAY_DEMO_START_WAIT5_2 } };
static aCR_donate_act_c donate_act[] = {
{ 0x2F63, aCR_TALK_END_WAIT },
{ 0x3A83, aCR_TALK_RETURN_DEMO_START_WAIT },
{ 0x2F64, aCR_TALK_RETURN_DEMO_START_WAIT },
{ 0x2F65, aCR_TALK_RETURN_DEMO_START_WAIT },
{ 0x2F6B, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F6C, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F6D, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F6E, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F67, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F68, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F69, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F6A, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F90, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F91, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F92, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F93, aCR_TALK_RETURN_DEMO_START_WAIT2 },
{ 0x2F8F, aCR_TALK_PUTAWAY_DEMO_START_WAIT2 },
{ 0x2F7F, aCR_TALK_PUTAWAY_DEMO_START_WAIT3 },
{ 0x2F80, aCR_TALK_PUTAWAY_DEMO_START_WAIT3 },
{ 0x2F81, aCR_TALK_PUTAWAY_DEMO_START_WAIT3 },
{ 0x2F82, aCR_TALK_PUTAWAY_DEMO_START_WAIT3 },
{ 0x2F83, aCR_TALK_PUTAWAY_DEMO_START_WAIT3 },
{ 0x2F70, aCR_TALK_PUTAWAY_DEMO_START_WAIT },
{ 0x2F71, aCR_TALK_PUTAWAY_DEMO_START_WAIT },
{ 0x2F72, aCR_TALK_PUTAWAY_DEMO_START_WAIT },
{ 0x2F86, aCR_TALK_PUTAWAY_DEMO_START_WAIT5 },
{ 0x2F87, aCR_TALK_PUTAWAY_DEMO_START_WAIT4 },
{ 0x2F89, aCR_TALK_PUTAWAY_DEMO_START_WAIT5_2 },
};
mMsg_Window_c* msg_p = mMsg_Get_base_window_p();
mActor_name_t item;
src/actor/npc/ac_npc_rcn_guide2_talk.c_inc
+2 -2
View File
@@ -163,7 +163,7 @@ static void aNRG2_stepup_j2(u32 kind, NPC_RCN_GUIDE2_ACTOR* rcn_guide2) {
static void aNRG2_stepup_j3(u32 kind, NPC_RCN_GUIDE2_ACTOR* rcn_guide2) {
/* List of 'no good' furniture, seemingly only ones you can walk on? */
static mActor_name_t ng_list[] = { FTR_MANHOLE_COVER, FTR_BATH_MAT };
static mActor_name_t ng_list[] = { FTR_START(FTR_TAK_HOLE01), FTR_START(FTR_KON_MAT) };
mQst_errand_c* errand_p;
AnmPersonalID_c* anm_pid_p;
mActor_name_t ftr;
@@ -426,7 +426,7 @@ static void aNRG2_demo_start_wait_talk_proc(NPC_RCN_GUIDE2_ACTOR* rcn_guide2) {
static mActor_name_t itemNo[] = {
ITM_CLOTH016, /* work uniform */
ITM_WHITE_PANSY_BAG, /* flower bag */
FTR_FAN, /* furniture */
FTR_START(FTR_NOG_FAN01), /* furniture */
ITM_PAPER55, /* simple paper */
ITM_CARPET00, /* carpet */
ITM_AXE, /* axe */
src/actor/npc/event/ac_ev_ghost_talk.c_inc
+127 -127
View File
@@ -89,133 +89,133 @@ extern mActor_name_t binsen_listB[];
extern mActor_name_t binsen_listC[];
static mActor_name_t list_haniwa[HANIWA_NUM + 1] = {
FTR_HANIWA000_SOUTH,
FTR_HANIWA001_SOUTH,
FTR_HANIWA002_SOUTH,
FTR_HANIWA003_SOUTH,
FTR_HANIWA004_SOUTH,
FTR_HANIWA005_SOUTH,
FTR_HANIWA006_SOUTH,
FTR_HANIWA007_SOUTH,
FTR_HANIWA008_SOUTH,
FTR_HANIWA009_SOUTH,
FTR_HANIWA010_SOUTH,
FTR_HANIWA011_SOUTH,
FTR_HANIWA012_SOUTH,
FTR_HANIWA013_SOUTH,
FTR_HANIWA014_SOUTH,
FTR_HANIWA015_SOUTH,
FTR_HANIWA016_SOUTH,
FTR_HANIWA017_SOUTH,
FTR_HANIWA018_SOUTH,
FTR_HANIWA019_SOUTH,
FTR_HANIWA020_SOUTH,
FTR_HANIWA021_SOUTH,
FTR_HANIWA022_SOUTH,
FTR_HANIWA023_SOUTH,
FTR_HANIWA024_SOUTH,
FTR_HANIWA025_SOUTH,
FTR_HANIWA026_SOUTH,
FTR_HANIWA027_SOUTH,
FTR_HANIWA028_SOUTH,
FTR_HANIWA029_SOUTH,
FTR_HANIWA030_SOUTH,
FTR_HANIWA031_SOUTH,
FTR_HANIWA032_SOUTH,
FTR_HANIWA033_SOUTH,
FTR_HANIWA034_SOUTH,
FTR_HANIWA035_SOUTH,
FTR_HANIWA036_SOUTH,
FTR_HANIWA037_SOUTH,
FTR_HANIWA038_SOUTH,
FTR_HANIWA039_SOUTH,
FTR_HANIWA040_SOUTH,
FTR_HANIWA041_SOUTH,
FTR_HANIWA042_SOUTH,
FTR_HANIWA043_SOUTH,
FTR_HANIWA044_SOUTH,
FTR_HANIWA045_SOUTH,
FTR_HANIWA046_SOUTH,
FTR_HANIWA047_SOUTH,
FTR_HANIWA048_SOUTH,
FTR_HANIWA049_SOUTH,
FTR_HANIWA050_SOUTH,
FTR_HANIWA051_SOUTH,
FTR_HANIWA052_SOUTH,
FTR_HANIWA053_SOUTH,
FTR_HANIWA054_SOUTH,
FTR_HANIWA055_SOUTH,
FTR_HANIWA056_SOUTH,
FTR_HANIWA057_SOUTH,
FTR_HANIWA058_SOUTH,
FTR_HANIWA059_SOUTH,
FTR_HANIWA060_SOUTH,
FTR_HANIWA061_SOUTH,
FTR_HANIWA062_SOUTH,
FTR_HANIWA063_SOUTH,
FTR_HANIWA064_SOUTH,
FTR_HANIWA065_SOUTH,
FTR_HANIWA066_SOUTH,
FTR_HANIWA067_SOUTH,
FTR_HANIWA068_SOUTH,
FTR_HANIWA069_SOUTH,
FTR_HANIWA070_SOUTH,
FTR_HANIWA071_SOUTH,
FTR_HANIWA072_SOUTH,
FTR_HANIWA073_SOUTH,
FTR_HANIWA074_SOUTH,
FTR_HANIWA075_SOUTH,
FTR_HANIWA076_SOUTH,
FTR_HANIWA077_SOUTH,
FTR_HANIWA078_SOUTH,
FTR_HANIWA079_SOUTH,
FTR_HANIWA080_SOUTH,
FTR_HANIWA081_SOUTH,
FTR_HANIWA082_SOUTH,
FTR_HANIWA083_SOUTH,
FTR_HANIWA084_SOUTH,
FTR_HANIWA085_SOUTH,
FTR_HANIWA086_SOUTH,
FTR_HANIWA087_SOUTH,
FTR_HANIWA088_SOUTH,
FTR_HANIWA089_SOUTH,
FTR_HANIWA090_SOUTH,
FTR_HANIWA091_SOUTH,
FTR_HANIWA092_SOUTH,
FTR_HANIWA093_SOUTH,
FTR_HANIWA094_SOUTH,
FTR_HANIWA095_SOUTH,
FTR_HANIWA096_SOUTH,
FTR_HANIWA097_SOUTH,
FTR_HANIWA098_SOUTH,
FTR_HANIWA099_SOUTH,
FTR_HANIWA100_SOUTH,
FTR_HANIWA101_SOUTH,
FTR_HANIWA102_SOUTH,
FTR_HANIWA103_SOUTH,
FTR_HANIWA104_SOUTH,
FTR_HANIWA105_SOUTH,
FTR_HANIWA106_SOUTH,
FTR_HANIWA107_SOUTH,
FTR_HANIWA108_SOUTH,
FTR_HANIWA109_SOUTH,
FTR_HANIWA110_SOUTH,
FTR_HANIWA111_SOUTH,
FTR_HANIWA112_SOUTH,
FTR_HANIWA113_SOUTH,
FTR_HANIWA114_SOUTH,
FTR_HANIWA115_SOUTH,
FTR_HANIWA116_SOUTH,
FTR_HANIWA117_SOUTH,
FTR_HANIWA118_SOUTH,
FTR_HANIWA119_SOUTH,
FTR_HANIWA120_SOUTH,
FTR_HANIWA121_SOUTH,
FTR_HANIWA122_SOUTH,
FTR_HANIWA123_SOUTH,
FTR_HANIWA124_SOUTH,
FTR_HANIWA125_SOUTH,
FTR_HANIWA126_SOUTH,
FTR_START(FTR_HNW_COMMON000),
FTR_START(FTR_HNW_COMMON001),
FTR_START(FTR_HNW_COMMON002),
FTR_START(FTR_HNW_COMMON003),
FTR_START(FTR_HNW_COMMON004),
FTR_START(FTR_HNW_COMMON005),
FTR_START(FTR_HNW_COMMON006),
FTR_START(FTR_HNW_COMMON007),
FTR_START(FTR_HNW_COMMON008),
FTR_START(FTR_HNW_COMMON009),
FTR_START(FTR_HNW_COMMON010),
FTR_START(FTR_HNW_COMMON011),
FTR_START(FTR_HNW_COMMON012),
FTR_START(FTR_HNW_COMMON013),
FTR_START(FTR_HNW_COMMON014),
FTR_START(FTR_HNW_COMMON015),
FTR_START(FTR_HNW_COMMON016),
FTR_START(FTR_HNW_COMMON017),
FTR_START(FTR_HNW_COMMON018),
FTR_START(FTR_HNW_COMMON019),
FTR_START(FTR_HNW_COMMON020),
FTR_START(FTR_HNW_COMMON021),
FTR_START(FTR_HNW_COMMON022),
FTR_START(FTR_HNW_COMMON023),
FTR_START(FTR_HNW_COMMON024),
FTR_START(FTR_HNW_COMMON025),
FTR_START(FTR_HNW_COMMON026),
FTR_START(FTR_HNW_COMMON027),
FTR_START(FTR_HNW_COMMON028),
FTR_START(FTR_HNW_COMMON029),
FTR_START(FTR_HNW_COMMON030),
FTR_START(FTR_HNW_COMMON031),
FTR_START(FTR_HNW_COMMON032),
FTR_START(FTR_HNW_COMMON033),
FTR_START(FTR_HNW_COMMON034),
FTR_START(FTR_HNW_COMMON035),
FTR_START(FTR_HNW_COMMON036),
FTR_START(FTR_HNW_COMMON037),
FTR_START(FTR_HNW_COMMON038),
FTR_START(FTR_HNW_COMMON039),
FTR_START(FTR_HNW_COMMON040),
FTR_START(FTR_HNW_COMMON041),
FTR_START(FTR_HNW_COMMON042),
FTR_START(FTR_HNW_COMMON043),
FTR_START(FTR_HNW_COMMON044),
FTR_START(FTR_HNW_COMMON045),
FTR_START(FTR_HNW_COMMON046),
FTR_START(FTR_HNW_COMMON047),
FTR_START(FTR_HNW_COMMON048),
FTR_START(FTR_HNW_COMMON049),
FTR_START(FTR_HNW_COMMON050),
FTR_START(FTR_HNW_COMMON051),
FTR_START(FTR_HNW_COMMON052),
FTR_START(FTR_HNW_COMMON053),
FTR_START(FTR_HNW_COMMON054),
FTR_START(FTR_HNW_COMMON055),
FTR_START(FTR_HNW_COMMON056),
FTR_START(FTR_HNW_COMMON057),
FTR_START(FTR_HNW_COMMON058),
FTR_START(FTR_HNW_COMMON059),
FTR_START(FTR_HNW_COMMON060),
FTR_START(FTR_HNW_COMMON061),
FTR_START(FTR_HNW_COMMON062),
FTR_START(FTR_HNW_COMMON063),
FTR_START(FTR_HNW_COMMON064),
FTR_START(FTR_HNW_COMMON065),
FTR_START(FTR_HNW_COMMON066),
FTR_START(FTR_HNW_COMMON067),
FTR_START(FTR_HNW_COMMON068),
FTR_START(FTR_HNW_COMMON069),
FTR_START(FTR_HNW_COMMON070),
FTR_START(FTR_HNW_COMMON071),
FTR_START(FTR_HNW_COMMON072),
FTR_START(FTR_HNW_COMMON073),
FTR_START(FTR_HNW_COMMON074),
FTR_START(FTR_HNW_COMMON075),
FTR_START(FTR_HNW_COMMON076),
FTR_START(FTR_HNW_COMMON077),
FTR_START(FTR_HNW_COMMON078),
FTR_START(FTR_HNW_COMMON079),
FTR_START(FTR_HNW_COMMON080),
FTR_START(FTR_HNW_COMMON081),
FTR_START(FTR_HNW_COMMON082),
FTR_START(FTR_HNW_COMMON083),
FTR_START(FTR_HNW_COMMON084),
FTR_START(FTR_HNW_COMMON085),
FTR_START(FTR_HNW_COMMON086),
FTR_START(FTR_HNW_COMMON087),
FTR_START(FTR_HNW_COMMON088),
FTR_START(FTR_HNW_COMMON089),
FTR_START(FTR_HNW_COMMON090),
FTR_START(FTR_HNW_COMMON091),
FTR_START(FTR_HNW_COMMON092),
FTR_START(FTR_HNW_COMMON093),
FTR_START(FTR_HNW_COMMON094),
FTR_START(FTR_HNW_COMMON095),
FTR_START(FTR_HNW_COMMON096),
FTR_START(FTR_HNW_COMMON097),
FTR_START(FTR_HNW_COMMON098),
FTR_START(FTR_HNW_COMMON099),
FTR_START(FTR_HNW_COMMON100),
FTR_START(FTR_HNW_COMMON101),
FTR_START(FTR_HNW_COMMON102),
FTR_START(FTR_HNW_COMMON103),
FTR_START(FTR_HNW_COMMON104),
FTR_START(FTR_HNW_COMMON105),
FTR_START(FTR_HNW_COMMON106),
FTR_START(FTR_HNW_COMMON107),
FTR_START(FTR_HNW_COMMON108),
FTR_START(FTR_HNW_COMMON109),
FTR_START(FTR_HNW_COMMON110),
FTR_START(FTR_HNW_COMMON111),
FTR_START(FTR_HNW_COMMON112),
FTR_START(FTR_HNW_COMMON113),
FTR_START(FTR_HNW_COMMON114),
FTR_START(FTR_HNW_COMMON115),
FTR_START(FTR_HNW_COMMON116),
FTR_START(FTR_HNW_COMMON117),
FTR_START(FTR_HNW_COMMON118),
FTR_START(FTR_HNW_COMMON119),
FTR_START(FTR_HNW_COMMON120),
FTR_START(FTR_HNW_COMMON121),
FTR_START(FTR_HNW_COMMON122),
FTR_START(FTR_HNW_COMMON123),
FTR_START(FTR_HNW_COMMON124),
FTR_START(FTR_HNW_COMMON125),
FTR_START(FTR_HNW_COMMON126),
EMPTY_NO /* end of list */
};
src/actor/npc/event/ac_ev_pumpkin_talk.c_inc
+1 -1
View File
@@ -13,7 +13,7 @@ static int aEPK_get_trick_type(void) {
int ftr_idx = mRmTp_FtrItemNo2FtrIdx(*pocket_p);
// skip jack-o'-lantern and jack-in-the-box
if (ftr_idx != 0x127 && ftr_idx != 0x131) {
if (ftr_idx != FTR_SUM_HAL_PKIN && ftr_idx != FTR_SUM_HAL_BOX01) {
idx[count] = i;
count++;
}
src/actor/npc/event/ac_ev_turkey.c
+10 -10
View File
@@ -53,16 +53,16 @@ ACTOR_PROFILE Ev_Turkey_Profile = {
static const mActor_name_t aETKY_present_table[] = {
// clang-format off
FTR_HARVEST_LAMP,
FTR_HARVEST_TABLE,
FTR_HARVEST_TV,
FTR_HARVEST_BED,
FTR_HARVEST_CHAIR,
FTR_HARVEST_CLOCK,
FTR_HARVEST_SOFA,
FTR_HARVEST_BUREAU,
FTR_HARVEST_DRESSER,
FTR_HARVEST_MIRROR,
FTR_START(FTR_IKU_TURKEY_LAMP),
FTR_START(FTR_IKU_TURKEY_TABLE),
FTR_START(FTR_IKU_TURKEY_TV),
FTR_START(FTR_IKU_TURKEY_BED),
FTR_START(FTR_YAZ_TURKEY_CHAIR),
FTR_START(FTR_YOS_TURKEY_WATCH),
FTR_START(FTR_HOS_TURKEY_SOFA),
FTR_START(FTR_YAZ_TURKEY_CLOSET),
FTR_START(FTR_YAZ_TURKEY_CHEST),
FTR_START(FTR_YOS_TURKEY_MIRROR),
ITM_CARPET66,
ITM_WALL66,
// clang-format on