Skip to content

Use ROM-proven daObjWaterfall_c C++ identity #2012

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
andrewboudreau merged 8 commits into from
Aug 30, 2026
Merged

Use ROM-proven daObjWaterfall_c C++ identity #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
adad62e
Use ROM-proven daObjWaterfall_c identity
andrewboudreau Aug 30, 2026
b93d818
Refresh Waterfall C++ integration state
andrewboudreau Aug 30, 2026
cab3401
Refresh Waterfall proof on current main
andrewboudreau Aug 30, 2026
d3a1758
Centralize the Waterfall vtable declaration
andrewboudreau Aug 30, 2026
daac614
Merge origin/main into cpp/waterfall-genuine-tu
andrewboudreau Aug 30, 2026
17a3350
Clear the last WaterfallMist references left by the rename
andrewboudreau Aug 30, 2026
6e180ef
Merge origin/main into cpp/waterfall-genuine-tu
andrewboudreau Aug 30, 2026
83e7314
Merge main into cpp/waterfall-genuine-tu
andrewboudreau Aug 30, 2026
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
10 changes: 5 additions & 5 deletions config/arm9/overlays/ov002/delinks.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,23 +1052,23 @@ src/PoppingLavaBubbles_Spawn.c:
complete
.text start:0x020b6dd8 end:0x020b6e08

src/_ZN13WaterfallMistD1Ev.cpp:
src/_ZN16daObjWaterfall_cD1Ev.cpp:
complete
.text start:0x020b6e08 end:0x020b6e2c

src/_ZN13WaterfallMistD0Ev.cpp:
src/_ZN16daObjWaterfall_cD0Ev.cpp:
complete
.text start:0x020b6e2c end:0x020b6e64

src/_ZN13WaterfallMist8BehaviorEv.cpp:
src/_ZN16daObjWaterfall_c8BehaviorEv.cpp:
complete
.text start:0x020b6e64 end:0x020b6eac

src/_ZN13WaterfallMist13InitResourcesEv.cpp:
src/_ZN16daObjWaterfall_c13InitResourcesEv.cpp:
complete
.text start:0x020b6eac end:0x020b6ee8

src/WaterfallMist_Spawn.c:
src/WaterfallMist_Spawn.cpp:
complete
.text start:0x020b6ee8 end:0x020b6f18

Expand Down
10 changes: 5 additions & 5 deletions config/arm9/overlays/ov002/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,10 @@ _ZN18PoppingLavaBubblesD0Ev kind:function(arm,size=0x38) addr:0x020b6d4c
func_ov002_020b6d84 kind:function(arm,size=0x4c) addr:0x020b6d84
_ZN18PoppingLavaBubbles13InitResourcesEv kind:function(arm,size=0x8) addr:0x020b6dd0
PoppingLavaBubbles_Spawn kind:function(arm,size=0x30) addr:0x020b6dd8
_ZN13WaterfallMistD1Ev kind:function(arm,size=0x24) addr:0x020b6e08
_ZN13WaterfallMistD0Ev kind:function(arm,size=0x38) addr:0x020b6e2c
_ZN13WaterfallMist8BehaviorEv kind:function(arm,size=0x48) addr:0x020b6e64
_ZN13WaterfallMist13InitResourcesEv kind:function(arm,size=0x3c) addr:0x020b6eac
_ZN16daObjWaterfall_cD1Ev kind:function(arm,size=0x24) addr:0x020b6e08
_ZN16daObjWaterfall_cD0Ev kind:function(arm,size=0x38) addr:0x020b6e2c
_ZN16daObjWaterfall_c8BehaviorEv kind:function(arm,size=0x48) addr:0x020b6e64
_ZN16daObjWaterfall_c13InitResourcesEv kind:function(arm,size=0x3c) addr:0x020b6eac
WaterfallMist_Spawn kind:function(arm,size=0x30) addr:0x020b6ee8
_ZN15daObjMarioCap_cD1Ev kind:function(arm,size=0x50) addr:0x020b6f18
_ZN15daObjMarioCap_cD0Ev kind:function(arm,size=0x64) addr:0x020b6f68
Expand Down Expand Up @@ -1803,7 +1803,7 @@ _ZTV18PoppingLavaBubbles kind:data(any) addr:0x021093e0
_ZTI16daObjWaterfall_c kind:data(any) addr:0x0210945c
_ZTS16daObjWaterfall_c kind:data(any) addr:0x02109468
WaterfallMist_SpawnInfo kind:data(any) addr:0x0210947c
_ZTV13WaterfallMist kind:data(any) addr:0x021094a0
_ZTV16daObjWaterfall_c kind:data(any) addr:0x021094a0
data_ov002_0210951c kind:data(any) addr:0x0210951c
data_ov002_02109524 kind:data(any) addr:0x02109524
data_ov002_0210952c kind:data(any) addr:0x0210952c
Expand Down
6 changes: 3 additions & 3 deletions config/converted-baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,9 +787,9 @@
"src/_ZN13UpDownLiftBbh6RenderEv.cpp",
"src/_ZN13UpDownLiftBbhD0Ev.cpp",
"src/_ZN13UpDownLiftBbhD1Ev.cpp",
"src/_ZN13WaterfallMist13InitResourcesEv.cpp",
"src/_ZN13WaterfallMistD0Ev.cpp",
"src/_ZN13WaterfallMistD1Ev.cpp",
"src/_ZN16daObjWaterfall_c13InitResourcesEv.cpp",
"src/_ZN16daObjWaterfall_cD0Ev.cpp",
"src/_ZN16daObjWaterfall_cD1Ev.cpp",
"src/_ZN13dScGameOver_c16CleanupResourcesEv.cpp",
"src/_ZN13dScGameOver_c16OnPendingDestroyEv.cpp",
"src/_ZN13dScGameOver_cD0Ev.cpp",
Expand Down
203 changes: 0 additions & 203 deletions config/tu_manifest.d/ov002/WaterfallMist.json
View file
Open in desktop

This file was deleted.

Loading
Loading