Skip to content

Commit 5b6cbe8

Browse files
authored
st_emblem fixes (#90)
deleted collisions instead of calling their destructor fixed symbol for createSceneGround
1 parent 82864ba commit 5b6cbe8

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

config/RSBE01_02/rels/st_emblem/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ __dt__8stEmblemFv = .text:0x000002CC; // type:function size:0xD0
77
loading__8stEmblemFv = .text:0x0000039C; // type:function size:0x8
88
createObj__8stEmblemFv = .text:0x000003A4; // type:function size:0x4F4
99
setSceneCollision__8stEmblemFv = .text:0x00000898; // type:function size:0x104
10-
createSceneGround__8stEmblemFi = .text:0x0000099C; // type:function size:0x188
10+
createSceneGround__8stEmblemFs = .text:0x0000099C; // type:function size:0x188
1111
setChangeSceneNumber__8stEmblemFl = .text:0x00000B24; // type:function size:0x8
1212
checkChangeScene__8stEmblemFv = .text:0x00000B2C; // type:function size:0x8
1313
resetChangeScene__8stEmblemFv = .text:0x00000B34; // type:function size:0xC

src/mo_stage/st_emblem/st_emblem.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,11 +488,13 @@ void stEmblem::updateScene(float deltaFrame) {
488488
m_curr_scene_effect.end();
489489
// TODO: figure out how to pass 1 to the destructors insead of -1
490490
if (unk734 != NULL) {
491-
unk734->~grCollision();
491+
delete(unk734);
492+
//unk734->~grCollision();
492493
unk734 = NULL;
493494
}
494495
if (unk738 != NULL) {
495-
unk738->~grCollision();
496+
delete(unk738);
497+
//unk738->~grCollision();
496498
unk738 = NULL;
497499
}
498500
s32 i = 0;

0 commit comments

Comments
 (0)