mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-07-07 12:03:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Implement & link ef_dig_scoop

Browse Source
This commit is contained in:
Cuyler36
2024-08-05 22:31:46 -04:00
parent 0df87d6228
commit 848df6ec2a
2 changed files with 155 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/rel_slices.yml
+4
View File
@@ -1131,6 +1131,10 @@ ef_dig_mud.c:
.text: [0x80609910, 0x80609F6C]
.rodata: [0x8064BF20, 0x8064BF70]
.data: [0x806D2220, 0x806D2268]
ef_dig_scoop.c:
.text: [0x80609F6C, 0x8060A808]
.rodata: [0x8064BF70, 0x8064BF90]
.data: [0x806D2268, 0x806D2280]
ef_flash.c:
.text: [0x8060B7B4, 0x8060BCB0]
.rodata: [0x8064C078, 0x8064C0B0]
src/ef_dig_scoop.c
+151 -4
View File
@@ -1,5 +1,8 @@
#include "ef_effect_control.h"
#include "m_common_data.h"
#include "m_player_lib.h"
static void eDig_Scoop_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1);
static void eDig_Scoop_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg);
static void eDig_Scoop_mv(eEC_Effect_c* effect, GAME* game);
@@ -18,17 +21,161 @@ eEC_PROFILE_c iam_ef_dig_scoop = {
};
static void eDig_Scoop_init(xyz_t pos, int prio, s16 angle, GAME* game, u16 item_name, s16 arg0, s16 arg1) {
// TODO
ACTOR* player_actorx = (ACTOR*)GET_PLAYER_ACTOR_GAME(game);
PLAYER_ACTOR* player;
int i;
s16 star_ef_angle;
s16 sand_angle;
xyz_t sand_pos;
s16 dust_angle;
pos.x += player_actorx->world.position.x + 30.0f * sin_s(angle);
pos.z += player_actorx->world.position.z + 30.0f * cos_s(angle);
pos.x /= 2.0f;
pos.z /= 2.0f;
if (eEC_CLIP != NULL) {
if (arg1 == 1) {
player = GET_PLAYER_ACTOR_GAME(game);
star_ef_angle = angle + DEG2SHORT_ANGLE2(22.5f);
switch (arg0) {
case mCoBG_ATTRIBUTE_BUSH: {
int i = 4;
do {
eEC_CLIP->effect_make_proc(eEC_EFFECT_BUSH_HAPPA, player->actor_class.world.position, prio,
angle, game, item_name, arg0, 1);
} while (i--);
if (Common_Get(time).season == mTM_SEASON_WINTER) {
int j = 4;
do {
eEC_CLIP->effect_make_proc(eEC_EFFECT_BUSH_YUKI, player->actor_class.world.position, prio,
angle, game, item_name, arg0, 0);
} while (j--);
}
break;
}
case mCoBG_ATTRIBUTE_GRASS0:
case mCoBG_ATTRIBUTE_GRASS1:
case mCoBG_ATTRIBUTE_GRASS2:
case mCoBG_ATTRIBUTE_SOIL0:
case mCoBG_ATTRIBUTE_SOIL1:
case mCoBG_ATTRIBUTE_SOIL2: {
f32 ground_dist = mCoBG_GetBgY_AngleS_FromWpos(NULL, pos, 0.0f);
if (ground_dist < (pos.y + 10.0f)) {
break;
}
}
/* Fallthrough */
default: {
s16 i;
pos.y += 11.0f;
for (i = 0; i < 2; i++) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_IMPACT_STAR, pos, prio, star_ef_angle, game, item_name,
arg0, (s16)i);
}
break;
}
}
} else if (arg1 == 0) {
pos.y += 10.0f;
for (i = 0; i < 6; i++) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_DIG_MUD, pos, prio, angle, game, item_name, arg0, i);
}
} else if (arg1 == 3) {
pos.y += 10.0f;
for (i = 3; i < 6; i++) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_DIG_MUD, pos, prio, angle, game, item_name, arg0, i);
}
} else {
pos.y += 5.0f;
if (Common_Get(time).season == mTM_SEASON_WINTER) {
if (arg0 == mCoBG_ATTRIBUTE_GRASS0 || arg0 == mCoBG_ATTRIBUTE_GRASS1 ||
arg0 == mCoBG_ATTRIBUTE_GRASS2) {
for (i = 2; i < 6; i++) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_YUKIDAMA, pos, prio, angle, game, item_name, arg0,
(0x2000 | 0x1000) | i);
}
} else if (arg0 == mCoBG_ATTRIBUTE_SAND) {
sand_angle = angle - DEG2SHORT_ANGLE2(45.0f);
for (i = 0; i < 3; i++) {
xyz_t sand_pos = pos;
sand_pos.x += 15.0f * sin_s(sand_angle);
sand_pos.z += 15.0f * cos_s(sand_angle);
eEC_CLIP->effect_make_proc(eEC_EFFECT_SANDSPLASH, sand_pos, prio, sand_angle, game, item_name,
3, 0);
sand_angle += DEG2SHORT_ANGLE2(45.0f);
}
} else if (mEnv_NowWeather() != mEnv_WEATHER_RAIN && arg0 != mCoBG_ATTRIBUTE_WAVE) {
dust_angle = angle - DEG2SHORT_ANGLE2(45.0f);
for (i = 0; i < 3; i++) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_TUMBLE_DUST, pos, prio, dust_angle, game, item_name, arg0,
i);
dust_angle += DEG2SHORT_ANGLE2(45.0f);
}
} else {
for (i = 2; i < 6; i++) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_MIZUTAMA, pos, prio, angle, game, item_name, arg0,
(0x2000 | 0x1000) | i);
}
if (arg0 == mCoBG_ATTRIBUTE_WAVE) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_AMI_MIZU, pos, prio, angle, game, item_name, 1, 0);
}
}
} else {
if (arg0 == mCoBG_ATTRIBUTE_SAND) {
sand_angle = angle - DEG2SHORT_ANGLE2(45.0f);
for (i = 0; i < 3; i++) {
xyz_t sand_pos = pos;
sand_pos.x += 15.0f * sin_s(sand_angle);
sand_pos.z += 15.0f * cos_s(sand_angle);
eEC_CLIP->effect_make_proc(eEC_EFFECT_SANDSPLASH, sand_pos, prio, sand_angle, game, item_name,
3, 0);
sand_angle += DEG2SHORT_ANGLE2(45.0f);
}
} else if (mEnv_NowWeather() == mEnv_WEATHER_RAIN || arg0 == mCoBG_ATTRIBUTE_WAVE) {
for (i = 2; i < 6; i++) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_MIZUTAMA, pos, prio, angle, game, item_name, arg0,
(0x2000 | 0x1000) | i);
}
if (arg0 == mCoBG_ATTRIBUTE_WAVE) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_AMI_MIZU, pos, prio, angle, game, item_name, 1, 0);
}
} else {
dust_angle = angle - DEG2SHORT_ANGLE2(45.0f);
for (i = 0; i < 3; i++) {
eEC_CLIP->effect_make_proc(eEC_EFFECT_TUMBLE_DUST, pos, prio, dust_angle, game, item_name, arg0,
i);
dust_angle += DEG2SHORT_ANGLE2(45.0f);
}
}
}
}
}
eEC_CLIP->make_effect_proc(eEC_EFFECT_DIG_SCOOP, pos, NULL, game, NULL, item_name, prio, arg0, arg1);
}
static void eDig_Scoop_ct(eEC_Effect_c* effect, GAME* game, void* ct_arg) {
// TODO
effect->timer = 0;
}
static void eDig_Scoop_mv(eEC_Effect_c* effect, GAME* game) {
// TODO
// empty
}
static void eDig_Scoop_dw(eEC_Effect_c* effect, GAME* game) {
// TODO
// empty
}