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

move to using MSG_1234 macro for easier shiftability

Browse Source
This commit is contained in:
mforde
2025-06-19 21:05:31 -04:00
parent 3dd3cffc3c
commit 238bb9138f
22 changed files with 16434 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_msg_enum.h
+16271 -2
View File
File diff suppressed because it is too large Load Diff
src/actor/ac_cottage.c
+1 -1
View File
@@ -593,7 +593,7 @@ static void Cottage_demo_speak_go_out(ACTOR* actor) {
island_villager = &Get_Island_Villager();
looks = mNpc_GetLooks(island_villager->id.npc_id);
mDemo_Set_msg_num((looks & 0xFF) + 0x2AFF);
mDemo_Set_msg_num((looks & 0xFF) + MSG_ISLANDER_NOENTRY_SLEEPING_BASE);
mDemo_Set_talk_display_name(FALSE);
mDemo_Set_camera(TRUE);
mPlib_Set_able_hand_all_item_in_demo(TRUE);
src/actor/ac_depart_move.c_inc
+9 -9
View File
@@ -68,8 +68,8 @@ static int aDPT_check_player(ACTOR* actorx, GAME_PLAY* play) {
dz = player->world.position.z - (actorx->world.position.z + 96.0f);
dist = SQ(dx) + SQ(dz);
if ((u16)player->shape_info.rotation.y > DEG2SHORT_ANGLE2(90.0f) && (u16)player->shape_info.rotation.y < DEG2SHORT_ANGLE2(180.f) &&
dist < 240.0f) {
if ((u16)player->shape_info.rotation.y > DEG2SHORT_ANGLE2(90.0f) &&
(u16)player->shape_info.rotation.y < DEG2SHORT_ANGLE2(180.f) && dist < 240.0f) {
ret = 2;
} else if (dist < 820.0f) {
ret = 1;
@@ -87,27 +87,27 @@ static void aDPT_set_talk_info_close_wait(ACTOR* actorx) {
now_sec = Common_Get(time.now_sec);
if (mSP_CheckFukubikiDay() != FALSE) {
if (now_sec >= (6 * mTM_SECONDS_IN_HOUR)) {
msg_no = mSP_ShopOpen() == mSP_SHOP_STATUS_PRE ? 0x7D6 : 0x7D7;
msg_no = mSP_ShopOpen() == mSP_SHOP_STATUS_PRE ? MSG_RAFFLE_TIME_ANNOUNCE : MSG_RAFFLE_ENDED;
} else {
msg_no = 0x7D0;
msg_no = MSG_SHOP2_OPEN;
}
} else {
switch (mSP_ShopOpen()) {
case mSP_SHOP_STATUS_PRE: // 0
case mSP_SHOP_STATUS_END: // 1
msg_no = 0x7D0;
msg_no = MSG_SHOP2_OPEN;
break;
case mSP_SHOP_STATUS_PREEVENT: // 4
msg_no = 0x7D4;
msg_no = MSG_SHOP2_SPECIAL_SALE;
break;
case mSP_SHOP_STATUS_ENDEVENT: // 5
msg_no = 0x7D9;
msg_no = MSG_SHOP_CLOSED_ENDEVENT;
break;
case mSP_SHOP_STATUS_RENEW: // 3
msg_no = 0x7D8;
msg_no = MSG_SHOP_RENEW;
break;
default:
msg_no = 0x7D0;
msg_no = MSG_SHOP2_OPEN;
break;
}
}
src/actor/ac_douzou_move.c_inc
+1 -1
View File
@@ -172,7 +172,7 @@ static void aDOU_set_talk_info(ACTOR* actor) {
}
mDemo_Set_talk_turn(FALSE);
mDemo_Set_msg_num(0x136B);
mDemo_Set_msg_num(MSG_DOZOU);
mDemo_Set_talk_display_name(FALSE);
mDemo_Set_camera(TRUE);
mPlib_Set_able_hand_all_item_in_demo(TRUE);
src/actor/ac_dump.c
+49 -76
View File
@@ -32,53 +32,34 @@ ACTOR_PROFILE Dump_Profile = {
};
u8 aDUM_shadow_vtx_fix_flg_table[] = {
1,0,0,1,
1,0,0,1,
1,0,0,1,
1,0,0,1,
1,0,0,1,
1,0,0,1,
1,0,0,1,
1,0,0,1,
1,0,0,1,
1,0,0,1,
1,0,0,1,
1,0,0,1,
1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1,
1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1,
};
bIT_ShadowData_c aDUM_shadow_data = {
48,
aDUM_shadow_vtx_fix_flg_table,
60.0f,
obj_dump_shadow_v,
obj_dump_shadowT_model,
48, aDUM_shadow_vtx_fix_flg_table, 60.0f, obj_dump_shadow_v, obj_dump_shadowT_model,
};
static void aDUM_set_bgOffset(DUMP_ACTOR*, int);
static void aDUM_setup_action(DUMP_ACTOR*, int);
static void aDUM_actor_ct(ACTOR* actor, GAME* game){
static void aDUM_actor_ct(ACTOR* actor, GAME* game) {
DUMP_ACTOR* dump = (DUMP_ACTOR*)actor;
dump->season = Common_Get(time.season);
aDUM_set_bgOffset(dump,1);
aDUM_setup_action(dump,0);
dump->season = Common_Get(time.season);
aDUM_set_bgOffset(dump, 1);
aDUM_setup_action(dump, 0);
actor->world.position.x -= 40.0f;
}
static void aDUM_actor_dt(ACTOR* actor, GAME* game){
static void aDUM_actor_dt(ACTOR* actor, GAME* game) {
actor->world.position.x += 40.0f;
}
static void aDUM_set_bgOffset_sub(DUMP_ACTOR* dump, int x, int z, s16 mode){
static void aDUM_set_bgOffset_sub(DUMP_ACTOR* dump, int x, int z, s16 mode) {
static int flag_tbl[6][6] = {
1,1,0,0,1,1,
1,0,0,0,0,1,
1,0,0,0,0,1,
1,0,0,0,0,1,
1,0,0,0,0,1,
1,1,1,1,1,1,
1, 1, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1,
};
xyz_t pos;
@@ -86,29 +67,28 @@ static void aDUM_set_bgOffset_sub(DUMP_ACTOR* dump, int x, int z, s16 mode){
pos.y = dump->actor_class.home.position.y;
pos.z = dump->actor_class.home.position.z - (z * 40);
if(flag_tbl[z][x] != 0){
if (flag_tbl[z][x] != 0) {
mCoBG_SetPlussOffset(pos, mode, 100);
}
}
static void aDUM_set_bgOffset(DUMP_ACTOR* dump, int s){
static void aDUM_set_bgOffset(DUMP_ACTOR* dump, int s) {
s16 mode = s ? 4 : 4;
int i;
for (i = 0; i < 6; i++) {
aDUM_set_bgOffset_sub(dump,0,i,mode);
aDUM_set_bgOffset_sub(dump,1,i,mode);
aDUM_set_bgOffset_sub(dump,2,i,mode);
aDUM_set_bgOffset_sub(dump,3,i,mode);
aDUM_set_bgOffset_sub(dump,4,i,mode);
aDUM_set_bgOffset_sub(dump,5,i,mode);
aDUM_set_bgOffset_sub(dump, 0, i, mode);
aDUM_set_bgOffset_sub(dump, 1, i, mode);
aDUM_set_bgOffset_sub(dump, 2, i, mode);
aDUM_set_bgOffset_sub(dump, 3, i, mode);
aDUM_set_bgOffset_sub(dump, 4, i, mode);
aDUM_set_bgOffset_sub(dump, 5, i, mode);
}
}
static void aDUM_set_talk_info(ACTOR* actor){
static void aDUM_set_talk_info(ACTOR* actor) {
rgba_t color;
mDemo_Set_msg_num(0x136A);
mDemo_Set_msg_num(MSG_4970);
mDemo_Set_talk_display_name(0);
mDemo_Set_camera(1);
mPlib_Set_able_hand_all_item_in_demo(1);
@@ -121,8 +101,7 @@ static void aDUM_set_talk_info(ACTOR* actor){
mDemo_Set_talk_window_color(&color);
}
static void aDUM_wait(DUMP_ACTOR* dump, GAME_PLAY* play){
static void aDUM_wait(DUMP_ACTOR* dump, GAME_PLAY* play) {
ACTOR* actor = &dump->actor_class;
PLAYER_ACTOR* player = get_player_actor_withoutCheck(play);
@@ -131,27 +110,26 @@ static void aDUM_wait(DUMP_ACTOR* dump, GAME_PLAY* play){
xyz_t_move(&pos, &actor->world.position);
if ((mDemo_Check(7, actor) != 1) && (player != NULL) && (mDemo_Get_talk_actor() == NULL)) {
if(player->actor_class.world.position.z >= pos.z){
if(ABS(actor->player_angle_y) < 0x2000){
if (player->actor_class.world.position.z >= pos.z) {
if (ABS(actor->player_angle_y) < 0x2000) {
mDemo_Request(7, actor, aDUM_set_talk_info);
}
}
}
}
static void aDUM_setup_action(DUMP_ACTOR* dump, int action){
static DUMP_PROC process[] = {aDUM_wait};
static void aDUM_setup_action(DUMP_ACTOR* dump, int action) {
static DUMP_PROC process[] = { aDUM_wait };
dump->proc = process[action];
dump->current_action = action;
dump->current_action = action;
}
static void aDUM_actor_move(ACTOR* actor, GAME* game){
static void aDUM_actor_move(ACTOR* actor, GAME* game) {
GAME_PLAY* play = (GAME_PLAY*)game;
DUMP_ACTOR* dump = (DUMP_ACTOR*) actor;
DUMP_ACTOR* dump = (DUMP_ACTOR*)actor;
PLAYER_ACTOR* player = get_player_actor_withoutCheck(play);
@@ -160,27 +138,25 @@ static void aDUM_actor_move(ACTOR* actor, GAME* game){
mFI_Wpos2BlockNum(&dbx, &dbz, actor->world.position);
mFI_Wpos2BlockNum(&pbx, &pbz, player->actor_class.world.position);
if ((mDemo_Check(1, &player->actor_class) == 0) && (mDemo_Check(5, &player->actor_class) == 0) && (mDemo_Check(0x10, &player->actor_class) == 0) && ((dbx != pbx) || (dbz != pbz))) {
if ((mDemo_Check(1, &player->actor_class) == 0) && (mDemo_Check(5, &player->actor_class) == 0) &&
(mDemo_Check(0x10, &player->actor_class) == 0) && ((dbx != pbx) || (dbz != pbz))) {
Actor_delete(actor);
}
else{
} else {
dump->proc(dump, play);
}
}
}
static void aDUM_actor_init(ACTOR* actor, GAME* game){
DUMP_ACTOR* dump = (DUMP_ACTOR*)actor;
static void aDUM_actor_init(ACTOR* actor, GAME* game) {
DUMP_ACTOR* dump = (DUMP_ACTOR*)actor;
mFI_SetFG_common(0xF115, actor->home.position, 0);
aDUM_actor_move(actor, game);
actor->mv_proc = aDUM_actor_move;
}
static void aDUM_actor_draw(ACTOR* actor, GAME* game){
static Gfx* model[] = {dump_s_DL_model, dump_w_DL_model};
DUMP_ACTOR* dump = (DUMP_ACTOR*)actor;
static void aDUM_actor_draw(ACTOR* actor, GAME* game) {
static Gfx* model[] = { dump_s_DL_model, dump_w_DL_model };
DUMP_ACTOR* dump = (DUMP_ACTOR*)actor;
GRAPH* graph = game->graph;
u16* pal;
@@ -190,28 +166,25 @@ static void aDUM_actor_draw(ACTOR* actor, GAME* game){
type = dump->season == mTM_SEASON_WINTER;
pal = Common_Get(clip.structure_clip)->get_pal_segment_proc(aSTR_PAL_DUMP);
_texture_z_light_fog_prim_npc(graph);
OPEN_DISP(graph);
gfx = NOW_POLY_OPA_DISP;
gSPSegment(gfx++, 0x8, pal);
gfx = NOW_POLY_OPA_DISP;
gSPSegment(gfx++, 0x8, pal);
Matrix_translate(-6000.0f, 0.0f, -10000.0f, 1);
Matrix_translate(-6000.0f, 0.0f,-10000.0f, 1);
cur = _Matrix_to_Mtx_new(graph);
cur =_Matrix_to_Mtx_new(graph);
if(cur != NULL){
gSPMatrix(gfx++, cur,G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (cur != NULL) {
gSPMatrix(gfx++, cur, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, model[type]);
SET_POLY_OPA_DISP(gfx);
}
(*Common_Get(clip).bg_item_clip->draw_shadow_proc)(game, &aDUM_shadow_data, FALSE);
CLOSE_DISP(graph);
}
}
src/actor/ac_flag.c
+1 -1
View File
@@ -87,7 +87,7 @@ static void aFLAG_actor_dt(ACTOR* actor, GAME* game) {
static void aFLAG_set_talk_info(ACTOR* actor) {
rgba_t window_color;
mDemo_Set_msg_num(0x3066);
mDemo_Set_msg_num(MSG_12390);
mDemo_Set_talk_display_name(FALSE);
mDemo_Set_ListenAble();
src/actor/ac_hatumode_control_move.c_inc
+4 -4
View File
@@ -1,6 +1,6 @@
static void aHTC_ready(HATUMODE_CONTROL_ACTOR* hatumode_control, GAME_PLAY* play) {
aEv_hatumode_save_c* hatumode_p = (aEv_hatumode_save_c*)mEv_get_save_area(1, 7);
if (hatumode_p != NULL && hatumode_p->state == 1) {
hatumode_control->actor_class.world.position.x = 20 + hatumode_p->yashiro_pos[0];
hatumode_control->actor_class.world.position.z = 40 + hatumode_p->yashiro_pos[1];
@@ -11,7 +11,7 @@ static void aHTC_ready(HATUMODE_CONTROL_ACTOR* hatumode_control, GAME_PLAY* play
static void aHTC_wait(HATUMODE_CONTROL_ACTOR* hatumode_control, GAME_PLAY* play) {
aEv_hatumode_save_c* hatumode_p = (aEv_hatumode_save_c*)mEv_get_save_area(1, 7);
if (hatumode_p->flags0 & 0x8000) {
aHTC_setup_move_proc(hatumode_control, 2);
}
@@ -36,10 +36,10 @@ static void aHTC_request(HATUMODE_CONTROL_ACTOR* hatumode_control, GAME_PLAY* pl
if (mDemo_Check(mDemo_TYPE_SPEAK, actorx) == TRUE) {
if (mSP_money_check(50)) {
aHTC_setup_move_proc(hatumode_control, 3);
mDemo_Set_msg_num(0x112C);
mDemo_Set_msg_num(MSG_4396);
} else {
aHTC_setup_move_proc(hatumode_control, 4);
mDemo_Set_msg_num(0x112E);
mDemo_Set_msg_num(MSG_4398);
}
} else {
if (mDemo_Get_talk_actor() == NULL) {
src/actor/ac_mscore_control.c
+1 -1
View File
@@ -98,7 +98,7 @@ static void aMSC_menu_close_wait(MSCORE_CONTROL_ACTOR* mscore_ctrl, GAME_PLAY* p
}
static void aMSC_set_force_talk_info_talk_request(ACTOR* actorx) {
mDemo_Set_msg_num(0x3DDA);
mDemo_Set_msg_num(MSG_15834);
mDemo_Set_talk_turn(FALSE);
mDemo_Set_camera(CAMERA2_PROCESS_STOP);
mDemo_Set_talk_display_name(FALSE);
src/actor/ac_museum_fish.c
+22 -56
View File
@@ -615,8 +615,6 @@ void Museum_Fish_Actor_dt(ACTOR* actor, GAME* game) {
}
int Museum_Fish_GetMsgNo(MUSEUM_FISH_ACTOR* actor) {
// MUSEUM_FISH_ACTOR* actor = (MUSEUM_FISH_ACTOR*)actorx;
static u8 item_name[mIN_ITEM_NAME_LEN];
int itemArticle;
mMsg_Window_c* msg;
@@ -633,16 +631,16 @@ int Museum_Fish_GetMsgNo(MUSEUM_FISH_ACTOR* actor) {
if (actor->fishDisplayMsgIter < actor->numFishDisplayed - 1) {
if (fishInfo >= 1 && fishInfo <= 4) {
return 0x2fa2;
return MSG_12194;
} else {
return 0x2fa3;
return MSG_12195;
}
}
if (fishInfo >= 1 && fishInfo <= 4) {
return 0x2f9f;
return MSG_12191;
} else {
return 0x2fa0;
return MSG_12192;
}
}
@@ -674,62 +672,30 @@ void Museum_Fish_Set_MsgFishInfo(MUSEUM_FISH_ACTOR* actor, int param2) {
// defines how many fish are in each grouping of fish names
static int group_max_num[5] = { 10, 9, 9, 6, 6 };
static int group_A_fish_name[10] = {
aGYO_TYPE_CRUCIAN_CARP,
aGYO_TYPE_BROOK_TROUT,
aGYO_TYPE_CARP,
aGYO_TYPE_KOI,
aGYO_TYPE_BARBEL_STEED,
aGYO_TYPE_BITTERLING,
aGYO_TYPE_EEL,
aGYO_TYPE_GOLDFISH,
aGYO_TYPE_POPEYED_GOLDFISH,
aGYO_TYPE_KILLIFISH,
aGYO_TYPE_CRUCIAN_CARP, aGYO_TYPE_BROOK_TROUT, aGYO_TYPE_CARP, aGYO_TYPE_KOI,
aGYO_TYPE_BARBEL_STEED, aGYO_TYPE_BITTERLING, aGYO_TYPE_EEL, aGYO_TYPE_GOLDFISH,
aGYO_TYPE_POPEYED_GOLDFISH, aGYO_TYPE_KILLIFISH,
};
static int group_B_fish_name[9] = {
aGYO_TYPE_CATFISH,
aGYO_TYPE_GIANT_CATFISH,
aGYO_TYPE_LOACH,
aGYO_TYPE_BLUEGILL,
aGYO_TYPE_SMALL_BASS,
aGYO_TYPE_BASS,
aGYO_TYPE_LARGE_BASS,
aGYO_TYPE_FRESHWATER_GOBY,
aGYO_TYPE_FROG,
aGYO_TYPE_CATFISH, aGYO_TYPE_GIANT_CATFISH, aGYO_TYPE_LOACH, aGYO_TYPE_BLUEGILL, aGYO_TYPE_SMALL_BASS,
aGYO_TYPE_BASS, aGYO_TYPE_LARGE_BASS, aGYO_TYPE_FRESHWATER_GOBY, aGYO_TYPE_FROG,
};
static int group_C_fish_name[9] = {
aGYO_TYPE_DACE,
aGYO_TYPE_PALE_CHUB,
aGYO_TYPE_POND_SMELT,
aGYO_TYPE_SWEETFISH,
aGYO_TYPE_CHERRY_SALMON,
aGYO_TYPE_RAINBOW_TROUT,
aGYO_TYPE_LARGE_CHAR,
aGYO_TYPE_STRINGFISH,
aGYO_TYPE_CRAWFISH,
aGYO_TYPE_DACE, aGYO_TYPE_PALE_CHUB, aGYO_TYPE_POND_SMELT,
aGYO_TYPE_SWEETFISH, aGYO_TYPE_CHERRY_SALMON, aGYO_TYPE_RAINBOW_TROUT,
aGYO_TYPE_LARGE_CHAR, aGYO_TYPE_STRINGFISH, aGYO_TYPE_CRAWFISH,
};
static int group_D_fish_name[6] = {
aGYO_TYPE_GIANT_SNAKEHEAD,
aGYO_TYPE_GUPPY,
aGYO_TYPE_ANGELFISH,
aGYO_TYPE_PIRANHA,
aGYO_TYPE_AROWANA,
aGYO_TYPE_ARAPAIMA,
aGYO_TYPE_GIANT_SNAKEHEAD, aGYO_TYPE_GUPPY, aGYO_TYPE_ANGELFISH,
aGYO_TYPE_PIRANHA, aGYO_TYPE_AROWANA, aGYO_TYPE_ARAPAIMA,
};
static int group_E_fish_name[6] = {
aGYO_TYPE_SALMON,
aGYO_TYPE_COELACANTH,
aGYO_TYPE_JELLYFISH,
aGYO_TYPE_SEA_BASS,
aGYO_TYPE_RED_SNAPPER,
aGYO_TYPE_BARRED_KNIFEJAW,
aGYO_TYPE_SALMON, aGYO_TYPE_COELACANTH, aGYO_TYPE_JELLYFISH,
aGYO_TYPE_SEA_BASS, aGYO_TYPE_RED_SNAPPER, aGYO_TYPE_BARRED_KNIFEJAW,
};
static int* group_fish_name[5] = {
group_A_fish_name,
group_B_fish_name,
group_C_fish_name,
group_D_fish_name,
group_E_fish_name,
group_A_fish_name, group_B_fish_name, group_C_fish_name, group_D_fish_name, group_E_fish_name,
};
actor->numFishDisplayed = 0;
@@ -751,15 +717,15 @@ void Museum_Fish_set_talk_info(ACTOR* actorx) {
MUSEUM_FISH_ACTOR* actor = (MUSEUM_FISH_ACTOR*)actorx;
static rgba_t window_color = { 255, 255, 205, 255 };
int r3;
int msg_no;
if (actor->numFishDisplayed > 0) { // maybe related to if there are fish in the tank
r3 = Museum_Fish_GetMsgNo(actor);
msg_no = Museum_Fish_GetMsgNo(actor);
actor->fishDisplayMsgIter++; // maybe iterating through the fish donation record, given which fish are donated?
} else {
r3 = 0x2fa1;
msg_no = MSG_12193;
}
mDemo_Set_msg_num(r3);
mDemo_Set_msg_num(msg_no);
mDemo_Set_talk_window_color(&window_color);
mDemo_Set_talk_display_name(0);
mDemo_Set_ListenAble();
@@ -858,7 +824,7 @@ void Museum_Fish_Actor_move(ACTOR* actorx, GAME* game) {
actor->_14d50[i]--;
if (actor->_14d50[i] < 0) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_SUISOU_AWA, suisou_awa_pos[i], 2, 0, game, RSV_NO,
suisou_awa_group[i], 0);
suisou_awa_group[i], 0);
if (actor->_14d78[i] > 0) {
actor->_14d78[i]--;
actor->_14d50[i] = RANDOMF_RANGE(2, 10);
src/actor/ac_museum_fossil.c
+2 -2
View File
@@ -103,8 +103,8 @@ static void Museum_Fossil_Actor_move(ACTOR* actorx, GAME* game) {
res = mRmTp_CheckTalkAble(&angle, &pos, aMF_fossil_data_table[i].direct, 42.5f, (GAME_PLAY*)game);
if (res != FALSE) {
museum_fossil->msg_no = (donator == mMmd_DONATOR_NONE)
? 0x2FA1
: ((donator == mMmd_DONATOR_DELETED_PLAYER) ? 0x2FA0 : 0x2F9F);
? MSG_12193
: ((donator == mMmd_DONATOR_DELETED_PLAYER) ? MSG_12192 : MSG_12191);
museum_fossil->target_angle = angle;
if (mDemo_Request(mDemo_TYPE_SPEAK, actorx, &aMF_SetTalkInfo)) {
if (mMmd_IS_DONATED(donator)) {
src/actor/ac_museum_insect.c
+5 -5
View File
@@ -708,15 +708,15 @@ int Museum_Insect_GetMsgNo(ACTOR* actorx) {
if (actor->_2F7C < actor->_2F78 - 1) {
if (insect_caught_by >= 1 && insect_caught_by <= 4) {
msgNo = 0x2fa2;
msgNo = MSG_12194;
} else {
msgNo = 0x2fa3;
msgNo = MSG_12195;
}
} else {
if (insect_caught_by >= 1 && insect_caught_by <= 4) {
msgNo = 0x2f9f;
msgNo = MSG_12191;
} else {
msgNo = 0x2fa0;
msgNo = MSG_12192;
}
}
@@ -775,7 +775,7 @@ void Museum_Insect_set_talk_info(ACTOR* actorx) {
x = Museum_Insect_GetMsgNo(actorx);
actor->_2F7C++;
} else {
x = 0x2fa1;
x = MSG_12193;
}
mDemo_Set_talk_window_color(&window_color);
mDemo_Set_msg_num(x);
src/actor/ac_museum_insect_goki.c_inc
+2 -2
View File
@@ -83,13 +83,13 @@ void goki_set_talk_info_init(ACTOR* actor) {
int info = mMmd_InsectInfo(0x1c);
int i;
if (info < 1 || info > 4) {
i = 0x2fa5;
i = MSG_12197;
} else {
if (info >= 1 && info <= 4) {
mMsg_Set_free_str(mMsg_Get_base_window_p(), mMsg_FREE_STR0,
common_data.save.save.private_data[info - 1].player_ID.player_name, 8);
}
i = 0x2fa4;
i = MSG_12196;
}
mDemo_Set_talk_window_color(&window_color);
mDemo_Set_talk_display_name(0);
src/actor/ac_my_room_msg_ctrl.c_inc
+28 -28
View File
@@ -1648,33 +1648,33 @@ static aMR_MSG_CTRL_PROC msg_ctrl_table[aMR_MSG_STATE_NUM] = {
static int aMR_msg_no_table[aMR_MSG_STATE_NUM] = {
aMR_NO_MSG,
aMR_NO_MSG,
0x0A0A,
0x0A0B,
0x2F1A,
0x2F1B,
0x2F1E,
MSG_2570,
MSG_2571,
MSG_12058,
MSG_12059,
MSG_12062,
aMR_NO_MSG,
aMR_NO_MSG,
0x0A0C,
0x0A0D,
0x2F1C,
0x2F1D,
MSG_2572,
MSG_2573,
MSG_12060,
MSG_12061,
aMR_NO_MSG,
aMR_NO_MSG,
aMR_NO_MSG,
aMR_NO_MSG,
aMR_NO_MSG,
aMR_NO_MSG,
0x2F1F,
0x2F1F,
MSG_12063,
MSG_12063,
aMR_NO_MSG,
aMR_NO_MSG,
aMR_NO_MSG,
0x10B7,
0x10BE,
0x10B8,
0x10B9,
0x10BA,
MSG_4279,
MSG_4286,
MSG_4280,
MSG_4281,
MSG_4282,
aMR_NO_MSG,
aMR_NO_MSG,
aMR_NO_MSG,
@@ -1683,27 +1683,27 @@ static int aMR_msg_no_table[aMR_MSG_STATE_NUM] = {
aMR_NO_MSG,
aMR_NO_MSG,
aMR_NO_MSG,
0x10BC,
MSG_4284,
aMR_NO_MSG,
aMR_NO_MSG,
0x2B72,
MSG_11122,
aMR_NO_MSG,
0x2B72,
MSG_11122,
aMR_NO_MSG,
0x3068,
0x3068,
MSG_12392,
MSG_12392,
aMR_NO_MSG,
aMR_NO_MSG,
aMR_NO_MSG,
aMR_NO_MSG,
0x2B69,
MSG_11113,
aMR_NO_MSG,
0x306C,
0x306B,
0x3A8A,
0x3AF1,
0x3B58,
0x2B6B,
MSG_12396,
MSG_12395,
MSG_14986,
MSG_15089,
MSG_15192,
MSG_11115,
aMR_NO_MSG,
aMR_NO_MSG,
aMR_NO_MSG,
src/actor/ac_super_move.c_inc
+9 -9
View File
@@ -68,8 +68,8 @@ static int aSPR_check_player(ACTOR* actorx, GAME_PLAY* play) {
dz = player->world.position.z - (actorx->world.position.z + 96.0f);
dist = SQ(dx) + SQ(dz);
if ((u16)player->shape_info.rotation.y > DEG2SHORT_ANGLE2(90.0f) && (u16)player->shape_info.rotation.y < DEG2SHORT_ANGLE2(180.f) &&
dist < 240.0f) {
if ((u16)player->shape_info.rotation.y > DEG2SHORT_ANGLE2(90.0f) &&
(u16)player->shape_info.rotation.y < DEG2SHORT_ANGLE2(180.f) && dist < 240.0f) {
ret = 2;
} else if (dist < 820.0f) {
ret = 1;
@@ -87,27 +87,27 @@ static void aSPR_set_talk_info_close_wait(ACTOR* actorx) {
now_sec = Common_Get(time.now_sec);
if (mSP_CheckFukubikiDay() != FALSE) {
if (now_sec >= (6 * mTM_SECONDS_IN_HOUR)) {
msg_no = mSP_ShopOpen() == mSP_SHOP_STATUS_PRE ? 0x7D6 : 0x7D7;
msg_no = mSP_ShopOpen() == mSP_SHOP_STATUS_PRE ? MSG_RAFFLE_TIME_ANNOUNCE : MSG_RAFFLE_ENDED;
} else {
msg_no = 0x7CF;
msg_no = MSG_SHOP2_CLOSED_NORMAL;
}
} else {
switch (mSP_ShopOpen()) {
case mSP_SHOP_STATUS_PRE: // 0
case mSP_SHOP_STATUS_END: // 1
msg_no = 0x7CF;
msg_no = MSG_SHOP2_CLOSED_NORMAL;
break;
case mSP_SHOP_STATUS_PREEVENT: // 4
msg_no = 0x7D3;
msg_no = MSG_SHOP2_SPECIAL_PREEVENT;
break;
case mSP_SHOP_STATUS_ENDEVENT: // 5
msg_no = 0x7D9;
msg_no = MSG_SHOP_CLOSED_ENDEVENT;
break;
case mSP_SHOP_STATUS_RENEW: // 3
msg_no = 0x7D8;
msg_no = MSG_SHOP_RENEW;
break;
default:
msg_no = 0x7CF;
msg_no = MSG_SHOP2_CLOSED_NORMAL;
break;
}
}
src/actor/npc/ac_npc_hem.c_inc
+1 -1
View File
@@ -133,7 +133,7 @@ static void aNHM_change_talk_proc(NPC_HEM_ACTOR* hem, int talk_idx) {
}
static void aNHM_set_force_talk_info_talk_request() {
mDemo_Set_msg_num(0x2C51);
mDemo_Set_msg_num(MSG_HEM_GOLD_AXE1);
mPr_SetFreePossessionItem(Now_Private, ITM_GOLDEN_AXE, mPr_ITEM_COND_NORMAL);
mSC_trophy_set(mSC_TROPHY_GOLDEN_AXE);
mFAs_ClearGoodField();
src/actor/npc/ac_npc_p_sel2.c
+2 -2
View File
@@ -143,13 +143,13 @@ static void aNPS2_actor_ct(ACTOR* actorx, GAME* game) {
p_sel2->npc_class.condition_info.demo_flg = aNPC_COND_DEMO_SKIP_FEEL_CHECK;
{
static int base_msg_table[] = { 0x13F2, 0x141A, 0x1442, 0x146A, 0x1492, 0x14BA };
static int base_msg_table[] = { MSG_5106, MSG_5146, MSG_5186, MSG_5226, MSG_5266, MSG_5306 };
p_sel2->base_message = base_msg_table[mNpc_GetNpcLooks(actorx)];
}
{
static int base_msg_table2[] = { 0x39EE, 0x39F8, 0x3A02, 0x3A0C, 0x3A16, 0x3A20 };
static int base_msg_table2[] = { MSG_14830, MSG_14840, MSG_14850, MSG_14860, MSG_14870, MSG_14880 };
p_sel2->base_message2 = base_msg_table2[mNpc_GetNpcLooks(actorx)];
}
src/actor/npc/ac_tamaire_npc0_talk.c_inc
+3 -3
View File
@@ -12,15 +12,15 @@ static int aTMN0_change_talk_proc(TAMAIRE_NPC0_ACTOR* actor, int talk_idx) {
}
static void aTMN0_set_nsg(ACTOR* actorx) {
static int base_msg_table[] = { 0x1E65, 0x1E71, 0x1E59, 0x1E7D, 0x1E89, 0x1E95 };
static int base_msg_table[] = { MSG_7781, MSG_7793, MSG_7769, MSG_7805, MSG_7817, MSG_7829 };
int msg_no = base_msg_table[mNpc_GetNpcLooks(actorx)] + RANDOM(3);
mDemo_Set_msg_num(msg_no);
}
static void aTMN0_set_norm_talk_info(ACTOR* actorx) {
TAMAIRE_NPC0_ACTOR* actor = (TAMAIRE_NPC0_ACTOR*)actorx;
aTMN0_set_nsg(actorx);
mDemo_Set_talk_turn(TRUE);
mDemo_Set_camera(CAMERA2_PROCESS_TALK);
src/actor/npc/ac_tamaire_npc1.c
+10 -4
View File
@@ -100,7 +100,7 @@ static void aTMN1_actor_ct(ACTOR* actorx, GAME* game) {
TAMAIRE_NPC1_ACTOR* actor = (TAMAIRE_NPC1_ACTOR*)actorx;
if (NPC_CLIP->birth_check_proc(actorx, game) == TRUE) {
static int base_msg_table[] = { 0x1E65, 0x1E71, 0x1E59, 0x1E7D, 0x1E89, 0x1E95 };
static int base_msg_table[] = { MSG_7781, MSG_7793, MSG_7769, MSG_7805, MSG_7817, MSG_7829 };
actor->npc_class.schedule.schedule_proc = aTMN1_schedule_proc;
NPC_CLIP->ct_proc(actorx, game, &ct_data);
@@ -144,7 +144,7 @@ static int aTMN1_set_request_act(TAMAIRE_NPC1_ACTOR* actor, u8 prio, u8 idx, u8
if (prio >= actor->npc_class.request.act_priority) {
u16 args[6];
bzero(args, sizeof(args));
args[0] = obj;
args[2] = move_x;
@@ -164,7 +164,10 @@ static void aTMN1_tama_process(ACTOR* actorx, GAME* game) {
static u8 table[] = { TOOL_TAMA2, TOOL_TAMA1, TOOL_TAMA4, TOOL_TAMA3 };
if (actor->npc_class.right_hand.item_actor_p == NULL) {
actor->npc_class.right_hand.item_actor_p = CLIP(tools_clip)->aTOL_birth_proc(table[(((mActor_name_t)(actorx->npc_id - SP_NPC_EV_TAMAIRE_1) >> 1) & 1 ^ 1)], aTOL_ACTION_TAKEOUT, actorx, game, -1, NULL);
actor->npc_class.right_hand.item_actor_p =
CLIP(tools_clip)
->aTOL_birth_proc(table[(((mActor_name_t)(actorx->npc_id - SP_NPC_EV_TAMAIRE_1) >> 1) & 1 ^ 1)],
aTOL_ACTION_TAKEOUT, actorx, game, -1, NULL);
} else {
TOOLS_ACTOR* tama = (TOOLS_ACTOR*)actor->npc_class.right_hand.item_actor_p;
@@ -172,7 +175,10 @@ static void aTMN1_tama_process(ACTOR* actorx, GAME* game) {
}
if (actor->npc_class.left_hand.item_actor_p == NULL) {
actor->npc_class.left_hand.item_actor_p = CLIP(tools_clip)->aTOL_birth_proc(table[2 + (((mActor_name_t)(actorx->npc_id - SP_NPC_EV_TAMAIRE_1) >> 1) & 1 ^ 1)], aTOL_ACTION_TAKEOUT, actorx, game, -1, NULL);
actor->npc_class.left_hand.item_actor_p =
CLIP(tools_clip)
->aTOL_birth_proc(table[2 + (((mActor_name_t)(actorx->npc_id - SP_NPC_EV_TAMAIRE_1) >> 1) & 1 ^ 1)],
aTOL_ACTION_TAKEOUT, actorx, game, -1, NULL);
} else {
TOOLS_ACTOR* tama = (TOOLS_ACTOR*)actor->npc_class.left_hand.item_actor_p;
src/actor/npc/ac_tokyoso_npc0.c
+2 -2
View File
@@ -101,7 +101,7 @@ static void aTKN0_actor_ct(ACTOR* actorx, GAME* game) {
TOKYOSO_NPC0_ACTOR* actor = (TOKYOSO_NPC0_ACTOR*)actorx;
if (NPC_CLIP->birth_check_proc(actorx, game) == TRUE) {
static int base_msg_table[] = { 0x19DD, 0x19ED, 0x19CD, 0x19FD, 0x1A0D, 0x1A1D };
static int base_msg_table[] = { MSG_6621, MSG_6637, MSG_6605, MSG_6653, MSG_6669, MSG_6685 };
actor->npc_class.schedule.schedule_proc = aTKN0_schedule_proc;
NPC_CLIP->ct_proc(actorx, game, &ct_data);
@@ -153,7 +153,7 @@ static int aTKN0_set_request_act(TOKYOSO_NPC0_ACTOR* actor, u8 prio, u8 idx, u8
if (prio >= actor->npc_class.request.act_priority) {
u16 args[6];
bzero(args, sizeof(args));
args[0] = obj;
args[2] = move_x;
src/actor/npc/ac_tokyoso_npc1.c
+2 -2
View File
@@ -101,7 +101,7 @@ static void aTKN1_actor_ct(ACTOR* actorx, GAME* game) {
TOKYOSO_NPC1_ACTOR* actor = (TOKYOSO_NPC1_ACTOR*)actorx;
if (NPC_CLIP->birth_check_proc(actorx, game) == TRUE) {
static int base_msg_table[] = { 0x19DD, 0x19ED, 0x19CD, 0x19FD, 0x1A0D, 0x1A1D };
static int base_msg_table[] = { MSG_6621, MSG_6637, MSG_6605, MSG_6653, MSG_6669, MSG_6685 };
actor->npc_class.schedule.schedule_proc = aTKN1_schedule_proc;
NPC_CLIP->ct_proc(actorx, game, &ct_data);
@@ -131,7 +131,7 @@ static int aTKN1_set_request_act(TOKYOSO_NPC1_ACTOR* actor, u8 prio, u8 idx, u8
if (prio >= actor->npc_class.request.act_priority) {
u16 args[6];
bzero(args, sizeof(args));
args[0] = obj;
args[2] = move_x;
src/actor/npc/ac_tunahiki_npc0.c
+4 -3
View File
@@ -100,7 +100,7 @@ static void aTNN0_actor_ct(ACTOR* actorx, GAME* game) {
TUNAHIKI_NPC0_ACTOR* actor = (TUNAHIKI_NPC0_ACTOR*)actorx;
if (NPC_CLIP->birth_check_proc(actorx, game) == TRUE) {
static int base_msg_table[] = { 0x1984, 0x1990, 0x1978, 0x199C, 0x19A8, 0x19B4 };
static int base_msg_table[] = { MSG_6532, MSG_6544, MSG_6520, MSG_6556, MSG_6568, MSG_6580 };
actor->npc_class.schedule.schedule_proc = aTNN0_schedule_proc;
NPC_CLIP->ct_proc(actorx, game, &ct_data);
@@ -144,12 +144,13 @@ static void aTNN0_actor_init(ACTOR* actorx, GAME* game) {
NPC_CLIP->init_proc(actorx, game);
}
static int aTNN0_set_request_act(TUNAHIKI_NPC0_ACTOR* actor, u8 prio, u8 idx, u8 type, u16 obj, s16 move_x, s16 move_z) {
static int aTNN0_set_request_act(TUNAHIKI_NPC0_ACTOR* actor, u8 prio, u8 idx, u8 type, u16 obj, s16 move_x,
s16 move_z) {
int res = FALSE;
if (prio >= actor->npc_class.request.act_priority) {
u16 args[6];
bzero(args, sizeof(args));
args[0] = obj;
args[2] = move_x;
src/actor/npc/ac_tunahiki_npc1.c
+5 -4
View File
@@ -100,7 +100,7 @@ static void aTNN1_actor_ct(ACTOR* actorx, GAME* game) {
TUNAHIKI_NPC1_ACTOR* actor = (TUNAHIKI_NPC1_ACTOR*)actorx;
if (NPC_CLIP->birth_check_proc(actorx, game) == TRUE) {
static int base_msg_table[] = { 0x1984, 0x1990, 0x1978, 0x199C, 0x19A8, 0x19B4 };
static int base_msg_table[] = { MSG_6532, MSG_6544, MSG_6520, MSG_6556, MSG_6568, MSG_6580 };
actor->npc_class.schedule.schedule_proc = aTNN1_schedule_proc;
NPC_CLIP->ct_proc(actorx, game, &ct_data);
@@ -133,12 +133,13 @@ static void aTNN1_actor_init(ACTOR* actorx, GAME* game) {
NPC_CLIP->init_proc(actorx, game);
}
static int aTNN1_set_request_act(TUNAHIKI_NPC1_ACTOR* actor, u8 prio, u8 idx, u8 type, u16 obj, s16 move_x, s16 move_z) {
static int aTNN1_set_request_act(TUNAHIKI_NPC1_ACTOR* actor, u8 prio, u8 idx, u8 type, u16 obj, s16 move_x,
s16 move_z) {
int res = FALSE;
if (prio >= actor->npc_class.request.act_priority) {
u16 args[6];
bzero(args, sizeof(args));
args[0] = obj;
args[2] = move_x;
@@ -156,7 +157,7 @@ static int aTNN1_set_request_act(TUNAHIKI_NPC1_ACTOR* actor, u8 prio, u8 idx, u8
static void aTNN1_actor_move(ACTOR* actorx, GAME* game) {
aEv_tunahiki_c* tunahiki = (aEv_tunahiki_c*)mEv_get_save_area(mEv_EVENT_SPORTS_FAIR_TUG_OF_WAR, 9);
TUNAHIKI_NPC1_ACTOR* actor = (TUNAHIKI_NPC1_ACTOR*)actorx;
NPC_CLIP->move_proc(actorx, game);
actorx->world.position.z = actorx->home.position.z;