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

Implement & link ac_event_manager

Browse Source
This commit is contained in:
Cuyler36
2025-02-07 10:47:58 -05:00
parent 66325624aa
commit 1e944fd7a8
15 changed files with 4827 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/actor/ac_event_manager.c
+4721
View File
File diff suppressed because it is too large Load Diff
src/actor/ac_fuusen.c
+2 -2
View File
@@ -480,10 +480,10 @@ static void aFSN_actor_move(ACTOR* actorx, GAME* game) {
player->actor_class.world.position.x + sin_s(actorx->player_angle_y - (s16)-0x8000) * 30.0f,
player->actor_class.world.position.y + 60.0f,
player->actor_class.world.position.z + cos_s(actorx->player_angle_y - (s16)-0x8000) * 30.0f,
1.0f, 1.0f, 1.0f,
0, rot_y, 0,
1.0f, 1.0f, 1.0f,
250, 100, 120, 128,
4,
Debug_Display_SHAPE_ARROW_MODEL,
game->graph
);
}
src/actor/ac_quest_talk_normal_init.c
+1 -1
View File
@@ -1456,7 +1456,7 @@ static int aQMgr_decide_msg_special_ev(QUEST_MANAGER_ACTOR* manager, int looks)
lbRTC_time_c* rtc_time = Common_GetPointer(time.rtc_time);
int i;
ev_kind = Save_Get(event_save_data).special.type;
ev_kind = Save_Get(event_save_data).special.kind;
if (ev_kind != -1) {
// clang-format off
src/game/m_debug_display.c
+44 -38
View File
@@ -2,29 +2,36 @@
#include "m_rcp.h"
#include "sys_matrix.h"
enum {
Debug_Display_DRAW_SPRITE,
Debug_Display_DRAW_POLYGON,
Debug_Display_DRAW_TYPE_NUM
};
typedef void (*DEBUG_DISP_PROC)(Debug_display*, void*, GAME_PLAY*);
typedef struct debug_display_info_s{
typedef struct debug_display_info_s {
/* 0x0 */ s16 type;
/* 0x4 */ void* arg;
} Debug_display_info;
} Debug_display_info;
static void debug_display_output_sprite_16x16_I8(Debug_display *, void *, GAME_PLAY *);
static void debug_display_output_polygon(Debug_display *, void *, GAME_PLAY *);
static void debug_display_output_sprite_16x16_I8(Debug_display*, void*, GAME_PLAY*);
static void debug_display_output_polygon(Debug_display*, void*, GAME_PLAY*);
Debug_display* debug_display;
void Debug_Display_init(){
extern void Debug_Display_init(void) {
debug_display = NULL;
}
extern Debug_display* Debug_Display_new(f32 posX, f32 posY, f32 posZ, f32 scaleX, f32 scaleY, f32 scaleZ,
s16 rotX, s16 rotY, s16 rotZ, u8 r, u8 g, u8 b, u8 alpha, s16 type, GRAPH* graph){
extern Debug_display* Debug_Display_new(f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, f32 scaleX,
f32 scaleY, f32 scaleZ, u8 r, u8 g, u8 b, u8 alpha, s16 shape, GRAPH* graph) {
Debug_display* display = debug_display;
debug_display = GRAPH_ALLOC(graph, sizeof(Debug_display) + 4);
Debug_display* prev_display = debug_display;
// allocate new debug display, aligned to 8 bytes to match Gfx size
debug_display = GRAPH_ALLOC(graph, ALIGN_NEXT(sizeof(Debug_display), 8));
debug_display->pos.x = posX;
debug_display->pos.y = posY;
debug_display->pos.z = posZ;
@@ -34,35 +41,37 @@ s16 rotX, s16 rotY, s16 rotZ, u8 r, u8 g, u8 b, u8 alpha, s16 type, GRAPH* graph
debug_display->scale.x = scaleX;
debug_display->scale.y = scaleY;
debug_display->scale.z = scaleZ;
debug_display->color.r = r;
debug_display->color.g = g;
debug_display->color.b = b;
debug_display->color.a = alpha;
debug_display->type = type;
debug_display->next = display;
debug_display->color.r = r;
debug_display->color.g = g;
debug_display->color.b = b;
debug_display->color.a = alpha;
debug_display->shape = shape;
debug_display->next = prev_display;
return debug_display;
return debug_display;
}
extern void* no_txt;
extern void* nx_txt;
extern void* np_txt;
extern void* nt_txt;
extern u8 no_txt[];
extern u8 nx_txt[];
extern u8 np_txt[];
extern u8 nt_txt[];
extern Gfx darrow_model[];
extern Gfx camera_model[];
extern void Debug_Display_output(GAME_PLAY* play){
static DEBUG_DISP_PROC debug_display_output_proc[] = { debug_display_output_sprite_16x16_I8, debug_display_output_polygon};
extern void Debug_Display_output(GAME_PLAY* play) {
static DEBUG_DISP_PROC debug_display_output_proc[] = { debug_display_output_sprite_16x16_I8,
debug_display_output_polygon };
static Debug_display_info debug_display_shape_data[] = {
{0, &no_txt}, {0, &nx_txt}, {0, &np_txt}, {0, &nt_txt}, {1, darrow_model}, {1, camera_model},
};
{ Debug_Display_DRAW_SPRITE, no_txt }, { Debug_Display_DRAW_SPRITE, nx_txt },
{ Debug_Display_DRAW_SPRITE, np_txt }, { Debug_Display_DRAW_SPRITE, nt_txt },
{ Debug_Display_DRAW_POLYGON, darrow_model }, { Debug_Display_DRAW_POLYGON, camera_model },
};
Debug_display_info* data;
Debug_display* display = debug_display;
Debug_display* display = debug_display;
while(display != NULL){
data = &debug_display_shape_data[display->type];
while (display != NULL) {
data = &debug_display_shape_data[display->shape];
debug_display_output_proc[data->type](display, data->arg, play);
display = display->next;
}
@@ -70,39 +79,37 @@ extern void Debug_Display_output(GAME_PLAY* play){
extern Gfx RCP_debug_texture_16x16_8[];
static void debug_display_output_sprite_16x16_I8(Debug_display* display, void* txt, GAME_PLAY* play){
static void debug_display_output_sprite_16x16_I8(Debug_display* display, void* txt, GAME_PLAY* play) {
OPEN_DISP(play->game.graph);
softsprite_prim(play->game.graph);
gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 0, display->color.r, display->color.g, display->color.b, display->color.a);
Matrix_translate(display->pos.x, display->pos.y, display->pos.z, 0);
Matrix_scale(display->scale.x, display->scale.y, display->scale.z, 1);
Matrix_mult(&play->billboard_matrix, 1);
Matrix_rotateXYZ(display->rot.x, display->rot.y, display->rot.z, 1);
gDPLoadTextureBlock(NEXT_POLY_XLU_DISP, txt, G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSPMatrix(NEXT_POLY_XLU_DISP, _Matrix_to_Mtx_new(play->game.graph), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(NEXT_POLY_XLU_DISP, RCP_debug_texture_16x16_8);
CLOSE_DISP(play->game.graph);
}
static void debug_display_output_polygon(Debug_display* display, void* dl, GAME_PLAY* play) {
static Lights1 material = gdSPDefLights1(128, 128, 128, 255, 255, 255, 73, 73, 73);
OPEN_DISP(play->game.graph);
polygon_z_light_prim(play->game.graph);
gDPSetPrimColor(NEXT_POLY_XLU_DISP, 0, 0, display->color.r, display->color.g, display->color.b, display->color.a);
gSPSetLights1(NEXT_POLY_XLU_DISP, material);
gSPSetLights1(NEXT_POLY_XLU_DISP, material);
Matrix_softcv3_load(&display->rot, display->pos.x, display->pos.y, display->pos.z);
Matrix_scale(display->scale.x, display->scale.y, display->scale.z, 1);
@@ -111,4 +118,3 @@ static void debug_display_output_polygon(Debug_display* display, void* dl, GAME_
gSPDisplayList(NEXT_POLY_XLU_DISP, dl);
CLOSE_DISP(play->game.graph);
}
src/game/m_event.c
+6 -6
View File
@@ -31,7 +31,7 @@ typedef union ymdh {
static int update_save_area(void);
extern void mEv_ClearSpecialEvent(mEv_special_c* special_event) {
special_event->type = -1;
special_event->kind = -1;
bzero(&special_event->event, sizeof(mEv_special_u));
bzero(Common_GetPointer(special_event_common), sizeof(mEv_event_common_u));
}
@@ -2448,13 +2448,13 @@ extern int mEv_clear_common_place(int type, u8 id) {
return 0;
}
extern int mEv_use_block_by_other_event(int type, BlockOrUnit_c* block) {
extern int mEv_use_block_by_other_event(int type, BlockOrUnit_c block) {
mEv_common_data_c* ev_common = Common_GetPointer(event_common);
int i;
for (i = 0; i < mEv_PLACE_NUM; i++) {
if (((1 << i) & ev_common->place_use_bitfield) != 0) {
if (ev_common->place[i].data.block.x == block->x && ev_common->place[i].data.block.z == block->z &&
if (ev_common->place[i].data.block.x == block.x && ev_common->place[i].data.block.z == block.z &&
ev_common->place[i].info.type != type) {
return TRUE;
}
@@ -2682,8 +2682,8 @@ extern int mEv_get_special_event_state() {
mEv_ymdh_u today_date_start;
int event_type;
if (Save_Get(event_save_data).special.type <= mEv_SPNPC_END) {
event_type = special_events[Save_Get(event_save_data).special.type];
if (Save_Get(event_save_data).special.kind <= mEv_SPNPC_END) {
event_type = special_events[Save_Get(event_save_data).special.kind];
} else {
return FALSE;
}
@@ -2716,7 +2716,7 @@ extern int mEv_get_special_event_state() {
res = mEv_SPECIAL_STATE_ACTIVE;
} else if (check_ymdh_range(today_date.raw, event_date_start.raw, event_date.raw)) {
res = mEv_SPECIAL_STATE_SCHEDULED_TODAY;
} else if (Save_Get(event_save_data).special.type != 0xFFFFFFFF && event_date_start.raw > today_date_start.raw) {
} else if (Save_Get(event_save_data).special.kind != 0xFFFFFFFF && event_date_start.raw > today_date_start.raw) {
res = mEv_SPECIAL_STATE_SCHEDULED_LATER;
}
src/game/m_npc.c
+1 -1
View File
@@ -1760,7 +1760,7 @@ static void mNpc_SendEventPresentMailSex(int* selected, u8* type, Animal_c* anim
/* this used to be mNpc_SendEventPresentMail_common in DnM and DnM+ (handled both valentine's day & white day) */
extern int mNpc_SendVtdayMail(int type) {
extern int mNpc_SendVtdayMail() {
u8 types[ANIMAL_NUM_MAX];
int other_sex_best_friends[ANIMAL_NUM_MAX];
Animal_c* animal_p;