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

Merge pull request #429 from Cuyler36:m_board_ovl

Browse Source 
Link m_board_ovl, implement m_player_main_shock
This commit is contained in:
Cuyler36
2024-09-06 04:01:47 -04:00
committed by GitHub
parent 4a26ebefba 1e238d3cab
commit e09193bc88
4 changed files with 205 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_player.h
+13 -2
View File
@@ -885,10 +885,10 @@ typedef struct player_request_mail_jump_s {
} mPlayer_request_mail_jump_c;
typedef struct player_request_shock_s {
f32 timer;
f32 start_time;
s16 target_angle_y;
u8 bee_chase_bgm_flag;
int axe_broke_flag;
int axe_flag;
} mPlayer_request_shock_c;
typedef struct player_request_push_snowball_s {
@@ -1757,6 +1757,16 @@ typedef struct player_main_remove_grass_s {
xyz_t target_pos;
} mPlayer_main_remove_grass_c;
typedef struct player_main_shock_s {
f32 start_time;
s16 target_angle_y;
f32 timer;
f32 end_time;
u8 bee_chase_bgm_flag;
int axe_flag;
int bgm_stop_flag;
} mPlayer_main_shock_c;
typedef struct player_main_push_snowball_s {
u32 label;
} mPlayer_main_push_snowball_c;
@@ -1857,6 +1867,7 @@ typedef union {
mPlayer_main_stung_bee_c stung_bee;
mPlayer_main_notice_bee_c notice_bee;
mPlayer_main_remove_grass_c remove_grass;
mPlayer_main_shock_c shock;
mPlayer_main_push_snowball_c push_snowball;
mPlayer_main_wade_snowball_c wade_snowball;
mPlayer_main_demo_geton_boat_wade_c demo_geton_boat_wade;