diff options
| author | inspectredc <78732756+inspectredc@users.noreply.github.com> | 2024-04-16 00:19:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-15 16:19:43 -0700 |
| commit | 7f426967efd07046bfbe791ed4e64808ae5a26e2 (patch) | |
| tree | 51014dee003a4e30ac6db96c640c66db13dc6d3f /include/m_collision_bg.h | |
| parent | 4ab3a1d9dcb76d80fe745dcbe79f3e925b8fac7e (diff) | |
ac_ball OK and documented (#173)
* ac_ball OK
* hopefully format
* address warnings
* Apply suggestions from code review
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
* suggestions pt2
---------
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
Diffstat (limited to 'include/m_collision_bg.h')
| -rw-r--r-- | include/m_collision_bg.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/include/m_collision_bg.h b/include/m_collision_bg.h index b231c38..c3463b6 100644 --- a/include/m_collision_bg.h +++ b/include/m_collision_bg.h @@ -35,6 +35,24 @@ typedef union mCoBG_unkStructUnion { u32 raw; } mCoBG_unkStructUnion; +// collision bg result data +typedef struct mCoBG_CheckResult { + u32 onGround:1; // [31] on_ground + u32 unk1:5; // [30:25] hit_attribute_wall + u32 hitWall:5; // [25:20] hit_wall + u32 unk3:3; // [20:17] hit_wall_count + u32 unk4:1; // [17:16] unk_flag0 + u32 unk5:6; // [16:10] unit_attribute + u32 unk6:1; // [10] is_on_move_bg_obj + u32 inWater:1; // [9] is_in_water + u32 unk8:1; // [8] unk_flag1 + u32 unk9:1; // [7] unk_flag2 + u32 unk10:1; // [6] unk_flag3 + u32 unk11:1; // [5] unk_flag4 + u32 unk12:1; // [4] unk_flag5 + u32 unk13:4; // [3:0] unk_flag6 +} mCoBG_CheckResult; + // void func_80067430_jp(); // void func_800674B0_jp(); // void func_800674D8_jp(); @@ -202,7 +220,7 @@ f32 mCoBG_GetBgY_AngleS_FromWpos(s_xyz* angleToGround, xyz_t wpos, f32 offsetY); // void func_80071A08_jp(); // void func_80071AB8_jp(); f32 mCoBG_GetBgY_OnlyCenter_FromWpos2(xyz_t arg0, f32 arg1); -// void func_80071C1C_jp(); +void mCoBG_GetBgNorm_FromWpos(xyz_t*, xyz_t); // void func_80071DB4_jp(); // void func_800721C8_jp(); // void func_800721E4_jp(); @@ -269,19 +287,19 @@ void mCoBG_SetPluss5PointOffset_file(xyz_t pos, mCoBG_unkStruct2 arg1, char* fil // void func_80075A10_jp(); // void func_80075AB4_jp(); // void func_80075B28_jp(); -// void func_80075EA0_jp(); +f32 mCoBG_GetWaterHeight_File(xyz_t, char*, s32); // void func_8007620C_jp(); // void func_80076248_jp(); // void func_80076270_jp(); // void func_80076280_jp(); -// void func_80076290_jp(); +void mCoBG_GetWaterFlow(xyz_t*, u32); s32 func_80076358_jp(u32 attribute); // void func_8007638C_jp(); // void func_800763F0_jp(); // void func_800763FC_jp(); // void func_8007648C_jp(); // void func_800764CC_jp(); -// void func_800765AC_jp(); +void mCoBG_BgCheckControll(xyz_t*, struct Actor*, f32, f32, s32, s32, s32); // void func_80076778_jp(); // void func_800768C8_jp(); // void func_80076A04_jp(); |
