Skip to content
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

Jump to bottom

Dowsing #17

Merged
merged 9 commits into from
Sep 12, 2024
Merged

Dowsing #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
241e3f1
Dowsing.
robojumper Jun 30, 2024
7d7a9cf
match d_t_dowsing
robojumper Jul 1, 2024
64f9196
Ok cool NOW this works for some reason (thanks Zeldex72!)
robojumper Jul 1, 2024
ab4d25b
Fixes
robojumper Jul 3, 2024
0c85907
d_t_holy_water OK
robojumper Jul 5, 2024
d068ec1
Use slot enum in ctor
robojumper Jul 9, 2024
0ba0cc1
Fix the dTg_c class to not override the common four lifecycle methods
robojumper Sep 11, 2024
0071898
Create some headers
robojumper Sep 11, 2024
8f406a6
Fix enum members
robojumper Sep 12, 2024
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
2 changes: 2 additions & 0 deletions config/SOUE01/rels/d_t_dowsingNP/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ REL/executor.c:

REL/d/t/d_t_dowsing.cpp:
.text start:0x00000070 end:0x00000580
.rodata start:0x00000000 end:0x00000004
.data start:0x00000000 end:0x000000B0
22 changes: 11 additions & 11 deletions config/SOUE01/rels/d_t_dowsingNP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
fn_299_70 = .text:0x00000070; // type:function size:0x30
fn_299_A0 = .text:0x000000A0; // type:function size:0x60
fn_299_100 = .text:0x00000100; // type:function size:0xBC
fn_299_1C0 = .text:0x000001C0; // type:function size:0x8
fn_299_1D0 = .text:0x000001D0; // type:function size:0xF4
fn_299_2D0 = .text:0x000002D0; // type:function size:0x8
fn_299_2E0 = .text:0x000002E0; // type:function size:0x228
fn_299_510 = .text:0x00000510; // type:function size:0x70
dTgDowsing_c_classInit__Fv = .text:0x00000070; // type:function size:0x30
__ct__12dTgDowsing_cFv = .text:0x000000A0; // type:function size:0x60
create__12dTgDowsing_cFv = .text:0x00000100; // type:function size:0xBC
doDelete__12dTgDowsing_cFv = .text:0x000001C0; // type:function size:0x8
actorExecute__12dTgDowsing_cFv = .text:0x000001D0; // type:function size:0xF4
draw__12dTgDowsing_cFv = .text:0x000002D0; // type:function size:0x8
checkDowsing__12dTgDowsing_cCFv = .text:0x000002E0; // type:function size:0x228
__dt__12dTgDowsing_cFv = .text:0x00000510; // type:function size:0x70
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_299_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float
lbl_299_data_0 = .data:0x00000000; // type:object size:0x10
lbl_299_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float
g_profile_T_DOWSING = .data:0x00000000; // type:object size:0x10
jumptable_299_data_10 = .data:0x00000010; // type:object size:0x2C scope:local
lbl_299_data_3C = .data:0x0000003C; // type:object size:0x74
__vt__12dTgDowsing_c = .data:0x0000003C; // type:object size:0x74
3 changes: 3 additions & 0 deletions config/SOUE01/rels/d_t_genki_dws_tgtNP/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ REL/executor.c:

