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

Implement & link ac_museum_picture

Browse Source
This commit is contained in:
Cuyler36
2024-02-27 19:26:53 -05:00
parent afb9b14f0e
commit 3e2bca3d6a
6 changed files with 1341 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/rel_slices.yml
+5
View File
@@ -426,6 +426,11 @@ ac_haniwa.c:
.text: [0x80427624, 0x80428F64]
.rodata: [0x806440B8, 0x806440F8]
.data: [0x80683D08, 0x80683E98]
ac_museum_picture.c:
.text: [0x8042F170, 0x8042F7FC]
.rodata: [0x806442D0, 0x80644330]
.data: [0x80684E38, 0x80684F58]
.bss: [0x812FBE70, 0x812FBE80]
ac_my_indoor.c:
.text: [0x8046EE38, 0x80470288]
.rodata: [0x80644A88, 0x80644A98]
include/ac_museum_picture.h
+5 -1
View File
@@ -8,6 +8,11 @@
extern "C" {
#endif
typedef struct museum_picture_actor_s {
ACTOR actor_class;
int msg_no;
} MUSEUM_PICTURE_ACTOR;
extern ACTOR_PROFILE Museum_Picture_Profile;
#ifdef __cplusplus
@@ -15,4 +20,3 @@ extern ACTOR_PROFILE Museum_Picture_Profile;
#endif
#endif
include/m_actor.h
+1094 -1086
View File
File diff suppressed because it is too large Load Diff
include/m_museum_display.h
+29 -28
View File
@@ -21,46 +21,47 @@ extern "C" {
#define mMmd_FISH_NUM 40
enum {
mMmd_DISPLAY_CANNOT_DONATE, /* Item cannot be donated */
mMmd_DISPLAY_CAN_DONATE, /* Item can be donated */
mMmd_DISPLAY_ALREADY_DONATED, /* Item has already been donated */
mMmd_DISPLAY_CANNOT_DONATE, /* Item cannot be donated */
mMmd_DISPLAY_CAN_DONATE, /* Item can be donated */
mMmd_DISPLAY_ALREADY_DONATED, /* Item has already been donated */
mMmd_DISPLAY_NUM
mMmd_DISPLAY_NUM
};
enum {
mMmd_DONATOR_NONE,
mMmd_DONATOR_PLAYER1,
mMmd_DONATOR_PLAYER2,
mMmd_DONATOR_PLAYER3,
mMmd_DONATOR_PLAYER4,
mMmd_DONATOR_DELETED_PLAYER,
mMmd_DONATOR_NONE,
mMmd_DONATOR_PLAYER1,
mMmd_DONATOR_PLAYER2,
mMmd_DONATOR_PLAYER3,
mMmd_DONATOR_PLAYER4,
mMmd_DONATOR_DELETED_PLAYER,
mMmd_DONATOR_NUM
mMmd_DONATOR_NUM
};
enum {
mMmd_CATEGORY_FOSSIL,
mMmd_CATEGORY_ART,
mMmd_CATEGORY_INSECT,
mMmd_CATEGORY_FISH,
#define mMmd_IS_DONATED(donator) ((donator) >= mMmd_DONATOR_PLAYER1 && (donator) <= mMmd_DONATOR_DELETED_PLAYER)
#define mMmd_DONATOR_EXISTS(donator) ((donator) >= mMmd_DONATOR_PLAYER1 && (donator) <= mMmd_DONATOR_PLAYER4)
#define mMmd_DONATOR_PLR_IDX(donator) (((donator)-1) & 3)
mMmd_CATEGORY_NUM
enum {
mMmd_CATEGORY_FOSSIL,
mMmd_CATEGORY_ART,
mMmd_CATEGORY_INSECT,
mMmd_CATEGORY_FISH,
mMmd_CATEGORY_NUM
};
/* 4 bits per donatable item */
#define mMmd_BIT_INFO(info, category, index) \
(((info).category##_bit[(index) >> 1] >> (((index) & 1) << 2)) & 0x0F)
#define mMmd_BIT_INFO2(bitfield, index) \
(((bitfield)[(index) >> 1] >> (((index) & 1) << 2)) & 0x0F)
#define mMmd_BIT_INFO(info, category, index) (((info).category##_bit[(index) >> 1] >> (((index)&1) << 2)) & 0x0F)
#define mMmd_BIT_INFO2(bitfield, index) (((bitfield)[(index) >> 1] >> (((index)&1) << 2)) & 0x0F)
#define mMmd_ART_BIT(info, index) mMmd_BIT_INFO(info, art, index)
#define mMmd_INSECT_BIT(info, index) mMmd_BIT_INFO(info, insect, index)
#define mMmd_FISH_BIT(info, index) mMmd_BIT_INFO(info, fish, index)
#define mMmd_FOSSIL_BIT(info, index) mMmd_BIT_INFO(info, fossil, index)
#define mMmd_BIT_CLR(info, category, index) \
((info).category##_bit[(index) >> 1] &= ~(0b1111 << (((index) & 1) * 4)))
#define mMmd_BIT_CLR(info, category, index) ((info).category##_bit[(index) >> 1] &= ~(0b1111 << (((index)&1) * 4)))
#define mMmd_FOSSIL_CLR(info, index) mMmd_BIT_CLR(info, fossil, index)
#define mMmd_ART_CLR(info, index) mMmd_BIT_CLR(info, art, index)
@@ -68,7 +69,7 @@ enum {
#define mMmd_FISH_CLR(info, index) mMmd_BIT_CLR(info, fish, index)
#define mMmd_BIT_SET(info, category, index, value) \
((info).category##_bit[(index) >> 1] |= (((value) & 0b1111) << (((index) & 1)) * 4))
((info).category##_bit[(index) >> 1] |= (((value)&0b1111) << (((index)&1)) * 4))
#define mMmd_FOSSIL_SET(info, index, value) mMmd_BIT_SET(info, fossil, index, value)
#define mMmd_ART_SET(info, index, value) mMmd_BIT_SET(info, art, index, value)
@@ -77,10 +78,10 @@ enum {
/* sizeof(mMmd_info_c) == 0x3F */
typedef struct museum_display_info_s {
/* 0x00 */ u8 fossil_bit[mMmd_FOSSIL_BIT_NUM];
/* 0x0D */ u8 art_bit[mMmd_ART_BIT_NUM];
/* 0x15 */ u8 fish_bit[mMmd_FISH_BIT_NUM];
/* 0x2A */ u8 insect_bit[mMmd_INSECT_BIT_NUM];
/* 0x00 */ u8 fossil_bit[mMmd_FOSSIL_BIT_NUM];
/* 0x0D */ u8 art_bit[mMmd_ART_BIT_NUM];
/* 0x15 */ u8 fish_bit[mMmd_FISH_BIT_NUM];
/* 0x2A */ u8 insect_bit[mMmd_INSECT_BIT_NUM];
} mMmd_info_c;
extern int mMmd_FossilInfo(int fossil_no);
src/ac_br_shop.c
+4 -5
View File
@@ -13,7 +13,7 @@ ACTOR_PROFILE BrShop_Profile = {
mAc_PROFILE_BRSHOP,
ACTOR_PART_ITEM,
ACTOR_STATE_TA_SET,
0x5826, // fix name later
0x5826, // fix name later
ACTOR_OBJ_BANK_KEEP,
sizeof(BRSHOP_ACTOR),
aBRS_actor_ct,
@@ -23,7 +23,7 @@ ACTOR_PROFILE BrShop_Profile = {
NULL,
};
u8 aBRS_shadow_vtx_fix_flg_table[] = {TRUE, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, TRUE};
u8 aBRS_shadow_vtx_fix_flg_table[] = { TRUE, FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, TRUE };
extern Vtx obj_yamishop_shadow_v[];
extern Gfx obj_yamishop_shadowT_model[];
@@ -94,7 +94,7 @@ static void aBRS_actor_ct(ACTOR* actor, GAME* game) {
}
Door_data_c aBRS_br_shop_door_data = {
SCENE_BROKER_SHOP, 4, FALSE, 0, {160, 0, 280}, EMPTY_NO, 1, {0, 0, 0},
SCENE_BROKER_SHOP, 4, FALSE, 0, { 160, 0, 280 }, EMPTY_NO, 1, { 0, 0, 0 },
};
static void aBRS_actor_dt(ACTOR* actor, GAME* game) {
@@ -108,6 +108,5 @@ static void aBRS_actor_dt(ACTOR* actor, GAME* game) {
}
}
#include "../src/ac_br_shop_move.c_inc"
#include "../src/ac_br_shop_draw.c_inc"
#include "../src/ac_br_shop_move.c_inc"
src/ac_museum_picture.c
+204
View File
@@ -0,0 +1,204 @@
#include "ac_museum_picture.h"
#include "m_camera2.h"
#include "m_demo.h"
#include "m_name_table.h"
#include "m_museum_display.h"
#include "m_name_table.h"
#include "sys_matrix.h"
#include "m_player_lib.h"
#include "m_room_type.h"
#include "m_msg.h"
#include "m_common_data.h"
typedef struct {
s16 x;
s16 z;
} aMP_pos_c;
typedef struct {
Gfx* disp_model;
Gfx* dummy_disp_model;
aMP_pos_c pos;
} aMP_art_data_c;
static void Museum_Picture_Actor_ct(ACTOR* actorx, GAME* game);
static void Museum_Picture_Actor_dt(ACTOR* actorx, GAME* game);
static void Museum_Picture_Actor_move(ACTOR* actorx, GAME* game);
static void Museum_Picture_Actor_draw(ACTOR* actorx, GAME* game);
ACTOR_PROFILE Museum_Picture_Profile = {
mAc_PROFILE_MUSEUM_PICTURE,
ACTOR_PART_BG,
ACTOR_STATE_CAN_MOVE_IN_DEMO_SCENES | ACTOR_STATE_NO_DRAW_WHILE_CULLED | ACTOR_STATE_NO_MOVE_WHILE_CULLED,
EMPTY_NO,
ACTOR_OBJ_BANK_MUSEUM_PICTURE,
sizeof(MUSEUM_PICTURE_ACTOR),
&Museum_Picture_Actor_ct,
&Museum_Picture_Actor_dt,
&Museum_Picture_Actor_move,
&Museum_Picture_Actor_draw,
NULL,
};
extern Gfx obj_art01_model[];
extern Gfx obj_art02_model[];
extern Gfx obj_art03_model[];
extern Gfx obj_art04_model[];
extern Gfx obj_art05_model[];
extern Gfx obj_art06_model[];
extern Gfx obj_art07_model[];
extern Gfx obj_art08_model[];
extern Gfx obj_art09_model[];
extern Gfx obj_art10_model[];
extern Gfx obj_art11_model[];
extern Gfx obj_art12_model[];
extern Gfx obj_art13_model[];
extern Gfx obj_art14_model[];
extern Gfx obj_art15_model[];
extern Gfx obj_art_dummy01_model[];
extern Gfx obj_art_dummy02_model[];
extern Gfx obj_art_dummy03_model[];
extern Gfx obj_art_dummy04_model[];
extern Gfx obj_art_dummy05_model[];
extern Gfx obj_art_dummy06_model[];
extern Gfx obj_art_dummy07_model[];
extern Gfx obj_art_dummy08_model[];
static aMP_art_data_c aMP_art_data_table[mMmd_ART_NUM] = {
{ obj_art01_model, obj_art_dummy01_model, 7, 1 }, { obj_art02_model, obj_art_dummy03_model, 1, 9 },
{ obj_art03_model, obj_art_dummy01_model, 11, 5 }, { obj_art04_model, obj_art_dummy04_model, 9, 1 },
{ obj_art05_model, obj_art_dummy02_model, 5, 9 }, { obj_art06_model, obj_art_dummy05_model, 3, 1 },
{ obj_art07_model, obj_art_dummy07_model, 3, 9 }, { obj_art08_model, obj_art_dummy06_model, 1, 5 },
{ obj_art09_model, obj_art_dummy04_model, 3, 5 }, { obj_art10_model, obj_art_dummy06_model, 11, 9 },
{ obj_art11_model, obj_art_dummy07_model, 11, 1 }, { obj_art12_model, obj_art_dummy04_model, 13, 5 },
{ obj_art13_model, obj_art_dummy08_model, 13, 9 }, { obj_art14_model, obj_art_dummy08_model, 9, 5 },
{ obj_art15_model, obj_art_dummy08_model, 5, 1 },
};
static void Museum_Picture_Actor_ct(ACTOR* actorx, GAME* game) {
// nothing
}
static void Museum_Picture_Actor_dt(ACTOR* actorx, GAME* game) {
// nothing
}
static void aMP_DrawOneArt(aMP_pos_c* pos_xz, Gfx* disp, GAME* game) {
GRAPH* graph = game->graph;
xyz_t pos = { 0.0f, 0.0f, 0.0f };
pos.x = pos_xz->x * 40.0f + 20.0f;
pos.z = pos_xz->z * 40.0f + 20.0f;
pos.y = 40.0f;
Matrix_translate(pos.x, pos.y, pos.z, 0);
Matrix_scale(0.01f, 0.01f, 0.01f, 1);
OPEN_DISP(graph);
gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(NEXT_POLY_OPA_DISP, disp);
CLOSE_DISP(graph);
}
static void Museum_Picture_Actor_draw(ACTOR* actorx, GAME* game) {
int i;
aMP_art_data_c* data_table_p = aMP_art_data_table;
for (i = 0; i < mMmd_ART_NUM; i++, data_table_p++) {
int info = mMmd_ArtInfo(i);
Gfx* disp_model = (&data_table_p->disp_model)[mMmd_IS_DONATED(info) == FALSE];
aMP_DrawOneArt(&data_table_p->pos, disp_model, game);
}
}
static int aMP_CheckTalkAble(xyz_t* pos, int direct, GAME* game, f32 dist) {
static int direct_table[] = { mRmTp_DIRECT_NORTH, -1, -1, mRmTp_DIRECT_WEST,
mRmTp_DIRECT_WEST, -1, -1, mRmTp_DIRECT_SOUTH,
mRmTp_DIRECT_SOUTH, -1, -1, mRmTp_DIRECT_EAST,
mRmTp_DIRECT_EAST, -1, -1, mRmTp_DIRECT_NORTH };
PLAYER_ACTOR* player = GET_PLAYER_ACTOR((GAME_PLAY*)game);
if ((direct & 3) == direct_table[(player->actor_class.shape_info.rotation.y >> 12) & 0xF]) {
f32 dx = player->actor_class.world.position.x - pos->x;
f32 dz = player->actor_class.world.position.z - pos->z;
if (sqrtf(dx * dx + dz * dz) <= dist) {
return TRUE;
} else {
return FALSE;
}
}
return FALSE;
}
static int aMP_CheckTalkAbleDist(aMP_pos_c* ut_pos, GAME* game) {
xyz_t pos = { 0.0f, 0.0f, 0.0f };
pos.x = (f32)(ut_pos->x & 15) * 40.0f + 60.0f;
pos.z = (f32)(ut_pos->z & 15) * 40.0f + 40.0f;
pos.y = 40.0f;
return aMP_CheckTalkAble(&pos, mRmTp_DIRECT_SOUTH, game, 33.0f);
}
static void aMP_SetTalkInfo(ACTOR* actorx) {
static rgba_t aMP_window_color = { 255, 255, 205, 255 };
MUSEUM_PICTURE_ACTOR* museum_picture = (MUSEUM_PICTURE_ACTOR*)actorx;
mDemo_Set_msg_num(museum_picture->msg_no);
mDemo_Set_talk_display_name(FALSE);
mDemo_Set_ListenAble();
mDemo_Set_camera(CAMERA2_PROCESS_NORMAL);
mDemo_Set_use_zoom_sound(TRUE);
mDemo_Set_talk_window_color(&aMP_window_color);
mMsg_Set_continue_msg_num(mMsg_Get_base_window_p(), -1);
}
static void Museum_Picture_Actor_move(ACTOR* actorx, GAME* game) {
static u8 item_name[mIN_ITEM_NAME_LEN];
MUSEUM_PICTURE_ACTOR* museum_picture = (MUSEUM_PICTURE_ACTOR*)actorx;
if (mDemo_Check(mDemo_TYPE_SPEAK, actorx)) {
PLAYER_ACTOR* player = GET_PLAYER_ACTOR((GAME_PLAY*)game);
s_xyz angle = player->actor_class.shape_info.rotation;
add_calc_short_angle2(&angle.y, DEG2SHORT_ANGLE(-180.0f), 1.0f - sqrtf(0.7), 0x800, 0);
GET_PLAYER_ACTOR_NOW()->Set_force_position_angle_proc(gamePT, NULL, &angle, mPlayer_FORCE_POSITION_ANGLE_ROTY);
} else if (chkTrigger(BUTTON_A) && mDemo_Get_talk_actor() == NULL) {
int i;
for (i = 0; i < mMmd_ART_NUM; i++) {
int donator = mMmd_ArtInfo(i);
if (aMP_CheckTalkAbleDist(&aMP_art_data_table[i].pos, game)) {
museum_picture->msg_no = (donator == mMmd_DONATOR_NONE)
? 0x2FA1
: ((donator == mMmd_DONATOR_DELETED_PLAYER) ? 0x2FA0 : 0x2F9F);
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;
/* Copy the art item's name */
mIN_copy_name_str(item_name, item);
mMsg_Set_item_str_art(mMsg_Get_base_window_p(), mMsg_ITEM_STR0, item_name, mIN_ITEM_NAME_LEN,
mIN_get_item_article(item));
/* If the donator still lives in town we need to copy their name */
if (mMmd_DONATOR_EXISTS(donator)) {
mMsg_Set_free_str(mMsg_Get_base_window_p(), mMsg_FREE_STR0,
Save_Get(private[mMmd_DONATOR_PLR_IDX(donator)]).player_ID.player_name,
PLAYER_NAME_LEN);
}
}
}
}
}
}