Skip to content

Start decompiling sora_enemy.rel #45

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
Jun 14, 2025
Merged

Start decompiling sora_enemy.rel #45

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
17 changes: 17 additions & 0 deletions config/RSBE01_02/rels/sora_enemy/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,23 @@ mo_enemy/sora_enemy/resource/em_resource_module_impl.cpp:
.text start:0x0001F57C end:0x0001F82C
.data start:0x00002C18 end:0x00002CF8

mo_enemy/sora_enemy/stop/em_stop_module_impl.cpp:
.text start:0x00022C88 end:0x00022D94
.data start:0x00003190 end:0x00003200

mo_enemy/sora_enemy/wnem/wn_em_resource_module_impl.cpp:
.text start:0x0002CF98 end:0x0002D038
.data start:0x00003EA8 end:0x00003F20

mo_enemy/sora_enemy/wnem/wn_em_heap_module_impl.cpp:
.text start:0x000349D0 end:0x00034AE8
.ctors start:0x00000020 end:0x00000024
.data start:0x00006CD8 end:0x00006D50
.bss start:0x00000260 end:0x00000280

mo_enemy/sora_enemy/wnem/wn_em_report.cpp:
.text start:0x0004833C end:0x0004838C

mo_enemy/mo_enemy.cpp:
.text start:0x0006B760 end:0x0006B7FC
.data start:0x0001FE78 end:0x0001FE85
Expand Down
64 changes: 32 additions & 32 deletions config/RSBE01_02/rels/sora_enemy/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ fn_41_2850 = .text:0x00002850; // type:function size:0x40
fn_41_2890 = .text:0x00002890; // type:function size:0x40
fn_41_28D0 = .text:0x000028D0; // type:function size:0x74
fn_41_2944 = .text:0x00002944; // type:function size:0x14
fn_41_2958 = .text:0x00002958; // type:function size:0x14
addObserver__22soAnimCmdEventObserverFsSc = .text:0x00002958; // type:function size:0x14
fn_41_296C = .text:0x0000296C; // type:function size:0x14
fn_41_2980 = .text:0x00002980; // type:function size:0x14
fn_41_2994 = .text:0x00002994; // type:function size:0x14
Expand Down Expand Up @@ -830,16 +830,16 @@ fn_41_229F8 = .text:0x000229F8; // type:function size:0x1E4
fn_41_22BDC = .text:0x00022BDC; // type:function size:0x8
fn_41_22BE4 = .text:0x00022BE4; // type:function size:0x5C
fn_41_22C40 = .text:0x00022C40; // type:function size:0x48
fn_41_22C88 = .text:0x00022C88; // type:function size:0x44
fn_41_22CCC = .text:0x00022CCC; // type:function size:0x5C
fn_41_22D28 = .text:0x00022D28; // type:function size:0x8
fn_41_22D30 = .text:0x00022D30; // type:function size:0x14
fn_41_22D44 = .text:0x00022D44; // type:function size:0x14
fn_41_22D58 = .text:0x00022D58; // type:function size:0x14
fn_41_22D6C = .text:0x00022D6C; // type:function size:0x14
fn_41_22D80 = .text:0x00022D80; // type:function size:0x4
fn_41_22D84 = .text:0x00022D84; // type:function size:0x8
fn_41_22D8C = .text:0x00022D8C; // type:function size:0x8
__ct__16emStopModuleImplFP16soModuleAccesser = .text:0x00022C88; // type:function size:0x44
__dt__16emStopModuleImplFv = .text:0x00022CCC; // type:function size:0x5C
getHitStopRealFrame__16soStopModuleImplFv = .text:0x00022D28; // type:function size:0x8
isDamage__16soStopModuleImplFv = .text:0x00022D30; // type:function size:0x14
isHit__16soStopModuleImplFv = .text:0x00022D44; // type:function size:0x14
isSpecialStop__16soStopModuleImplFv = .text:0x00022D58; // type:function size:0x14
isStop__16soStopModuleImplFv = .text:0x00022D6C; // type:function size:0x14
setHitStop__16soStopModuleImplFv = .text:0x00022D80; // type:function size:0x4
@4@notifyEventAnimCmd__16soStopModuleImplFP9acAnimCmdP16soModuleAccesserl = .text:0x00022D84; // type:function size:0x8
@4@isObserv__16soStopModuleImplFc = .text:0x00022D8C; // type:function size:0x8
fn_41_22D94 = .text:0x00022D94; // type:function size:0x90
fn_41_22E24 = .text:0x00022E24; // type:function size:0x40
fn_41_22E64 = .text:0x00022E64; // type:function size:0x14
Expand Down Expand Up @@ -1125,8 +1125,8 @@ fn_41_2C9F0 = .text:0x0002C9F0; // type:function size:0x14
fn_41_2CA04 = .text:0x0002CA04; // type:function size:0x68
fn_41_2CA6C = .text:0x0002CA6C; // type:function size:0x10
fn_41_2CA7C = .text:0x0002CA7C; // type:function size:0x51C
fn_41_2CF98 = .text:0x0002CF98; // type:function size:0x44
fn_41_2CFDC = .text:0x0002CFDC; // type:function size:0x5C
__ct__22wnemResourceModuleImplFUlP24soResourceIdAccesserImplUl = .text:0x0002CF98; // type:function size:0x44
__dt__22wnemResourceModuleImplFv = .text:0x0002CFDC; // type:function size:0x5C
fn_41_2D038 = .text:0x0002D038; // type:function size:0x18C
fn_41_2D1C4 = .text:0x0002D1C4; // type:function size:0x40
fn_41_2D204 = .text:0x0002D204; // type:function size:0x40
Expand Down Expand Up @@ -1415,12 +1415,12 @@ fn_41_349B0 = .text:0x000349B0; // type:function size:0x8
fn_41_349B8 = .text:0x000349B8; // type:function size:0x8
fn_41_349C0 = .text:0x000349C0; // type:function size:0x8
fn_41_349C8 = .text:0x000349C8; // type:function size:0x8
fn_41_349D0 = .text:0x000349D0; // type:function size:0x20
fn_41_349F0 = .text:0x000349F0; // type:function size:0x40
fn_41_34A30 = .text:0x00034A30; // type:function size:0x4
fn_41_34A34 = .text:0x00034A34; // type:function size:0x8
fn_41_34A3C = .text:0x00034A3C; // type:function size:0x5C
fn_41_34A98 = .text:0x00034A98; // type:function size:0x50
__ct__18wnemHeapModuleImplFQ25Heaps8HeapTypeQ25Heaps8HeapType = .text:0x000349D0; // type:function size:0x20
__dt__12soHeapModuleFv = .text:0x000349F0; // type:function size:0x40
setInstanceHeap__12soHeapModuleFQ25Heaps8HeapType = .text:0x00034A30; // type:function size:0x4
getSlotNo__18wnemHeapModuleImplCFv = .text:0x00034A34; // type:function size:0x8
__dt__18wnemHeapModuleImplFv = .text:0x00034A3C; // type:function size:0x5C
__sinit_\wn_em_heap_module_impl_cpp = .text:0x00034A98; // type:function size:0x50 scope:local
fn_41_34AE8 = .text:0x00034AE8; // type:function size:0x30
fn_41_34B18 = .text:0x00034B18; // type:function size:0x120
fn_41_34C38 = .text:0x00034C38; // type:function size:0x16C
Expand Down Expand Up @@ -1869,7 +1869,7 @@ fn_41_47F98 = .text:0x00047F98; // type:function size:0x1C
fn_41_47FB4 = .text:0x00047FB4; // type:function size:0x84
fn_41_48038 = .text:0x00048038; // type:function size:0x1CC
fn_41_48204 = .text:0x00048204; // type:function size:0x138
fn_41_4833C = .text:0x0004833C; // type:function size:0x50
wnemReport__FPCce = .text:0x0004833C; // type:function size:0x50
__ct__8emKuriboFUlP8emCreate = .text:0x0004838C; // type:function size:0x134
fn_41_484C0 = .text:0x000484C0; // type:function size:0xB8
fn_41_48578 = .text:0x00048578; // type:function size:0x124
Expand Down Expand Up @@ -3049,9 +3049,9 @@ lbl_41_data_1554 = .data:0x00001554; // type:object size:0xC
lbl_41_data_1560 = .data:0x00001560; // type:object size:0x8
lbl_41_data_1568 = .data:0x00001568; // type:object size:0x18
lbl_41_data_1580 = .data:0x00001580; // type:object size:0xC
lbl_41_data_158C = .data:0x0000158C; // type:object size:0x8
__RTTI__22soAnimCmdEventObserver = .data:0x0000158C; // type:object size:0x8
lbl_41_data_1594 = .data:0x00001594; // type:object size:0x28 data:string
lbl_41_data_15BC = .data:0x000015BC; // type:object size:0x8
__RTTI__41soEventObserver<22soAnimCmdEventObserver> = .data:0x000015BC; // type:object size:0x8
__vt__10soNullable = .data:0x000015C4; // type:object size:0xC
lbl_41_data_15D0 = .data:0x000015D0; // type:object size:0xC
__RTTI__10soNullable = .data:0x000015DC; // type:object size:0x14
Expand Down Expand Up @@ -3098,7 +3098,7 @@ lbl_41_data_1C3C = .data:0x00001C3C; // type:object size:0x28
lbl_41_data_1C64 = .data:0x00001C64; // type:object size:0x8
lbl_41_data_1C6C = .data:0x00001C6C; // type:object size:0x14
lbl_41_data_1C80 = .data:0x00001C80; // type:object size:0x24
lbl_41_data_1CA4 = .data:0x00001CA4; // type:object size:0x8
__RTTI__16emStopModuleImpl = .data:0x00001CA4; // type:object size:0x8
lbl_41_data_1CAC = .data:0x00001CAC; // type:object size:0x1B4
lbl_41_data_1E60 = .data:0x00001E60; // type:object size:0x14
lbl_41_data_1E74 = .data:0x00001E74; // type:object size:0x74
Expand Down Expand Up @@ -3141,9 +3141,9 @@ lbl_41_data_229C = .data:0x0000229C; // type:object size:0x28
lbl_41_data_22C4 = .data:0x000022C4; // type:object size:0x8
lbl_41_data_22CC = .data:0x000022CC; // type:object size:0x14
lbl_41_data_22E0 = .data:0x000022E0; // type:object size:0x1C
lbl_41_data_22FC = .data:0x000022FC; // type:object size:0x8
__RTTI__16soStopModuleImpl = .data:0x000022FC; // type:object size:0x8
lbl_41_data_2304 = .data:0x00002304; // type:object size:0x10
lbl_41_data_2314 = .data:0x00002314; // type:object size:0x8
__RTTI__12soStopModule = .data:0x00002314; // type:object size:0x8
lbl_41_data_231C = .data:0x0000231C; // type:object size:0x1C data:string
lbl_41_data_2338 = .data:0x00002338; // type:object size:0xC
lbl_41_data_2344 = .data:0x00002344; // type:object size:0x8
Expand Down Expand Up @@ -3246,7 +3246,7 @@ lbl_41_data_3160 = .data:0x00003160; // type:object size:0xC
lbl_41_data_316C = .data:0x0000316C; // type:object size:0x8
lbl_41_data_3174 = .data:0x00003174; // type:object size:0x10 data:string
lbl_41_data_3184 = .data:0x00003184; // type:object size:0xC
lbl_41_data_3190 = .data:0x00003190; // type:object size:0x70
__vt__16emStopModuleImpl = .data:0x00003190; // type:object size:0x70
lbl_41_data_3200 = .data:0x00003200; // type:object size:0x24
lbl_41_data_3224 = .data:0x00003224; // type:object size:0x18
lbl_41_data_323C = .data:0x0000323C; // type:object size:0x14
Expand Down Expand Up @@ -3307,10 +3307,10 @@ lbl_41_data_3E4C = .data:0x00003E4C; // type:object size:0x4
lbl_41_data_3E50 = .data:0x00003E50; // type:object size:0x40
lbl_41_data_3E90 = .data:0x00003E90; // type:object size:0x10 data:string
lbl_41_data_3EA0 = .data:0x00003EA0; // type:object size:0x8
lbl_41_data_3EA8 = .data:0x00003EA8; // type:object size:0x38
__vt__22wnemResourceModuleImpl = .data:0x00003EA8; // type:object size:0x38
lbl_41_data_3EE0 = .data:0x00003EE0; // type:object size:0x18
lbl_41_data_3EF8 = .data:0x00003EF8; // type:object size:0x1C
lbl_41_data_3F14 = .data:0x00003F14; // type:object size:0xC
__RTTI__22wnemResourceModuleImpl = .data:0x00003F14; // type:object size:0x8
lbl_41_data_3F20 = .data:0x00003F20; // type:object size:0xA4
lbl_41_data_3FC4 = .data:0x00003FC4; // type:object size:0x2C
lbl_41_data_3FF0 = .data:0x00003FF0; // type:object size:0x14
Expand Down Expand Up @@ -3403,13 +3403,13 @@ lbl_41_data_69A0 = .data:0x000069A0; // type:object size:0x70
lbl_41_data_6A10 = .data:0x00006A10; // type:object size:0x40
lbl_41_data_6A50 = .data:0x00006A50; // type:object size:0x34
lbl_41_data_6A84 = .data:0x00006A84; // type:object size:0x254
lbl_41_data_6CD8 = .data:0x00006CD8; // type:object size:0x24
__vt__18wnemHeapModuleImpl = .data:0x00006CD8; // type:object size:0x24
lbl_41_data_6CFC = .data:0x00006CFC; // type:object size:0x14
lbl_41_data_6D10 = .data:0x00006D10; // type:object size:0x14
lbl_41_data_6D24 = .data:0x00006D24; // type:object size:0x8
__RTTI__18wnemHeapModuleImpl = .data:0x00006D24; // type:object size:0x8
lbl_41_data_6D2C = .data:0x00006D2C; // type:object size:0x10
lbl_41_data_6D3C = .data:0x00006D3C; // type:object size:0xC
lbl_41_data_6D48 = .data:0x00006D48; // type:object size:0x8
__RTTI__12soHeapModule = .data:0x00006D48; // type:object size:0x8
jumptable_41_data_6D50 = .data:0x00006D50; // type:object size:0x4C scope:local
lbl_41_data_6D9C = .data:0x00006D9C; // type:object size:0x3C
lbl_41_data_6DD8 = .data:0x00006DD8; // type:object size:0x18
Expand Down Expand Up @@ -5056,7 +5056,7 @@ lbl_41_bss_250 = .bss:0x00000250; // type:object size:0x4
lbl_41_bss_254 = .bss:0x00000254; // type:object size:0x1 data:byte
lbl_41_bss_258 = .bss:0x00000258; // type:object size:0x8
lbl_41_bss_260 = .bss:0x00000260; // type:object size:0xC
lbl_41_bss_26C = .bss:0x0000026C; // type:object size:0x14 data:4byte
g_wnemHeapModule = .bss:0x0000026C; // type:object size:0x14 data:4byte
lbl_41_bss_280 = .bss:0x00000280; // type:object size:0xC
lbl_41_bss_28C = .bss:0x0000028C; // type:object size:0xC
lbl_41_bss_298 = .bss:0x00000298; // type:object size:0xC
Expand Down
48 changes: 23 additions & 25 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 @@ -2315,33 +2315,31 @@ fn_27_67240 = .text:0x00067240; // type:function size:0x8
fn_27_67248 = .text:0x00067248; // type:function size:0x8
fn_27_67250 = .text:0x00067250; // type:function size:0x8
fn_27_67258 = .text:0x00067258; // type:function size:0x8
fn_27_67260 = .text:0x00067260; // type:function size:0xD0
__ct__16soStopModuleImplFP16soModuleAccesser = .text:0x00067260; // type:function size:0xD0
fn_27_67330 = .text:0x00067330; // type:function size:0x40
fn_27_67370 = .text:0x00067370; // type:function size:0xC4
fn_27_67434 = .text:0x00067434; // type:function size:0x44
fn_27_67478 = .text:0x00067478; // type:function size:0x20
fn_27_67498 = .text:0x00067498; // type:function size:0x64
fn_27_674FC = .text:0x000674FC; // type:function size:0x4
fn_27_67500 = .text:0x00067500; // type:function size:0x8
fn_27_67508 = .text:0x00067508; // type:function size:0x134
fn_27_6763C = .text:0x0006763C; // type:function size:0x6C
fn_27_676A8 = .text:0x000676A8; // type:function size:0x4
fn_27_676AC = .text:0x000676AC; // type:function size:0x130
fn_27_677DC = .text:0x000677DC; // type:function size:0x164
fn_27_67940 = .text:0x00067940; // type:function size:0x12C
fn_27_67A6C = .text:0x00067A6C; // type:function size:0x1D0
fn_27_67C3C = .text:0x00067C3C; // type:function size:0x14
fn_27_67C50 = .text:0x00067C50; // type:function size:0x4E8
fn_27_68138 = .text:0x00068138; // type:function size:0x8
__dt__16soStopModuleImplFv = .text:0x00067370; // type:function size:0xC4
activate__16soStopModuleImplFv = .text:0x00067434; // type:function size:0x44
end__16soStopModuleImplFl = .text:0x00067478; // type:function size:0x20
setHitStopFrame__16soStopModuleImplFUlb = .text:0x00067498; // type:function size:0x68
setHitStopFrameFix__16soStopModuleImplFl = .text:0x00067500; // type:function size:0x8
cancelHitStop__16soStopModuleImplFv = .text:0x00067508; // type:function size:0x134
setOtherStop__16soStopModuleImplFUl = .text:0x0006763C; // type:function size:0x70
cancelOtherStop__16soStopModuleImplFv = .text:0x000676AC; // type:function size:0x130
setLinkStop__16soStopModuleImplFUl = .text:0x000677DC; // type:function size:0x164
setSpecialStop__16soStopModuleImplFUl = .text:0x00067940; // type:function size:0x12C
update__16soStopModuleImplFv = .text:0x00067A6C; // type:function size:0x1D0
isObserv__16soStopModuleImplFc = .text:0x00067C3C; // type:function size:0x14
notifyEventAnimCmd__16soStopModuleImplFP9acAnimCmdP16soModuleAccesserl = .text:0x00067C50; // type:function size:0x4E8
getHitStopFrame__16soStopModuleImplFv = .text:0x00068138; // type:function size:0x8
fn_27_68140 = .text:0x00068140; // type:function size:0x60
fn_27_681A0 = .text:0x000681A0; // type:function size:0x8
fn_27_681A8 = .text:0x000681A8; // type:function size:0x18
fn_27_681C0 = .text:0x000681C0; // type:function size:0x18
fn_27_681D8 = .text:0x000681D8; // type:function size:0x18
fn_27_681F0 = .text:0x000681F0; // type:function size:0x18
fn_27_68208 = .text:0x00068208; // type:function size:0x4
fn_27_6820C = .text:0x0006820C; // type:function size:0x8
fn_27_68214 = .text:0x00068214; // type:function size:0x8
getHitStopRealFrame__16soStopModuleImplFv = .text:0x000681A0; // type:function size:0x8 scope:weak
isDamage__16soStopModuleImplFv = .text:0x000681A8; // type:function size:0x18 scope:weak
isHit__16soStopModuleImplFv = .text:0x000681C0; // type:function size:0x18 scope:weak
isSpecialStop__16soStopModuleImplFv = .text:0x000681D8; // type:function size:0x18 scope:weak
isStop__16soStopModuleImplFv = .text:0x000681F0; // type:function size:0x18 scope:weak
setHitStop__16soStopModuleImplFv = .text:0x00068208; // type:function size:0x4 scope:weak
@4@notifyEventAnimCmd__16soStopModuleImplFP9acAnimCmdP16soModuleAccesserl = .text:0x0006820C; // type:function size:0x8 scope:weak
@4@isObserv__16soStopModuleImplFc = .text:0x00068214; // type:function size:0x8 scope:weak
fn_27_6821C = .text:0x0006821C; // type:function size:0x1AC
fn_27_683C8 = .text:0x000683C8; // type:function size:0x1D0
fn_27_68598 = .text:0x00068598; // type:function size:0x1F4
Expand Down
4 changes: 4 additions & 0 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,10 @@ def MatchingFor(*versions):
"objects": [
Object(Matching, "mo_enemy/sora_enemy/em_info.cpp"),
Object(Matching, "mo_enemy/sora_enemy/resource/em_resource_module_impl.cpp"),
Object(Matching, "mo_enemy/sora_enemy/stop/em_stop_module_impl.cpp"),
Object(Matching, "mo_enemy/sora_enemy/wnem/wn_em_resource_module_impl.cpp"),
Object(NonMatching, "mo_enemy/sora_enemy/wnem/wn_em_heap_module_impl.cpp"),
Object(Matching, "mo_enemy/sora_enemy/wnem/wn_em_report.cpp"),
Object(Matching, "mo_enemy/mo_enemy.cpp"),
],
},
Expand Down
2 changes: 1 addition & 1 deletion include/lib/BrawlHeaders
Open in desktop
Submodule BrawlHeaders updated 8 files
+12 −0 Brawl/Include/em/stop/em_stop_module_impl.h
+22 −0 Brawl/Include/em/wnem/wn_em_heap_module_impl.h
+3 −0 Brawl/Include/em/wnem/wn_em_report.h
+13 −0 Brawl/Include/em/wnem/wn_em_resource_module_impl.h
+3 −1 Brawl/Include/mu/selchar/mu_selchar.h
+1 −0 Brawl/Include/so/anim/so_anim_cmd.h
+20 −0 Brawl/Include/so/so_heap_module.h
+52 −42 Brawl/Include/so/stop/so_stop_module_impl.h
6 changes: 6 additions & 0 deletions src/mo_enemy/sora_enemy/stop/em_stop_module_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include <em/stop/em_stop_module_impl.h>

