From b16da413bfc4e71319f142792638e4bf8e284d21 Mon Sep 17 00:00:00 2001 From: Rainchus Date: Sun, 3 Mar 2024 09:49:31 -0600 Subject: [PATCH] match ev_cherry_manager.c (#272) * match ev_cherry_manager.c * remove extra include * update cherry manager definitions --- config/rel_slices.yml | 3 +++ include/ev_cherry_manager.h | 4 ++++ include/m_event.h | 1 + src/ev_cherry_manager.c | 38 +++++++++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 src/ev_cherry_manager.c diff --git a/config/rel_slices.yml b/config/rel_slices.yml index e51ac0be..bf012e37 100644 --- a/config/rel_slices.yml +++ b/config/rel_slices.yml @@ -634,6 +634,9 @@ m_random_field_ovl.c: .rodata: [0x80648ED0, 0x80648ED8] .data: [0x8069E918, 0x8069F070] .bss: [0x813010D0, 0x813013E0] +ev_cherry_manager.c: + .text: [0x8050B3D0, 0x8050B404] + .data: [0x8069F070, 0x8069F098] ac_fuusen.c: .text: [0x8050DAC4, 0x8050F06C] .rodata: [0x80648FE8, 0x80649098] diff --git a/include/ev_cherry_manager.h b/include/ev_cherry_manager.h index 667bb26e..e006cd1b 100644 --- a/include/ev_cherry_manager.h +++ b/include/ev_cherry_manager.h @@ -10,6 +10,10 @@ extern "C" { extern ACTOR_PROFILE Ev_Cherry_Manager_Profile; +typedef struct cherry_manager_s { + ACTOR actor_class; +} CHERRY_MANAGER_EVENT_ACTOR; + #ifdef __cplusplus } #endif diff --git a/include/m_event.h b/include/m_event.h index 4b219333..86900144 100644 --- a/include/m_event.h +++ b/include/m_event.h @@ -567,6 +567,7 @@ typedef struct event_common_save_data { u8 dozaemon_completed; // used to signal when you've received an item from gulliver } mEv_save_common_data_c; +extern void mEv_clear_status(int event, s16 status); extern int mEv_CheckFirstJob(); extern int mEv_CheckFirstIntro(); extern int mEv_CheckArbeit(); diff --git a/src/ev_cherry_manager.c b/src/ev_cherry_manager.c new file mode 100644 index 00000000..726ddec8 --- /dev/null +++ b/src/ev_cherry_manager.c @@ -0,0 +1,38 @@ +#include "m_event.h" +#include "ev_cherry_manager.h" + +void eChryMgr_move(ACTOR* actor, GAME* game); +void eChryMgr_draw(ACTOR* actor, GAME* game); +void eChryMgr_ct(ACTOR* actor, GAME* game); +void eChryMgr_dt(ACTOR* actor, GAME* game); + +ACTOR_PROFILE Ev_Cherry_Manager_Profile = { + mAc_PROFILE_EV_CHERRY_MANAGER, + ACTOR_PART_CONTROL, + ACTOR_STATE_CAN_MOVE_IN_DEMO_SCENES, + EMPTY_NO, + ACTOR_OBJ_BANK_KEEP, + sizeof(CHERRY_MANAGER_EVENT_ACTOR), + + &eChryMgr_ct, + &eChryMgr_dt, + &eChryMgr_move, + &eChryMgr_draw, + NULL, +}; + +void eChryMgr_move(ACTOR* actor, GAME* game) { + +} + +void eChryMgr_draw(ACTOR* actor, GAME* game) { + +} + +void eChryMgr_ct(ACTOR* actor, GAME* game) { + +} + +void eChryMgr_dt(ACTOR* actor, GAME* game) { + mEv_clear_status(mEv_EVENT_CHERRY_BLOSSOM_FESTIVAL, mEv_STATUS_ACTIVE); +}