Skip to content

Update symbols.txt and BrawlHeaders #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mparisi20 merged 1 commit into from
Mar 12, 2026
Merged

Update symbols.txt and BrawlHeaders #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions config/RSBE01_02/rels/sora_melee/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8734,7 +8734,7 @@ fn_27_D8DB4 = .text:0x000D8DB4; // type:function size:0x30
fn_27_D8DE4 = .text:0x000D8DE4; // type:function size:0x10
fn_27_D8DF4 = .text:0x000D8DF4; // type:function size:0x10
fn_27_D8E04 = .text:0x000D8E04; // type:function size:0x8
__ct__46soInstanceUnitFullProperty<P15soKineticEnergy>FRP15soKineticEnergylRCss = .text:0x000D8E0C; // type:function size:0x1C
__ct__46soInstanceUnitFullProperty<P15soKineticEnergy>FRCP15soKineticEnergylRCss = .text:0x000D8E0C; // type:function size:0x1C
fn_27_D8E28 = .text:0x000D8E28; // type:function size:0x98
fn_27_D8EC0 = .text:0x000D8EC0; // type:function size:0x70
fn_27_D8F30 = .text:0x000D8F30; // type:function size:0x28
Expand Down Expand Up @@ -13849,29 +13849,29 @@ fn_27_196E80 = .text:0x00196E80; // type:function size:0x60
fn_27_196EE0 = .text:0x00196EE0; // type:function size:0x8
fn_27_196EE8 = .text:0x00196EE8; // type:function size:0x40
fn_27_196F28 = .text:0x00196F28; // type:function size:0x34
fn_27_196F5C = .text:0x00196F5C; // type:function size:0x78
fn_27_196FD4 = .text:0x00196FD4; // type:function size:0x68
fn_27_19703C = .text:0x0019703C; // type:function size:0x7C
fn_27_1970B8 = .text:0x001970B8; // type:function size:0x7C
fn_27_197134 = .text:0x00197134; // type:function size:0x58
fn_27_19718C = .text:0x0019718C; // type:function size:0x3C
fn_27_1971C8 = .text:0x001971C8; // type:function size:0x70
fn_27_197238 = .text:0x00197238; // type:function size:0x54
fn_27_19728C = .text:0x0019728C; // type:function size:0x58
fn_27_1972E4 = .text:0x001972E4; // type:function size:0x38
fn_27_19731C = .text:0x0019731C; // type:function size:0x8
fn_27_197324 = .text:0x00197324; // type:function size:0x10
fn_27_197334 = .text:0x00197334; // type:function size:0x10
fn_27_197344 = .text:0x00197344; // type:function size:0xD8
fn_27_19741C = .text:0x0019741C; // type:function size:0x104
fn_27_197520 = .text:0x00197520; // type:function size:0x8
fn_27_197528 = .text:0x00197528; // type:function size:0x30
fn_27_197558 = .text:0x00197558; // type:function size:0x8
__ct__33soArrayList<P14wnPikminPikmin,10>Fv = .text:0x00196F5C; // type:function size:0x78
__dt__33soArrayList<P14wnPikminPikmin,10>Fv = .text:0x00196FD4; // type:function size:0x68
at__33soArrayList<P14wnPikminPikmin,10>Fl = .text:0x0019703C; // type:function size:0x7C
at__33soArrayList<P14wnPikminPikmin,10>CFl = .text:0x001970B8; // type:function size:0x7C
unshift__33soArrayList<P14wnPikminPikmin,10>FRCP14wnPikminPikmin = .text:0x00197134; // type:function size:0x58
shift__33soArrayList<P14wnPikminPikmin,10>Fv = .text:0x0019718C; // type:function size:0x3C
push__33soArrayList<P14wnPikminPikmin,10>FRCP14wnPikminPikmin = .text:0x001971C8; // type:function size:0x70
pop__33soArrayList<P14wnPikminPikmin,10>Fv = .text:0x00197238; // type:function size:0x54
insert__33soArrayList<P14wnPikminPikmin,10>FlRCP14wnPikminPikmin = .text:0x0019728C; // type:function size:0x58
erase__33soArrayList<P14wnPikminPikmin,10>Fl = .text:0x001972E4; // type:function size:0x38
erase__33soArrayList<P14wnPikminPikmin,10>FRC43soArrayListEnumerator<P14wnPikminPikmin,Sc> = .text:0x0019731C; // type:function size:0x8
size__33soArrayList<P14wnPikminPikmin,10>CFv = .text:0x00197324; // type:function size:0x10
isFull__33soArrayList<P14wnPikminPikmin,10>CFv = .text:0x00197334; // type:function size:0x10
set__33soArrayList<P14wnPikminPikmin,10>FlRCP14wnPikminPikminl = .text:0x00197344; // type:function size:0xD8
clear__33soArrayList<P14wnPikminPikmin,10>Fv = .text:0x0019741C; // type:function size:0x104
capacity__33soArrayList<P14wnPikminPikmin,10>CFv = .text:0x00197520; // type:function size:0x8
getEnumerator__33soArrayList<P14wnPikminPikmin,10>Fv = .text:0x00197528; // type:function size:0x30
isNull__33soArrayList<P14wnPikminPikmin,10>CFv = .text:0x00197558; // type:function size:0x8
shiftFreeArrayIndex__33soArrayList<P14wnPikminPikmin,10>Fl = .text:0x00197560; // type:function size:0x1AC
getArrayIndex__33soArrayList<P14wnPikminPikmin,10>CFl = .text:0x0019770C; // type:function size:0x194
insertSub__33soArrayList<P14wnPikminPikmin,10>Fll = .text:0x001978A0; // type:function size:0x118
eraseSub__33soArrayList<P14wnPikminPikmin,10>Fl = .text:0x001979B8; // type:function size:0x1B0
fn_27_197B68 = .text:0x00197B68; // type:function size:0x34
isEmpty__31soArrayFixed<P14wnPikminPikmin>CFv = .text:0x00197B68; // type:function size:0x34
__ct__37soArrayListUnit<P14wnPikminPikmin,Sc>Fv = .text:0x00197B9C; // type:function size:0x1C
__dt__37soArrayListUnit<P14wnPikminPikmin,Sc>Fv = .text:0x00197BB8; // type:function size:0x40
fn_27_197BF8 = .text:0x00197BF8; // type:function size:0x10
Expand Down Expand Up @@ -16326,22 +16326,22 @@ fn_27_1ADF48 = .text:0x001ADF48; // type:function size:0x10
fn_27_1ADF58 = .text:0x001ADF58; // type:function size:0x28
fn_27_1ADF80 = .text:0x001ADF80; // type:function size:0x28
fn_27_1ADFA8 = .text:0x001ADFA8; // type:function size:0x1DC
fn_27_1AE184 = .text:0x001AE184; // type:function size:0xA0
add__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>FRP15soKineticEnergylRC19soInstanceAttributes = .text:0x001AE224; // type:function size:0x1A8
fn_27_1AE3CC = .text:0x001AE3CC; // type:function size:0xC8
fn_27_1AE494 = .text:0x001AE494; // type:function size:0x10
fn_27_1AE4A4 = .text:0x001AE4A4; // type:function size:0x100
fn_27_1AE5A4 = .text:0x001AE5A4; // type:function size:0x10
fn_27_1AE5B4 = .text:0x001AE5B4; // type:function size:0x44
fn_27_1AE5F8 = .text:0x001AE5F8; // type:function size:0x10
fn_27_1AE608 = .text:0x001AE608; // type:function size:0xB0
__ct__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>Fb = .text:0x001AE184; // type:function size:0xA0
add__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>FRCP15soKineticEnergylRC19soInstanceAttributes = .text:0x001AE224; // type:function size:0x1A8
erase__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>Fl = .text:0x001AE3CC; // type:function size:0xC8
clear__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>Fv = .text:0x001AE494; // type:function size:0x10
at__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>Fl = .text:0x001AE4A4; // type:function size:0x100
atIndex__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>Fl = .text:0x001AE5A4; // type:function size:0x10
set__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>FRCP15soKineticEnergyl = .text:0x001AE5B4; // type:function size:0x44
size__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>CFv = .text:0x001AE5F8; // type:function size:0x10
isContain__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>CFl = .text:0x001AE608; // type:function size:0xB0
getAttributeArray__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>FRC19soInstanceAttributeR28soArray<PP15soKineticEnergy> = .text:0x001AE6B8; // type:function size:0xCC
getAttribute__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>CFl = .text:0x001AE784; // type:function size:0xD8
getPriorityArray__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>FR28soArray<PP15soKineticEnergy> = .text:0x001AE85C; // type:function size:0xA4
fn_27_1AE900 = .text:0x001AE900; // type:function size:0x30
fn_27_1AE930 = .text:0x001AE930; // type:function size:0x10
fn_27_1AE940 = .text:0x001AE940; // type:function size:0x28
fn_27_1AE968 = .text:0x001AE968; // type:function size:0x28
getId__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>Fl = .text:0x001AE900; // type:function size:0x30
capacity__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>Fv = .text:0x001AE930; // type:function size:0x10
atIndexFast__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>Fl = .text:0x001AE940; // type:function size:0x28
atUnitIndexFast__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>Fl = .text:0x001AE968; // type:function size:0x28
getFreeId__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>CFv = .text:0x001AE990; // type:function size:0x1DC
fn_27_1AEB6C = .text:0x001AEB6C; // type:function size:0xA0
fn_27_1AEC0C = .text:0x001AEC0C; // type:function size:0x1A8
Expand All @@ -16360,7 +16360,7 @@ fn_27_1AF318 = .text:0x001AF318; // type:function size:0x10
fn_27_1AF328 = .text:0x001AF328; // type:function size:0x28
fn_27_1AF350 = .text:0x001AF350; // type:function size:0x28
fn_27_1AF378 = .text:0x001AF378; // type:function size:0x1DC
fn_27_1AF554 = .text:0x001AF554; // type:function size:0xAC
getIndex__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>CFl = .text:0x001AF554; // type:function size:0xAC
fn_27_1AF600 = .text:0x001AF600; // type:function size:0xAC
fn_27_1AF6AC = .text:0x001AF6AC; // type:function size:0x28
fn_27_1AF6D4 = .text:0x001AF6D4; // type:function size:0x28
Expand Down Expand Up @@ -18980,9 +18980,9 @@ fn_27_1D4888 = .text:0x001D4888; // type:function size:0x8
fn_27_1D4890 = .text:0x001D4890; // type:function size:0x8
fn_27_1D4898 = .text:0x001D4898; // type:function size:0x8
fn_27_1D48A0 = .text:0x001D48A0; // type:function size:0x8
fn_27_1D48A8 = .text:0x001D48A8; // type:function size:0x8
fn_27_1D48B0 = .text:0x001D48B0; // type:function size:0x8
fn_27_1D48B8 = .text:0x001D48B8; // type:function size:0x8
@8@getPriorityArray__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>FR28soArray<PP15soKineticEnergy> = .text:0x001D48A8; // type:function size:0x8
@12@getAttributeArray__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>FRC19soInstanceAttributeR28soArray<PP15soKineticEnergy> = .text:0x001D48B0; // type:function size:0x8
@12@getAttribute__57soInstanceManagerFullPropertyVector<P15soKineticEnergy,4>CFl = .text:0x001D48B8; // type:function size:0x8
fn_27_1D48C0 = .text:0x001D48C0; // type:function size:0x8C
fn_27_1D494C = .text:0x001D494C; // type:function size:0xB0
fn_27_1D49FC = .text:0x001D49FC; // type:function size:0x144
Expand Down Expand Up @@ -21322,7 +21322,7 @@ fn_27_26537C = .text:0x0026537C; // type:function size:0x10
fn_27_26538C = .text:0x0026538C; // type:function size:0x4
setTeamYakumonoOwnerId__10grYakumonoFUl = .text:0x00265390; // type:function size:0x38
setTeamYakumono__10grYakumonoFUlUl = .text:0x002653C8; // type:function size:0x5C
getTeamYakumono__10grYakumonoFUl = .text:0x00265424; // type:function size:0x48
getTeamYakumono__10grYakumonoFPi = .text:0x00265424; // type:function size:0x48
setOffsetAttack__10grYakumonoFP5Vec3fi = .text:0x0026546C; // type:function size:0x10
fn_27_26547C = .text:0x0026547C; // type:function size:0x4
setAreaGimmick__10grYakumonoFP10soAreaDataP19soSet<10soAreaData>P10ykAreaDatab = .text:0x00265480; // type:function size:0x170
Expand Down
8 changes: 4 additions & 4 deletions config/RSBE01_02/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3501,9 +3501,9 @@ setEffect__5ecMgrF4EfIDPC5Vec3fPC5Vec3fPC5Vec3f = .text:0x8005F7E0; // type:func
fn_8005F7FC = .text:0x8005F7FC; // type:function size:0x4
fn_8005F800 = .text:0x8005F800; // type:function size:0x14
fn_8005F814 = .text:0x8005F814; // type:function size:0x448
setParent__5ecMgrFUlPQ34nw4r3g3d6ScnMdlPCci = .text:0x8005FC5C; // type:function size:0x98
setParent2__5ecMgrFUlPQ34nw4r3g3d6ScnMdlPCci = .text:0x8005FCF4; // type:function size:0x98
fn_8005FD8C = .text:0x8005FD8C; // type:function size:0x200
setParent__5ecMgrFUlPQ34nw4r3g3d6ScnMdlPCcb = .text:0x8005FC5C; // type:function size:0x98
setParent__5ecMgrFUlPQ34nw4r3g3d6ScnMdlUlb = .text:0x8005FCF4; // type:function size:0x98
setParent__5ecMgrFUlUlPCcb = .text:0x8005FD8C; // type:function size:0x200
fn_8005FF8C = .text:0x8005FF8C; // type:function size:0x90
setGroundAttach__5ecMgrFUlP14soGroundModule = .text:0x8006001C; // type:function size:0xD0
setGroundAttach__5ecMgrFUlP19grCollisionLineWork = .text:0x800600EC; // type:function size:0x90
Expand Down Expand Up @@ -3587,7 +3587,7 @@ end__10ecTraceMgrFUlUlUl = .text:0x800658B8; // type:function size:0x6C
endGroup__10ecTraceMgrFUlUlUl = .text:0x80065924; // type:function size:0x88
pauseGroup__10ecTraceMgrFbUlUl = .text:0x800659AC; // type:function size:0x84
setOffset__10ecTraceMgrFUlRC5Vec3fRC5Vec3f = .text:0x80065A30; // type:function size:0x78
setAttachEffect__10ecTraceMgrFUl4EfIDPQ34nw4r3g3d6ScnMdlPCcPC5Vec3fPC5Vec3fPC5Vec3f = .text:0x80065AA8; // type:function size:0xB8
setAttachEffect__10ecTraceMgrFUl4EfIDPQ34nw4r3g3d6ScnMdlUlPC5Vec3fPC5Vec3fPC5Vec3f = .text:0x80065AA8; // type:function size:0xB8
__ct__7ecTraceFUlUlUlUlUlUl = .text:0x80065B60; // type:function size:0x98
fn_80065BF8 = .text:0x80065BF8; // type:function size:0x4
__ct__7ecTraceFUlUlUlUlUlUlUl = .text:0x80065BFC; // type:function size:0x9C
Expand Down
2 changes: 1 addition & 1 deletion include/lib/BrawlHeaders
Open in desktop
Submodule BrawlHeaders updated 45 files
+3 −2 Brawl/Include/ec/ec_mgr.h
+1 −1 Brawl/Include/ec/ec_trace_mgr.h
+12 −0 Brawl/Include/ft/ft_bombhei_log.h
+12 −0 Brawl/Include/ft/ft_combo_log.h
+4 −1 Brawl/Include/ft/ft_entry_manager.h
+12 −0 Brawl/Include/ft/ft_item_log.h
+12 −0 Brawl/Include/ft/ft_kill_log.h
+36 −0 Brawl/Include/ft/ft_log.h
+16 −0 Brawl/Include/ft/ft_log_attack_info_module.h
+33 −0 Brawl/Include/ft/ft_log_data_accesser.h
+7 −4 Brawl/Include/ft/ft_manager.h
+15 −4 Brawl/Include/ft/ft_owner.h
+19 −0 Brawl/Include/ft/ft_pattern_log.h
+4 −1 Brawl/Include/ft/ft_slot_manager.h
+12 −0 Brawl/Include/ft/ft_trick_log.h
+164 −2 Brawl/Include/gf/gf_model.h
+2 −2 Brawl/Include/gm/gm_global_mode_melee.h
+62 −19 Brawl/Include/gr/collision/gr_collision_line.h
+1 −1 Brawl/Include/gr/gr_gimmick.h
+5 −5 Brawl/Include/gr/gr_madein.h
+4 −4 Brawl/Include/gr/gr_yakumono.h
+17 −10 Brawl/Include/gr/ground.h
+21 −20 Brawl/Include/ip/input.h
+43 −11 Brawl/Include/it/it_archive.h
+1 −1 Brawl/Include/it/it_customizer.h
+9 −3 Brawl/Include/it/item.h
+1 −1 Brawl/Include/mt/mt_vector.h
+3 −1 Brawl/Include/snd/snd_system.h
+16 −16 Brawl/Include/so/area/so_area_module_impl.h
+34 −29 Brawl/Include/so/collision/so_collision.h
+2 −2 Brawl/Include/so/collision/so_collision_attack_module_impl.h
+5 −4 Brawl/Include/so/collision/so_collision_attack_part.h
+1 −1 Brawl/Include/so/collision/so_collision_hit_group.h
+2 −2 Brawl/Include/so/ground/so_ground_module_impl.h
+2 −2 Brawl/Include/so/item/so_item_pick_transactor_impl.h
+10 −9 Brawl/Include/so/slope/so_slope_module_impl.h
+4 −6 Brawl/Include/so/so_array.h
+3 −5 Brawl/Include/so/so_connectable.h
+11 −11 Brawl/Include/so/stageobject.h
+2 −1 Brawl/Include/st/operator/st_operator_drop_item.h
+1 −1 Brawl/Include/st/st_data_container.h
+2 −0 Brawl/Include/st/stage.h
+82 −5 RSBE01.lst
+64 −0 nw4r/include/nw4r/snd/data_reference.h
+201 −0 nw4r/include/nw4r/snd/snd_sound_archive.h
4 changes: 2 additions & 2 deletions src/sora/ec/ec_trace_mgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,13 @@ bool ecTraceMgr::setOffset(u32 id, const Vec3f& p2, const Vec3f& p3) {
}