REL/d/t/d_t_genki_dws_tgt.cpp:
.text start:0x00000070 end:0x000003C0
.rodata start:0x00000000 end:0x0000000C
.data start:0x00000000 end:0x00000084
.bss start:0x00000008 end:0x00000018
22 changes: 11 additions & 11 deletions config/SOUE01/rels/d_t_genki_dws_tgtNP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
fn_632_70 = .text:0x00000070; // type:function size:0x70
fn_632_E0 = .text:0x000000E0; // type:function size:0x168
fn_632_250 = .text:0x00000250; // type:function size:0x24
fn_632_280 = .text:0x00000280; // type:function size:0xB4
fn_632_340 = .text:0x00000340; // type:function size:0xC
fn_632_350 = .text:0x00000350; // type:function size:0x70
dTgGenkiDwsTgt_c_classInit__Fv = .text:0x00000070; // type:function size:0x70
create__16dTgGenkiDwsTgt_cFv = .text:0x000000E0; // type:function size:0x168
doDelete__16dTgGenkiDwsTgt_cFv = .text:0x00000250; // type:function size:0x24
actorExecute__16dTgGenkiDwsTgt_cFv = .text:0x00000280; // type:function size:0xB4
getSceneFlagFromParams__16dTgGenkiDwsTgt_cFv = .text:0x00000340; // type:function size:0xC
__dt__16dTgGenkiDwsTgt_cFv = .text:0x00000350; // type:function size:0x70
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_632_rodata_0 = .rodata:0x00000000; // type:object size:0xC data:float
lbl_632_data_0 = .data:0x00000000; // type:object size:0x10
lbl_632_data_10 = .data:0x00000010; // type:object size:0x74
lbl_632_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
lbl_632_bss_C = .bss:0x0000000C; // type:object size:0xC data:float
lbl_632_rodata_0 = .rodata:0x00000000; // type:object size:0xC scope:local data:float
g_profile_TAG_GENKI_DOWSING_TARGET = .data:0x00000000; // type:object size:0x10
__vt__16dTgGenkiDwsTgt_c = .data:0x00000010; // type:object size:0x74
@GUARD@create__16dTgGenkiDwsTgt_cFv@offset = .bss:0x00000008; // type:object size:0x1 scope:local data:byte
@LOCAL@create__16dTgGenkiDwsTgt_cFv@offset = .bss:0x0000000C; // type:object size:0xC scope:local data:float
2 changes: 2 additions & 0 deletions config/SOUE01/rels/d_t_holy_waterNP/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ REL/executor.c:

