Skip to content

st_emblem fixes #90

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 4 commits into from
Feb 15, 2026
Merged

st_emblem fixes #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
263377c
Nearly match st_emblem
MarioLover63 Feb 9, 2026
8b546ac
Merge branch 'main' into stEmblem
MarioLover63 Feb 9, 2026
f7b03d2
st_emblem fixes
MarioLover63 Feb 15, 2026
92cc9a1
Merge branch 'main' into stEmblem
MarioLover63 Feb 15, 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
2 changes: 1 addition & 1 deletion config/RSBE01_02/rels/st_emblem/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ __dt__8stEmblemFv = .text:0x000002CC; // type:function size:0xD0
loading__8stEmblemFv = .text:0x0000039C; // type:function size:0x8
createObj__8stEmblemFv = .text:0x000003A4; // type:function size:0x4F4
setSceneCollision__8stEmblemFv = .text:0x00000898; // type:function size:0x104
createSceneGround__8stEmblemFi = .text:0x0000099C; // type:function size:0x188
createSceneGround__8stEmblemFs = .text:0x0000099C; // type:function size:0x188
setChangeSceneNumber__8stEmblemFl = .text:0x00000B24; // type:function size:0x8
checkChangeScene__8stEmblemFv = .text:0x00000B2C; // type:function size:0x8
resetChangeScene__8stEmblemFv = .text:0x00000B34; // type:function size:0xC
Expand Down
6 changes: 4 additions & 2 deletions src/mo_stage/st_emblem/st_emblem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,11 +488,13 @@ void stEmblem::updateScene(float deltaFrame) {
m_curr_scene_effect.end();
// TODO: figure out how to pass 1 to the destructors insead of -1
if (unk734 != NULL) {
unk734->~grCollision();
delete(unk734);
//unk734->~grCollision();
unk734 = NULL;
}
if (unk738 != NULL) {
unk738->~grCollision();
delete(unk738);
//unk738->~grCollision();
unk738 = NULL;
}
s32 i = 0;
Expand Down
Loading