void ecTraceMgr::setAttachEffect(u32 id, EfID efId, nw4r::g3d::ScnMdl* scnMdl,
const char* name, const Vec3f* pos, const Vec3f* rot, const Vec3f* scale) {
u32 nodeIndex, const Vec3f* pos, const Vec3f* rot, const Vec3f* scale) {
ecTrace* trace = getTraceById(id);
if (trace)
switch (trace->unk2C) {
case 0:
trace->unk2C = g_ecMgr->setEffect(efId, pos, rot, scale);
g_ecMgr->setParent2(trace->unk2C, scnMdl, name, 0);
g_ecMgr->setParent(trace->unk2C, scnMdl, nodeIndex, false);
break;
default:
break;
Expand Down
9 changes: 3 additions & 6 deletions src/sora/st/st_data_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@ stDataContainer::stDataContainer(stDataContainerData* data)

stDataContainer::~stDataContainer() { }

// TODO: suspect that this returns a void* or u8*
stDataContainerData* stDataContainer::getData(u32 index) {
if (m_filedata->m_numFiles <= index) {
void* stDataContainer::getData(u32 index) {
if (m_filedata->m_numFiles <= index)
return nullptr;
}
u32* startOffsets = static_cast<u32*>(getDataAddressHead());
return reinterpret_cast<stDataContainerData*>(
reinterpret_cast<u8*>(m_filedata) + startOffsets[index]);
return reinterpret_cast<u8*>(m_filedata) + startOffsets[index];
}

void* stDataContainer::getDataAddressHead() {
Expand Down
Loading