Skip to content

Commit 9e438be

Browse files
robojumperrobojumper
committed
d_lyt_drop_line OK
1 parent c51e2ea commit 9e438be

File tree

4 files changed

+72
-59
lines changed

4 files changed

+72
-59
lines changed

‎config/SOUE01/symbols.txt‎

Lines changed: 58 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -15065,10 +15065,10 @@ isSameName__28sFStateID_c<13dLytSaveMgr_c>CFPCc = .text:0x80286C00; // type:func
1506515065
__ct__18dLytDropLine_HIO_cFv = .text:0x80286C90; // type:function size:0x28
1506615066
__dt__18dLytDropLine_HIO_cFv = .text:0x80286CC0; // type:function size:0x40
1506715067
create__19dLytDropLineParts_cFP14dLytDropLine_c = .text:0x80286D00; // type:function size:0x58
15068-
changeState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x80286D60; // type:function size:0x10
15068+
changeState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x80286D60; // type:function size:0x10 scope:weak
1506915069
doDelete__19dLytDropLineParts_cFv = .text:0x80286D70; // type:function size:0x8
1507015070
execute__19dLytDropLineParts_cFv = .text:0x80286D80; // type:function size:0x30
15071-
executeState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80286DB0; // type:function size:0x10
15071+
executeState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80286DB0; // type:function size:0x10 scope:weak
1507215072
draw__19dLytDropLineParts_cFv = .text:0x80286DC0; // type:function size:0x8
1507315073
startPickup__19dLytDropLineParts_cF7mVec3_cl = .text:0x80286DD0; // type:function size:0x74
1507415074
startChange__19dLytDropLineParts_cF7mVec3_clb = .text:0x80286E50; // type:function size:0x44
@@ -15080,12 +15080,12 @@ initializeState_Move__19dLytDropLineParts_cFv = .text:0x80286F40; // type:functi
1508015080
executeState_Move__19dLytDropLineParts_cFv = .text:0x802870A0; // type:function size:0x504
1508115081
finalizeState_Move__19dLytDropLineParts_cFv = .text:0x802875B0; // type:function size:0x4
1508215082
dLytDropLine_c_classInit__Fv = .text:0x802875C0; // type:function size:0x70
15083-
__ct__19dLytDropLineParts_cFv = .text:0x80287630; // type:function size:0x94
15084-
__dt__32sFState_c<19dLytDropLineParts_c>Fv = .text:0x802876D0; // type:function size:0x58
15085-
__dt__35sFStateFct_c<19dLytDropLineParts_c>Fv = .text:0x80287730; // type:function size:0x6C
15086-
__dt__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802877A0; // type:function size:0xA0
15087-
__dt__58sFStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c>Fv = .text:0x80287840; // type:function size:0xA4
15088-
__dt__19dLytDropLineParts_cFv = .text:0x802878F0; // type:function size:0xB8
15083+
__ct__19dLytDropLineParts_cFv = .text:0x80287630; // type:function size:0x94 scope:weak
15084+
__dt__32sFState_c<19dLytDropLineParts_c>Fv = .text:0x802876D0; // type:function size:0x58 scope:weak
15085+
__dt__35sFStateFct_c<19dLytDropLineParts_c>Fv = .text:0x80287730; // type:function size:0x6C scope:weak
15086+
__dt__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802877A0; // type:function size:0xA0 scope:weak
15087+
__dt__58sFStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c>Fv = .text:0x80287840; // type:function size:0xA4 scope:weak
15088+
__dt__19dLytDropLineParts_cFv = .text:0x802878F0; // type:function size:0xB8 scope:weak
1508915089
create__14dLytDropLine_cFv = .text:0x802879B0; // type:function size:0x28
1509015090
doDelete__14dLytDropLine_cFv = .text:0x802879E0; // type:function size:0x28
1509115091
execute__14dLytDropLine_cFv = .text:0x80287A10; // type:function size:0x30
@@ -15104,25 +15104,25 @@ startChangeInternal__14dLytDropLine_cFPQ34nw4r3lyt4PanePQ34nw4r3lyt4PaneQ29dAcIt
1510415104
finishPartInternal__14dLytDropLine_cFv = .text:0x80287E80; // type:function size:0x4C
1510515105
setPaneInternal__14dLytDropLine_cFPQ34nw4r3lyt4Pane = .text:0x80287ED0; // type:function size:0xBC
1510615106
getActivePaneInternal__14dLytDropLine_cFv = .text:0x80287F90; // type:function size:0x40
15107-
__dt__14dLytDropLine_cFv = .text:0x80287FD0; // type:function size:0x84
15108-
build__35sFStateFct_c<19dLytDropLineParts_c>FRC12sStateIDIf_c = .text:0x80288060; // type:function size:0x60
15109-
dispose__35sFStateFct_c<19dLytDropLineParts_c>FRP10sStateIf_c = .text:0x802880C0; // type:function size:0xC
15110-
initialize__32sFState_c<19dLytDropLineParts_c>Fv = .text:0x802880D0; // type:function size:0x1C
15111-
execute__32sFState_c<19dLytDropLineParts_c>Fv = .text:0x802880F0; // type:function size:0x1C
15112-
finalize__32sFState_c<19dLytDropLineParts_c>Fv = .text:0x80288110; // type:function size:0x1C
15113-
initializeState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80288130; // type:function size:0x10
15114-
finalizeState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80288140; // type:function size:0x10
15115-
refreshState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80288150; // type:function size:0x10
15116-
getState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80288160; // type:function size:0x10
15117-
getNewStateID__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80288170; // type:function size:0x10
15118-
getStateID__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80288180; // type:function size:0x10
15119-
getOldStateID__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80288190; // type:function size:0x10
15120-
finalizeState__34sFStateID_c<19dLytDropLineParts_c>CFR19dLytDropLineParts_c = .text:0x802881A0; // type:function size:0x30
15121-
executeState__34sFStateID_c<19dLytDropLineParts_c>CFR19dLytDropLineParts_c = .text:0x802881D0; // type:function size:0x30
15122-
initializeState__34sFStateID_c<19dLytDropLineParts_c>CFR19dLytDropLineParts_c = .text:0x80288200; // type:function size:0x30
15123-
__sinit_\d_lyt_drop_line_cpp = .text:0x80288230; // type:function size:0x1DC
15124-
__dt__34sFStateID_c<19dLytDropLineParts_c>Fv = .text:0x80288410; // type:function size:0x58
15125-
isSameName__34sFStateID_c<19dLytDropLineParts_c>CFPCc = .text:0x80288470; // type:function size:0x88
15107+
__dt__14dLytDropLine_cFv = .text:0x80287FD0; // type:function size:0x84 scope:weak
15108+
build__35sFStateFct_c<19dLytDropLineParts_c>FRC12sStateIDIf_c = .text:0x80288060; // type:function size:0x60 scope:weak
15109+
dispose__35sFStateFct_c<19dLytDropLineParts_c>FRP10sStateIf_c = .text:0x802880C0; // type:function size:0xC scope:weak
15110+
initialize__32sFState_c<19dLytDropLineParts_c>Fv = .text:0x802880D0; // type:function size:0x1C scope:weak
15111+
execute__32sFState_c<19dLytDropLineParts_c>Fv = .text:0x802880F0; // type:function size:0x1C scope:weak
15112+
finalize__32sFState_c<19dLytDropLineParts_c>Fv = .text:0x80288110; // type:function size:0x1C scope:weak
15113+
initializeState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80288130; // type:function size:0x10 scope:weak
15114+
finalizeState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80288140; // type:function size:0x10 scope:weak
15115+
refreshState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80288150; // type:function size:0x10 scope:weak
15116+
getState__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80288160; // type:function size:0x10 scope:weak
15117+
getNewStateID__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80288170; // type:function size:0x10 scope:weak
15118+
getStateID__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80288180; // type:function size:0x10 scope:weak
15119+
getOldStateID__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80288190; // type:function size:0x10 scope:weak
15120+
finalizeState__34sFStateID_c<19dLytDropLineParts_c>CFR19dLytDropLineParts_c = .text:0x802881A0; // type:function size:0x30 scope:weak
15121+
executeState__34sFStateID_c<19dLytDropLineParts_c>CFR19dLytDropLineParts_c = .text:0x802881D0; // type:function size:0x30 scope:weak
15122+
initializeState__34sFStateID_c<19dLytDropLineParts_c>CFR19dLytDropLineParts_c = .text:0x80288200; // type:function size:0x30 scope:weak
15123+
__sinit_\d_lyt_drop_line_cpp = .text:0x80288230; // type:function size:0x1DC scope:local
15124+
__dt__34sFStateID_c<19dLytDropLineParts_c>Fv = .text:0x80288410; // type:function size:0x58 scope:weak
15125+
isSameName__34sFStateID_c<19dLytDropLineParts_c>CFPCc = .text:0x80288470; // type:function size:0x88 scope:weak
1512615126
fn_80288500 = .text:0x80288500; // type:function size:0x14
1512715127
fn_80288520 = .text:0x80288520; // type:function size:0x28
1512815128
fn_80288550 = .text:0x80288550; // type:function size:0x40
@@ -36652,14 +36652,22 @@ __vt__26sFState_c<13dLytSaveMgr_c> = .data:0x80538340; // type:object size:0x18
3665236652
@27170 = .data:0x80538444; // type:object size:0x1E scope:local data:string
3665336653
__vt__28sFStateID_c<13dLytSaveMgr_c> = .data:0x80538464; // type:object size:0x34 scope:weak
3665436654
g_profile_LYT_DROP_LINE = .data:0x80538498; // type:object size:0xC
36655-
lbl_805384A4 = .data:0x805384A4; // type:object size:0xC
36656-
__vt__14dLytDropLine_c = .data:0x805384B0; // type:object size:0x50
36657-
__vt__58sFStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c> = .data:0x80538500; // type:object size:0x30
36658-
__vt__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x80538530; // type:object size:0x30
36659-
__vt__35sFStateFct_c<19dLytDropLineParts_c> = .data:0x80538560; // type:object size:0x14
36660-
__vt__32sFState_c<19dLytDropLineParts_c> = .data:0x80538578; // type:object size:0x18
36661-
lbl_80538590 = .data:0x80538590; // type:object size:0x90
36662-
__vt__34sFStateID_c<19dLytDropLineParts_c> = .data:0x80538620; // type:object size:0x34
36655+
...data.0 = .data:0x80538498; // type:label scope:local
36656+
__vt__18dLytDropLine_HIO_c = .data:0x805384A4; // type:object size:0xC
36657+
__vt__14dLytDropLine_c = .data:0x805384B0; // type:object size:0x4C
36658+
__vt__58sFStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c> = .data:0x80538500; // type:object size:0x30 scope:weak
36659+
__vt__88sStateMgr_c<19dLytDropLineParts_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x80538530; // type:object size:0x30 scope:weak
36660+
__vt__35sFStateFct_c<19dLytDropLineParts_c> = .data:0x80538560; // type:object size:0x14 scope:weak
36661+
__vt__32sFState_c<19dLytDropLineParts_c> = .data:0x80538578; // type:object size:0x18 scope:weak
36662+
@29381 = .data:0x80538590; // type:object size:0xC scope:local
36663+
@29382 = .data:0x8053859C; // type:object size:0xC scope:local
36664+
@29383 = .data:0x805385A8; // type:object size:0xC scope:local
36665+
@29384 = .data:0x805385B4; // type:object size:0xC scope:local
36666+
@29385 = .data:0x805385C0; // type:object size:0xC scope:local
36667+
@29386 = .data:0x805385CC; // type:object size:0xC scope:local
36668+
@29388 = .data:0x805385D8; // type:object size:0x22 scope:local data:string
36669+
@29389 = .data:0x805385FC; // type:object size:0x22 scope:local data:string
36670+
__vt__34sFStateID_c<19dLytDropLineParts_c> = .data:0x80538620; // type:object size:0x34 scope:weak
3666336671
g_profile_LYT_FORCE_LINE = .data:0x80538658; // type:object size:0xC
3666436672
lbl_80538664 = .data:0x80538664; // type:object size:0xC data:string
3666536673
lbl_80538670 = .data:0x80538670; // type:object size:0xC data:string
@@ -42443,8 +42451,8 @@ sDisp00ArrowLength__14dLytPauseMgr_c = .sbss:0x8057593C; // type:object size:0x4
4244342451
sInstance__14dLytPauseMgr_c = .sbss:0x80575940; // type:object size:0x4 data:4byte
4244442452
sInstance__17dLytGameOverMgr_c = .sbss:0x80575948; // type:object size:0x4 data:4byte
4244542453
sInstance__13dLytSaveMgr_c = .sbss:0x80575950; // type:object size:0x4 data:4byte
42446-
lbl_80575958 = .sbss:0x80575958; // type:object size:0x1 data:byte
42447-
lbl_80575959 = .sbss:0x80575959; // type:object size:0x1 data:byte
42454+
@GUARD@executeState_Move__19dLytDropLineParts_cFv@sColors1 = .sbss:0x80575958; // type:object size:0x1 scope:local data:byte
42455+
@GUARD@executeState_Move__19dLytDropLineParts_cFv@sColors2@0 = .sbss:0x80575959; // type:object size:0x1 scope:local data:byte
4244842456
sInstance__14dLytDropLine_c = .sbss:0x8057595C; // type:object size:0x4 data:4byte
4244942457
lbl_80575960 = .sbss:0x80575960; // type:object size:0x8 data:4byte
4245042458
lbl_80575968 = .sbss:0x80575968; // type:object size:0x8 data:4byte
@@ -48377,10 +48385,10 @@ lbl_8057C698 = .sdata2:0x8057C698; // type:object size:0x4 align:4 data:float
4837748385
lbl_8057C6A0 = .sdata2:0x8057C6A0; // type:object size:0x4 align:4 data:float
4837848386
lbl_8057C6A4 = .sdata2:0x8057C6A4; // type:object size:0x4 align:4 data:float
4837948387
lbl_8057C6A8 = .sdata2:0x8057C6A8; // type:object size:0x4 align:4 data:float
48380-
lbl_8057C6B0 = .sdata2:0x8057C6B0; // type:object size:0x4 align:4 data:float
48381-
lbl_8057C6B4 = .sdata2:0x8057C6B4; // type:object size:0x4 align:4 data:float
48382-
lbl_8057C6B8 = .sdata2:0x8057C6B8; // type:object size:0x8 align:8 data:double
48383-
lbl_8057C6C0 = .sdata2:0x8057C6C0; // type:object size:0x4 align:4 data:float
48388+
@28933 = .sdata2:0x8057C6B0; // type:object size:0x4 scope:local align:4 data:float
48389+
@28953 = .sdata2:0x8057C6B4; // type:object size:0x4 scope:local align:4 data:float
48390+
@28992 = .sdata2:0x8057C6B8; // type:object size:0x8 scope:local align:8 data:double
48391+
@29289 = .sdata2:0x8057C6C0; // type:object size:0x4 scope:local align:4 data:float
4838448392
lbl_8057C6C8 = .sdata2:0x8057C6C8; // type:object size:0x4 align:4 data:float
4838548393
lbl_8057C6CC = .sdata2:0x8057C6CC; // type:object size:0x4 align:4 data:float
4838648394
lbl_8057C6D0 = .sdata2:0x8057C6D0; // type:object size:0x8 align:8 data:double
@@ -52321,10 +52329,15 @@ StateID_FadeOut__13dLytSaveMgr_c = .bss:0x805B5F50; // type:object size:0x30 dat
5232152329
StateID_Select__13dLytSaveMgr_c = .bss:0x805B5F90; // type:object size:0x30 data:4byte
5232252330
@25088 = .bss:0x805B5FC0; // type:object size:0xC scope:local
5232352331
StateID_FadeIn__13dLytSaveMgr_c = .bss:0x805B5FD0; // type:object size:0x30 data:4byte
52324-
lbl_805B6000 = .bss:0x805B6000; // type:object size:0x10
52325-
lbl_805B6010 = .bss:0x805B6010; // type:object size:0x20
52326-
LytDropLineParts__STATE_WAIT = .bss:0x805B6030; // type:object size:0x40 data:4byte
52327-
LytDropLineParts__STATE_MOVE = .bss:0x805B6070; // type:object size:0x50 data:4byte
52332+
@25245 = .bss:0x805B6000; // type:object size:0xC scope:local
52333+
...bss.0 = .bss:0x805B6000; // type:label scope:local
52334+
sHio = .bss:0x805B6010; // type:object size:0x10 scope:local
52335+
@25260 = .bss:0x805B6020; // type:object size:0xC scope:local
52336+
StateID_Wait__19dLytDropLineParts_c = .bss:0x805B6030; // type:object size:0x30 data:4byte
52337+
@25264 = .bss:0x805B6060; // type:object size:0xC scope:local
52338+
StateID_Move__19dLytDropLineParts_c = .bss:0x805B6070; // type:object size:0x30 data:4byte
52339+
@LOCAL@executeState_Move__19dLytDropLineParts_cFv@sColors1 = .bss:0x805B60A0; // type:object size:0x10 scope:local
52340+
@LOCAL@executeState_Move__19dLytDropLineParts_cFv@sColors2@0 = .bss:0x805B60B0; // type:object size:0x10 scope:local
5232852341
lbl_805B60C0 = .bss:0x805B60C0; // type:object size:0x10
5232952342
lbl_805B60D0 = .bss:0x805B60D0; // type:object size:0x20
5233052343
LytForceLineParts__STATE_WAIT = .bss:0x805B60F0; // type:object size:0x40 data:4byte

