mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-08-22 05:49:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
roeming
2025-06-20 15:30:26 -04:00
committed by GitHub
parent 71fe44369c 42bd0578fe
commit 68d61403f8
266 changed files with 1413 additions and 1385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_event.h
+16
View File
@@ -52,6 +52,20 @@ extern "C" {
#define mEv_TO_DAY(month_day) ((lbRTC_day_t)(month_day))
#define mEv_TO_MONTH(month_day) ((lbRTC_month_t)((month_day) >> 8))
enum {
mEv_TITLEDEMO_STAFFROLL = -9,
mEv_TITLEDEMO_LOGO = -1,
mEv_TITLEDEMO_NONE = 0,
mEv_TITLEDEMO_START1,
mEv_TITLEDEMO_START2,
mEv_TITLEDEMO_START3,
mEv_TITLEDEMO_START4,
mEv_TITLEDEMO_START5,
mEv_TITLEDEMO_NUM
};
typedef union event_monthday_s {
struct {
u8 month;
@@ -632,6 +646,8 @@ extern void mEv_SetGateway();
extern int mEv_CheckGateway();
extern void mEv_UnSetGateway();
extern int mEv_CheckTitleDemo();
#define mEv_IsTitleDemo() (mEv_CheckTitleDemo() > mEv_TITLEDEMO_NONE)
#define mEv_IsNotTitleDemo() (!mEv_IsTitleDemo())
extern void mEv_SetTitleDemo(int demo_number);
extern void mEv_RenewalDataEveryDay();
extern void mEv_GetEventWeather(s16* weather, s16* intensity);
include/sys_matrix.h
+3
View File
@@ -10,6 +10,9 @@
extern "C" {
#endif
#define MTX_LOAD 0 // load into new matrix
#define MTX_MULT 1 // multiply into existing matrix
extern MtxF MtxF_clear;
extern Mtx Mtx_clear;