Skip to content

Match 3 files from the dol #27

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 29, 2025
Merged

Match 3 files from the dol #27

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
11 changes: 11 additions & 0 deletions config/RSBE01_02/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ sora/cm/cm_controller_default.cpp:
.text start:0x8009F560 end:0x8009F564
.data start:0x80454CC0 end:0x80454CD0

sora/cm/cm_controller_melee_fixed.cpp:
.text start:0x800AA998 end:0x800AA9F8
.data start:0x80455000 end:0x80455038
.sdata start:0x8059DEE8 end:0x8059DEF0

sora/cm/cm_stage_param.cpp:
.text start:0x800AC9B8 end:0x800AC9DC
.sdata2 start:0x805A21D8 end:0x805A21E8
Expand Down Expand Up @@ -89,6 +94,12 @@ sora/ac/ac_null.cpp:
.sdata start:0x8059E718 end:0x8059E720
.sbss start:0x805A0370 end:0x805A0380

sora/ft_system.cpp:
.text start:0x8013D004 end:0x8013D078
.ctors start:0x80406558 end:0x8040655C
.bss start:0x8049EA20 end:0x8049EA30
.sbss start:0x805A0380 end:0x805A0390

sora/ad/ad_static_data.cpp:
.text start:0x8015B09C end:0x8015B0E0
.data start:0x804621C0 end:0x804629C8
Expand Down
20 changes: 10 additions & 10 deletions config/RSBE01_02/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4224,7 +4224,7 @@ fn_8009FCF4 = .text:0x8009FCF4; // type:function size:0x10
fn_8009FD04 = .text:0x8009FD04; // type:function size:0x148
fn_8009FE4C = .text:0x8009FE4C; // type:function size:0x9B8
fn_800A0804 = .text:0x800A0804; // type:function size:0x5D0
fn_800A0DD4 = .text:0x800A0DD4; // type:function size:0x64C
updateMeleeFix__14cmAIControllerFf = .text:0x800A0DD4; // type:function size:0x64C
fn_800A1420 = .text:0x800A1420; // type:function size:0x50
fn_800A1470 = .text:0x800A1470; // type:function size:0x1DC
fn_800A164C = .text:0x800A164C; // type:function size:0x108
Expand Down Expand Up @@ -4326,9 +4326,9 @@ fn_800A9E4C = .text:0x800A9E4C; // type:function size:0xC
fn_800A9E58 = .text:0x800A9E58; // type:function size:0x32C
fn_800AA184 = .text:0x800AA184; // type:function size:0x3EC
fn_800AA570 = .text:0x800AA570; // type:function size:0x428
fn_800AA998 = .text:0x800AA998; // type:function size:0x18
fn_800AA9B0 = .text:0x800AA9B0; // type:function size:0x40
fn_800AA9F0 = .text:0x800AA9F0; // type:function size:0x8
__ct__22cmMeleeFixedControllerFv = .text:0x800AA998; // type:function size:0x18
__dt__22cmMeleeFixedControllerFv = .text:0x800AA9B0; // type:function size:0x40
update__22cmMeleeFixedControllerFf = .text:0x800AA9F0; // type:function size:0x8
fn_800AA9F8 = .text:0x800AA9F8; // type:function size:0xA0
fn_800AAA98 = .text:0x800AAA98; // type:function size:0x40
fn_800AAAD8 = .text:0x800AAAD8; // type:function size:0x304
Expand Down Expand Up @@ -17613,7 +17613,7 @@ jumptable_80420AE8 = .data:0x80420AE8; // type:object size:0x20 scope:local
lbl_80420B08 = .data:0x80420B08; // type:object size:0x64
lbl_80420B6C = .data:0x80420B6C; // type:object size:0xC
lbl_80420B78 = .data:0x80420B78; // type:object size:0x10
@237 = .data:0x80420B88; // type:object size:0x13 scope:local data:string
@241 = .data:0x80420B88; // type:object size:0x13 scope:local data:string
lbl_80420BA0 = .data:0x80420BA0; // type:object size:0x10
lbl_80420BB0 = .data:0x80420BB0; // type:object size:0x10
lbl_80420BC0 = .data:0x80420BC0; // type:object size:0x10
Expand Down Expand Up @@ -25385,9 +25385,9 @@ lbl_80454FC4 = .data:0x80454FC4; // type:object size:0xC
lbl_80454FD0 = .data:0x80454FD0; // type:object size:0x10
lbl_80454FE0 = .data:0x80454FE0; // type:object size:0x14
lbl_80454FF4 = .data:0x80454FF4; // type:object size:0xC
lbl_80455000 = .data:0x80455000; // type:object size:0x10
lbl_80455010 = .data:0x80455010; // type:object size:0x18
lbl_80455028 = .data:0x80455028; // type:object size:0x10
__vt__22cmMeleeFixedController = .data:0x80455000; // type:object size:0x10
@256 = .data:0x80455010; // type:object size:0x17 scope:local data:string
@257 = .data:0x80455028; // type:object size:0xC scope:local
lbl_80455038 = .data:0x80455038; // type:object size:0x10 data:4byte
lbl_80455048 = .data:0x80455048; // type:object size:0x10
lbl_80455058 = .data:0x80455058; // type:object size:0x14
Expand Down Expand Up @@ -29291,7 +29291,7 @@ lbl_8059DEC8 = .sdata:0x8059DEC8; // type:object size:0x8
lbl_8059DED0 = .sdata:0x8059DED0; // type:object size:0x8
lbl_8059DED8 = .sdata:0x8059DED8; // type:object size:0x8
lbl_8059DEE0 = .sdata:0x8059DEE0; // type:object size:0x8
lbl_8059DEE8 = .sdata:0x8059DEE8; // type:object size:0x8
__RTTI__22cmMeleeFixedController = .sdata:0x8059DEE8; // type:object size:0x8 scope:weak
lbl_8059DEF0 = .sdata:0x8059DEF0; // type:object size:0x8
lbl_8059DEF8 = .sdata:0x8059DEF8; // type:object size:0x8
lbl_8059DF00 = .sdata:0x8059DF00; // type:object size:0x8
Expand Down Expand Up @@ -30759,7 +30759,7 @@ lbl_805A0268 = .sbss:0x805A0268; // type:object size:0x8 data:4byte
lbl_805A0270 = .sbss:0x805A0270; // type:object size:0x8 data:byte
lbl_805A0278 = .sbss:0x805A0278; // type:object size:0x8 data:4byte
lbl_805A0280 = .sbss:0x805A0280; // type:object size:0x8 data:4byte
lbl_805A0288 = .sbss:0x805A0288; // type:object size:0x8 data:4byte
g_cmAIController = .sbss:0x805A0288; // type:object size:0x8 data:4byte
lbl_805A0290 = .sbss:0x805A0290; // type:object size:0x8 data:4byte
lbl_805A0298 = .sbss:0x805A0298; // type:object size:0x4 align:4 data:float
lbl_805A029C = .sbss:0x805A029C; // type:object size:0x4 align:4 data:float
Expand Down
4 changes: 3 additions & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,13 +297,15 @@ def MatchingFor(*versions):
Object(Matching, "sora/mt/mt_prng.cpp", extra_cflags=["-RTTI off"]),
Object(Matching, "sora/ef/ef_screen_handle.cpp"),
Object(Matching, "sora/cm/cm_controller_default.cpp", extra_cflags=["-RTTI off"]),
Object(Matching, "sora/cm/cm_controller_melee_fixed.cpp"),
Object(Matching, "sora/cm/cm_stage_param.cpp"),
Object(NonMatching, "sora/ty/ty_fig_listmng.cpp"),
Object(Matching, "sora/gr/collision/gr_collision_data.cpp"),
Object(NonMatching, "sora/ac/ac_cmd_interpreter.cpp"),
Object(Matching, "sora/ac/ac_anim_cmd_impl.cpp"),
Object(Matching, "sora/ac/ac_null.cpp"),
Object(NonMatching, "sora/ad/ad_static_data.cpp"),
Object(Matching, "sora/ft/ft_system.cpp"),
Object(Matching, "sora/ad/ad_static_data.cpp"),
],
},
# Common REL units
Expand Down
2 changes: 1 addition & 1 deletion include/lib/BrawlHeaders
Open in desktop
Submodule BrawlHeaders updated 6 files
+16 −0 Brawl/Include/cm/cm_controller_ai.h
+12 −0 Brawl/Include/cm/cm_controller_melee_fixed.h
+16 −0 Brawl/Include/ft/ft_system.h
+1 −0 Brawl/Include/gf/gf_camera_controller.h
+1 −0 Brawl/Include/so/so_external_value_accesser.h
+1 −0 RSBE01.lst
4 changes: 2 additions & 2 deletions src/sora/ad/ad_static_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,9 @@ adventureStaticData adventureStaticData::s_adventureStaticData[0x101] = {
};

s32 adventureStaticData::getStepIndex(u32 p1) {
for (u32 i = 0; i < getAllStepNum(); i++) {
for (s32 i = 0, stepIndex = 0; i < getAllStepNum(); i++, stepIndex++) {
if (p1 == s_adventureStaticData[i].unk0) {
return i;
return stepIndex;
}
}
return -1;
Expand Down
11 changes: 11 additions & 0 deletions src/sora/cm/cm_controller_melee_fixed.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#include <cm/cm_controller_ai.h>
#include <cm/cm_controller_melee_fixed.h>
#include <gf/gf_camera_controller.h>

cmMeleeFixedController::cmMeleeFixedController() : gfCameraController() { }

cmMeleeFixedController::~cmMeleeFixedController() { }

void cmMeleeFixedController::update(float p1) {
g_cmAIController->updateMeleeFix(p1);
}
11 changes: 11 additions & 0 deletions src/sora/ft/ft_system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#include <ft/ft_system.h>
#include <types.h>

ftSystem g_ftSystem;

ftSystem::~ftSystem() { }

void ftSystem::setCommonResourceData(u32 p1, u32 p2) {
unk0 = p1;
unk4 = p2;
}