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 ef_reset_hole

Browse Source
This commit is contained in:
Norgesnerd
2025-06-15 16:54:37 +02:00
parent 7d77222a29
commit bb209a8ed4
2 changed files with 99 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -1309,7 +1309,7 @@ config.libs = [
Object(Matching, "effect/ef_pun.c"),
Object(Matching, "effect/ef_pun_sekimen.c"),
Object(Matching, "effect/ef_pun_yuge.c"),
Object(NonMatching, "effect/ef_reset_hole.c"),
Object(Matching, "effect/ef_reset_hole.c"),
Object(Matching, "effect/ef_room_sunshine.c"),
Object(Matching, "effect/ef_room_sunshine_minsect.c"),
Object(Matching, "effect/ef_room_sunshine_museum.c"),
src/effect/ef_reset_hole.c
+98 -4
View File
@@ -1,5 +1,12 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
#include "m_debug.h"
#include "m_rcp.h"
#include "sys_matrix.h"
extern Gfx ef_reset_hole_modelT[];
static void eReset_Hole_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eReset_Hole_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eReset_Hole_mv(eEC_Effect_c* effect, GAME* game);
@@ -18,17 +25,104 @@ eEC_PROFILE_c iam_ef_reset_hole = {
};
static void eReset_Hole_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
// TODO
pos.y += 1.0f;
eEC_CLIP->make_effect_proc(eEC_EFFECT_RESET_HOLE, pos, NULL, game, &angle, item_name, prio, arg0, arg1);
}
static void eReset_Hole_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
effect->timer = 16;
if (effect->arg0 == 1) {
if (effect->arg1 == 0) {
effect->scale.x = effect->scale.y = effect->scale.z = 0.01f;
} else {
effect->scale.x = effect->scale.y = effect->scale.z = (GETREG(TAKREG, 0x32) * 0.01f + 0.93f) * 0.01f;
}
} else {
effect->scale = ZeroVec;
}
effect->effect_specific[0] = *(s16*)ct_arg;
}
static void eReset_Hole_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
s16 angle;
f32 scale;
int i;
eEC_CLIP->set_continious_env_proc(effect, 16, 120);
if ((effect->state == eEC_STATE_NORMAL) && (effect->arg0 != 1)) {
if (effect->arg1 == 0) {
scale = 0.01f;
} else {
scale = (GETREG(TAKREG, 0x32) * 0.01f + 0.93f) * 0.01f;
}
effect->scale.x = effect->scale.y = effect->scale.z =
eEC_CLIP->calc_adjust_proc(effect->timer, 0, 16, scale, 0.0f);
if ((effect->timer & 7) == 0) {
for (i = 0; i < 3; i++) {
static s16 angle_tbl[] = { DEG2SHORT_ANGLE(0.0f), DEG2SHORT_ANGLE(135.0f), DEG2SHORT_ANGLE(270.0f) };
xyz_t pos = effect->position;
angle = angle_tbl[i];
if ((effect->timer & 15) == 0) {
angle += DEG2SHORT_ANGLE2(180.0f);
}
eEC_CLIP->effect_make_proc(eEC_EFFECT_DIG_MUD, pos, effect->prio, angle, game, effect->item_name,
effect->arg0, DEG2SHORT_ANGLE(-179.965f));
}
}
} else if (effect->state == eEC_STATE_FINISHED) {
if (effect->arg1 == 0) {
scale = 0.01f;
} else {
scale = (GETREG(TAKREG, 0x32) * 0.01f + 0.93f) * 0.01f;
}
effect->scale.x = effect->scale.y = effect->scale.z =
eEC_CLIP->calc_adjust_proc(effect->timer, 0, 24, 0.0f, scale);
if (((effect->timer & 7) == 0) && (effect->timer > 8)) {
for (i = 0; i < 3; i++) {
static s16 angle_tbl[] = { DEG2SHORT_ANGLE(0.0f), DEG2SHORT_ANGLE(135.0f), DEG2SHORT_ANGLE(270.0f) };
xyz_t pos = effect->position;
angle = angle_tbl[i];
if ((effect->timer & 15) == 0) {
angle += DEG2SHORT_ANGLE2(180.0f);
}
eEC_CLIP->effect_make_proc(eEC_EFFECT_DIG_MUD, pos, effect->prio, angle, game, effect->item_name,
effect->arg0, DEG2SHORT_ANGLE(-179.965f));
}
}
} else {
if (effect->arg1 == 0) {
scale = 0.01f;
} else {
scale = (GETREG(TAKREG, 0x32) * 0.01f + 0.93f) * 0.01f;
}
effect->scale.x = effect->scale.y = effect->scale.z = scale;
}
}
static void eReset_Hole_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
f32 scale;
OPEN_DISP(game->graph);
_texture_z_light_fog_prim_xlu(game->graph);
Matrix_translate(effect->position.x, effect->position.y, effect->position.z, FALSE);
scale = GETREG(MYKREG, 0x1b) * 0.01f + 1.0f;
Matrix_scale(effect->scale.x * scale, effect->scale.y * scale, effect->scale.z * scale, TRUE);
gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(game->graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(NEXT_POLY_XLU_DISP, ef_reset_hole_modelT);
CLOSE_DISP(game->graph);
}