Skip to content

Commit e720314

Browse files
elijah-thomas774elijah-thomas774
committed
Maybe some more
1 parent a07b487 commit e720314

6 files changed

Lines changed: 836 additions & 140 deletions

File tree

‎config/SOUE01/splits.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1450,7 +1450,7 @@ d/a/obj/d_a_obj_boomerang.cpp:
14501450
.sdata start:0x805739D8 end:0x80573A30
14511451
.sbss start:0x80575900 end:0x80575908
14521452
.sdata2 start:0x8057C0F8 end:0x8057C180
1453-
.bss start:0x805B4BF0 end:0x805B4DD8
1453+
.bss start:0x805B4BE0 end:0x805B4DD8
14541454

14551455
d/a/obj/d_a_obj_fairy.cpp:
14561456
.text start:0x80265620 end:0x80268598 align:16

‎config/SOUE01/symbols.txt‎

Lines changed: 61 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -3522,7 +3522,7 @@ ActorEventRelated__somethingUpdate = .text:0x8009CCC0; // type:function size:0x1
35223522
ActorEventRelated__cutEnd = .text:0x8009CEB0; // type:function size:0x30
35233523
ActorEventRelated__getCurrentStepIndex = .text:0x8009CEE0; // type:function size:0x30
35243524
getCurrentEventCommand__17ActorEventRelatedCFv = .text:0x8009CF10; // type:function size:0x84
3525-
ActorEventRelated__getSomeEventRelatedNumber = .text:0x8009CFA0; // type:function size:0x80
3525+
getSomeEventRelatedNumber__17ActorEventRelatedFv = .text:0x8009CFA0; // type:function size:0x80
35263526
isAdvance__17ActorEventRelatedFv = .text:0x8009D020; // type:function size:0x34
35273527
advanceNext__17ActorEventRelatedFv = .text:0x8009D060; // type:function size:0x50
35283528
ActorEventRelated__getSingleIntData2 = .text:0x8009D0B0; // type:function size:0x8C
@@ -10729,7 +10729,7 @@ fn_8019E200 = .text:0x8019E200; // type:function size:0x18C
1072910729
fn_8019E390 = .text:0x8019E390; // type:function size:0xC
1073010730
getCameraYRot = .text:0x8019E3A0; // type:function size:0x8
1073110731
fn_8019E3B0 = .text:0x8019E3B0; // type:function size:0xC
10732-
fn_8019E3C0 = .text:0x8019E3C0; // type:function size:0x44
10732+
fn_8019E3C0__9dCamera_cCFv = .text:0x8019E3C0; // type:function size:0x44
1073310733
fn_8019E410 = .text:0x8019E410; // type:function size:0x1C
1073410734
fn_8019E430 = .text:0x8019E430; // type:function size:0x18
1073510735
fn_8019E450 = .text:0x8019E450; // type:function size:0x7C
@@ -11972,7 +11972,7 @@ fn_801E2DD0 = .text:0x801E2DD0; // type:function size:0x38
1197211972
fn_801E2E10 = .text:0x801E2E10; // type:function size:0x54
1197311973
fn_801E2E70 = .text:0x801E2E70; // type:function size:0x74
1197411974
fn_801E2EF0 = .text:0x801E2EF0; // type:function size:0xD0
11975-
fn_801E2FC0 = .text:0x801E2FC0; // type:function size:0x1A0
11975+
spawnItemHitEffect__7dAcPy_cFRC7mVec3_cRC13cBgS_PolyInfof = .text:0x801E2FC0; // type:function size:0x1A0
1197611976
isBWheelItemNotRestricted = .text:0x801E3160; // type:function size:0xB0
1197711977
hasUsableItem = .text:0x801E3210; // type:function size:0x40
1197811978
fn_801E3250 = .text:0x801E3250; // type:function size:0x78
@@ -12418,7 +12418,7 @@ getHeightStateForHeldItem = .text:0x80204920; // type:function size:0x30
1241812418
ActorLink__canThrowObject = .text:0x80204950; // type:function size:0x4C
1241912419
ActorLink__canRollObject = .text:0x802049A0; // type:function size:0x4C
1242012420
fn_802049F0 = .text:0x802049F0; // type:function size:0x20
12421-
fn_80204A10 = .text:0x80204A10; // type:function size:0x178
12421+
setGuide__7dAcPy_cFP12dAcObjBase_c = .text:0x80204A10; // type:function size:0x178
1242212422
fn_80204B90 = .text:0x80204B90; // type:function size:0xC
1242312423
ActorLink__relatedToThrowing = .text:0x80204BA0; // type:function size:0x164
1242412424
fn_80204D10 = .text:0x80204D10; // type:function size:0xA8
@@ -12739,33 +12739,33 @@ fn_8021A970 = .text:0x8021A970; // type:function size:0xFC
1273912739
ActorLink__equipBeetle = .text:0x8021AA70; // type:function size:0x270
1274012740
fn_8021ACE0 = .text:0x8021ACE0; // type:function size:0x2D8
1274112741
ActorLink__equipSpawnBeetle = .text:0x8021AFC0; // type:function size:0x80
12742-
fn_8021B040 = .text:0x8021B040; // type:function size:0x20
12743-
getBeetleHeldActor = .text:0x8021B060; // type:function size:0x1C
12744-
getBeetleActor = .text:0x8021B080; // type:function size:0x8
12745-
getBeetleFlightTime = .text:0x8021B090; // type:function size:0x50
12746-
getBettleAngle0 = .text:0x8021B0E0; // type:function size:0x28
12747-
getBettleAngle1 = .text:0x8021B110; // type:function size:0x28
12748-
getBeetleWingAngleActive = .text:0x8021B140; // type:function size:0x8
12749-
getBeetleWingAngleInactive = .text:0x8021B150; // type:function size:0x8
12750-
getBeetleNormalSpeed = .text:0x8021B160; // type:function size:0x8
12751-
getBeetleQuickSpeed = .text:0x8021B170; // type:function size:0x8
12752-
getBeetleMaxRange = .text:0x8021B180; // type:function size:0x8
12753-
getBeetleLargeRadius = .text:0x8021B190; // type:function size:0x8
12754-
getBeetleSmallRadius = .text:0x8021B1A0; // type:function size:0x8
12755-
getBeetleMaxHeightOffset = .text:0x8021B1B0; // type:function size:0x8
12756-
getBeetleSmallAngle0 = .text:0x8021B1C0; // type:function size:0x28
12757-
getBeetleSmallAngle1 = .text:0x8021B1F0; // type:function size:0x28
12758-
getBeetleBonkRecoilAngle = .text:0x8021B220; // type:function size:0x28
12759-
getBeetleSmallAngle2 = .text:0x8021B250; // type:function size:0x28
12760-
fn_8021B280 = .text:0x8021B280; // type:function size:0x8
12761-
fn_8021B290 = .text:0x8021B290; // type:function size:0x8
12762-
fn_8021B2A0 = .text:0x8021B2A0; // type:function size:0x8
12763-
getBeetleWarningTimeLeft__7dAcPy_cFv = .text:0x8021B2B0; // type:function size:0x8
12764-
fn_8021B2C0 = .text:0x8021B2C0; // type:function size:0x8
12742+
unkBeetle_8021B040__7dAcPy_cFP12dAcObjBase_c = .text:0x8021B040; // type:function size:0x20
12743+
getBeetleHeldActor__7dAcPy_cCFv = .text:0x8021B060; // type:function size:0x1C
12744+
getBeetleActor__7dAcPy_cCFv = .text:0x8021B080; // type:function size:0x8
12745+
getBeetleFlightTime__7dAcPy_cCFv = .text:0x8021B090; // type:function size:0x50
12746+
getBeetleAngle0__7dAcPy_cCFv = .text:0x8021B0E0; // type:function size:0x28
12747+
getBeetleAngle1__7dAcPy_cCFv = .text:0x8021B110; // type:function size:0x28
12748+
getBeetleWingAngleActive__7dAcPy_cCFv = .text:0x8021B140; // type:function size:0x8
12749+
getBeetleWingAngleInactive__7dAcPy_cCFv = .text:0x8021B150; // type:function size:0x8
12750+
getBeetleNormalSpeed__7dAcPy_cCFv = .text:0x8021B160; // type:function size:0x8
12751+
getBeetleQuickSpeed__7dAcPy_cCFv = .text:0x8021B170; // type:function size:0x8
12752+
getBeetleMaxRange__7dAcPy_cCFv = .text:0x8021B180; // type:function size:0x8
12753+
getBeetleLargeRadius__7dAcPy_cCFv = .text:0x8021B190; // type:function size:0x8
12754+
getBeetleSmallRadius__7dAcPy_cCFv = .text:0x8021B1A0; // type:function size:0x8
12755+
getBeetleMaxHeightOffset__7dAcPy_cCFv = .text:0x8021B1B0; // type:function size:0x8
12756+
getBeetleSmallAngle0__7dAcPy_cCFv = .text:0x8021B1C0; // type:function size:0x28
12757+
getBeetleSmallAngle1__7dAcPy_cCFv = .text:0x8021B1F0; // type:function size:0x28
12758+
getBeetleBonkRecoilAngle__7dAcPy_cCFv = .text:0x8021B220; // type:function size:0x28
12759+
getBeetleSmallAngle2__7dAcPy_cCFv = .text:0x8021B250; // type:function size:0x28
12760+
getBeetle_8021B280__7dAcPy_cCFv = .text:0x8021B280; // type:function size:0x8
12761+
getBeetle_8021B290__7dAcPy_cCFv = .text:0x8021B290; // type:function size:0x8
12762+
getBeetle_8021B2A0__7dAcPy_cCFv = .text:0x8021B2A0; // type:function size:0x8
12763+
getBeetleWarningTimeLeft__7dAcPy_cCFv = .text:0x8021B2B0; // type:function size:0x8
12764+
getBeetleUnkTimeLeft__7dAcPy_cCFv = .text:0x8021B2C0; // type:function size:0x8
1276512765
checkBeetleItemRetrieve = .text:0x8021B2D0; // type:function size:0xAC
1276612766
setBeetleFlashClr__7dAcPy_cFRC6mColor = .text:0x8021B380; // type:function size:0x48
1276712767
setBeetleBackAnim__7dAcPy_cFv = .text:0x8021B3D0; // type:function size:0x48
12768-
setBeetleReleasedObject = .text:0x8021B420; // type:function size:0x38
12768+
setBeetleReleasedObject__7dAcPy_cFP12dAcObjBase_c = .text:0x8021B420; // type:function size:0x38
1276912769
getBeetleActorPtr = .text:0x8021B460; // type:function size:0x7C
1277012770
strippedBeetleFunction = .text:0x8021B4E0; // type:function size:0x4
1277112771
checkUsingBeetleAnim = .text:0x8021B4F0; // type:function size:0x50
@@ -13138,7 +13138,7 @@ fn_8023B4D0 = .text:0x8023B4D0; // type:function size:0x4C
1313813138
fn_8023B520 = .text:0x8023B520; // type:function size:0x6C
1313913139
fn_8023B590 = .text:0x8023B590; // type:function size:0x70
1314013140
moveLinkToCoordinatesMaybe = .text:0x8023B600; // type:function size:0x438
13141-
fn_8023BA40 = .text:0x8023BA40; // type:function size:0xAC
13141+
fn_8023BA40__7dAcPy_cCF4mAng4mAng = .text:0x8023BA40; // type:function size:0xAC
1314213142
fn_8023BAF0 = .text:0x8023BAF0; // type:function size:0x6C
1314313143
checkMinigameStateBitset = .text:0x8023BB60; // type:function size:0x13C
1314413144
checkInsectCaptureGameState = .text:0x8023BCA0; // type:function size:0x4
@@ -14120,17 +14120,17 @@ retrieve__14dAcBoomerang_cFv = .text:0x80261C20; // type:function size:0x88
1412014120
doDelete__14dAcBoomerang_cFv = .text:0x80261CB0; // type:function size:0x8
1412114121
setRoomId__14dAcBoomerang_cFv = .text:0x80261CC0; // type:function size:0x68
1412214122
placeOnArm__14dAcBoomerang_cFv = .text:0x80261D30; // type:function size:0xDC
14123-
fn_80261E10 = .text:0x80261E10; // type:function size:0x338
14124-
fn_80262150 = .text:0x80262150; // type:function size:0x54
14125-
calcBeetleVelocity_y = .text:0x802621B0; // type:function size:0x12C
14126-
fn_802622E0 = .text:0x802622E0; // type:function size:0xA4
14127-
fn_80262390 = .text:0x80262390; // type:function size:0x64
14128-
fn_80262400 = .text:0x80262400; // type:function size:0x48C
14129-
fn_80262890 = .text:0x80262890; // type:function size:0x22C
14130-
fn_80262AC0 = .text:0x80262AC0; // type:function size:0x120
14131-
fn_80262BE0 = .text:0x80262BE0; // type:function size:0x1E0
14132-
fn_80262DC0 = .text:0x80262DC0; // type:function size:0x13C
14133-
bonk__14dAcBoomerang_cFv = .text:0x80262F00; // type:function size:0x2C
14123+
fn_80261E10__14dAcBoomerang_cFv = .text:0x80261E10; // type:function size:0x338
14124+
fn_80262150__14dAcBoomerang_cFv = .text:0x80262150; // type:function size:0x54
14125+
calcVelocity__14dAcBoomerang_cFv = .text:0x802621B0; // type:function size:0x12C
14126+
playFlySound__14dAcBoomerang_cFv = .text:0x802622E0; // type:function size:0xA4
14127+
startHitEffect__14dAcBoomerang_cFRC7mVec3_cRC13cBgS_PolyInfo = .text:0x80262390; // type:function size:0x64
14128+
fn_80262400__14dAcBoomerang_cFv = .text:0x80262400; // type:function size:0x48C
14129+
getCollidingPolyInfo__14dAcBoomerang_cFR7mVec3_c = .text:0x80262890; // type:function size:0x22C
14130+
tryGrabObject__14dAcBoomerang_cFP12dAcObjBase_c = .text:0x80262AC0; // type:function size:0x120
14131+
fn_80262BE0__14dAcBoomerang_cFv = .text:0x80262BE0; // type:function size:0x1E0
14132+
fn_80262DC0__14dAcBoomerang_cFv = .text:0x80262DC0; // type:function size:0x13C
14133+
startRumble__14dAcBoomerang_cFv = .text:0x80262F00; // type:function size:0x2C
1413414134
setChrAnimation__14dAcBoomerang_cFQ214dAcBoomerang_c14ChrAnimation_e = .text:0x80262F30; // type:function size:0x154
1413514135
setFlyChrAnimation__14dAcBoomerang_cFQ214dAcBoomerang_c14FlyAnimation_e = .text:0x80263090; // type:function size:0xE4
1413614136
setRemainingFlightTime__14dAcBoomerang_cFs = .text:0x80263180; // type:function size:0x50
@@ -14155,7 +14155,7 @@ actorExecute__14dAcBoomerang_cFv = .text:0x80264870; // type:function size:0x45C
1415514155
executeState__83sStateMgr_c<14dAcBoomerang_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80264CD0; // type:function size:0x10
1415614156
draw__14dAcBoomerang_cFv = .text:0x80264CE0; // type:function size:0x160
1415714157
create__18dAcBoomerangProc_cFPQ23m3d5mdl_c6mColoriP12mAllocator_c = .text:0x80264E40; // type:function size:0x88
14158-
fn_80264ED0 = .text:0x80264ED0; // type:function size:0x80
14158+
drawOpa__18dAcBoomerangProc_cFv = .text:0x80264ED0; // type:function size:0x80
1415914159
build__30sFStateFct_c<14dAcBoomerang_c>FRC12sStateIDIf_c = .text:0x80264F50; // type:function size:0x60
1416014160
dispose__30sFStateFct_c<14dAcBoomerang_c>FRP10sStateIf_c = .text:0x80264FB0; // type:function size:0xC
1416114161
initialize__27sFState_c<14dAcBoomerang_c>Fv = .text:0x80264FC0; // type:function size:0x1C
@@ -17870,7 +17870,7 @@ fn_802F25E0 = .text:0x802F25E0; // type:function size:0x19C
1787017870
fn_802F2780__7mQuat_cFRC7mQuat_c = .text:0x802F2780; // type:function size:0x198
1787117871
fn_802F2920 = .text:0x802F2920; // type:function size:0x48
1787217872
createProjectionXZ__7mVec3_cFRC7mAng3_cf = .text:0x802F2970; // type:function size:0x110
17873-
mVec__fromXY = .text:0x802F2A80; // type:function size:0xF0
17873+
fromXY__7mVec3_cFRC4mAngRC4mAngf = .text:0x802F2A80; // type:function size:0xF0
1787417874
normalize__7mVec3_cFv = .text:0x802F2B70; // type:function size:0x78
1787517875
normalizeRS__7mVec3_cFv = .text:0x802F2BF0; // type:function size:0x84
1787617876
rotX__7mVec3_cFRC4mAng = .text:0x802F2C80; // type:function size:0xA8
@@ -19802,7 +19802,7 @@ Init__15dBgS_Acch_0x1A8Fv = .text:0x80359B40; // type:function size:0x28
1980219802
CalcPos__15dBgS_Acch_0x1A8FP7mVec3_c = .text:0x80359B70; // type:function size:0x4C
1980319803
fn_80359BC0 = .text:0x80359BC0; // type:function size:0x84
1980419804
fn_80359C50 = .text:0x80359C50; // type:function size:0x1C
19805-
fn_80359C70 = .text:0x80359C70; // type:function size:0x8
19805+
GetField_0x1C__15dBgS_Acch_0x1A8CFv = .text:0x80359C70; // type:function size:0x8
1980619806
fn_80359C80 = .text:0x80359C80; // type:function size:0xA0
1980719807
__ct__9dSndMgr_cFv = .text:0x80359D20; // type:function size:0x9C
1980819808
setup__9dSndMgr_cFPQ23EGG4HeapUl = .text:0x80359DC0; // type:function size:0xEC
@@ -36087,7 +36087,7 @@ lbl_805348F8 = .data:0x805348F8; // type:object size:0x30
3608736087
lbl_80534928 = .data:0x80534928; // type:object size:0x18
3608836088
lbl_80534940 = .data:0x80534940; // type:object size:0x15C
3608936089
lbl_80534A9C = .data:0x80534A9C; // type:object size:0x34
36090-
AcBoomerang__colliderInit = .data:0x80534AD0; // type:object size:0x30
36090+
sSphSrc__14dAcBoomerang_c = .data:0x80534AD0; // type:object size:0x30
3609136091
g_profile_BOOMERANG = .data:0x80534B00; // type:object size:0x10
3609236092
lbl_80534B10 = .data:0x80534B10; // type:object size:0xC data:string
3609336093
lbl_80534B1C = .data:0x80534B1C; // type:object size:0x1C data:string
@@ -36097,9 +36097,10 @@ lbl_80534B50 = .data:0x80534B50; // type:object size:0x10
3609736097
__vt__14dAcBoomerang_c = .data:0x80534B60; // type:object size:0x80
3609836098
__vt__53sFStateMgr_c<14dAcBoomerang_c,20sStateMethodUsr_FI_c> = .data:0x80534BE0; // type:object size:0x30
3609936099
__vt__83sStateMgr_c<14dAcBoomerang_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x80534C10; // type:object size:0x30
36100-
__vt__30sFStateFct_c<14dAcBoomerang_c> = .data:0x80534C40; // type:object size:0x18
36100+
__vt__30sFStateFct_c<14dAcBoomerang_c> = .data:0x80534C40; // type:object size:0x14
3610136101
__vt__27sFState_c<14dAcBoomerang_c> = .data:0x80534C58; // type:object size:0x18
36102-
__vt__18dAcBoomerangProc_c = .data:0x80534C70; // type:object size:0x1D0
36102+
__vt__18dAcBoomerangProc_c = .data:0x80534C70; // type:object size:0x2C
36103+
lbl_80534C9C = .data:0x80534C9C; // type:object size:0x1A4
3610336104
lbl_80534E40 = .data:0x80534E40; // type:object size:0x38
3610436105
g_profile_OBJ_FAIRY = .data:0x80534E78; // type:object size:0x10
3610536106
...data.0 = .data:0x80534E78; // type:label scope:local
@@ -51935,13 +51936,20 @@ AcArrow__STATE_MOVE = .bss:0x805B4AE0; // type:object size:0x80 data:4byte
5193551936
AcArrow__STATE_BG_STOP = .bss:0x805B4B60; // type:object size:0x40 data:4byte
5193651937
AcArrow__STATE_BOUND = .bss:0x805B4BA0; // type:object size:0x30 data:4byte
5193751938
lbl_805B4BD0 = .bss:0x805B4BD0; // type:object size:0x10 align:4 data:float
51938-
lbl_805B4BE0 = .bss:0x805B4BE0; // type:object size:0x10
51939-
lbl_805B4BF0 = .bss:0x805B4BF0; // type:object size:0xA8
51940-
StateID_Wait__14dAcBoomerang_c = .bss:0x805B4C98; // type:object size:0x40 data:4byte
51941-
StateID_Move__14dAcBoomerang_c = .bss:0x805B4CD8; // type:object size:0x40 data:4byte
51942-
StateID_MoveCancelWait__14dAcBoomerang_c = .bss:0x805B4D18; // type:object size:0x40 data:4byte
51943-
StateID_ReturnWait__14dAcBoomerang_c = .bss:0x805B4D58; // type:object size:0x40 data:4byte
51944-
StateID_EventReturnWait__14dAcBoomerang_c = .bss:0x805B4D98; // type:object size:0x40 data:4byte
51939+
...bss.0 = .bss:0x805B4BE0; // type:label scope:local
51940+
@25908 = .bss:0x805B4BE0; // type:object size:0xC scope:local
51941+
sLinChk__14dAcBoomerang_c = .bss:0x805B4BF0; // type:object size:0x98
51942+
@25916 = .bss:0x805B4C88; // type:object size:0xC scope:local
51943+
StateID_Wait__14dAcBoomerang_c = .bss:0x805B4C98; // type:object size:0x30 data:4byte
51944+
@25920 = .bss:0x805B4CC8; // type:object size:0xC scope:local
51945+
StateID_Move__14dAcBoomerang_c = .bss:0x805B4CD8; // type:object size:0x30 data:4byte
51946+
@25924 = .bss:0x805B4D08; // type:object size:0xC scope:local
51947+
StateID_MoveCancelWait__14dAcBoomerang_c = .bss:0x805B4D18; // type:object size:0x30 data:4byte
51948+
@25928 = .bss:0x805B4D48; // type:object size:0xC scope:local
51949+
StateID_ReturnWait__14dAcBoomerang_c = .bss:0x805B4D58; // type:object size:0x30 data:4byte
51950+
@25932 = .bss:0x805B4D88; // type:object size:0xC scope:local
51951+
StateID_EventReturnWait__14dAcBoomerang_c = .bss:0x805B4D98; // type:object size:0x30 data:4byte
51952+
@LOCAL@draw__14dAcBoomerang_cFv@shadow = .bss:0x805B4DC8; // type:object size:0x10 scope:local data:4byte
5194551953
@25786 = .bss:0x805B4DD8; // type:object size:0xC scope:local
5194651954
...bss.0 = .bss:0x805B4DD8; // type:label scope:local
5194751955
StateID_Wait__11dAcOFairy_c = .bss:0x805B4DE8; // type:object size:0x30 data:4byte

