Skip to content

Commit

Permalink
Merge branch 'main' into pr/96
Browse files Browse the repository at this point in the history
  • Loading branch information
@elijah-thomas774
elijah-thomas774 committed Nov 9, 2024
2 parents 50ddab9 + 74db770 commit 79e6d69
Show file tree
Hide file tree
Showing 14 changed files with 645 additions and 81 deletions.
8 changes: 8 additions & 0 deletions config/SOUE01/splits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,11 @@ d/lyt/d_screen_fader.cpp:
.data start:0x80528D68 end:0x80528D90
.sdata2 start:0x8057ABE0 end:0x8057AC08

d/a/d_a_insect.cpp:
.text start:0x8018F190 end:0x80190710
.data start:0x8052ABD8 end:0x8052ACC0
.sdata2 start:0x8057ADD8 end:0x8057AE30

d/d_cs_base.cpp:
.text start:0x801BC6C0 end:0x801BD250
.data start:0x8052E860 end:0x8052E968
Expand Down Expand Up @@ -720,6 +725,9 @@ d/tg/d_t_force_get_flag.cpp:
d/a/obj/d_a_obj_water_spout.cpp:
.text start:0x802D5C00 end:0x802D67F8
.ctors start:0x804DB8AC end:0x804DB8B0
.data start:0x80540FE0 end:0x805411A8
.sdata2 start:0x8057CB40 end:0x8057CB58
.bss start:0x805B8190 end:0x805B81D0

