generated from encounter/dtk-template
-
Notifications
You must be signed in to change notification settings - Fork 6
Match and link gr_adventure_final.cpp #95
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.
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
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| #pragma once | ||
|
|
||
| #include <gr/gr_yakumono.h> | ||
|
|
||
| const float EFF_SOMETHING = 0.0f; | ||
| const float EFF_FRAME_MAX1 = 2540.0f; | ||
| const float EFF_FRAME_MAX2 = 6100.0f; | ||
| class grAdventureFinal : public grYakumono { | ||
| protected: | ||
| char unk1; | ||
| float unk4; | ||
| u8 m_step; | ||
| u16 padding; | ||
|
|
||
| public: | ||
| grAdventureFinal(const char* taskName) : grYakumono(taskName) { | ||
| unk1 = 0; | ||
| unk4 = EFF_SOMETHING; | ||
| m_step = 0; | ||
| setupMelee(); | ||
| m_transparencySettings = 0; | ||
| }; | ||
| virtual void update(float deltaFrame); | ||
| virtual ~grAdventureFinal(); | ||
|
|
||
| virtual void updateEff(); | ||
|
|
||
| static grAdventureFinal* create(int mdlIndex, const char* tgtNodeName, const char* taskName); | ||
|
|
||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| #include <sora_adv_stage/gr_adventure_final.h> | ||
| #include <ec/ec_mgr.h> | ||
| #include <memory.h> | ||
|
|
||
| grAdventureFinal* grAdventureFinal::create(int mdlIndex, const char* tgtNodeName, const char* taskName) { | ||
| grAdventureFinal* ground = new (Heaps::StageInstance) grAdventureFinal(taskName); | ||
| if (ground) { | ||
| ground->setMdlIndex(mdlIndex); | ||
| ground->setTgtNode(tgtNodeName); | ||
| } | ||
| return ground; | ||
| } | ||
|
|
||
| grAdventureFinal::~grAdventureFinal() { } | ||
|
|
||
| void grAdventureFinal::update(float deltaFrame) { | ||
| this->updateEff(); | ||
| } | ||
|
|
||
| void grAdventureFinal::updateEff() | ||
| { | ||
| switch (m_step) { | ||
| case 0: | ||
| g_ecMgr->setDrawPrio(1); | ||
| g_ecMgr->setEffect(ef_ptc_stg_final_zenpan); | ||
| g_ecMgr->setDrawPrio(0xffffffff); | ||
| unk4 = EFF_SOMETHING; | ||
| m_step++; | ||
| break; | ||
| case 1: | ||
| if (!(this->getMotionFrame(0) < 2540.0f)) { | ||
| g_ecMgr->setDrawPrio(1); | ||
| u32 unk = g_ecMgr->setEffect(ef_ptc_stg_final_star); | ||
| g_ecMgr->setDrawPrio(0xffffffff); | ||
| g_ecMgr->setParent(unk, m_sceneModels[0], "spaceB", 0); // sceneModel is actually supposed to be a wrapper of some kind | ||
| m_step++; | ||
| } | ||
| break; | ||
| case 2: | ||
| if (!(this->getMotionFrame(0) < 6100.0f)) { | ||
| g_ecMgr->setDrawPrio(1); | ||
| u32 unk = g_ecMgr->setEffect(ef_ptc_stg_final_kirakira); | ||
| g_ecMgr->setDrawPrio(0xffffffff); | ||
| g_ecMgr->setParent(unk, m_sceneModels[0], "spaceF", 0); // sceneModel is actually supposed to be a wrapper of some kind | ||
| m_step++; | ||
| } | ||
| break; | ||
| case 3: | ||
| if (this->getMotionFrame(0) < unk4) { | ||
| m_step = 0; | ||
| } else { | ||
| unk4 = this->getMotionFrame(0); | ||
| } | ||
| break; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There may be something wrong with CI, becuase the report says
.dataand.rodataare not fully matched, yet the file is markedMatching. Are these sections not showing 100% in objdiff?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
how do I remove the duplicate __RTTI__10grYakumono and similar data?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not necessarily wrong for RTTI and vtables to be duplicated across RELs; it just means all the virtuals are defined in the class definition. As long as you've labeled them correctly in
sora_adv_stage/symbols.txt, it's not a problem.