mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-23 06:34:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ACreTeam:master' into master

Browse Source
This commit is contained in:
roeming
2025-07-10 09:03:25 -04:00
committed by GitHub
parent 4b1f7de1d5 8620018ea9
commit c742e39d86
35 changed files with 3586 additions and 1825 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_ftr_def.h
+1283
View File
File diff suppressed because it is too large Load Diff
include/m_name_table.h
+1307 -833
View File
File diff suppressed because it is too large Load Diff
include/m_room_type.h
+2 -2
View File
@@ -92,7 +92,7 @@ typedef struct room_type_place_info_one_s {
int ut_z;
} mRmTp_FtrPlaceInfoOne_t;
#define FTR_NUM 1266
// #define FTR_NUM 1266
#define FTR_GET_ROTATION(f) ((f)&3)
#define FTR_IDX_2_NO(f) ((f) >> 2)
@@ -181,4 +181,4 @@ extern int mRmTp_FtrItemNo2FtrIdx(mActor_name_t ftr_item_no);
extern mActor_name_t mRmTp_FtrIdx2FtrItemNo(int ftr_idx, int direct);
extern int mRmTp_SoundStepWalkSE(xyz_t* wpos);
#endif
#endif
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
src/bg_item/bg_item_common.c_inc
+4 -4
View File
@@ -1004,16 +1004,16 @@ static void drop_fruit(mActor_name_t fg_item, int ut_x, int ut_z, xyz_t* drop_po
{ TREE_10000BELLS, ITM_MONEY_10000, TREE, 3 },
{ TREE_30000BELLS, ITM_MONEY_30000, TREE, 3 },
{ TREE_100BELLS, ITM_MONEY_100, TREE, 3 },
{ TREE_FTR, FTR_FAN, TREE, 1 },
{ TREE_FTR, FTR_START(FTR_NOG_FAN01), TREE, 1 },
{ TREE_BEES, HONEYCOMB, TREE, 1 },
{ TREE_PRESENT, ITM_PRESENT, TREE, 1 },
{ TREE_BELLS, ITM_MONEY_100, TREE, 1 },
{ TREE_PALM_FRUIT, ITM_FOOD_COCONUT, TREE_PALM_NOFRUIT_0, 2 },
{ CEDAR_TREE_BELLS, ITM_MONEY_100, CEDAR_TREE, 1 },
{ CEDAR_TREE_FTR, FTR_FAN, CEDAR_TREE, 1 },
{ CEDAR_TREE_FTR, FTR_START(FTR_NOG_FAN01), CEDAR_TREE, 1 },
{ CEDAR_TREE_BEES, HONEYCOMB, CEDAR_TREE, 1 },
{ GOLD_TREE_BELLS, ITM_MONEY_100, GOLD_TREE, 1 },
{ GOLD_TREE_FTR, FTR_FAN, GOLD_TREE, 1 },
{ GOLD_TREE_FTR, FTR_START(FTR_NOG_FAN01), GOLD_TREE, 1 },
{ GOLD_TREE_BEES, HONEYCOMB, GOLD_TREE, 1 },
{ GOLD_TREE_SHOVEL, ITM_GOLDEN_SHOVEL, GOLD_TREE, 1 },
};
@@ -1025,7 +1025,7 @@ static void drop_fruit(mActor_name_t fg_item, int ut_x, int ut_z, xyz_t* drop_po
if (fg_item == fg_ytable[i].src_tree_item) {
mActor_name_t item = fg_ytable[i].dropped_item;
if (item == FTR_FAN) {
if (item == FTR_START(FTR_NOG_FAN01)) {
int list = mSP_LISTTYPE_ABC;
mActor_name_t ftr_item;
src/data/item/ftr_list.c
+535 -535
View File
File diff suppressed because it is too large Load Diff
src/furniture/ac_radio_test.c
+1 -1
View File
@@ -13,7 +13,7 @@ static void fRT_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* d
(*Common_Get(clip).effect_clip->effect_make_proc)(eEC_EFFECT_KONPU, pos, 1,
ftr_actor->s_angle_y + DEG2SHORT_ANGLE(337.5f), game,
FTR_AEROBICS_RADIO, 1, 0);
FTR_START(FTR_RADIO_TEST), 1, 0);
ftr_actor->dynamic_work_s[0] = 0;
}
src/game/m_catalog_ovl.c
+2 -2
View File
@@ -303,7 +303,7 @@ static void mCL_furniture_init(mCL_Item_c* item, mActor_name_t item_no) {
ftr_actor->position.y = 0.0f;
item->price = mSP_ItemNo2ItemPrice(item_no);
} else if ((mRmTp_FtrItemNo2FtrIdx(item_no) >= 0x3FC && mRmTp_FtrItemNo2FtrIdx(item_no) <= 0x403) ||
(item_no >= FTR_COLLEGERULE && item_no <= FTR_CALLIGRAPHY_PAD_WEST) ||
(item_no >= FTR_START(FTR_NOG_COLLEGENOTE) && item_no <= FTR_END(FTR_IKE_NIKKI_WAFU1)) ||
(mRmTp_FtrItemNo2FtrIdx(item_no) >= 0x453 && mRmTp_FtrItemNo2FtrIdx(item_no) <= 0x45A) ||
(mRmTp_FtrItemNo2FtrIdx(item_no) >= 0x45B && mRmTp_FtrItemNo2FtrIdx(item_no) <= 0x462) ||
(mRmTp_FtrItemNo2FtrIdx(item_no) >= 0x44F && mRmTp_FtrItemNo2FtrIdx(item_no) <= 0x452) ||
@@ -315,7 +315,7 @@ static void mCL_furniture_init(mCL_Item_c* item, mActor_name_t item_no) {
} else if (item_no >= FTR_DINO_START && item_no <= FTR_DINO_END) {
item->pos_y = 45.0f;
if (item_no == FTR_DINO_APATO_SKULL) {
if (item_no == FTR_START(FTR_DIN_BRONT_HEAD)) {
item->scale = 0.5f;
ftr_actor->position.y = -mFI_UNIT_BASE_SIZE_F;
} else {
src/game/m_home.c
+11 -11
View File
@@ -310,10 +310,10 @@ typedef struct {
/* list of default properties for each house */
static mHm_player_room_default_data_c l_mHm_player_room_default_data[PLAYER_NUM] = {
{ 3, 38, 4, 1, FTR_TAPEDECK }, /* Top-left house, stone wall & old flooring */
{ 41, 42, 4, 1, FTR_TAPEDECK }, /* Top-right house, wood panelling & steel flooring */
{ 55, 5, 4, 1, FTR_TAPEDECK }, /* Bottom-left house, shanty wall & birch flooring */
{ 42, 34, 4, 1, FTR_TAPEDECK } /* Bottom-right house, concrete wall & charcoal tile */
{ 3, 38, 4, 1, FTR_START(FTR_SUM_CASSE01) }, /* Top-left house, stone wall & old flooring */
{ 41, 42, 4, 1, FTR_START(FTR_SUM_CASSE01) }, /* Top-right house, wood panelling & steel flooring */
{ 55, 5, 4, 1, FTR_START(FTR_SUM_CASSE01) }, /* Bottom-left house, shanty wall & birch flooring */
{ 42, 34, 4, 1, FTR_START(FTR_SUM_CASSE01) } /* Bottom-right house, concrete wall & charcoal tile */
};
/**
@@ -329,7 +329,7 @@ extern void mHm_SetDefaultPlayerRoomData(int home_no) {
Save_Set(homes[home_no & 3].floors[mHm_ROOM_MAIN].layer_main.items[ut_z][ut_x],
l_mHm_player_room_default_data[home_no & 3].item);
Save_Set(homes[home_no & 3].floors[mHm_ROOM_MAIN].layer_main.items[1][1], FTR_ORANGEBOX);
Save_Set(homes[home_no & 3].floors[mHm_ROOM_MAIN].layer_main.items[1][1], FTR_START(FTR_NOG_MIKANBOX));
Save_Set(homes[home_no & 3].floors[mHm_ROOM_MAIN].layer_secondary.items[1][1], ITM_DIARY00);
for (i = 0; i < mHm_ROOM_NUM; i++) {
@@ -572,13 +572,13 @@ static void mHm_SetDefaultCottageData(mHm_cottage_c* cottage) {
return;
}
cottage->room.wall_floor.flooring_idx = 13;
cottage->room.wall_floor.wallpaper_idx = 13;
cottage->room.wall_floor.flooring_idx = FLOOR_NPC013;
cottage->room.wall_floor.wallpaper_idx = WALL_NPC013;
cottage->room.layer_main.items[3][3] = FTR_REDALOHASHIRT;
cottage->room.layer_main.items[3][6] = FTR_BLUEALOHASHIRT;
cottage->room.layer_main.items[6][3] = FTR_REDALOHASHIRT;
cottage->room.layer_main.items[6][6] = FTR_BLUEALOHASHIRT;
cottage->room.layer_main.items[3][3] = FTR_START(FTR_FMANEKIN026);
cottage->room.layer_main.items[3][6] = FTR_START(FTR_FMANEKIN027);
cottage->room.layer_main.items[6][3] = FTR_START(FTR_FMANEKIN026);
cottage->room.layer_main.items[6][6] = FTR_START(FTR_FMANEKIN027);
}
/**
src/game/m_inventory_ovl.c
+1 -1
View File
@@ -122,7 +122,7 @@ static mActor_name_t mIV_set_collect_itemNo(int type, int page) {
}
} else {
int fish_no = mIV_fish_collect_list[type];
int bit = FTR_IDX_2_NO(FTR_NO_2_IDX(0x31A) + (u32)FTR_NO_2_IDX(fish_no));
int bit = FTR_IDX_2_NO(FTR_NO_2_IDX(FTR_SUM_FUNA) + (u32)FTR_NO_2_IDX(fish_no));
if (Now_Private->furniture_collected_bitfield[bit >> 5] & (1 << (bit & 31))) {
return mNT_FishIdx2FishItemNo(fish_no);
src/game/m_mail.c
+4 -4
View File
@@ -319,10 +319,10 @@ typedef struct post_office_gift_info_s {
} mMl_PostOffice_Info_c;
static mMl_PostOffice_Info_c l_mml_postoffice_info[mMl_POSTOFFICE_GIFT_NUM] = {
{ 0x0246, FTR_TISSUE, ITM_PAPER00, mPr_FLAG_POSTOFFICE_GIFT0, 1000000 },
{ 0x0247, FTR_PIGGY_BANK, ITM_PAPER00, mPr_FLAG_POSTOFFICE_GIFT1, 10000000 },
{ 0x0248, FTR_MAILBOX, ITM_PAPER00, mPr_FLAG_POSTOFFICE_GIFT2, 100000000 },
{ 0x0249, FTR_POST_MODEL, ITM_PAPER00, mPr_FLAG_POSTOFFICE_GIFT3, 999999999 }
{ 0x0246, FTR_START(FTR_IKE_PST_TESYU01), ITM_PAPER00, mPr_FLAG_POSTOFFICE_GIFT0, 1000000 },
{ 0x0247, FTR_START(FTR_IKE_PST_PIG01), ITM_PAPER00, mPr_FLAG_POSTOFFICE_GIFT1, 10000000 },
{ 0x0248, FTR_START(FTR_YOS_MAILBOX), ITM_PAPER00, mPr_FLAG_POSTOFFICE_GIFT2, 100000000 },
{ 0x0249, FTR_START(FTR_NOG_YUBIN), ITM_PAPER00, mPr_FLAG_POSTOFFICE_GIFT3, 999999999 }
};
static void mMl_send_postoffice_mail() {
src/game/m_mail_password_check.c
+8 -8
View File
@@ -964,22 +964,22 @@ extern int mMpswd_check_present_user(mActor_name_t item) {
switch (ITEM_NAME_GET_TYPE(item)) {
case NAME_TYPE_FTR0:
case NAME_TYPE_FTR1: {
if (item >= FTR_CLOTH_MANNIQUIN000_SOUTH && item <= FTR_CLOTH_MANNIQUIN254_WEST) {
if (item >= FTR_CLOTH_START && item <= FTR_CLOTH_END) {
item = mRmTp_FtrItemNo2Item1ItemNo(item, FALSE);
if (mSP_SearchItemCategoryPriority(item, mSP_KIND_CLOTH, mSP_LISTTYPE_COMMON, NULL) ||
mSP_SearchItemCategoryPriority(item, mSP_KIND_CLOTH, mSP_LISTTYPE_UNCOMMON, NULL) ||
mSP_SearchItemCategoryPriority(item, mSP_KIND_CLOTH, mSP_LISTTYPE_RARE, NULL)) {
price = mSP_ItemNo2ItemPrice(item);
}
} else if (item >= FTR_UMBRELLA00_SOUTH && item <= FTR_UMBRELLA31_WEST) {
} else if (item >= FTR_UMBRELLA_START && item <= FTR_UMBRELLA_END) {
price = mSP_ItemNo2ItemPrice(mRmTp_FtrItemNo2Item1ItemNo(item, FALSE));
} else if ( // TODO: furniture index values need to be declared in some header file as defines
(mRmTp_FtrItemNo2FtrIdx(item) >= 0x3FC && mRmTp_FtrItemNo2FtrIdx(item) <= 0x403) || // balloons
(item >= FTR_COLLEGERULE && item <= FTR_CALLIGRAPHY_PAD_WEST) || // diaries
(mRmTp_FtrItemNo2FtrIdx(item) >= 0x453 && mRmTp_FtrItemNo2FtrIdx(item) <= 0x45A) || // fans
(mRmTp_FtrItemNo2FtrIdx(item) >= 0x45B && mRmTp_FtrItemNo2FtrIdx(item) <= 0x462) || // pinwheels
(mRmTp_FtrItemNo2FtrIdx(item) >= 0x44F && mRmTp_FtrItemNo2FtrIdx(item) <= 0x452) || // golden tools
(mRmTp_FtrItemNo2FtrIdx(item) >= 0x463 && mRmTp_FtrItemNo2FtrIdx(item) <= 0x466) // regular tools
(mRmTp_FtrItemNo2FtrIdx(item) >= FTR_NOG_BALLOON_COMMON0 && mRmTp_FtrItemNo2FtrIdx(item) <= FTR_NOG_BALLOON_COMMON7) || // balloons
(item >= FTR_START(FTR_NOG_COLLEGENOTE) && item <= FTR_END(FTR_IKE_NIKKI_WAFU1)) || // diaries
(mRmTp_FtrItemNo2FtrIdx(item) >= FTR_UTIWA0 && mRmTp_FtrItemNo2FtrIdx(item) <= FTR_UTIWA7) || // fans
(mRmTp_FtrItemNo2FtrIdx(item) >= FTR_KAZAGURUMA0 && mRmTp_FtrItemNo2FtrIdx(item) <= FTR_KAZAGURUMA7) || // pinwheels
(mRmTp_FtrItemNo2FtrIdx(item) >= FTR_GOLD_ITEM0 && mRmTp_FtrItemNo2FtrIdx(item) <= FTR_GOLD_ITEM3) || // golden tools
(mRmTp_FtrItemNo2FtrIdx(item) >= FTR_TOOL0 && mRmTp_FtrItemNo2FtrIdx(item) <= FTR_TOOL3) // regular tools
) {
/* Convert furniture to their item1 variants */
price = mSP_ItemNo2ItemPrice(mRmTp_FtrItemNo2Item1ItemNo(item, FALSE));
src/game/m_mark_room_ovl.c
+2 -2
View File
@@ -2793,10 +2793,10 @@ static int mMkRm_DecideLetterNo(mActor_name_t* present, mHm_hs_c* house, int poi
int letter_idx = RANDOM(3);
if (points >= mMkRm_REWARD0_POINTS && house->flags.hra_reward0 == FALSE) {
present[0] = FTR_HOUSE_MODEL;
present[0] = FTR_START(FTR_NOG_MYHOME2);
return mHandbill_HRA_REWARD0;
} else if (points >= mMkRm_REWARD1_POINTS && house->flags.hra_reward1 == FALSE) {
present[0] = FTR_MANOR_MODEL;
present[0] = FTR_START(FTR_NOG_MYHOME4);
return mHandbill_HRA_REWARD1;
} else {
int i;
src/game/m_museum.c
+3 -3
View File
@@ -72,11 +72,11 @@ static int mMsm_GetFossilMailNo(mActor_name_t fossil) {
int type = 0; // invalid item
if (fossil >= FTR_DINO_TRICERA_SKULL && fossil <= FTR_DINO_TRILOBITE_WEST) {
if (fossil >= FTR_START(FTR_DIN_TRIKERA_HEAD) && fossil <= FTR_END(FTR_DIN_TRILOBITE)) {
type = 1; // valid fossil
}
return mail_no_table[type != 0 ? (fossil - FTR_DINO_TRICERA_SKULL) >> 2 : 0];
return mail_no_table[type != 0 ? (fossil - FTR_START(FTR_DIN_TRIKERA_HEAD)) >> 2 : 0];
}
static void mMsm_GetRemailAddIdx(int* add, int* shift, int idx) {
@@ -652,7 +652,7 @@ extern void mMsm_SendCompMail() {
mHandbill_Set_free_str(mHandbill_FREE_STR0, Save_Get(land_info.name), land_name_len);
if (mMl_send_mail_postoffice(&priv->player_ID, i, FTR_MUSEUM_MODEL, ITM_PAPER24, 0x22F,
if (mMl_send_mail_postoffice(&priv->player_ID, i, FTR_START(FTR_NOG_MUSEUM), ITM_PAPER24, 0x22F,
l_museum_name_str, mMl_DATA2, mMl_TYPE_MAIL) == TRUE) {
mMsm_SetPrivateCompMail(priv, mPr_FLAG_MUSEUM_COMP_HANDBILL_RECEIVED);
}
src/game/m_museum_display.c
+39 -39
View File
@@ -90,16 +90,16 @@ extern void mMmd_SetFish(int fish_no) {
}
extern int mMmd_GetDisplayInfo(mActor_name_t item) {
if (item >= FTR_DINO_TRICERA_SKULL && item <= FTR_DINO_TRILOBITE_WEST) {
if (item >= FTR_START(FTR_DIN_TRIKERA_HEAD) && item <= FTR_END(FTR_DIN_TRILOBITE)) {
int fossil_idx;
int valid = FALSE;
/* ??? why check this again */
if (item >= FTR_DINO_TRICERA_SKULL && item <= FTR_DINO_TRILOBITE_WEST) {
if (item >= FTR_START(FTR_DIN_TRIKERA_HEAD) && item <= FTR_END(FTR_DIN_TRILOBITE)) {
valid = TRUE;
}
fossil_idx = valid != FALSE ? FTR_IDX_2_NO(item - FTR_DINO_TRICERA_SKULL) : 0;
fossil_idx = valid != FALSE ? FTR_IDX_2_NO(item - FTR_START(FTR_DIN_TRIKERA_HEAD)) : 0;
if (mMmd_FossilInfo(fossil_idx) >= mMmd_DONATOR_PLAYER1 && mMmd_FossilInfo(fossil_idx) <= mMmd_DONATOR_DELETED_PLAYER) {
return mMmd_DISPLAY_ALREADY_DONATED;
}
@@ -107,16 +107,16 @@ extern int mMmd_GetDisplayInfo(mActor_name_t item) {
return mMmd_DISPLAY_CAN_DONATE;
}
}
else if (item >= FTR_PAINTING0 && item <= FTR_PAINTING14_WEST) {
else if (item >= FTR_START(FTR_SUM_ART01) && item <= FTR_END(FTR_SUM_ART15)) {
int painting_idx;
int valid = FALSE;
/* ??? why check this again */
if (item >= FTR_PAINTING0 && item <= FTR_PAINTING14_WEST) {
if (item >= FTR_START(FTR_SUM_ART01) && item <= FTR_END(FTR_SUM_ART15)) {
valid = TRUE;
}
painting_idx = valid != FALSE ? FTR_IDX_2_NO(item - FTR_PAINTING0) : 0;
painting_idx = valid != FALSE ? FTR_IDX_2_NO(item - FTR_START(FTR_SUM_ART01)) : 0;
if (mMmd_ArtInfo(painting_idx) >= mMmd_DONATOR_PLAYER1 && mMmd_ArtInfo(painting_idx) <= mMmd_DONATOR_DELETED_PLAYER) {
return mMmd_DISPLAY_ALREADY_DONATED;
}
@@ -164,31 +164,31 @@ extern int mMmd_GetDisplayInfo(mActor_name_t item) {
extern int mMmd_RequestMuseumDisplay(mActor_name_t item) {
if (mLd_PlayerManKindCheck() == FALSE) {
if (item >= FTR_DINO_TRICERA_SKULL && item <= FTR_DINO_TRILOBITE_WEST) {
if (item >= FTR_START(FTR_DIN_TRIKERA_HEAD) && item <= FTR_END(FTR_DIN_TRILOBITE)) {
int fossil_idx;
int valid = FALSE;
/* ??? why check this again */
if (item >= FTR_DINO_TRICERA_SKULL && item <= FTR_DINO_TRILOBITE_WEST) {
if (item >= FTR_START(FTR_DIN_TRIKERA_HEAD) && item <= FTR_END(FTR_DIN_TRILOBITE)) {
valid = TRUE;
}
fossil_idx = valid != FALSE ? FTR_IDX_2_NO(item - FTR_DINO_TRICERA_SKULL) : 0;
fossil_idx = valid != FALSE ? FTR_IDX_2_NO(item - FTR_START(FTR_DIN_TRIKERA_HEAD)) : 0;
if (mMmd_FossilInfo(fossil_idx) < mMmd_DONATOR_PLAYER1 || mMmd_FossilInfo(fossil_idx) > mMmd_DONATOR_DELETED_PLAYER) {
mMmd_SetFossil(fossil_idx);
return TRUE;
}
}
else if (item >= FTR_PAINTING0 && item <= FTR_PAINTING14_WEST) {
else if (item >= FTR_START(FTR_SUM_ART01) && item <= FTR_END(FTR_SUM_ART15)) {
int painting_idx;
int valid = FALSE;
/* ??? why check this again */
if (item >= FTR_PAINTING0 && item <= FTR_PAINTING14_WEST) {
if (item >= FTR_START(FTR_SUM_ART01) && item <= FTR_END(FTR_SUM_ART15)) {
valid = TRUE;
}
painting_idx = valid != FALSE ? FTR_IDX_2_NO(item - FTR_PAINTING0) : 0;
painting_idx = valid != FALSE ? FTR_IDX_2_NO(item - FTR_START(FTR_SUM_ART01)) : 0;
if (mMmd_ArtInfo(painting_idx) < mMmd_DONATOR_PLAYER1 || mMmd_ArtInfo(painting_idx) > mMmd_DONATOR_DELETED_PLAYER) {
mMmd_SetArt(painting_idx);
return TRUE;
@@ -238,38 +238,38 @@ typedef struct museum_display_fossil_data_s {
#define mMmd_UT(x, z) ((((z) & 0xF) << 4) | ((x) & 0xF))
static mMmd_fossil_data_c mMmd_museum_fossil_data[mMmd_FOSSIL_NUM] = {
{ mMmd_UT(5, 2), FTR_DINO_DISP_TRICERA, mRmTp_DIRECT_NORTH }, /* tricera skull */
{ mMmd_UT(1, 2), FTR_DINO_DISP_TRICERA, mRmTp_DIRECT_NORTH }, /* tricera tail */
{ mMmd_UT(3, 2), FTR_DINO_DISP_TRICERA, mRmTp_DIRECT_NORTH }, /* tricera torso */
{ mMmd_UT(5, 2), FTR_START(FTR_DIN_TRIKERA_DUMMY), mRmTp_DIRECT_NORTH }, /* tricera skull */
{ mMmd_UT(1, 2), FTR_START(FTR_DIN_TRIKERA_DUMMY), mRmTp_DIRECT_NORTH }, /* tricera tail */
{ mMmd_UT(3, 2), FTR_START(FTR_DIN_TRIKERA_DUMMY), mRmTp_DIRECT_NORTH }, /* tricera torso */
{ mMmd_UT(9, 2), FTR_DINO_DISP_TREX, mRmTp_DIRECT_SOUTH }, /* T-rex skull */
{ mMmd_UT(13, 2), FTR_DINO_DISP_TREX, mRmTp_DIRECT_SOUTH }, /* T-rex tail */
{ mMmd_UT(11, 2), FTR_DINO_DISP_TREX, mRmTp_DIRECT_SOUTH }, /* T-rex torso */
{ mMmd_UT(9, 2), FTR_START(FTR_DIN_TREX_DUMMY), mRmTp_DIRECT_SOUTH }, /* T-rex skull */
{ mMmd_UT(13, 2), FTR_START(FTR_DIN_TREX_DUMMY), mRmTp_DIRECT_SOUTH }, /* T-rex tail */
{ mMmd_UT(11, 2), FTR_START(FTR_DIN_TREX_DUMMY), mRmTp_DIRECT_SOUTH }, /* T-rex torso */
{ mMmd_UT(5, 10), FTR_DINO_DISP_BRONTO, mRmTp_DIRECT_NORTH }, /* apato skull */
{ mMmd_UT(1, 10), FTR_DINO_DISP_BRONTO, mRmTp_DIRECT_NORTH }, /* apato tail */
{ mMmd_UT(3, 10), FTR_DINO_DISP_BRONTO, mRmTp_DIRECT_NORTH }, /* apato torso */
{ mMmd_UT(5, 10), FTR_START(FTR_DIN_BRONT_DUMMY), mRmTp_DIRECT_NORTH }, /* apato skull */
{ mMmd_UT(1, 10), FTR_START(FTR_DIN_BRONT_DUMMY), mRmTp_DIRECT_NORTH }, /* apato tail */
{ mMmd_UT(3, 10), FTR_START(FTR_DIN_BRONT_DUMMY), mRmTp_DIRECT_NORTH }, /* apato torso */
{ mMmd_UT(10, 6), FTR_DINO_DISP_STEGO, mRmTp_DIRECT_EAST }, /* stego skull */
{ mMmd_UT(13, 5), FTR_DINO_DISP_STEGO2, mRmTp_DIRECT_SOUTH }, /* stego tail */
{ mMmd_UT(11, 5), FTR_DINO_DISP_STEGO2, mRmTp_DIRECT_SOUTH }, /* stego torso */
{ mMmd_UT(10, 6), FTR_START(FTR_DIN_STEGO_DUMMYA), mRmTp_DIRECT_EAST }, /* stego skull */
{ mMmd_UT(13, 5), FTR_START(FTR_DIN_STEGO_DUMMYB), mRmTp_DIRECT_SOUTH }, /* stego tail */
{ mMmd_UT(11, 5), FTR_START(FTR_DIN_STEGO_DUMMYB), mRmTp_DIRECT_SOUTH }, /* stego torso */
{ mMmd_UT(6, 6), FTR_DINO_DISP_PTERA, mRmTp_DIRECT_SOUTH }, /* ptera skull */
{ mMmd_UT(6, 5), FTR_DINO_DISP_PTERA, mRmTp_DIRECT_SOUTH }, /* ptera right wing */
{ mMmd_UT(6, 7), FTR_DINO_DISP_PTERA, mRmTp_DIRECT_SOUTH }, /* ptera left wing */
{ mMmd_UT(6, 6), FTR_START(FTR_DIN_PTERA_DUMMY), mRmTp_DIRECT_SOUTH }, /* ptera skull */
{ mMmd_UT(6, 5), FTR_START(FTR_DIN_PTERA_DUMMY), mRmTp_DIRECT_SOUTH }, /* ptera right wing */
{ mMmd_UT(6, 7), FTR_START(FTR_DIN_PTERA_DUMMY), mRmTp_DIRECT_SOUTH }, /* ptera left wing */
{ mMmd_UT(9, 10), FTR_DINO_DISP_PLESIO, mRmTp_DIRECT_SOUTH }, /* plesio skull */
{ mMmd_UT(11, 10), FTR_DINO_DISP_PLESIO, mRmTp_DIRECT_SOUTH }, /* plesio neck */
{ mMmd_UT(13, 10), FTR_DINO_DISP_PLESIO, mRmTp_DIRECT_SOUTH }, /* plesio torso */
{ mMmd_UT(9, 10), FTR_START(FTR_DIN_HUTABA_DUMMY), mRmTp_DIRECT_SOUTH }, /* plesio skull */
{ mMmd_UT(11, 10), FTR_START(FTR_DIN_HUTABA_DUMMY), mRmTp_DIRECT_SOUTH }, /* plesio neck */
{ mMmd_UT(13, 10), FTR_START(FTR_DIN_HUTABA_DUMMY), mRmTp_DIRECT_SOUTH }, /* plesio torso */
{ mMmd_UT(2, 7), FTR_DINO_DISP_MAMMOTH, mRmTp_DIRECT_EAST }, /* mammoth skull */
{ mMmd_UT(2, 5), FTR_DINO_DISP_MAMMOTH, mRmTp_DIRECT_EAST }, /* mammoth torso */
{ mMmd_UT(2, 7), FTR_START(FTR_DIN_MAMMOTH_DUMMY), mRmTp_DIRECT_EAST }, /* mammoth skull */
{ mMmd_UT(2, 5), FTR_START(FTR_DIN_MAMMOTH_DUMMY), mRmTp_DIRECT_EAST }, /* mammoth torso */
{ mMmd_UT(6, 8), FTR_FOSSIL, mRmTp_DIRECT_SOUTH }, /* amber */
{ mMmd_UT(7, 8), FTR_FOSSIL, mRmTp_DIRECT_SOUTH }, /* dinosaur track */
{ mMmd_UT(8, 8), FTR_FOSSIL, mRmTp_DIRECT_SOUTH }, /* ammonite */
{ mMmd_UT(9, 8), FTR_FOSSIL, mRmTp_DIRECT_SOUTH }, /* dinosaur egg */
{ mMmd_UT(10, 8), FTR_FOSSIL, mRmTp_DIRECT_SOUTH } /* trilobite */
{ mMmd_UT(6, 8), FTR_START(FTR_DIN_DUMMY), mRmTp_DIRECT_SOUTH }, /* amber */
{ mMmd_UT(7, 8), FTR_START(FTR_DIN_DUMMY), mRmTp_DIRECT_SOUTH }, /* dinosaur track */
{ mMmd_UT(8, 8), FTR_START(FTR_DIN_DUMMY), mRmTp_DIRECT_SOUTH }, /* ammonite */
{ mMmd_UT(9, 8), FTR_START(FTR_DIN_DUMMY), mRmTp_DIRECT_SOUTH }, /* dinosaur egg */
{ mMmd_UT(10, 8), FTR_START(FTR_DIN_DUMMY), mRmTp_DIRECT_SOUTH } /* trilobite */
};
static void mMmd_MuseumFossilProcess_MakeFgData() {
@@ -293,9 +293,9 @@ static void mMmd_MuseumFossilProcess_MakeFgData() {
}
/* TODO: this might be a fake match */
item = FTR_DINO_TRICERA_SKULL;
item = FTR_START(FTR_DIN_TRIKERA_HEAD);
if (valid) {
mActor_name_t fossil_ftr_idx = FTR_DINO_TRICERA_SKULL + (mActor_name_t)FTR_NO_2_IDX(fossil_idx);
mActor_name_t fossil_ftr_idx = FTR_START(FTR_DIN_TRIKERA_HEAD) + (mActor_name_t)FTR_NO_2_IDX(fossil_idx);
item = fossil_ftr_idx;
}
//item = (valid != FALSE ? (mActor_name_t)(FTR_DINO_TRICERA_SKULL + (mActor_name_t)FTR_NO_2_IDX(fossil_idx)) : FTR_DINO_TRICERA_SKULL);
src/game/m_npc.c
+2 -2
View File
@@ -1925,7 +1925,7 @@ static void mNpc_GetXmasCardData(Mail_c* mail, PersonalID_c* pid) {
mail->content.mail_type = mMl_TYPE_XMAS;
mPr_CopyPersonalID(&mail->header.recipient.personalID, pid);
mail->header.recipient.type = mMl_NAME_TYPE_PLAYER;
mail->present = FTR_FAMICOM_BALLOON_FIGHT;
mail->present = FTR_START(FTR_FAMICOM_COMMON01);
mail->content.paper_type = 22; // festive paper
}
@@ -3066,7 +3066,7 @@ static int mNpc_CheckSelectFurniture(mActor_name_t item) {
!(item >= FTR_FISH_START && item <= FTR_FISH_END) && // Fish (furniture)
!(item >= HANIWA_START && item <= HANIWA_END) && // Gyroids
!(item >= FTR_DINO_START && item <= FTR_DINO_END) && // Idenitfied fossils
!(item >= FTR_FAMICOM_START && item <= FTR_FAMICOM_END) // NES/Famicom games
!(item >= FTR_START(FTR_FAMICOM_COMMON00) && item <= FTR_END(FTR_FAMICOM_COMMON18)) // NES/Famicom games
) {
res = TRUE;
}
src/game/m_private.c
+5 -5
View File
@@ -555,8 +555,8 @@ extern void mPr_SetItemCollectBit(mActor_name_t item) {
mActor_name_t ftr_item_no = mRmTp_Item1ItemNo2FtrItemNo_AtPlayerRoom(item, 0);
int item_type;
if ((ftr_item_no >= FTR_FISH00 && ftr_item_no <= FTR_FISH39_WEST) ||
(ftr_item_no >= FTR_INSECT00 && ftr_item_no <= FTR_INSECT39_WEST)) {
if ((ftr_item_no >= FTR_FISH_START && ftr_item_no <= FTR_FISH_END) ||
(ftr_item_no >= FTR_INSECT_START && ftr_item_no <= FTR_INSECT_END)) {
return;
}
@@ -889,7 +889,7 @@ static int mPr_SendMotherMailDate(mPr_mother_mail_info_c* mother_mail, lbRTC_tim
if (Common_Get(now_private)->birthday.month == send_time->month &&
Common_Get(now_private)->birthday.day == send_time->day) {
mail_no = 0x184 + RANDOM(mPr_MOTHER_MAIL_MONTHLY_NUM);
present = FTR_BIRTHDAY_CAKE;
present = FTR_START(FTR_SUM_BDCAKE01);
} else if (send_time->month == send_time->day) {
int letter_num = (send_time->month - 1) * mPr_MOTHER_MAIL_MONTHLY_NUM + RANDOM(mPr_MOTHER_MAIL_MONTHLY_NUM);
mail_no = 0x164 + letter_num;
@@ -1123,11 +1123,11 @@ static void mPr_GetMotherMailNormalData(mPr_mother_mail_data_c* send_data, int*
break;
case 37:
*present = FTR_PAPA_BEAR;
*present = FTR_START(FTR_SUM_DOLL02);
break;
case 38:
*present = FTR_DRACAENA;
*present = FTR_START(FTR_SUM_PL_DRACAENA);
break;
case 40:
src/game/m_room_type.c
+19 -19
View File
@@ -1929,22 +1929,22 @@ extern mActor_name_t mRmTp_Item1ItemNo2FtrItemNo_AtPlayerRoom(mActor_name_t item
return FTR_UMBRELLA_START + (is_valid ? item1_no - ITM_UMBRELLA_START : 0) * mRmTp_DIRECT_NUM;
} else if (item1_no >= ITM_BALLOON_START && item1_no <= ITM_BUNNY_O_BALLOON) {
return mRmTp_FtrIdx2FtrItemNo(0x3FC + ((item1_no - ITM_BALLOON_START) & 7), mRmTp_DIRECT_SOUTH);
return mRmTp_FtrIdx2FtrItemNo(FTR_NOG_BALLOON_COMMON0 + ((item1_no - ITM_BALLOON_START) & 7), mRmTp_DIRECT_SOUTH);
}
if (no_convert_tools == FALSE) {
if (item1_no >= ITM_DIARY_START && item1_no <= ITM_DIARY15) {
return FTR_COLLEGERULE + ((item1_no - ITM_DIARY_START) & 15) * mRmTp_DIRECT_NUM;
return FTR_START(FTR_NOG_COLLEGENOTE) + ((item1_no - ITM_DIARY_START) & 15) * mRmTp_DIRECT_NUM;
} else if (item1_no >= ITM_BLUEBELL_FAN && item1_no <= ITM_LEAF_FAN) {
return mRmTp_FtrIdx2FtrItemNo(0x453 + ((item1_no - ITM_BLUEBELL_FAN) & 7), mRmTp_DIRECT_SOUTH);
return mRmTp_FtrIdx2FtrItemNo(FTR_UTIWA0 + ((item1_no - ITM_BLUEBELL_FAN) & 7), mRmTp_DIRECT_SOUTH);
} else if (item1_no >= ITM_YELLOW_PINWHEEL && item1_no <= ITM_FANCY_PINWHEEL) {
return mRmTp_FtrIdx2FtrItemNo(0x45B + ((item1_no - ITM_YELLOW_PINWHEEL) & 7), mRmTp_DIRECT_SOUTH);
return mRmTp_FtrIdx2FtrItemNo(FTR_KAZAGURUMA0 + ((item1_no - ITM_YELLOW_PINWHEEL) & 7), mRmTp_DIRECT_SOUTH);
} else if (item1_no >= ITM_GOLDEN_NET && item1_no <= ITM_GOLDEN_ROD) {
return mRmTp_FtrIdx2FtrItemNo(0x44F + ((item1_no - ITM_GOLDEN_NET) & 3), mRmTp_DIRECT_SOUTH);
return mRmTp_FtrIdx2FtrItemNo(FTR_GOLD_ITEM0 + ((item1_no - ITM_GOLDEN_NET) & 3), mRmTp_DIRECT_SOUTH);
} else if (item1_no >= ITM_NET && item1_no <= ITM_ROD) {
return mRmTp_FtrIdx2FtrItemNo(0x463 + ((item1_no - ITM_NET) & 3), mRmTp_DIRECT_SOUTH);
return mRmTp_FtrIdx2FtrItemNo(FTR_TOOL0 + ((item1_no - ITM_NET) & 3), mRmTp_DIRECT_SOUTH);
} else if (item1_no >= ITM_AXE_USE_1 && item1_no <= ITM_AXE_USE_7) {
return FTR_AXE;
return FTR_START(FTR_TOOL1);
}
}
@@ -1968,18 +1968,18 @@ extern mActor_name_t mRmTp_FtrItemNo2Item1ItemNo(mActor_name_t ftr_no, int no_co
return mNT_FishIdx2FishItemNo(is_valid ? (ftr_no - FTR_FISH_START) >> 2 : 0);
} else if (ftr_no >= FTR_UMBRELLA_START && ftr_no <= FTR_UMBRELLA_END) {
return ITM_UMBRELLA_START + ((ftr_no - FTR_UMBRELLA_START) >> 2);
} else if (mRmTp_FtrItemNo2FtrIdx(ftr_no) >= 0x3FC && mRmTp_FtrItemNo2FtrIdx(ftr_no) <= 0x403) {
return ITM_BALLOON_START + ((mRmTp_FtrItemNo2FtrIdx(ftr_no) - 0x3FC) & 7);
} else if (ftr_no >= FTR_COLLEGERULE && ftr_no <= FTR_CALLIGRAPHY_PAD_WEST) {
return ITM_DIARY_START + (((ftr_no - FTR_COLLEGERULE) >> 2) & 15);
} else if (mRmTp_FtrItemNo2FtrIdx(ftr_no) >= 0x453 && mRmTp_FtrItemNo2FtrIdx(ftr_no) <= 0x45A) {
return ITM_BLUEBELL_FAN + ((mRmTp_FtrItemNo2FtrIdx(ftr_no) - 0x453) & 7);
} else if (mRmTp_FtrItemNo2FtrIdx(ftr_no) >= 0x45B && mRmTp_FtrItemNo2FtrIdx(ftr_no) <= 0x462) {
return ITM_YELLOW_PINWHEEL + ((mRmTp_FtrItemNo2FtrIdx(ftr_no) - 0x45B) & 7);
} else if (mRmTp_FtrItemNo2FtrIdx(ftr_no) >= 0x44F && mRmTp_FtrItemNo2FtrIdx(ftr_no) <= 0x452) {
return ITM_GOLDEN_NET + ((mRmTp_FtrItemNo2FtrIdx(ftr_no) - 0x44F) & 3);
} else if (mRmTp_FtrItemNo2FtrIdx(ftr_no) >= 0x463 && mRmTp_FtrItemNo2FtrIdx(ftr_no) <= 0x466) {
return ITM_NET + ((mRmTp_FtrItemNo2FtrIdx(ftr_no) - 0x463) & 3);
} else if (mRmTp_FtrItemNo2FtrIdx(ftr_no) >= FTR_NOG_BALLOON_COMMON0 && mRmTp_FtrItemNo2FtrIdx(ftr_no) <= 0x403) {
return ITM_BALLOON_START + ((mRmTp_FtrItemNo2FtrIdx(ftr_no) - FTR_NOG_BALLOON_COMMON0) & 7);
} else if (ftr_no >= FTR_START(FTR_NOG_COLLEGENOTE) && ftr_no <= FTR_END(FTR_IKE_NIKKI_WAFU1)) {
return ITM_DIARY_START + (((ftr_no - FTR_START(FTR_NOG_COLLEGENOTE)) >> 2) & 15);
} else if (mRmTp_FtrItemNo2FtrIdx(ftr_no) >= FTR_UTIWA0 && mRmTp_FtrItemNo2FtrIdx(ftr_no) <= 0x45A) {
return ITM_BLUEBELL_FAN + ((mRmTp_FtrItemNo2FtrIdx(ftr_no) - FTR_UTIWA0) & 7);
} else if (mRmTp_FtrItemNo2FtrIdx(ftr_no) >= FTR_KAZAGURUMA0 && mRmTp_FtrItemNo2FtrIdx(ftr_no) <= 0x462) {
return ITM_YELLOW_PINWHEEL + ((mRmTp_FtrItemNo2FtrIdx(ftr_no) - FTR_KAZAGURUMA0) & 7);
} else if (mRmTp_FtrItemNo2FtrIdx(ftr_no) >= FTR_GOLD_ITEM0 && mRmTp_FtrItemNo2FtrIdx(ftr_no) <= 0x452) {
return ITM_GOLDEN_NET + ((mRmTp_FtrItemNo2FtrIdx(ftr_no) - FTR_GOLD_ITEM0) & 3);
} else if (mRmTp_FtrItemNo2FtrIdx(ftr_no) >= FTR_TOOL0 && mRmTp_FtrItemNo2FtrIdx(ftr_no) <= 0x466) {
return ITM_NET + ((mRmTp_FtrItemNo2FtrIdx(ftr_no) - FTR_TOOL0) & 3);
}
return ftr_no;
src/game/m_shop.c
+11 -9
View File
@@ -159,9 +159,9 @@ static void mSP_SetSeasonFTR(mActor_name_t* item_table, int count) {
if (count > 0 && month == lbRTC_DECEMBER) {
if (day <= 24) {
mSP_SetSeasonFTR_local_december(item_table, count, FTR_FESTIVE_TREE, FTR_BIG_FESTIVE_TREE);
mSP_SetSeasonFTR_local_december(item_table, count, FTR_START(FTR_NOG_XTREE), FTR_START(FTR_KON_XTREE02));
} else if (day >= 26) {
mSP_SetSeasonFTR_local_december(item_table, count, FTR_FESTIVE_CANDLE, FTR_FESTIVE_FLAG);
mSP_SetSeasonFTR_local_december(item_table, count, FTR_START(FTR_YAZ_CANDLE), FTR_START(FTR_YOS_KFLAG));
}
}
}
@@ -491,8 +491,9 @@ static int mSP_NoList(mActor_name_t* items_table, int count, mActor_name_t* list
}
static void mSP_SetDummyItem(mActor_name_t* items_table, int count, int kind) {
mActor_name_t dummy_table[mSP_KIND_EXTENDED_MAX] = { FTR_CLASSIC_WARDROBE, ITM_PAPER00, ITM_CLOTH000,
ITM_CARPET00, ITM_WALL00, ITM_DIARY00 };
mActor_name_t dummy_table[mSP_KIND_EXTENDED_MAX] = {
FTR_START(FTR_SUM_CLCHEST03), ITM_PAPER00, ITM_CLOTH000, ITM_CARPET00, ITM_WALL00, ITM_DIARY00
};
mActor_name_t dummy_item = dummy_table[kind];
int i;
@@ -1909,7 +1910,7 @@ static mActor_name_t mSP_FtrBirthIdx2ItemNo(u8 birth_type, int birth_idx) {
birth_type_p++;
}
return FTR_DINO_TREX_SKULL;
return FTR_START(FTR_DIN_TREX_HEAD);
}
extern mActor_name_t mSP_RandomOneFossilSelect(int multi_fossil) {
@@ -2229,9 +2230,10 @@ extern mActor_name_t mSP_SelectFishginPresent(int player_no) {
mSP_LISTTYPE_EVENT);
}
mActor_name_t mSP_gc_famicom_table[8] = { FTR_FAMICOM_CLU_CLU_LAND, FTR_FAMICOM_BALLOON_FIGHT, FTR_FAMICOM_DONKEY_KONG,
FTR_FAMICOM_DK_JR_MATCH, FTR_FAMICOM_PINBALL, FTR_FAMICOM_TENNIS,
FTR_FAMICOM_GOLF, FTR_FAMICOM_EXCITEBIKE };
mActor_name_t mSP_gc_famicom_table[8] = {
FTR_START(FTR_FAMICOM_COMMON00), FTR_START(FTR_FAMICOM_COMMON01), FTR_START(FTR_FAMICOM_COMMON02), FTR_START(FTR_FAMICOM_COMMON03),
FTR_START(FTR_FAMICOM_COMMON04), FTR_START(FTR_FAMICOM_COMMON05), FTR_START(FTR_FAMICOM_COMMON06), FTR_START(FTR_FAMICOM_COMMON13),
};
/* @unused size: 0xDC */
// static mActor_name_t mSP_RandomOneFamicomSelect(...)
@@ -2462,7 +2464,7 @@ extern const char* mSP_ShopStatus2String(int status) {
extern mActor_name_t mSP_GetRandomStationToyItemNo() {
/* TODO: where does this go? DnM+ indicates no unused functions after this, but data appears after str_table in
* mSP_ShopStatus2String */
static mActor_name_t train[2] = { FTR_LOCOMOTIVE_MODEL, FTR_TRAIN_CAR_MODEL };
static mActor_name_t train[2] = { FTR_START(FTR_IKE_K_KID01), FTR_START(FTR_IKE_K_KID02) };
/* TODO: furniture item index enum/defines */
return mRmTp_FtrIdx2FtrItemNo(0x42A + RANDOM(15), mRmTp_DIRECT_SOUTH);
src/game/m_soncho.c
+34 -34
View File
@@ -190,34 +190,34 @@ extern void mSC_trophy_set(u8 num) {
extern mActor_name_t mSC_trophy_item(u8 soncho_event) {
static mActor_name_t soncho_item_table[mSC_EVENT_NUM] = {
ITM_FOOD_APPLE, // mSC_EVENT_NEW_YEARS_DAY
FTR_WEED_MODEL, // mSC_EVENT_FOUNDERS_DAY
FTR_NEEDLEWORK_MODEL, // mSC_EVENT_GRADUATION_DAY
FTR_SUPER_TORTIMER, // mSC_EVENT_APRILFOOLS_DAY
ITM_FOOD_APPLE, // mSC_EVENT_TOWN_DAY
FTR_LOVELY_PHONE, // mSC_EVENT_MOTHERS_DAY
FTR_MARKET_MODEL, // mSC_EVENT_SALE_DAY
FTR_PINK_TREE_MODEL, // mSC_EVENT_CHERRY_BLOSSOM_FESTIVAL
FTR_SPRING_MEDAL, // mSC_EVENT_SPRING_SPORTS_FAIR
FTR_TREE_MODEL, // mSC_EVENT_NATURE_DAY
FTR_DUMP_MODEL, // mSC_EVENT_SPRING_CLEANING
FTR_LOCOMOTIVE_MODEL, // mSC_EVENT_FATHERS_DAY
FTR_ANGLER_TROPHY, // mSC_EVENT_FISHING_TOURNEY_1
ITM_FOOD_PEAR, // mSC_EVENT_GROUNDHOG_DAY
FTR_BOTTLED_SHIP, // mSC_EVENT_EXPLORERS_DAY
FTR_BOTTLE_ROCKET, // mSC_EVENT_FIREWORKS_SHOW
FTR_TELESCOPE, // mSC_EVENT_METEOR_SHOWER
FTR_MOON, // mSC_EVENT_HARVEST_MOON_FESTIVAL
FTR_WELL_MODEL, // mSC_EVENT_MAYORS_DAY
FTR_POLICE_MODEL, // mSC_EVENT_OFFICERS_DAY
FTR_AUTUMN_MEDAL, // mSC_EVENT_FALL_SPORTS_FAIR
FTR_FORTUNE_TENT_MODEL, // mSC_EVENT_HALLOWEEN
FTR_FISHING_TROPHY, // mSC_EVENT_FISHING_TOURNEY_2
FTR_SNOWMAN, // mSC_EVENT_SNOW_DAY
FTR_SHOP_MDOEL, // mSC_EVENT_LABOR_DAY
ITM_FOOD_APPLE, // mSC_EVENT_TOY_DAY
FTR_NOISEMAKER, // mSC_EVENT_NEW_YEARS_EVE_COUNTDOWN
FTR_CORNUCOPIA // mSC_EVENT_HARVEST_FESTIVAL
ITM_FOOD_APPLE, // mSC_EVENT_NEW_YEARS_DAY
FTR_START(FTR_NOG_ZASSOU), // mSC_EVENT_FOUNDERS_DAY
FTR_START(FTR_TAK_TAILOR), // mSC_EVENT_GRADUATION_DAY
FTR_START(FTR_TAK_NES01), // mSC_EVENT_APRILFOOLS_DAY
ITM_FOOD_APPLE, // mSC_EVENT_TOWN_DAY
FTR_START(FTR_IKE_K_OTOME01), // mSC_EVENT_MOTHERS_DAY
FTR_START(FTR_NOG_YAMISHOP), // mSC_EVENT_SALE_DAY
FTR_START(FTR_NOG_F_TREE), // mSC_EVENT_CHERRY_BLOSSOM_FESTIVAL
FTR_START(FTR_IKU_GOLD_GREEN), // mSC_EVENT_SPRING_SPORTS_FAIR
FTR_START(FTR_NOG_S_TREE), // mSC_EVENT_NATURE_DAY
FTR_START(FTR_NOG_DUMP), // mSC_EVENT_SPRING_CLEANING
FTR_START(FTR_IKE_K_KID01), // mSC_EVENT_FATHERS_DAY
FTR_START(FTR_IKE_FISH_TRO2), // mSC_EVENT_FISHING_TOURNEY_1
ITM_FOOD_PEAR, // mSC_EVENT_GROUNDHOG_DAY
FTR_START(FTR_IKE_JNY_BOTLE01), // mSC_EVENT_EXPLORERS_DAY
FTR_START(FTR_YAZ_ROCKET), // mSC_EVENT_FIREWORKS_SHOW
FTR_START(FTR_YAZ_TELESCOPE), // mSC_EVENT_METEOR_SHOWER
FTR_START(FTR_TAK_MOON), // mSC_EVENT_HARVEST_MOON_FESTIVAL
FTR_START(FTR_NOG_SHRINE), // mSC_EVENT_MAYORS_DAY
FTR_START(FTR_NOG_KOBAN), // mSC_EVENT_OFFICERS_DAY
FTR_START(FTR_IKU_GOLD_RED), // mSC_EVENT_FALL_SPORTS_FAIR
FTR_START(FTR_NOG_URANAI), // mSC_EVENT_HALLOWEEN
FTR_START(FTR_YAZ_FISH_TROPHY), // mSC_EVENT_FISHING_TOURNEY_2
FTR_START(FTR_NOG_SNOWMAN), // mSC_EVENT_SNOW_DAY
FTR_START(FTR_NOG_SHOP1), // mSC_EVENT_LABOR_DAY
ITM_FOOD_APPLE, // mSC_EVENT_TOY_DAY
FTR_START(FTR_TAK_NOISE), // mSC_EVENT_NEW_YEARS_EVE_COUNTDOWN
FTR_START(FTR_NOG_CORNUCOPIA) // mSC_EVENT_HARVEST_FESTIVAL
};
mActor_name_t item = ITM_FOOD_APPLE;
@@ -236,9 +236,9 @@ extern mActor_name_t mSC_trophy_item(u8 soncho_event) {
case mSC_EVENT_TOY_DAY: {
if (Common_Get(now_private)->gender == mPr_SEX_MALE) {
item = FTR_MINI_CAR;
item = FTR_START(FTR_IKE_K_IVEBOY01);
} else {
item = FTR_DOLLY;
item = FTR_START(FTR_IID_NINGYOU);
}
break;
}
@@ -608,7 +608,7 @@ extern int mSC_Radio_Set_Talk_Proc(TAISOU_NPC0_ACTOR* taisou_actor) {
taisou_actor->talk_proc = mSCR_TALK_INSPECTION;
card = mSC_Radio_have_taisou_card();
mSC_Radio_stamp_card(radiocard->days);
taisou_actor->held_item = FTR_AEROBICS_RADIO;
taisou_actor->held_item = FTR_START(FTR_RADIO_TEST);
mSC_Radio_change_taisou_card(card, taisou_actor->held_item);
mIN_copy_name_str(item_name, taisou_actor->held_item);
article = mIN_get_item_article(taisou_actor->held_item);
@@ -636,7 +636,7 @@ extern int mSC_Radio_Set_Talk_Proc(TAISOU_NPC0_ACTOR* taisou_actor) {
} else {
taisou_actor->talk_proc = mSCR_TALK_NEXT_INSPECTION;
radiocard->days++;
taisou_actor->held_item = FTR_AEROBICS_RADIO;
taisou_actor->held_item = FTR_START(FTR_RADIO_TEST);
mPr_SetFreePossessionItem(Common_Get(now_private), taisou_actor->held_item,
mPr_ITEM_COND_NORMAL);
mIN_copy_name_str(item_name, taisou_actor->held_item);
@@ -962,10 +962,10 @@ extern void mSC_LightHouse_Event_Clear(int player_no) {
extern mActor_name_t mSC_LightHouse_Event_Present_Item(u32 player_no) {
if (Save_Get(LightHouse).renew_time.month == lbRTC_JANUARY) {
return FTR_LIGHTHOUSE_MODEL;
return FTR_START(FTR_TAK_TOUDAI);
}
return FTR_CHOCOLATES;
return FTR_START(FTR_IKE_JNY_MAKADA01);
}
static void mSC_LightHouse_clear_data() {
src/game/m_start_data_init.c
+45 -45
View File
@@ -234,11 +234,11 @@ static int mSDI_StartInitNew(GAME* game, int player_no, int malloc_flag) {
mNpc_SetRemoveAnimalNo(Save_GetPointer(remove_animal_idx), animals, -1);
title_game_haniwa_data_init();
mPB_police_box_init(g);
mSN_snowman_init(); //
mSN_snowman_init();
mHS_house_init();
mGH_animal_return_init(); //
mMC_mask_cat_init(); //
mDE_maskcat_init(Save_GetPointer(mask_cat)); //
mGH_animal_return_init();
mMC_mask_cat_init();
mDE_maskcat_init(Save_GetPointer(mask_cat));
lbRTC_TimeCopy(Save_GetPointer(last_grow_time), &mTM_rtcTime_clear_code);
lbRTC_TimeCopy(Save_GetPointer(treasure_buried_time), &mTM_rtcTime_clear_code);
@@ -299,11 +299,11 @@ static int mSDI_StartInitFrom(GAME* game, int player_no, int malloc_flag) {
if (priv->exists == TRUE) {
Common_Set(now_private, priv);
Common_Set(player_no, player_no);
mFM_SetBlockKindLoadCombi(g); //
mEv_init_force(&play->event); //
mFM_SetBlockKindLoadCombi(g);
mEv_init_force(&play->event);
mHsRm_GetHuusuiRoom(g, player_no);
mCkRh_DecideNowGokiFamilyCount(player_no);
mSP_ExchangeLineUp_InGame(g); //
mSP_ExchangeLineUp_InGame(g);
mNpc_SetRemoveAnimalNo(Save_GetPointer(remove_animal_idx), animals, -1);
mMkRm_MarkRoom(g);
mRmTp_SetDefaultLightSwitchData(2); // TODO: enum
@@ -314,11 +314,11 @@ static int mSDI_StartInitFrom(GAME* game, int player_no, int malloc_flag) {
priv->exists = TRUE;
Common_Set(now_private, priv);
Common_Set(player_no, player_no);
mFM_SetBlockKindLoadCombi(g); //
mEv_init_force(&play->event); //
mFM_SetBlockKindLoadCombi(g);
mEv_init_force(&play->event);
mHsRm_GetHuusuiRoom(g, player_no);
mCkRh_DecideNowGokiFamilyCount(player_no);
mSP_ExchangeLineUp_InGame(g); //
mSP_ExchangeLineUp_InGame(g);
mNpc_SetRemoveAnimalNo(Save_GetPointer(remove_animal_idx), animals, -1);
/* Punish player by deleting their pockets and some pending items */
@@ -327,8 +327,8 @@ static int mSDI_StartInitFrom(GAME* game, int player_no, int malloc_flag) {
priv->inventory.lotto_ticket_mail_storage = 0;
priv->inventory.item_conditions = 0;
priv->inventory.wallet = 0;
mQst_ClearDelivery(priv->deliveries, mPr_DELIVERY_QUEST_NUM); //
mQst_ClearErrand(priv->errands, mPr_ERRAND_QUEST_NUM); //
mQst_ClearDelivery(priv->deliveries, mPr_DELIVERY_QUEST_NUM);
mQst_ClearErrand(priv->errands, mPr_ERRAND_QUEST_NUM);
mMkRm_MarkRoom(g);
mRmTp_SetDefaultLightSwitchData(2); // TODO: enum
@@ -402,10 +402,10 @@ static int mSDI_StartInitPak(GAME* game, int player_no, int malloc_flag) {
mCkRh_DecideNowGokiFamilyCount(player_no);
mSP_ExchangeLineUp_InGame(g);
mNpc_SetRemoveAnimalNo(Save_GetPointer(remove_animal_idx), animals, -1);
mNpc_SetReturnAnimal(mNpc_GetInAnimalP()); //
mNpc_SendRegisteredGoodbyMail(); //
mNpc_SetReturnAnimal(mNpc_GetInAnimalP());
mNpc_SendRegisteredGoodbyMail();
mMkRm_MarkRoom(g);
mEv_SetGateway(); //
mEv_SetGateway();
mRmTp_SetDefaultLightSwitchData(2); // TODO: enum
res = TRUE;
}
@@ -425,61 +425,61 @@ extern void mSDI_StartInitAfter(GAME* game, int renew_mode, int malloc_flag) {
mEA_InitLetterCardE();
Common_Set(last_field_id, -1);
mHm_SetNowHome();
mNpc_RenewalAnimalMemory(); //
mNpc_ForceRemove(); //
mNpc_RenewalAnimalMemory();
mNpc_ForceRemove();
mTM_renewal_renew_time();
mEv_ClearEventInfo();
mEnv_DecideWeather_NormalGameStart(); //
mEnv_DecideWeather_NormalGameStart();
mMl_start_send_mail();
mPO_first_work(play);
mTM_set_season();
mAGrw_ClearAllShine_Stone(); //
mAGrw_ClearAllShine_Stone();
mAGrw_RestoreStoneShine(Common_Get(player_no));
mFAs_SetFieldRank();
mEv_2nd_init(&play->event);
mNpc_Grow(); //
mNpc_Grow();
Kabu_manager();
mNpc_InitNpcData();
mNpc_InitNpcList(Common_Get(npclist), ANIMAL_NUM_MAX); //
mNpc_InitNpcList(Common_Get(npclist), ANIMAL_NUM_MAX);
mNpc_SetNpcList(Common_Get(npclist), animals, ANIMAL_NUM_MAX, malloc_flag);
mNpc_InitNpcList(Common_Get(island_npclist), 1);
mNpc_ClearTalkInfo(); //
mNpc_ClearTalkInfo();
if (renew_mode == 1) {
mFM_RenewalReserve(); //
mFM_RenewalReserve();
}
mNpc_ChangePresentCloth(); //
mQst_ClearNotSaveQuest(Common_GetPointer(quest)); //
mGH_check_delete(); //
mMC_check_delete(); //
mFM_SetIslandNpcRoomData(game, malloc_flag); //
mCD_calendar_wellcome_on(); //
mPr_SetItemCollectBit(FTR_TAPEDECK);
mPr_SetItemCollectBit(FTR_COLLEGERULE);
mPr_SetItemCollectBit(FTR_ORANGEBOX);
mNPS_set_all_schedule_area(); //
mNpcW_InitNpcWalk(Common_GetPointer(npc_walk)); //
mNpc_ChangePresentCloth();
mQst_ClearNotSaveQuest(Common_GetPointer(quest));
mGH_check_delete();
mMC_check_delete();
mFM_SetIslandNpcRoomData(game, malloc_flag);
mCD_calendar_wellcome_on();
mPr_SetItemCollectBit(FTR_START(FTR_SUM_CASSE01));
mPr_SetItemCollectBit(FTR_START(FTR_NOG_COLLEGENOTE));
mPr_SetItemCollectBit(FTR_START(FTR_NOG_MIKANBOX));
mNPS_set_all_schedule_area();
mNpcW_InitNpcWalk(Common_GetPointer(npc_walk));
mHm_CheckRehouseOrder();
decide_fish_location(Common_GetPointer(fish_location));
mTRC_init(game);
Common_Set(goki_shocked_flag, FALSE);
mNtc_auto_nwrite_time_ct(); //
mNtc_auto_nwrite_time_ct();
mPr_SendMailFromMother();
mNpc_Remail(); //
mNpc_Remail();
mPr_SendForeingerAnimalMail(Common_Get(now_private));
mPr_StartSetCompleteTalkInfo();
mMsm_SendInformationMail(); //
mMsm_SendCompMail(); //
mFI_SetFirstSetShell(); //
mMsm_SendInformationMail();
mMsm_SendCompMail();
mFI_SetFirstSetShell();
mMsr_FirstClearMushroom();
mSN_decide_msg(); //
mSN_decide_msg();
mPr_RenewalMapInfo(Common_Get(now_private)->maps, mPr_FOREIGN_MAP_COUNT, Save_GetPointer(land_info));
mSP_SetTanukiShopStatus(); //
mEnv_DecideTodayWindPowerRange(); //
mSP_SetTanukiShopStatus();
mEnv_DecideTodayWindPowerRange();
mFI_SetClimate(mFI_CLIMATE_0);
mISL_RestoreIsland(); //
mNpc_SendHPMail(); //
mISL_RestoreIsland();
mNpc_SendHPMail();
}
typedef int (*mSDI_INIT_PROC)(GAME*, int, int);
@@ -489,7 +489,7 @@ extern int mSDI_StartInitBefore(GAME* game, int player_no, int init_mode, int ma
&mSDI_StartInitFrom, &mSDI_StartInitPak,
&mSDI_StartInitErr };
mEv_UnSetGateway(); //
mEv_UnSetGateway();
return (*init_proc[init_mode])(game, player_no, malloc_flag);
}
src/game/m_tag_ovl.c
+4 -4
View File
@@ -3039,20 +3039,20 @@ static int mTG_nw_drop_furniture(GAME_PLAY* play, int type, int image_no) {
switch (type) {
case mNW_TYPE_MANEKIN:
idx = aMR_CLIP->judge_breed_new_ftr_proc(game, 0x2EA + (image_no & 7), &ux, &uz, &rot, &sq_ofs, &layer);
idx = aMR_CLIP->judge_breed_new_ftr_proc(game, FTR_MYFMANEKIN0 + (image_no & 7), &ux, &uz, &rot, &sq_ofs, &layer);
break;
case mNW_TYPE_UMBRELLA:
idx = aMR_CLIP->judge_breed_new_ftr_proc(game, 0x362 + (image_no & 7), &ux, &uz, &rot, &sq_ofs, &layer);
idx = aMR_CLIP->judge_breed_new_ftr_proc(game, FTR_MYFUMBRELLA0 + (image_no & 7), &ux, &uz, &rot, &sq_ofs, &layer);
break;
}
if (idx >= 0) {
switch (type) {
case mNW_TYPE_MANEKIN:
aMR_CLIP->reserve_ftr_proc(game, 0x2EA + (image_no & 7), idx, ux, uz, rot, sq_ofs, layer);
aMR_CLIP->reserve_ftr_proc(game, FTR_MYFMANEKIN0 + (image_no & 7), idx, ux, uz, rot, sq_ofs, layer);
break;
case mNW_TYPE_UMBRELLA:
aMR_CLIP->reserve_ftr_proc(game, 0x362 + (image_no & 7), idx, ux, uz, rot, sq_ofs, layer);
aMR_CLIP->reserve_ftr_proc(game, FTR_MYFUMBRELLA0 + (image_no & 7), idx, ux, uz, rot, sq_ofs, layer);
break;
}
}