‎configure.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ def MatchingFor(*versions):
647647
Object(Matching, "d/lyt/d_lyt_pause.cpp"),
648648
Object(NonMatching, "d/lyt/d_lyt_game_over.cpp"),
649649
Object(Matching, "d/lyt/d_lyt_save_mgr.cpp"),
650-
Object(NonMatching, "d/lyt/d_lyt_drop_line.cpp"),
650+
Object(Matching, "d/lyt/d_lyt_drop_line.cpp"),
651651
Object(NonMatching, "d/lyt/d_lyt_force_line.cpp"),
652652
Object(NonMatching, "d/lyt/d_lyt_enemy_icon.cpp"),
653653
Object(NonMatching, "d/lyt/d_lyt_mini_game.cpp"),

‎include/d/lyt/d_lyt_drop_line.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class dLytDropLineParts_c {
6060
/* 0x40 */ dEmitter_c mEmitter;
6161
/* 0x74 */ mVec3_c mStartPos;
6262
/* 0x80 */ mVec3_c mEffectPos;
63-
/* 0x8C */ mVec3_c field_0x8C;
63+
/* 0x8C */ mVec3_c mMoveLinearCoeff;
6464
/* 0x98 */ s32 mTrial;
6565
/* 0x9C */ s32 mMoveTimer;
6666
/* 0xA0 */ bool mMoveRequest;

‎src/d/lyt/d_lyt_drop_line.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void dLytDropLineParts_c::startChange(mVec3_c startPos, s32 trial, bool leftRigh
8080
void dLytDropLineParts_c::reset() {
8181
mStartPos.setZero();
8282
mEffectPos.setZero();
83-
field_0x8C.setZero();
83+
mMoveLinearCoeff.setZero();
8484
mMoveTimer = 0;
8585
mTrial = 4;
8686
mMoveRequest = false;
@@ -104,13 +104,13 @@ void dLytDropLineParts_c::initializeState_Move() {
104104
if (mpTargetPane != nullptr) {
105105
nw4r::math::MTX34 mtx = mpTargetPane->GetGlobalMtx();
106106

107-
// TODO
108-
mVec2_c v1 = mVec2_c(mtx._03, mtx._13);
109-
v1 -= mVec2_c(mStartPos.x, mStartPos.y);
107+
// Set up the coefficients for the quadratic parabola below
108+
mVec3_c v1 = mVec3_c(mtx._03, mtx._13, 0.0f);
110109

111-
field_0x8C.x =
112-
(v1.x + ((f32)sHio.mMoveDuration * sHio.field_0x04 * (f32)sHio.mMoveDuration)) / (f32)sHio.mMoveDuration;
113-
field_0x8C.y = v1.y / (f32)sHio.mMoveDuration;
110+
mMoveLinearCoeff.x =
111+
((v1.x - mStartPos.x) + (sHio.field_0x04 * (f32)sHio.mMoveDuration * (f32)sHio.mMoveDuration)) /
112+
(f32)sHio.mMoveDuration;
113+
mMoveLinearCoeff.y = (v1.y - mStartPos.y) / (f32)sHio.mMoveDuration;
114114

115115
if (!mIsChangeAnim) {
116116
dSndSmallEffectMgr_c::GetInstance()->playSound(SE_S_SIREN_SHIZUKU_GET_MOVE);
@@ -137,14 +137,14 @@ void dLytDropLineParts_c::executeState_Move() {
137137
if (mMoveTimer < sHio.mMoveDuration) {
138138
// Quadratic parabola
139139
if (mLeftRight) {
140-
mEffectPos.x = mStartPos.x -
141-
(field_0x8C.x * (f32)mMoveTimer - sHio.field_0x04 * (f32)mMoveTimer * (f32)mMoveTimer);
140+
mEffectPos.x = mStartPos.x - (mMoveLinearCoeff.x * (f32)mMoveTimer -
141+
sHio.field_0x04 * (f32)mMoveTimer * (f32)mMoveTimer);
142142
} else {
143-
mEffectPos.x =
144-
mStartPos.x + field_0x8C.x * (f32)mMoveTimer - sHio.field_0x04 * (f32)mMoveTimer * (f32)mMoveTimer;
143+
mEffectPos.x = mStartPos.x + mMoveLinearCoeff.x * (f32)mMoveTimer -
144+
sHio.field_0x04 * (f32)mMoveTimer * (f32)mMoveTimer;
145145
}
146146

147-
mEffectPos.y = mStartPos.y + field_0x8C.y * (f32)mMoveTimer;
147+
mEffectPos.y = mStartPos.y + mMoveLinearCoeff.y * (f32)mMoveTimer;
148148
mEffectPos.z = 0.0f;
149149
mMoveTimer++;
150150
} else {

0 commit comments

Comments
 (0)