REL/d/t/d_t_holy_water.cpp:
.text start:0x00000070 end:0x00000360
.rodata start:0x00000000 end:0x0000000C
.data start:0x00000000 end:0x00000084
26 changes: 13 additions & 13 deletions config/SOUE01/rels/d_t_holy_waterNP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
_prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
fn_445_70 = .text:0x00000070; // type:function size:0x70
fn_445_E0 = .text:0x000000E0; // type:function size:0x3C
fn_445_120 = .text:0x00000120; // type:function size:0x8
fn_445_130 = .text:0x00000130; // type:function size:0x70
fn_445_1A0 = .text:0x000001A0; // type:function size:0x8
fn_445_1B0 = .text:0x000001B0; // type:function size:0x12C
fn_445_2E0 = .text:0x000002E0; // type:function size:0x4
fn_445_2F0 = .text:0x000002F0; // type:function size:0x70
dTgHolyWater_c_classInit__Fv = .text:0x00000070; // type:function size:0x70
create__14dTgHolyWater_cFv = .text:0x000000E0; // type:function size:0x3C
doDelete__14dTgHolyWater_cFv = .text:0x00000120; // type:function size:0x8
actorExecute__14dTgHolyWater_cFv = .text:0x00000130; // type:function size:0x70
draw__14dTgHolyWater_cFv = .text:0x000001A0; // type:function size:0x8
isLinkNearby__14dTgHolyWater_cFv = .text:0x000001B0; // type:function size:0x12C
dowsingActive__14dTgHolyWater_cFv = .text:0x000002E0; // type:function size:0x4
__dt__14dTgHolyWater_cFv = .text:0x000002F0; // type:function size:0x70
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
lbl_445_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float
lbl_445_rodata_4 = .rodata:0x00000004; // type:object size:0x4 data:float
lbl_445_rodata_8 = .rodata:0x00000008; // type:object size:0x4 data:float
lbl_445_data_0 = .data:0x00000000; // type:object size:0x10
lbl_445_data_10 = .data:0x00000010; // type:object size:0x74
lbl_445_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float
lbl_445_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local data:float
lbl_445_rodata_8 = .rodata:0x00000008; // type:object size:0x4 scope:local data:float
g_profile_TAG_HOLY_WATER = .data:0x00000000; // type:object size:0x10
__vt__14dTgHolyWater_c = .data:0x00000010; // type:object size:0x74
8 changes: 4 additions & 4 deletions config/SOUE01/rels/d_t_light_shaft_effNP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
dTgLightShaftEff_c_classInit__Fv = .text:0x00000070; // type:function size:0x4C
create__5dTg_cFv = .text:0x000000C0; // type:function size:0x8
doDelete__5dTg_cFv = .text:0x000000D0; // type:function size:0x8
actorExecute__5dTg_cFv = .text:0x000000E0; // type:function size:0x8
draw__5dTg_cFv = .text:0x000000F0; // type:function size:0x8
create__18dTgLightShaftEff_cFv = .text:0x000000C0; // type:function size:0x8
doDelete__18dTgLightShaftEff_cFv = .text:0x000000D0; // type:function size:0x8
actorExecute__18dTgLightShaftEff_cFv = .text:0x000000E0; // type:function size:0x8
draw__18dTgLightShaftEff_cFv = .text:0x000000F0; // type:function size:0x8
__dt__18dTgLightShaftEff_cFv = .text:0x00000100; // type:function size:0x5C
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
Expand Down
6 changes: 3 additions & 3 deletions config/SOUE01/rels/d_t_map_instNP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ _epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
dTgMapInst_c_classInit__Fv = .text:0x00000070; // type:function size:0x4C
create__12dTgMapInst_cFv = .text:0x000000C0; // type:function size:0x10
doDelete__5dTg_cFv = .text:0x000000D0; // type:function size:0x8
actorExecute__5dTg_cFv = .text:0x000000E0; // type:function size:0x8
draw__5dTg_cFv = .text:0x000000F0; // type:function size:0x8
doDelete__12dTgMapInst_cFv = .text:0x000000D0; // type:function size:0x8
actorExecute__12dTgMapInst_cFv = .text:0x000000E0; // type:function size:0x8
draw__12dTgMapInst_cFv = .text:0x000000F0; // type:function size:0x8
__dt__12dTgMapInst_cFv = .text:0x00000100; // type:function size:0x5C
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
Expand Down
8 changes: 4 additions & 4 deletions config/SOUE01/rels/d_t_tackleNP/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
_epilog = .text:0x00000030; // type:function size:0x2C scope:global
_unresolved = .text:0x00000060; // type:function size:0x4 scope:global
dTgTackle_c_classInit__Fv = .text:0x00000070; // type:function size:0x4C
create__5dTg_cFv = .text:0x000000C0; // type:function size:0x8
doDelete__5dTg_cFv = .text:0x000000D0; // type:function size:0x8
actorExecute__5dTg_cFv = .text:0x000000E0; // type:function size:0x8
draw__5dTg_cFv = .text:0x000000F0; // type:function size:0x8
create__11dTgTackle_cFv = .text:0x000000C0; // type:function size:0x8
doDelete__11dTgTackle_cFv = .text:0x000000D0; // type:function size:0x8
actorExecute__11dTgTackle_cFv = .text:0x000000E0; // type:function size:0x8
draw__11dTgTackle_cFv = .text:0x000000F0; // type:function size:0x8
__dt__11dTgTackle_cFv = .text:0x00000100; // type:function size:0x5C
_ctors = .ctors:0x00000000; // type:label scope:global
_dtors = .dtors:0x00000000; // type:label scope:global
Expand Down
11 changes: 11 additions & 0 deletions config/SOUE01/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ toBeSorted/file_manager.cpp:
toBeSorted/save_manager.cpp:
.text start:0x80011730 end:0x80015310

toBeSorted/sound_info.cpp:
.text start:0x8002C250 end:0x8002C308

d/a/d_a_base.cpp:
.text start:0x8002C3A0 end:0x8002DE40
.data start:0x80501538 end:0x805015B8
Expand Down Expand Up @@ -143,6 +146,14 @@ toBeSorted/arc_managers/layout_arc_manager.cpp:
.sdata start:0x80571D68 end:0x80571D70
.sbss start:0x80575288 end:0x80575290

toBeSorted/dowsing_target.cpp:
.text start:0x80097570 end:0x80098574
.ctors start:0x804DB6BC end:0x804DB6C0
.rodata start:0x804E3698 end:0x804E36B8
.data start:0x8050F550 end:0x8050F560
.sdata2 start:0x80579640 end:0x80579670
.bss start:0x805A2FB0 end:0x805A3010

toBeSorted/sceneflag_manager.cpp:
.text start:0x800BD8C0 end:0x800BE7A8
.sbss start:0x805753E0 end:0x805753F0
Expand Down
Loading