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

Match ac_my_room.c

Browse Source
This commit is contained in:
Cuyler36
2024-03-25 00:06:16 -04:00
parent 779b0da981
commit 5083c7f2ba
16 changed files with 6995 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ac_furniture_data.c_inc
+2603
View File
File diff suppressed because it is too large Load Diff
src/ac_my_room.c
+2274
View File
File diff suppressed because it is too large Load Diff
src/ac_my_room_data.c_inc
+1402
View File
File diff suppressed because it is too large Load Diff
src/audio.c
+4 -5
View File
@@ -219,14 +219,13 @@ extern s8 sAdo_GetRhythmDelay(u32 p) {
return Na_GetRhythmDelay(p);
}
extern f32 sAdo_GetRhythmInfo(u32 p) {
extern void sAdo_GetRhythmInfo(TempoBeat_c* rhythm) {
return Na_GetRhythmInfo(p);
Na_GetRhythmInfo(rhythm);
}
extern void sAdo_SetRhythmInfo(f32 p) {
Na_SetRhythmInfo(p);
extern void sAdo_SetRhythmInfo(TempoBeat_c* rhythm) {
Na_SetRhythmInfo(rhythm);
}
extern int sAdo_InstCountGet() {
src/famicom_emu.c
+3 -3
View File
@@ -77,7 +77,7 @@ extern void famicom_emu_main(GAME* famicom) {
if (famicom_done == 0) {
if (famicom_rom_load_check() < 0) {
Common_Set(famicom_2DBAC, Common_Get(famicom_2DBAC) | 1);
Common_Set(my_room_message_control_flags, Common_Get(my_room_message_control_flags) | 1);
famicom_done = 1;
famicom_done_countdown = 0;
} else {
@@ -152,7 +152,7 @@ extern void famicom_emu_init(GAME* game) {
my_alloc_init(game, freeXfbBase, freeXfbSize);
if (famicom_init(rom_id, &my_malloc_func, player) != 0) {
Common_Set(famicom_2DBAC, Common_Get(famicom_2DBAC) | 1);
Common_Set(my_room_message_control_flags, Common_Get(my_room_message_control_flags) | 1);
return_emu_game(game);
}
}
@@ -161,7 +161,7 @@ extern void famicom_emu_cleanup(GAME* game) {
JC_JFWDisplay_startFadeIn(JC_JFWDisplay_getManager(), 1);
if (famicom_cleanup() != 0) {
Common_Set(famicom_2DBAC, Common_Get(famicom_2DBAC) | 2);
Common_Set(my_room_message_control_flags, Common_Get(my_room_message_control_flags) | 2);
}
my_alloc_cleanup();
src/ftr/ac_ike_jny_houi01.c
+11 -30
View File
@@ -57,7 +57,7 @@ static void fIJHOUI_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u
cKF_SkeletonInfo_R_c* keyf = &ftr_actor->keyframe;
FTR_ACTOR* parent;
parent = aMR_GetParentFactor();
parent = aMR_GetParentFactor(ftr_actor, my_room_actor);
fIJHOUI_Status2SetMode(ftr_actor, ftr_actor);
if (parent != NULL) {
@@ -88,14 +88,14 @@ static void fIJHOUI_mv(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u
ftr_actor->dynamic_work_s[0] = ftr_actor->state;
}
static int fIJHOUI_DrawBefore(GAME* game, cKF_SkeletonInfo_R_c* keyf, int jointNum, Gfx** joint, u8* jointFlag, void* arg,
s_xyz* joint1, xyz_t* trans) {
static int fIJHOUI_DrawBefore(GAME* game, cKF_SkeletonInfo_R_c* keyf, int jointNum, Gfx** joint, u8* jointFlag,
void* arg, s_xyz* joint1, xyz_t* trans) {
FTR_ACTOR* actor = (FTR_ACTOR*)arg;
int offset = 10430.378f * (0.017453292f * actor->dynamic_work_f[1]);
if (jointNum == 3) {
MY_ROOM_ACTOR* my_room_actor;
ACTOR* my_room_actor;
int exists = FALSE;
if ((Common_Get(clip).my_room_clip != NULL && Common_Get(clip).my_room_clip->my_room_actor_p != NULL)) {
@@ -114,15 +114,15 @@ static int fIJHOUI_DrawBefore(GAME* game, cKF_SkeletonInfo_R_c* keyf, int jointN
return 1;
}
static int fIJHOUI_DrawAfter(GAME* game, cKF_SkeletonInfo_R_c* keyf, int jointNum, Gfx** joint, u8* jointFlag, void* arg,
s_xyz* joint1, xyz_t* trans) {
static int fIJHOUI_DrawAfter(GAME* game, cKF_SkeletonInfo_R_c* keyf, int jointNum, Gfx** joint, u8* jointFlag,
void* arg, s_xyz* joint1, xyz_t* trans) {
return 1;
}
static void fIJHOUI_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u8* data) {
Mtx* mtx = ftr_actor->skeleton_mtx[game->frame_counter & 1];
OPEN_DISP(game->graph);
OPEN_DISP(game->graph);
gSPMatrix(NEXT_POLY_OPA_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -131,29 +131,10 @@ static void fIJHOUI_dw(FTR_ACTOR* ftr_actor, ACTOR* my_room_actor, GAME* game, u
}
static aFTR_vtable_c fIJHOUI_func = {
&fIJHOUI_ct,
&fIJHOUI_mv,
&fIJHOUI_dw,
NULL,
NULL,
&fIJHOUI_ct, &fIJHOUI_mv, &fIJHOUI_dw, NULL, NULL,
};
aFTR_PROFILE iam_ike_jny_houi01 = {
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL,
40.0f,
0.01f,
aFTR_SHAPE_TYPEA,
mCoBG_FTR_TYPEA,
0,
2,
0,
0,
&fIJHOUI_func,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 40.0f, 0.01f, aFTR_SHAPE_TYPEA, mCoBG_FTR_TYPEA,
0, 2, 0, 0, &fIJHOUI_func,
};
src/m_island.c
+502 -556
View File
File diff suppressed because it is too large Load Diff
src/m_room_type.c
+4 -4
View File
@@ -2019,9 +2019,9 @@ extern void mRmTp_MakeFamicom_Fdebug() {
u16 ftr_idx;
int res;
Clip_c* clip;
GAME_PLAY* play = (GAME_PLAY*)gamePT;
GAME* game = gamePT;
if ((gamePT->pads[PAD1].on.button & BUTTON_Z) == BUTTON_Z && play != NULL) {
if ((gamePT->pads[PAD1].on.button & BUTTON_Z) == BUTTON_Z && game != NULL) {
clip = Common_GetPointer(clip);
if (clip->my_room_clip != NULL) {
@@ -2036,10 +2036,10 @@ extern void mRmTp_MakeFamicom_Fdebug() {
ftr_idx = 0x36A + mRmTp_famicom_idx;
}
res = (*clip->my_room_clip->judge_breed_new_ftr_proc)(play, ftr_idx, &ut_x, &ut_z, &direct, &ofs, &layer);
res = (*clip->my_room_clip->judge_breed_new_ftr_proc)(game, ftr_idx, &ut_x, &ut_z, &direct, &ofs, &layer);
if (res >= 0) {
(*clip->my_room_clip->reserve_ftr_proc)(play, ftr_idx, res, ut_x, ut_z, direct, ofs, layer);
(*clip->my_room_clip->reserve_ftr_proc)(game, ftr_idx, res, ut_x, ut_z, direct, ofs, layer);
}
}
}