‎include/d/a/d_a_player.h‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,35 @@ class dAcPy_c : public daPlayerModelBase_c {
3939

4040
public:
4141
// Beetle Functions [0x8021AA70 - 0x8021BE20]
42-
s16 getBeetleFlightTime();
43-
mAng getBeetleAngle0();
44-
mAng getBeetleAngle1();
45-
f32 getBeetleWingAngleActive();
46-
f32 getBeetleWingAngleInactive();
47-
f32 getBeetleNormalSpeed();
48-
f32 getBeetleQuickSpeed();
49-
f32 getBeetleMaxRange();
50-
f32 getBeetleLargeRadius();
51-
f32 getBeetleSmallRadius();
52-
f32 getBeetleMaxHeightOffset();
53-
mAng getBeetleSmallAngle0();
54-
mAng getBeetleSmallAngle1();
55-
mAng getBeetleBonkRecoilAngle();
56-
mAng getBeetleSmallAngle2();
42+
mAng fn_8023BA40(mAng p1, mAng p2) const;
43+
bool unkBeetle_8021B040(dAcObjBase_c *);
44+
s16 getBeetleFlightTime() const;
45+
mAng getBeetleAngle0() const;
46+
mAng getBeetleAngle1() const;
47+
f32 getBeetleWingAngleActive() const;
48+
f32 getBeetleWingAngleInactive() const;
49+
f32 getBeetleNormalSpeed() const;
50+
f32 getBeetleQuickSpeed() const;
51+
f32 getBeetleMaxRange() const;
52+
f32 getBeetleLargeRadius() const;
53+
f32 getBeetleSmallRadius() const;
54+
f32 getBeetleMaxHeightOffset() const;
55+
mAng getBeetleSmallAngle0() const;
56+
mAng getBeetleSmallAngle1() const;
57+
mAng getBeetleBonkRecoilAngle() const;
58+
mAng getBeetleSmallAngle2() const;
59+
f32 getBeetle_8021B280() const;
60+
f32 getBeetle_8021B290() const;
61+
u8 getBeetle_8021B2A0() const;
5762
void setBeetleFlashClr(const mColor &);
5863
void setBeetleBackAnim();
59-
s32 getBeetleWarningTimeLeft();
64+
int getBeetleWarningTimeLeft() const;
65+
s16 getBeetleUnkTimeLeft() const;
66+
void setBeetleReleasedObject(dAcObjBase_c *pObj);
67+
68+
// Responsible for taking in some collision Poly Info and playing the related effect.
69+
// Used on Impact
70+
static void spawnItemHitEffect(const mVec3_c &position, const cBgS_PolyInfo &polyInfo, f32 scale);
6071

6172
// Item select/equip/use functions [0x801E3160 - 0x801E7AD0] ?
6273
static s32 calcItemWheelSelection(bool reset, s32 numOptions);
@@ -121,6 +132,7 @@ class dAcPy_c : public daPlayerModelBase_c {
121132

122133
static u32 getCurrentHealthCapacity();
123134

135+
void setGuide(dAcObjBase_c *);
124136
bool canDowseProbably() const;
125137

126138
mAng fn_8023B520() const;

0 commit comments

Comments
 (0)