Skip to content

Commit

Permalink
d_bg_s_acch majority done
Browse files Browse the repository at this point in the history
  • Loading branch information
@elijah-thomas774
elijah-thomas774 committed Oct 13, 2024
1 parent 98ae7e3 commit 5fed03d
Show file tree
Hide file tree
Showing 23 changed files with 1,487 additions and 155 deletions.
4 changes: 3 additions & 1 deletion config/SOUE01/splits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -964,10 +964,12 @@ d/col/bg/d_bg_s.cpp:
.rodata start:0x804F0C00 end:0x804F0D00
.data start:0x80547698 end:0x805477C0
.sdata start:0x80574060 end:0x80574070
.sdata2 start:0x8057D068 end:0x8057D0C0
.sdata2 start:0x8057D068 end:0x8057D0FC

d/col/bg/d_bg_s_acch.cpp:
.text start:0x8033F150 end:0x803412F8
.data start:0x805477C0 end:0x80547868
.sdata2 start:0x8057D100 end:0x8057D13C

d/col/bg/d_bg_s_chk.cpp:
.text start:0x80341300 end:0x80341488
Expand Down
150 changes: 75 additions & 75 deletions config/SOUE01/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19047,8 +19047,8 @@ getCrossYLessD__8cM3dGPlaCFRC7mVec3_cPf = .text:0x80338520; // type:function siz
GetAngle__8cM3dGPlaCF4mAng = .text:0x80338580; // type:function size:0xAC
GetNegativeAngle__8cM3dGPlaCF4mAng = .text:0x80338630; // type:function size:0x48
__ct__8cM3dGSphFv = .text:0x80338680; // type:function size:0xC
SetC__8cM3dGSphFRC7mVec3_c = .text:0x80338690; // type:function size:0x1C
Set__8cM3dGSphFRC7mVec3_cf = .text:0x803386B0; // type:function size:0x44
SetC__8cM3dGSphFPC7mVec3_c = .text:0x80338690; // type:function size:0x1C
Set__8cM3dGSphFPC7mVec3_cf = .text:0x803386B0; // type:function size:0x44
SetR__8cM3dGSphFf = .text:0x80338700; // type:function size:0x18
SetC__8cM3dGSphFfff = .text:0x80338720; // type:function size:0x30
fn_80338750__8cM3dGSphFP8cM3dGUnkP7mVec3_c = .text:0x80338750; // type:function size:0x10
Expand Down Expand Up @@ -19193,66 +19193,66 @@ SetLightingCode__4dBgSFP12dAcObjBase_cf = .text:0x8033EE90; // type:function siz
GetLightingCode__4dBgSFPC7mVec3_c = .text:0x8033EF50; // type:function size:0x94
GetPolyPreventObjOnly__4dBgSFRC13cBgS_PolyInfo = .text:0x8033EFF0; // type:function size:0x114
GetMapGradationColor__4dBgSFP8_GXColor = .text:0x8033F110; // type:function size:0x3C
fn_8033F150 = .text:0x8033F150; // type:function size:0x5C
fn_8033F1B0 = .text:0x8033F1B0; // type:function size:0x40
fn_8033F1F0 = .text:0x8033F1F0; // type:function size:0x40
fn_8033F230 = .text:0x8033F230; // type:function size:0x5C
fn_8033F290 = .text:0x8033F290; // type:function size:0x8
fn_8033F2A0 = .text:0x8033F2A0; // type:function size:0xC
fn_8033F2B0 = .text:0x8033F2B0; // type:function size:0x16C
fn_8033F420 = .text:0x8033F420; // type:function size:0x98
fn_8033F4C0 = .text:0x8033F4C0; // type:function size:0x74
copyActorObjectBaseVelocityToSomething = .text:0x8033F540; // type:function size:0x70
fn_8033F5B0 = .text:0x8033F5B0; // type:function size:0x198
fn_8033F750 = .text:0x8033F750; // type:function size:0x3E8
fn_8033FB40 = .text:0x8033FB40; // type:function size:0x16C
fn_8033FCB0 = .text:0x8033FCB0; // type:function size:0x190
fn_8033FE40 = .text:0x8033FE40; // type:function size:0x554
fn_803403A0 = .text:0x803403A0; // type:function size:0xE4
fn_80340490 = .text:0x80340490; // type:function size:0x600
fn_80340A90 = .text:0x80340A90; // type:function size:0x44
fn_80340AE0 = .text:0x80340AE0; // type:function size:0x19C
fn_80340C80 = .text:0x80340C80; // type:function size:0x14
fn_80340CA0 = .text:0x80340CA0; // type:function size:0xB8
fn_80340D60 = .text:0x80340D60; // type:function size:0x4
fn_80340D70 = .text:0x80340D70; // type:function size:0x1C
fn_80340D90 = .text:0x80340D90; // type:function size:0x1C
someCollisionCheck = .text:0x80340DB0; // type:function size:0x5C
fn_80340E10 = .text:0x80340E10; // type:function size:0x5C
fn_80340E70 = .text:0x80340E70; // type:function size:0x98
fn_80340F10 = .text:0x80340F10; // type:function size:0x10
fn_80340F20 = .text:0x80340F20; // type:function size:0x10
fn_80340F30 = .text:0x80340F30; // type:function size:0x10
fn_80340F40 = .text:0x80340F40; // type:function size:0x10
fn_80340F50 = .text:0x80340F50; // type:function size:0x10
fn_80340F60 = .text:0x80340F60; // type:function size:0x10
fn_80340F70 = .text:0x80340F70; // type:function size:0x84
fn_80341000 = .text:0x80341000; // type:function size:0x3C
fn_80341040 = .text:0x80341040; // type:function size:0x54
fn_803410A0 = .text:0x803410A0; // type:function size:0x58
fn_80341100 = .text:0x80341100; // type:function size:0x54
fn_80341160 = .text:0x80341160; // type:function size:0x58
fn_803411C0 = .text:0x803411C0; // type:function size:0x54
fn_80341220 = .text:0x80341220; // type:function size:0x58
fn_80341280 = .text:0x80341280; // type:function size:0x8
fn_80341290 = .text:0x80341290; // type:function size:0x8
fn_803412A0 = .text:0x803412A0; // type:function size:0x8
fn_803412B0 = .text:0x803412B0; // type:function size:0x8
fn_803412C0 = .text:0x803412C0; // type:function size:0x8
fn_803412D0 = .text:0x803412D0; // type:function size:0x8
fn_803412E0 = .text:0x803412E0; // type:function size:0x8
fn_803412F0 = .text:0x803412F0; // type:function size:0x8
fn_80341300 = .text:0x80341300; // type:function size:0x4C
fn_80341350 = .text:0x80341350; // type:function size:0x68
fn_803413C0 = .text:0x803413C0; // type:function size:0x4
fn_803413D0 = .text:0x803413D0; // type:function size:0x10
__ct__12dBgS_AcchCirFv = .text:0x8033F150; // type:function size:0x5C
__dt__8cM3dGCirFv = .text:0x8033F1B0; // type:function size:0x40
__dt__12dBgS_AcchCirFv = .text:0x8033F1F0; // type:function size:0x40
ChkWallHit__12dBgS_AcchCirCFv = .text:0x8033F230; // type:function size:0x5C
SetWallR__12dBgS_AcchCirFf = .text:0x8033F290; // type:function size:0x8
SetWall__12dBgS_AcchCirFff = .text:0x8033F2A0; // type:function size:0xC
__ct__9dBgS_AcchFv = .text:0x8033F2B0; // type:function size:0x16C
__dt__9dBgS_AcchFv = .text:0x8033F420; // type:function size:0x98
Set__9dBgS_AcchFP7mVec3_cP7mVec3_cP12dAcObjBase_ciP12dBgS_AcchCirP7mVec3_cP7mAng3_cP7mAng3_c = .text:0x8033F4C0; // type:function size:0x74
Set__9dBgS_AcchFP12dAcObjBase_ciP12dBgS_AcchCir = .text:0x8033F540; // type:function size:0x70
fn_8033f5b0__9dBgS_AcchFP7mVec3_cP7mVec3_cf = .text:0x8033F5B0; // type:function size:0x198
GroundCheck__9dBgS_AcchFR4dBgSb = .text:0x8033F750; // type:function size:0x3E8
RoofCheck__9dBgS_AcchFR4dBgS = .text:0x8033FB40; // type:function size:0x16C
GroundRoofProc__9dBgS_AcchFR4dBgSb = .text:0x8033FCB0; // type:function size:0x190
LineCheck__9dBgS_AcchFR4dBgS = .text:0x8033FE40; // type:function size:0x554
SphCheck__9dBgS_AcchFv = .text:0x803403A0; // type:function size:0xE4
CrrPos__9dBgS_AcchFR4dBgS = .text:0x80340490; // type:function size:0x600
GetWallAllR__9dBgS_AcchFv = .text:0x80340A90; // type:function size:0x44
CalcWallBmdCyl__9dBgS_AcchFv = .text:0x80340AE0; // type:function size:0x19C
SetGroundUpY__9dBgS_AcchFf = .text:0x80340C80; // type:function size:0x14
fn_80340ca0__9dBgS_AcchCFR13cBgS_PolyInfo = .text:0x80340CA0; // type:function size:0xB8
Draw__9dBgS_AcchFR4dBgS = .text:0x80340D60; // type:function size:0x4
SetMoveBGOnly__9dBgS_AcchFv = .text:0x80340D70; // type:function size:0x1C
ClrMoveBGOnly__9dBgS_AcchFv = .text:0x80340D90; // type:function size:0x1C
ChkGndHit__9dBgS_AcchCFv = .text:0x80340DB0; // type:function size:0x5C
ChkRoofHit__9dBgS_AcchCFv = .text:0x80340E10; // type:function size:0x5C
ChkWallHit__9dBgS_AcchCFPi = .text:0x80340E70; // type:function size:0x98
SetGndThinCellingOff__9dBgS_AcchFv = .text:0x80340F10; // type:function size:0x10
ClrGndThinCellingOff__9dBgS_AcchFv = .text:0x80340F20; // type:function size:0x10
Set_0x2000000__9dBgS_AcchFv = .text:0x80340F30; // type:function size:0x10
Clr_0x2000000__9dBgS_AcchFv = .text:0x80340F40; // type:function size:0x10
OnWallSort__9dBgS_AcchFv = .text:0x80340F50; // type:function size:0x10
GetCir__9dBgS_AcchFi = .text:0x80340F60; // type:function size:0x10
fn_80340f70__9dBgS_AcchFPC7mVec3_c = .text:0x80340F70; // type:function size:0x84
fn_80341000__9dBgS_AcchFv = .text:0x80341000; // type:function size:0x3C
__ct__12dBgS_ObjAcchFv = .text:0x80341040; // type:function size:0x54
__dt__12dBgS_ObjAcchFv = .text:0x803410A0; // type:function size:0x58
__ct__13dBgS_LinkAcchFv = .text:0x80341100; // type:function size:0x54
__dt__13dBgS_LinkAcchFv = .text:0x80341160; // type:function size:0x58
__ct__13dBgS_BombAcchFv = .text:0x803411C0; // type:function size:0x54
__dt__13dBgS_BombAcchFv = .text:0x80341220; // type:function size:0x58
@56@__dt__9dBgS_AcchFv = .text:0x80341280; // type:function size:0x8
@40@__dt__9dBgS_AcchFv = .text:0x80341290; // type:function size:0x8
@56@__dt__12dBgS_ObjAcchFv = .text:0x803412A0; // type:function size:0x8
@40@__dt__12dBgS_ObjAcchFv = .text:0x803412B0; // type:function size:0x8
@56@__dt__13dBgS_LinkAcchFv = .text:0x803412C0; // type:function size:0x8
@40@__dt__13dBgS_LinkAcchFv = .text:0x803412D0; // type:function size:0x8
@56@__dt__13dBgS_BombAcchFv = .text:0x803412E0; // type:function size:0x8
@40@__dt__13dBgS_BombAcchFv = .text:0x803412F0; // type:function size:0x8
__ct__8dBgS_ChkFv = .text:0x80341300; // type:function size:0x4C
__dt__8dBgS_ChkFv = .text:0x80341350; // type:function size:0x68
GetPolyPassChkInfo__8dBgS_ChkFv = .text:0x803413C0; // type:function size:0x4
GetGrpPassChkInfo__8dBgS_ChkFv = .text:0x803413D0; // type:function size:0x10
fn_803413E0 = .text:0x803413E0; // type:function size:0x10
fn_803413F0 = .text:0x803413F0; // type:function size:0x40
fn_80341430 = .text:0x80341430; // type:function size:0x10
fn_80341440 = .text:0x80341440; // type:function size:0x40
fn_80341480 = .text:0x80341480; // type:function size:0x8
fn_80341490 = .text:0x80341490; // type:function size:0x6C
fn_80341500 = .text:0x80341500; // type:function size:0x68
__ct__11dBgS_GndChkFv = .text:0x80341490; // type:function size:0x6C
__dt__11dBgS_GndChkFv = .text:0x80341500; // type:function size:0x68
fn_80341570 = .text:0x80341570; // type:function size:0x44
fn_803415C0 = .text:0x803415C0; // type:function size:0x54
fn_80341620 = .text:0x80341620; // type:function size:0x58
Expand Down Expand Up @@ -19357,9 +19357,9 @@ fn_80342C80 = .text:0x80342C80; // type:function size:0x8
fn_80342C90 = .text:0x80342C90; // type:function size:0x8
fn_80342CA0 = .text:0x80342CA0; // type:function size:0x6C
fn_80342D10 = .text:0x80342D10; // type:function size:0x58
fn_80342D70 = .text:0x80342D70; // type:function size:0xC0
fn_80342E30 = .text:0x80342E30; // type:function size:0x68
fn_80342EA0 = .text:0x80342EA0; // type:function size:0x1C
__ct__12dBgS_RoofChkFv = .text:0x80342D70; // type:function size:0xC0
__dt__12dBgS_RoofChkFv = .text:0x80342E30; // type:function size:0x68
SetPos__12dBgS_RoofChkFPC7mVec3_c = .text:0x80342EA0; // type:function size:0x1C
fn_80342EC0 = .text:0x80342EC0; // type:function size:0x5C
fn_80342F20 = .text:0x80342F20; // type:function size:0x58
CtInstance__15dBgS_ObjRoofChkFv = .text:0x80342F80; // type:function size:0x2C
Expand All @@ -19376,8 +19376,8 @@ fn_80343170 = .text:0x80343170; // type:function size:0x8
fn_80343180 = .text:0x80343180; // type:function size:0x8
fn_80343190 = .text:0x80343190; // type:function size:0x8
fn_803431A0 = .text:0x803431A0; // type:function size:0x8
fn_803431B0 = .text:0x803431B0; // type:function size:0xEC
fn_803432A0 = .text:0x803432A0; // type:function size:0x68
__ct__11dBgS_SphChkFv = .text:0x803431B0; // type:function size:0xEC
__dt__11dBgS_SphChkFv = .text:0x803432A0; // type:function size:0x68
fn_80343310 = .text:0x80343310; // type:function size:0x5C
fn_80343370 = .text:0x80343370; // type:function size:0x58
fn_803433D0 = .text:0x803433D0; // type:function size:0x8
Expand All @@ -19392,8 +19392,8 @@ fn_80343580 = .text:0x80343580; // type:function size:0x20
fn_803435A0 = .text:0x803435A0; // type:function size:0x8
fn_803435B0 = .text:0x803435B0; // type:function size:0x8
fn_803435C0 = .text:0x803435C0; // type:function size:0x8
fn_803435D0 = .text:0x803435D0; // type:function size:0x60
fn_80343630 = .text:0x80343630; // type:function size:0x58
__ct__11dBgS_WtrChkFv = .text:0x803435D0; // type:function size:0x60
__dt__11dBgS_WtrChkFv = .text:0x80343630; // type:function size:0x58
CtInstance__11dBgS_WtrChkFv = .text:0x80343690; // type:function size:0x2C
fn_803436C0 = .text:0x803436C0; // type:function size:0xAC
fn_80343770 = .text:0x80343770; // type:function size:0x2C
Expand Down Expand Up @@ -19798,9 +19798,9 @@ fn_803599A0 = .text:0x803599A0; // type:function size:0xC
fn_803599B0 = .text:0x803599B0; // type:function size:0x4
fn_803599C0 = .text:0x803599C0; // type:function size:0x98
fn_80359A60 = .text:0x80359A60; // type:function size:0x98
fn_80359B00 = .text:0x80359B00; // type:function size:0x34
fn_80359B40 = .text:0x80359B40; // type:function size:0x28
fn_80359B70 = .text:0x80359B70; // type:function size:0x4C
__ct__15dBgS_Acch_0x1A8Fv = .text:0x80359B00; // type:function size:0x34
Init__15dBgS_Acch_0x1A8Fv = .text:0x80359B40; // type:function size:0x28
CalcPos__15dBgS_Acch_0x1A8FP7mVec3_c = .text:0x80359B70; // type:function size:0x4C
fn_80359BC0 = .text:0x80359BC0; // type:function size:0x84
fn_80359C50 = .text:0x80359C50; // type:function size:0x1C
fn_80359C70 = .text:0x80359C70; // type:function size:0x8
Expand Down Expand Up @@ -36095,12 +36095,12 @@ __vt__4dBgS = .data:0x80547778; // type:object size:0x14
__vt__14MapLineSegment = .data:0x80547790; // type:object size:0x10
__vt__4cBgS = .data:0x805477A0; // type:object size:0x14
__vt__11cBgS_ChkElm = .data:0x805477B4; // type:object size:0xC
lbl_805477C0 = .data:0x805477C0; // type:object size:0x24
lbl_805477E4 = .data:0x805477E4; // type:object size:0x24
lbl_80547808 = .data:0x80547808; // type:object size:0x24
lbl_8054782C = .data:0x8054782C; // type:object size:0x24
lbl_80547850 = .data:0x80547850; // type:object size:0xC
lbl_8054785C = .data:0x8054785C; // type:object size:0xC
__vt__13dBgS_BombAcch = .data:0x805477C0; // type:object size:0x24
__vt__13dBgS_LinkAcch = .data:0x805477E4; // type:object size:0x24
__vt__12dBgS_ObjAcch = .data:0x80547808; // type:object size:0x24
__vt__9dBgS_Acch = .data:0x8054782C; // type:object size:0x24
__vt__12dBgS_AcchCir = .data:0x80547850; // type:object size:0xC
__vt__8cM3dGCir = .data:0x8054785C; // type:object size:0xC
lbl_80547868 = .data:0x80547868; // type:object size:0x18
lbl_80547880 = .data:0x80547880; // type:object size:0xC
lbl_8054788C = .data:0x8054788C; // type:object size:0xC
Expand Down Expand Up @@ -46054,7 +46054,7 @@ lbl_8057D0E0 = .sdata2:0x8057D0E0; // type:object size:0x8 data:double
lbl_8057D0E8 = .sdata2:0x8057D0E8; // type:object size:0x8 data:double
lbl_8057D0F0 = .sdata2:0x8057D0F0; // type:object size:0x4 data:float
lbl_8057D0F4 = .sdata2:0x8057D0F4; // type:object size:0x4 data:float
lbl_8057D0F8 = .sdata2:0x8057D0F8; // type:object size:0x8 data:float
lbl_8057D0F8 = .sdata2:0x8057D0F8; // type:object size:0x4 data:float
lbl_8057D100 = .sdata2:0x8057D100; // type:object size:0x4 data:float
lbl_8057D104 = .sdata2:0x8057D104; // type:object size:0x4 data:float
lbl_8057D108 = .sdata2:0x8057D108; // type:object size:0x4 data:float
Expand All @@ -46069,7 +46069,7 @@ lbl_8057D128 = .sdata2:0x8057D128; // type:object size:0x4 data:float
lbl_8057D12C = .sdata2:0x8057D12C; // type:object size:0x4 data:float
lbl_8057D130 = .sdata2:0x8057D130; // type:object size:0x4 data:float
lbl_8057D134 = .sdata2:0x8057D134; // type:object size:0x4 data:float
lbl_8057D138 = .sdata2:0x8057D138; // type:object size:0x8 data:float
lbl_8057D138 = .sdata2:0x8057D138; // type:object size:0x4 data:float
lbl_8057D140 = .sdata2:0x8057D140; // type:object size:0x8 data:float
lbl_8057D148 = .sdata2:0x8057D148; // type:object size:0x4 data:float
lbl_8057D14C = .sdata2:0x8057D14C; // type:object size:0x4 data:float
Expand Down
10 changes: 7 additions & 3 deletions include/d/a/d_a_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,17 @@ class dAcBase_c : public dBase_c {
void copyPosition() {
pos_copy = position;
}
void copyRotation() {
rot_copy = rotation;
}

const mVec3_c &GetPostion() const {
mVec3_c &GetPostion() {
return position;
}
void copyRotation() {
rot_copy = rotation;
mAng3_c &GetRotation() {
return rotation;
}

mVec3_c GetPostionDifference(const dAcBase_c &other) {
return position - other.position;
}
Expand Down
46 changes: 46 additions & 0 deletions include/d/a/d_a_player.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,49 @@
#include <d/a/obj/d_a_obj_base.h>

class dAcPy_c : public dAcObjBase_c {
// See Below for some info
// https://github.com/lepelog/skywardsword-tools/wiki/Player-Actor
public:
// These Flags are named under general guesses. Very likely may need some changes
// Correspond to mActionFlags
enum dAcPy_FLG0 {
FLG0_ON_FOOT = 0x80000000,
FLG0_USE_ITEM_0 = 0x40000000,
FLG0_USE_ITEM_1 = 0x20000000,
FLG0_UNK_GEN_MOVE = 0x10000000,
FLG0_ATTACK_MOVE = 0x8000000,
FLG0_USE_ITEM_2 = 0x4000000,
FLG0_RECOVER_ELEC = 0x2000000,
FLG0_CRAWLING = 0x1000000,
FLG0_TIGHT_ROPE = 0x800000,
FLG0_SWING_ROPE = 0x400000,
FLG0_PUSHPULL = 0x200000,
FLG0_UNK_100000 = 0x100000,
FLG0_UNK_80000 = 0x80000,
FLG0_IN_WATER = 0x40000,
FLG0_ON_LADDDER = 0x20000,
FLG0_ON_VINES = 0x10000,
FLG0_UNK_0x8000 = 0x8000,
FLG0_UNK_0x4000 = 0x4000,
FLG0_INTERATION = 0x2000,
FLG0_BASIC_ACTION = 0x1000,
FLG0_HANGING_ITEM = 0x800,
FLG0_EXTERN_CONTROL = 0x400,
FLG0_ATTACK_RELATED = 0x200,
FLG0_UNK_0x100 = 0x100,
FLG0_UNK_0x80 = 0x80,
FLG0_HANGING_LEDGE = 0x40,
FLG0_UNK_0x20 = 0x20,
FLG0_UNK_0x10 = 0x10,
FLG0_DAMAGED = 0x8,
FLG0_UNK_0x4 = 0x4,
FLG0_IN_AIR = 0x2,
FLG0_STATIONARY = 0x1,

FLG0_FLY = FLG0_TIGHT_ROPE | FLG0_SWING_ROPE | FLG0_IN_WATER | FLG0_ON_LADDDER | FLG0_ON_VINES |
FLG0_HANGING_ITEM | FLG0_HANGING_LEDGE | FLG0_UNK_0x10 | FLG0_IN_AIR,
};

dAcPy_c();
virtual ~dAcPy_c();

Expand Down Expand Up @@ -190,5 +232,9 @@ class dAcPy_c : public dAcObjBase_c {
return (someFlags_0x350 & mask) != 0;
}

bool CheckPlayerFly() const {
return mActionFlags & FLG0_FLY;
}

static dAcPy_c *LINK;
};
15 changes: 13 additions & 2 deletions include/d/a/obj/d_a_obj_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ class dAcObjBase_c : public dAcBase_c {
/* 0x108 */ char _1[12];
/* 0x114 */ u16 targetFiTextId;
/* 0x116 */ u8 unkByteTargetFiRelated;
/* 0x118 */ mVec3_c poscopy1;
/* 0x118 */ mVec3_c mOldPosition;
/* 0x124 */ mVec3_c poscopy2;
/* 0x130 */ mVec3_c poscopy3;
/* 0x13C */ mAng3_c rotcopy1;
/* 0x13C */ mAng3_c angle;
/* 0x144 */ f32 forwardSpeed;
/* 0x148 */ f32 forwardAccel;
/* 0x14C */ f32 forwardMaxSpeed;
Expand All @@ -78,6 +78,16 @@ class dAcObjBase_c : public dAcBase_c {
/* 0x32C */ u32 mField_0x32C;

public:
mVec3_c &GetOldPosition() {
return mOldPosition;
}
mVec3_c &GetVelocity() {
return velocity;
}
mAng3_c &GetAngle() {
return angle;
}

// could be their own thing?
/* 8002de40 */ static void *getOarcFile(const char *oarcName, const char *fileName);
/* 8002de60 */ static void *getOarcSubEntry(const char *oarcName, const char *fileName);
Expand Down Expand Up @@ -154,6 +164,7 @@ class dAcObjBase_c : public dAcBase_c {
);

protected:
// TODO May be cM3dGAab (has a very similar set func)
inline void setBoundingBox(mVec3_c min, mVec3_c max) {
boundingBox.min = min;
boundingBox.max = max;
Expand Down
5 changes: 4 additions & 1 deletion include/d/col/bg/d_bg_s.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include "d/a/d_a_base.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/a/obj/d_a_obj_bg.h"
#include "d/col/bg/d_bg_s_sph_chk.h"
#include "d/col/bg/d_bg_w.h"
#include "d/col/bg/d_bg_w_base.h"
#include "d/col/bg/d_bg_w_kcol.h"
Expand Down Expand Up @@ -247,6 +246,10 @@ class dBgS : public cBgS {
int GetLightingCode(const mVec3_c *);
bool GetPolyPreventObjOnly(const cBgS_PolyInfo &);
bool GetMapGradationColor(GXColor *);

bool WaterChk(dBgS_SplGrpChk *chk) {
return SplGrpChk(chk);
}
};

void dBgS_MoveBGProc_Trans(
Expand Down
Loading

0 comments on commit 5fed03d

Please sign in to comment.