Skip to content

Match if_wifipr_task.cpp #36

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
May 1, 2025
Merged

Match if_wifipr_task.cpp #36

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
5 changes: 5 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 @@ -94,6 +94,11 @@ sora/ty/ty_fig_listmng.cpp:
.text start:0x800AC9DC end:0x800AD808
.data start:0x80455120 end:0x80455180

sora/if/if_wifipr_task.cpp:
.text start:0x800FD110 end:0x800FD1F8
.data start:0x8045C678 end:0x8045C708
.sdata start:0x8059E4E8 end:0x8059E4F0

sora/gr/collision/gr_collision_data.cpp:
.text start:0x80110720 end:0x80110748

Expand Down
18 changes: 9 additions & 9 deletions config/RSBE01_02/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2641,7 +2641,7 @@ setNextScene__14gfSceneManagerFv = .text:0x8002D5AC; // type:function size:0x94
setNextSequence__14gfSceneManagerFv = .text:0x8002D640; // type:function size:0x94
setLoadModuleName__14gfSceneManagerFv = .text:0x8002D6D4; // type:function size:0x68
loadModule__14gfSceneManagerFv = .text:0x8002D73C; // type:function size:0x17C
__ct__6gfTaskFPCciiii = .text:0x8002D8B8; // type:function size:0x164
__ct__6gfTaskFPCcQ26gfTask8Categoryiii = .text:0x8002D8B8; // type:function size:0x164
__dt__6gfTaskFv = .text:0x8002DA1C; // type:function size:0x104
fn_8002DB20 = .text:0x8002DB20; // type:function size:0x18
fn_8002DB38 = .text:0x8002DB38; // type:function size:0x70
Expand Down Expand Up @@ -5291,7 +5291,7 @@ fn_800FC840 = .text:0x800FC840; // type:function size:0xE0
fn_800FC920 = .text:0x800FC920; // type:function size:0x130
fn_800FCA50 = .text:0x800FCA50; // type:function size:0x134
fn_800FCB84 = .text:0x800FCB84; // type:function size:0x68
fn_800FCBEC = .text:0x800FCBEC; // type:function size:0x90
main__12IfWifiprMngrFv = .text:0x800FCBEC; // type:function size:0x90
fn_800FCC7C = .text:0x800FCC7C; // type:function size:0x8
fn_800FCC84 = .text:0x800FCC84; // type:function size:0xC
fn_800FCC90 = .text:0x800FCC90; // type:function size:0x14
Expand All @@ -5314,9 +5314,9 @@ fn_800FCF9C = .text:0x800FCF9C; // type:function size:0x154
fn_800FD0F0 = .text:0x800FD0F0; // type:function size:0xC
fn_800FD0FC = .text:0x800FD0FC; // type:function size:0xC
fn_800FD108 = .text:0x800FD108; // type:function size:0x8
fn_800FD110 = .text:0x800FD110; // type:function size:0x88
fn_800FD198 = .text:0x800FD198; // type:function size:0x8
fn_800FD1A0 = .text:0x800FD1A0; // type:function size:0x58
create__12ifWifiprTaskFv = .text:0x800FD110; // type:function size:0x88
processDefault__12ifWifiprTaskFv = .text:0x800FD198; // type:function size:0x8
__dt__12ifWifiprTaskFv = .text:0x800FD1A0; // type:function size:0x58
fn_800FD1F8 = .text:0x800FD1F8; // type:function size:0x28
fn_800FD220 = .text:0x800FD220; // type:function size:0xB0
fn_800FD2D0 = .text:0x800FD2D0; // type:function size:0x178
Expand Down Expand Up @@ -25928,8 +25928,8 @@ lbl_8045C580 = .data:0x8045C580; // type:object size:0x14
lbl_8045C594 = .data:0x8045C594; // type:object size:0xC
lbl_8045C5A0 = .data:0x8045C5A0; // type:object size:0x10
lbl_8045C5B0 = .data:0x8045C5B0; // type:object size:0xC8
lbl_8045C678 = .data:0x8045C678; // type:object size:0x10
lbl_8045C688 = .data:0x8045C688; // type:object size:0x64
TaskName__12ifWifiprTask = .data:0x8045C678; // type:object size:0x10
__vt__12ifWifiprTask = .data:0x8045C688; // type:object size:0x64
lbl_8045C6EC = .data:0x8045C6EC; // type:object size:0x10
lbl_8045C6FC = .data:0x8045C6FC; // type:object size:0xC
lbl_8045C708 = .data:0x8045C708; // type:object size:0x18
Expand Down Expand Up @@ -29514,7 +29514,7 @@ lbl_8059E4CC = .sdata:0x8059E4CC; // type:object size:0x4
lbl_8059E4D0 = .sdata:0x8059E4D0; // type:object size:0x8
lbl_8059E4D8 = .sdata:0x8059E4D8; // type:object size:0x8
lbl_8059E4E0 = .sdata:0x8059E4E0; // type:object size:0x8
lbl_8059E4E8 = .sdata:0x8059E4E8; // type:object size:0x8
__RTTI__12ifWifiprTask = .sdata:0x8059E4E8; // type:object size:0x8
lbl_8059E4F0 = .sdata:0x8059E4F0; // type:object size:0x8
lbl_8059E4F8 = .sdata:0x8059E4F8; // type:object size:0x8
lbl_8059E500 = .sdata:0x8059E500; // type:object size:0x8
Expand Down Expand Up @@ -30779,7 +30779,7 @@ lbl_805A02E8 = .sbss:0x805A02E8; // type:object size:0x4 data:4byte
lbl_805A02EC = .sbss:0x805A02EC; // type:object size:0x4 data:4byte
lbl_805A02F0 = .sbss:0x805A02F0; // type:object size:0x8 data:4byte
lbl_805A02F8 = .sbss:0x805A02F8; // type:object size:0x8 data:byte
lbl_805A0300 = .sbss:0x805A0300; // type:object size:0x8 data:4byte
g_IfWifiprMngr = .sbss:0x805A0300; // type:object size:0x8 data:4byte
lbl_805A0308 = .sbss:0x805A0308; // type:object size:0x4 data:4byte
lbl_805A030C = .sbss:0x805A030C; // type:object size:0x4 data:4byte
lbl_805A0310 = .sbss:0x805A0310; // type:object size:0x4 data:4byte
Expand Down
1 change: 1 addition & 0 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ def MatchingFor(*versions):
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/if/if_wifipr_task.cpp"),
Object(Matching, "sora/gr/collision/gr_collision_data.cpp"),
Object(Matching, "sora/gr/collision/gr_collision_handle.cpp"),
Object(NonMatching, "sora/ac/ac_cmd_interpreter.cpp"),
Expand Down
2 changes: 1 addition & 1 deletion include/lib/BrawlHeaders
Open in desktop
Submodule BrawlHeaders updated 3 files
+4 −2 Brawl/Include/gf/gf_task.h
+9 −0 Brawl/Include/if/if_wifipr_mngr.h
+15 −0 Brawl/Include/if/if_wifipr_task.h
18 changes: 18 additions & 0 deletions src/sora/if/if_wifipr_task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#include <if/if_wifipr_mngr.h>
#include <if/if_wifipr_task.h>
#include <sr/sr_common.h>

char ifWifiprTask::TaskName[] = "ifWifiprTask";

ifWifiprTask* ifWifiprTask::create() {
ifWifiprTask* task = new (Heaps::InfoInstance) ifWifiprTask;
task->init();
task->unk2C_b1 = false;
return task;
}

void ifWifiprTask::processDefault() {
g_IfWifiprMngr->main();
}

ifWifiprTask::~ifWifiprTask() { }