emStopModuleImpl::emStopModuleImpl(soModuleAccesser* acc)
: soStopModuleImpl(acc) { }

emStopModuleImpl::~emStopModuleImpl() { }
6 changes: 6 additions & 0 deletions src/mo_enemy/sora_enemy/wnem/wn_em_heap_module_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include <em/wnem/wn_em_heap_module_impl.h>

wnemHeapModuleImpl g_wnemHeapModule(Heaps::WeaponInstance, Heaps::StageResource);

wnemHeapModuleImpl::wnemHeapModuleImpl(HeapType p1, HeapType p2)
: unk8(p1), unkC(p2) { }
3 changes: 3 additions & 0 deletions src/mo_enemy/sora_enemy/wnem/wn_em_report.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include <em/wnem/wn_em_report.h>

void wnemReport(const char* fmt, ...) { }
7 changes: 7 additions & 0 deletions src/mo_enemy/sora_enemy/wnem/wn_em_resource_module_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include <em/wnem/wn_em_resource_module_impl.h>

wnemResourceModuleImpl::
wnemResourceModuleImpl(u32 p1, soResourceIdAccesserImpl* rsrcIdAcc, u32 p3)
: soResourceModuleImpl(p1, rsrcIdAcc, p3) { }

wnemResourceModuleImpl::~wnemResourceModuleImpl() { }