Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
11bdbda
WIP getHandle Decompilation
ThePlayerRolo Apr 21, 2025
499e91b
Edit 0 to nullptr for consientesy.
ThePlayerRolo Apr 21, 2025
0b99bab
Update According to @break-core revision
ThePlayerRolo Apr 21, 2025
b265aef
Implement getSceneNo
ThePlayerRolo Apr 21, 2025
2cdbe7f
100% GETSCENENO MATCHING LETS GOOOOO
ThePlayerRolo Apr 21, 2025
c1934f8
Broken SetTrack Volume
ThePlayerRolo Apr 21, 2025
c64fba9
76% matching SetTrackVolume
ThePlayerRolo Apr 21, 2025
0010d97
Actually 74% I forgot for a second
ThePlayerRolo Apr 21, 2025
f70783a
I think this is what you said to do?
ThePlayerRolo Apr 22, 2025
a2227c3
Change the right thing
ThePlayerRolo Apr 22, 2025
11b00e5
Changing it to JAISound still doesn't work?
ThePlayerRolo Apr 22, 2025
339f8e2
Update DOcs I guess?
ThePlayerRolo Apr 22, 2025
41e229a
Change Value to track for 76% matching
ThePlayerRolo Apr 23, 2025
29fc552
Final edit to setTrackVolume For now
ThePlayerRolo May 16, 2025
14894cb
Format
ThePlayerRolo May 16, 2025
c868cfe
100% SET TRACK VOLUME BABY
ThePlayerRolo May 17, 2025
86b2b20
Lots more functions
ThePlayerRolo May 17, 2025
7b74abb
WIP progress StopTrackBGM, StartBGM, and setStageBgmYoshiPercussion. …
ThePlayerRolo May 19, 2025
2a3c32e
Yeah I think I'm good
ThePlayerRolo May 20, 2025
43660bb
Remove Useless Include
ThePlayerRolo May 20, 2025
3a0b778
Format
ThePlayerRolo May 20, 2025
0493c60
unk14 change
ThePlayerRolo May 20, 2025
7aad333
FormatING!!!
ThePlayerRolo May 20, 2025
1fb8770
Merge branch 'main' of https://github.com/ThePlayerRolo/sms
ThePlayerRolo Jun 22, 2025
e8d223e
make the repo actually proper
ThePlayerRolo Jun 22, 2025
6c61290
NpcCoinWork
ThePlayerRolo Jun 23, 2025
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 include/MSound/MSoundBGM.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ class MSBgm : public JALListHioNode<MSBgm, u32> {
/* 0x14 */ JAISound* unk14;
};

#endif
#endif
21 changes: 21 additions & 0 deletions include/NPC/NpcCoin.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#include "MoveBG/MapObjBase.hpp"
#include "dolphin.h"
#include "dolphin/mtx.h"








class TNpcCoin {
TNpcCoin(int);
void requestAppearAfterCoin(const Vec&, f32, int);
void updateCoin();
TMapObjBase* unk0;
s32 unk4;
JGeometry::TVec3<f32> unk8;
JGeometry::TVec3<f32> unk14;

};
2 changes: 1 addition & 1 deletion src/MSound/MSoundBGM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -305,4 +305,4 @@ JAISound* MSBgm::getHandle(u8 param)
return nullptr;
}

JAISound* MSBgm::getJASTrack(JAISound* param1, u8 param2) { return nullptr; }
JAISound* MSBgm::getJASTrack(JAISound* param1, u8 param2) { return nullptr; }
66 changes: 66 additions & 0 deletions src/NPC/NpcCoin.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
#include "NPC/NpcCoin.hpp"
#include "MSound/MSound.hpp"
#include "MSound/MSoundSE.hpp"
#include "MoveBG/ItemManager.hpp"
#include "MoveBG/MapObjBase.hpp"
#include "MoveBG/MapObjManager.hpp"
#include "System/MarDirector.hpp"
#include "types.h"




TNpcCoin::TNpcCoin(int arg1) {
unk0 = nullptr;
unk4 = 0;
unk8.x = 0.0f;
unk8.y = 0.0f;
unk8.z = 0.0f;
unk14.x = 0.0f;
unk14.y = 0.0f;
unk14.z = 0.0f;
unk0 = TMapObjBaseManager::newAndRegisterObjByEventID(arg1, nullptr);
this->unk0->kill();
};

void TNpcCoin::updateCoin() {
bool bVar2;
bool bVar3;
TMapObjBase* temp;
if (0 < this->unk4) {
bVar2 = true;
bVar3 = true;
if (gpMarDirector->unk124 != 1 && gpMarDirector->unk124 != 2 ) {
bVar2 = false;
}
if (!bVar2) {
bVar2 = true;
if (gpMarDirector->unk124 != 3 && gpMarDirector->unk124 != 4) {
bVar2 = false;
}
}
if (!bVar2) {
bVar3 = false;
}
if (!bVar3 && (this->unk4--, this->unk4 != 0)) {
temp->appear();
} else {
temp = gpItemManager->makeObjAppear(unk8.x, unk8.y, unk8.z,0x2000000e,true);
if (temp) {
f32 float2;
f32 float1;
f32 float3;
float1 = unk14.z;
float2 = unk14.y;
float3 = unk14.x;
temp->unkAC.x = float3;
temp->unkAC.y = float2;
temp->unkAC.z = float1;
temp->mLiveFlag &= ~0x10;
}
}
if (gpMSound->gateCheck(0x8807)) {
MSoundSESystem::MSoundSE::startSoundNpcActor(0x8807, unk8, 0, nullptr, 0, 4);
}
}
}
Loading