diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-03-26 17:38:55 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-26 16:38:55 -0400 |
| commit | 89a0b26289a7bcb2e5cc450f2792e08b7bb276f9 (patch) | |
| tree | 2635012016662ffc7c1f468773e6d2b5120ccba0 /ZAPD/ZFile.cpp | |
| parent | 14d2a734b3fdddf2091629edc59db94ab5548f3e (diff) | |
Add cutscene extraction for MM (#242)
* Initial draft
* crashes a lot less
* Some scenes matches
* GiveTatl
* A class for every command
* CS_MISC
* A few macros
* More commands
* Macros for unknown commands
* small cleanup
* Remove useless destructors and fix warnings
* More cleanup
* format
* Move stuff around
* move commands to commands file
* oot builds again
* Mix OoT and MM SetTime commands
* Name Terminator and Camera
* MOTIONBLUR
* Use CS_TEXT_LEARN_SONG in OoT
* Macros for each type of textbox
* Mix PlaySec and PlayBgm classes
* Mix StopSeq and StopBgm
* Mix the actor actions from oot and mm
* Merge unknown command
* Mix ZCutscene and ZCutsceneMM into one
* Fix SCENE_CMD_CUTSCENE_LIST not using symbol and hardcoded MM cutscenes names
* Mix OoT and MM LIGHTING class
* Mix OoT and MM misc
* Rumble
* format
* remove redundant else
* CS_FADESCREEN
* argument change
* Remove some redundant parameters
* Renames
* format
* Rename ChooseCredits class
* Final cleanup
* line
* GenericCmd class for MM
* Move some extra commands to csCommandsDescMM
* Remove redundant GetCommandOoTFromID
* CutsceneCommand_GenericCmd for OoT
* Move CS_UNK_DATA to GenericCmd
* Final cleanup
* format
* warning
Diffstat (limited to 'ZAPD/ZFile.cpp')
| -rw-r--r-- | ZAPD/ZFile.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ZAPD/ZFile.cpp b/ZAPD/ZFile.cpp index d9733f3..b81399e 100644 --- a/ZAPD/ZFile.cpp +++ b/ZAPD/ZFile.cpp @@ -695,7 +695,7 @@ bool ZFile::GetDeclarationArrayIndexedName(segptr_t segAddress, size_t elementSi return true; } -Declaration* ZFile::GetDeclaration(uint32_t address) const +Declaration* ZFile::GetDeclaration(offset_t address) const { if (declarations.find(address) != declarations.end()) return declarations.at(address); @@ -703,7 +703,7 @@ Declaration* ZFile::GetDeclaration(uint32_t address) const return nullptr; } -Declaration* ZFile::GetDeclarationRanged(uint32_t address) const +Declaration* ZFile::GetDeclarationRanged(offset_t address) const { for (const auto decl : declarations) { @@ -714,7 +714,7 @@ Declaration* ZFile::GetDeclarationRanged(uint32_t address) const return nullptr; } -bool ZFile::HasDeclaration(uint32_t address) +bool ZFile::HasDeclaration(offset_t address) { assert(GETSEGNUM(address) == 0); return declarations.find(address) != declarations.end(); |