d/tg/d_t_siren_tag.cpp:
.text start:0x802D6800 end:0x802D84F8
Expand Down
159 changes: 80 additions & 79 deletions config/SOUE01/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10221,39 +10221,39 @@ fn_8018EB80 = .text:0x8018EB80; // type:function size:0x5C
fn_8018EBE0 = .text:0x8018EBE0; // type:function size:0x38
fn_8018EC20 = .text:0x8018EC20; // type:function size:0x2C
fn_8018EC50 = .text:0x8018EC50; // type:function size:0x538
fn_8018F190 = .text:0x8018F190; // type:function size:0x60
fn_8018F1F0 = .text:0x8018F1F0; // type:function size:0xAC
fn_8018F2A0 = .text:0x8018F2A0; // type:function size:0xA0
fn_8018F340 = .text:0x8018F340; // type:function size:0x4C
fn_8018F390 = .text:0x8018F390; // type:function size:0x50
fn_8018F3E0 = .text:0x8018F3E0; // type:function size:0x40
fn_8018F420 = .text:0x8018F420; // type:function size:0x38
fn_8018F460 = .text:0x8018F460; // type:function size:0xD8
fn_8018F540 = .text:0x8018F540; // type:function size:0x8
fn_8018F550 = .text:0x8018F550; // type:function size:0xD4
fn_8018F630 = .text:0x8018F630; // type:function size:0xB8
fn_8018F6F0 = .text:0x8018F6F0; // type:function size:0x4
fn_8018F700 = .text:0x8018F700; // type:function size:0x8
fn_8018F710 = .text:0x8018F710; // type:function size:0x30
fn_8018F740 = .text:0x8018F740; // type:function size:0x84
fn_8018F7D0 = .text:0x8018F7D0; // type:function size:0x8
fn_8018F7E0 = .text:0x8018F7E0; // type:function size:0x8
fn_8018F7F0 = .text:0x8018F7F0; // type:function size:0xA8
fn_8018F8A0 = .text:0x8018F8A0; // type:function size:0x8
fn_8018F8B0 = .text:0x8018F8B0; // type:function size:0x14C
fn_8018FA00 = .text:0x8018FA00; // type:function size:0x7C
fn_8018FA80 = .text:0x8018FA80; // type:function size:0x18
fn_8018FAA0 = .text:0x8018FAA0; // type:function size:0x28
fn_8018FAD0 = .text:0x8018FAD0; // type:function size:0x314
fn_8018FDF0 = .text:0x8018FDF0; // type:function size:0x2C0
fn_801900B0 = .text:0x801900B0; // type:function size:0xD0
fn_80190180 = .text:0x80190180; // type:function size:0x2C0
fn_80190440 = .text:0x80190440; // type:function size:0x1D0
fn_80190610 = .text:0x80190610; // type:function size:0x2C
fn_80190640 = .text:0x80190640; // type:function size:0x4
fn_80190650 = .text:0x80190650; // type:function size:0x4
fn_80190660 = .text:0x80190660; // type:function size:0x8
fn_80190670 = .text:0x80190670; // type:function size:0xA0
kill__12dAcOInsect_cFv = .text:0x8018F190; // type:function size:0x60
checkForLinkScare__12dAcOInsect_cFv = .text:0x8018F1F0; // type:function size:0xAC
checkDeath__12dAcOInsect_cFR9dBgS_Acch = .text:0x8018F2A0; // type:function size:0xA0
isLinkUsingBugNet__12dAcOInsect_cFv = .text:0x8018F340; // type:function size:0x4C
getLinkSpeedLevel__12dAcOInsect_cFv = .text:0x8018F390; // type:function size:0x50
checkPlayerRadius__12dAcOInsect_cFf = .text:0x8018F3E0; // type:function size:0x40
checkPlayerElevationDiff__12dAcOInsect_cFf = .text:0x8018F420; // type:function size:0x38
someBaseFunction__12dAcOInsect_cFv = .text:0x8018F460; // type:function size:0xD8
dAcOInsect_0x8C__12dAcOInsect_cFv = .text:0x8018F540; // type:function size:0x8
someBaseFunction0__12dAcOInsect_cFv = .text:0x8018F550; // type:function size:0xD4
addAttentionTarget__12dAcOInsect_cFv = .text:0x8018F630; // type:function size:0xB8
shouldAddAttentionTarget__12dAcOInsect_cFv = .text:0x8018F6F0; // type:function size:0x4
getAttentionField__12dAcOInsect_cFv = .text:0x8018F700; // type:function size:0x8
preAttention__12dAcOInsect_cFv = .text:0x8018F710; // type:function size:0x30
dAcOInsect_0x80__12dAcOInsect_cFv = .text:0x8018F740; // type:function size:0x84
dAcOInsect_0x84__12dAcOInsect_cFv = .text:0x8018F7D0; // type:function size:0x8
dAcOInsect_0x88__12dAcOInsect_cFv = .text:0x8018F7E0; // type:function size:0x8
isLinkCloseAndFlag__12dAcOInsect_cFv = .text:0x8018F7F0; // type:function size:0xA8
dAcOInsect_0x94__12dAcOInsect_cFv = .text:0x8018F8A0; // type:function size:0x8
checkDeath__12dAcOInsect_cFR8cCcD_Obj = .text:0x8018F8B0; // type:function size:0x14C
checkCaught__12dAcOInsect_cFR8cCcD_Obj = .text:0x8018FA00; // type:function size:0x7C
resetScale__12dAcOInsect_cFv = .text:0x8018FA80; // type:function size:0x18
fn_8018FAA0__12dAcOInsect_cFv = .text:0x8018FAA0; // type:function size:0x28
fn_8018FAD0__12dAcOInsect_cFv = .text:0x8018FAD0; // type:function size:0x314
fn_8018FDF0__12dAcOInsect_cFRC7mVec3_c = .text:0x8018FDF0; // type:function size:0x2C0
fn_801900B0__12dAcOInsect_cFRC7mVec3_cRC7mVec3_c = .text:0x801900B0; // type:function size:0xD0
fn_80190180__12dAcOInsect_cFR4mAng = .text:0x80190180; // type:function size:0x2C0
fn_80190440__12dAcOInsect_cFv = .text:0x80190440; // type:function size:0x1D0
fn_80190160__12dAcOInsect_cFv = .text:0x80190610; // type:function size:0x2C
dAcOInsect_0xAC__12dAcOInsect_cFv = .text:0x80190640; // type:function size:0x4
dAcOInsect_0xA8__12dAcOInsect_cFv = .text:0x80190650; // type:function size:0x4
dAcOInsect_0xA4__12dAcOInsect_cFv = .text:0x80190660; // type:function size:0x8
__dt__12dAcOInsect_cFv = .text:0x80190670; // type:function size:0xA0
fn_80190710 = .text:0x80190710; // type:function size:0x14
fn_80190730 = .text:0x80190730; // type:function size:0x48
fn_80190780 = .text:0x80190780; // type:function size:0x40
Expand Down Expand Up @@ -16998,40 +16998,40 @@ fn_802D5B40 = .text:0x802D5B40; // type:function size:0x10
fn_802D5B50 = .text:0x802D5B50; // type:function size:0xC
TgForceGetFlag__dtor = .text:0x802D5B60; // type:function size:0x7C
TgForceGetFlag__initList = .text:0x802D5BE0; // type:function size:0x14
AcOwaterSpout__ctor = .text:0x802D5C00; // type:function size:0x14C
fn_802D5D50 = .text:0x802D5D50; // type:function size:0x58
fn_802D5DB0 = .text:0x802D5DB0; // type:function size:0x6C
fn_802D5E20 = .text:0x802D5E20; // type:function size:0xA0
fn_802D5EC0 = .text:0x802D5EC0; // type:function size:0xA4
fn_802D5F70 = .text:0x802D5F70; // type:function size:0x114
AcOwaterSpout__init = .text:0x802D6090; // type:function size:0x138
fn_802D61D0 = .text:0x802D61D0; // type:function size:0x10
fn_802D61E0 = .text:0x802D61E0; // type:function size:0x8
fn_802D61F0 = .text:0x802D61F0; // type:function size:0x7C
fn_802D6270 = .text:0x802D6270; // type:function size:0x10
AcOwaterSpout__draw = .text:0x802D6280; // type:function size:0x28
AcOwaterSpout__stateWaitEnter = .text:0x802D62B0; // type:function size:0x38
AcOwaterSpout__stateWaitUpdate = .text:0x802D62F0; // type:function size:0x40
AcOwaterSpout__stateWaitLeave = .text:0x802D6330; // type:function size:0x4
fn_802D6340 = .text:0x802D6340; // type:function size:0xE4
fn_802D6430 = .text:0x802D6430; // type:function size:0x10
fn_802D6440 = .text:0x802D6440; // type:function size:0x60
fn_802D64A0 = .text:0x802D64A0; // type:function size:0xC
fn_802D64B0 = .text:0x802D64B0; // type:function size:0x1C
fn_802D64D0 = .text:0x802D64D0; // type:function size:0x1C
fn_802D64F0 = .text:0x802D64F0; // type:function size:0x1C
fn_802D6510 = .text:0x802D6510; // type:function size:0x10
fn_802D6520 = .text:0x802D6520; // type:function size:0x10
fn_802D6530 = .text:0x802D6530; // type:function size:0x10
fn_802D6540 = .text:0x802D6540; // type:function size:0x10
fn_802D6550 = .text:0x802D6550; // type:function size:0x10
fn_802D6560 = .text:0x802D6560; // type:function size:0x10
fn_802D6570 = .text:0x802D6570; // type:function size:0x30
fn_802D65A0 = .text:0x802D65A0; // type:function size:0x30
fn_802D65D0 = .text:0x802D65D0; // type:function size:0x30
AcOwaterSpout__initState = .text:0x802D6600; // type:function size:0x10C
AcOwaterSpout__dtor = .text:0x802D6710; // type:function size:0x58
fn_802D6770 = .text:0x802D6770; // type:function size:0x88
dAcOwaterSpout_c_classInit__Fv = .text:0x802D5C00; // type:function size:0x14C
__dt__29sFState_c<16dAcOwaterSpout_c>Fv = .text:0x802D5D50; // type:function size:0x58
__dt__32sFStateFct_c<16dAcOwaterSpout_c>Fv = .text:0x802D5DB0; // type:function size:0x6C
__dt__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802D5E20; // type:function size:0xA0
__dt__55sFStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c>Fv = .text:0x802D5EC0; // type:function size:0xA4
createHeap__16dAcOwaterSpout_cFv = .text:0x802D5F70; // type:function size:0x114
create__16dAcOwaterSpout_cFv = .text:0x802D6090; // type:function size:0x138
changeState__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x802D61D0; // type:function size:0x10
doDelete__16dAcOwaterSpout_cFv = .text:0x802D61E0; // type:function size:0x8
actorExecute__16dAcOwaterSpout_cFv = .text:0x802D61F0; // type:function size:0x7C
executeState__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802D6270; // type:function size:0x10
draw__16dAcOwaterSpout_cFv = .text:0x802D6280; // type:function size:0x28
initializeState_Wait__16dAcOwaterSpout_cFv = .text:0x802D62B0; // type:function size:0x38
executeState_Wait__16dAcOwaterSpout_cFv = .text:0x802D62F0; // type:function size:0x40
finalizeState_Wait__16dAcOwaterSpout_cFv = .text:0x802D6330; // type:function size:0x4
__dt__16dAcOwaterSpout_cFv = .text:0x802D6340; // type:function size:0xE4
getStateID__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802D6430; // type:function size:0x10
build__32sFStateFct_c<16dAcOwaterSpout_c>FRC12sStateIDIf_c = .text:0x802D6440; // type:function size:0x60
dispose__32sFStateFct_c<16dAcOwaterSpout_c>FRP10sStateIf_c = .text:0x802D64A0; // type:function size:0xC
initialize__29sFState_c<16dAcOwaterSpout_c>Fv = .text:0x802D64B0; // type:function size:0x1C
execute__29sFState_c<16dAcOwaterSpout_c>Fv = .text:0x802D64D0; // type:function size:0x1C
finalize__29sFState_c<16dAcOwaterSpout_c>Fv = .text:0x802D64F0; // type:function size:0x1C
initializeState__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802D6510; // type:function size:0x10
finalizeState__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802D6520; // type:function size:0x10
refreshState__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x802D6530; // type:function size:0x10
getState__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802D6540; // type:function size:0x10
getNewStateID__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802D6550; // type:function size:0x10
getOldStateID__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x802D6560; // type:function size:0x10
finalizeState__31sFStateID_c<16dAcOwaterSpout_c>CFR16dAcOwaterSpout_c = .text:0x802D6570; // type:function size:0x30
executeState__31sFStateID_c<16dAcOwaterSpout_c>CFR16dAcOwaterSpout_c = .text:0x802D65A0; // type:function size:0x30
initializeState__31sFStateID_c<16dAcOwaterSpout_c>CFR16dAcOwaterSpout_c = .text:0x802D65D0; // type:function size:0x30
__sinit_\d_a_obj_water_spout_cpp = .text:0x802D6600; // type:function size:0x10C scope:local
__dt__31sFStateID_c<16dAcOwaterSpout_c>Fv = .text:0x802D6710; // type:function size:0x58
isSameName__31sFStateID_c<16dAcOwaterSpout_c>CFPCc = .text:0x802D6770; // type:function size:0x88
TgSirenTag__ctor = .text:0x802D6800; // type:function size:0x1D4
fn_802D69E0 = .text:0x802D69E0; // type:function size:0x58
fn_802D6A40 = .text:0x802D6A40; // type:function size:0x6C
Expand Down Expand Up @@ -33803,7 +33803,8 @@ lbl_8052A890 = .data:0x8052A890; // type:object size:0xC8
lbl_8052A958 = .data:0x8052A958; // type:object size:0x68
lbl_8052A9C0 = .data:0x8052A9C0; // type:object size:0x1AC
lbl_8052AB6C = .data:0x8052AB6C; // type:object size:0x6C
lbl_8052ABD8 = .data:0x8052ABD8; // type:object size:0xE8
@LOCAL@addAttentionTarget__12dAcOInsect_cFv@tmpTarget = .data:0x8052ABD8; // type:object size:0x30 scope:local
__vt__12dAcOInsect_c = .data:0x8052AC08; // type:object size:0xB4
lbl_8052ACC0 = .data:0x8052ACC0; // type:object size:0x10
lbl_8052ACD0 = .data:0x8052ACD0; // type:object size:0x340
lbl_8052B010 = .data:0x8052B010; // type:object size:0x34
Expand Down Expand Up @@ -35660,14 +35661,14 @@ lbl_80540F44 = .data:0x80540F44; // type:object size:0x14 data:string
g_profile_TAG_FORCE_GET_FLAG = .data:0x80540F58; // type:object size:0x10
TgForceGetFlag__vtable = .data:0x80540F68; // type:object size:0x78
g_profile_OBJ_WATER_SPOUT = .data:0x80540FE0; // type:object size:0x10
lbl_80540FF0 = .data:0x80540FF0; // type:object size:0x10
lbl_80541000 = .data:0x80541000; // type:object size:0x20
AcOwaterSpout__vtable = .data:0x80541020; // type:object size:0x80
lbl_805410A0 = .data:0x805410A0; // type:object size:0x30
lbl_805410D0 = .data:0x805410D0; // type:object size:0x30
lbl_80541100 = .data:0x80541100; // type:object size:0x18
lbl_80541118 = .data:0x80541118; // type:object size:0x5C
lbl_80541174 = .data:0x80541174; // type:object size:0x34
lbl_80540FF0 = .data:0x80540FF0; // type:object size:0xF data:string
lbl_80541000 = .data:0x80541000; // type:object size:0x1E data:string
__vt__16dAcOwaterSpout_c = .data:0x80541020; // type:object size:0x80
__vt__55sFStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c> = .data:0x805410A0; // type:object size:0x30
__vt__85sStateMgr_c<16dAcOwaterSpout_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x805410D0; // type:object size:0x30
__vt__32sFStateFct_c<16dAcOwaterSpout_c> = .data:0x80541100; // type:object size:0x14
__vt__29sFState_c<16dAcOwaterSpout_c> = .data:0x80541118; // type:object size:0x18
__vt__31sFStateID_c<16dAcOwaterSpout_c> = .data:0x80541174; // type:object size:0x34
g_profile_SIREN_TAG = .data:0x805411A8; // type:object size:0x2C
lbl_805411D4 = .data:0x805411D4; // type:object size:0x10
lbl_805411E4 = .data:0x805411E4; // type:object size:0xC data:string
Expand Down Expand Up @@ -45809,7 +45810,7 @@ lbl_8057CB40 = .sdata2:0x8057CB40; // type:object size:0x4 data:float
lbl_8057CB44 = .sdata2:0x8057CB44; // type:object size:0x4 data:float
lbl_8057CB48 = .sdata2:0x8057CB48; // type:object size:0x4 data:float
lbl_8057CB4C = .sdata2:0x8057CB4C; // type:object size:0x4 data:float
lbl_8057CB50 = .sdata2:0x8057CB50; // type:object size:0x8 data:float
lbl_8057CB50 = .sdata2:0x8057CB50; // type:object size:0x4 data:float
lbl_8057CB58 = .sdata2:0x8057CB58; // type:object size:0x4 data:float
lbl_8057CB5C = .sdata2:0x8057CB5C; // type:object size:0x4 data:float
lbl_8057CB60 = .sdata2:0x8057CB60; // type:object size:0x4 data:float
Expand Down Expand Up @@ -49146,8 +49147,8 @@ LytControlGame__StateID_DelRes2 = .bss:0x805B8000; // type:object size:0x40 data
lbl_805B8040 = .bss:0x805B8040; // type:object size:0xE0 data:float
lbl_805B8120 = .bss:0x805B8120; // type:object size:0x10
lbl_805B8130 = .bss:0x805B8130; // type:object size:0x60 data:4byte
lbl_805B8190 = .bss:0x805B8190; // type:object size:0x10
AcOwaterSpout__STATE_WAIT = .bss:0x805B81A0; // type:object size:0x30 data:4byte
lbl_805B8190 = .bss:0x805B8190; // type:object size:0xC
StateID_Wait__16dAcOwaterSpout_c = .bss:0x805B81A0; // type:object size:0x30 data:4byte
lbl_805B81D0 = .bss:0x805B81D0; // type:object size:0x10
TgSirenTag__StateID_Wait = .bss:0x805B81E0; // type:object size:0x40 data:4byte
TgSirenTag__StateID_Demo = .bss:0x805B8220; // type:object size:0x40 data:4byte
Expand Down
2 changes: 2 additions & 0 deletions configure.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
Object(NonMatching, "d/a/obj/d_a_obj_tbox.cpp"),
Object(NonMatching, "d/a/obj/d_a_obj_time_area.cpp"),
Object(Matching, "d/a/obj/d_a_obj_switch.cpp"),
Object(Matching, "d/a/obj/d_a_obj_water_spout.cpp"),
Object(Matching, "d/tg/d_t_switch.cpp"),
Object(Matching, "toBeSorted/arc_managers/current_stage_arc_manager.cpp"),
Object(Matching, "toBeSorted/arc_managers/oarc_manager.cpp"),
Expand Down Expand Up @@ -415,6 +416,7 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
Object(NonMatching, "d/lyt/d_lyt_pause_disp_00.cpp"),
Object(Matching, "d/lyt/d_lyt_fader.cpp"),
Object(Matching, "d/lyt/d_screen_fader.cpp"),
Object(NonMatching, "d/a/d_a_insect.cpp"),
Object(NonMatching, "d/d_cs_base.cpp"),
Object(NonMatching, "d/d_cs_game.cpp"),
Object(Matching, "d/lyt/d_lyt_common_arrow.cpp"),
Expand Down
5 changes: 4 additions & 1 deletion include/d/a/d_a_base.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include "stddef.h"
#include "toBeSorted/tlist.h"


class dAcBase_c;

struct SoundSource {
Expand Down Expand Up @@ -150,6 +149,10 @@ class dAcBase_c : public dBase_c {
return diff.x * diff.x + diff.z * diff.z;
}

f32 getDistanceTo(const mVec3_c &to) const {
return position.distance(to);
}

bool IsOutOfRange(const mVec3_c &point, f32 radius) {
return getSquareDistanceTo(point) > radius;
}
Expand Down
Loading

0 comments on commit 79e6d69

Please sign in to comment.