Working more on zNPCFXCinematic with one 100% and started on other functions#519
Working more on zNPCFXCinematic with one 100% and started on other functions#519mattbruv merged 25 commits intobfbbdecomp:mainfrom
Conversation
…0% zTalkBox function
🆗 ✅+494 bytes No Regressions 🎉Progress: 10📈 |
src/SB/Game/zNPCFXCinematic.cpp
Outdated
| } | ||
|
|
||
| switch (fxrec->typ_ncinfx) | ||
| switch(fxrec->typ_ncinfx) |
There was a problem hiding this comment.
Can you run the formatter on this file so things like this don't sneak into PRs?
src/SB/Game/zTalkBox.cpp
Outdated
| void ztalkbox::reset_all() | ||
| { | ||
| volatile int* sharedMemory = reinterpret_cast<volatile int*>(ztalkbox_shared.active); | ||
|
|
||
| int value = 0; | ||
| *sharedMemory = value; | ||
| *(sharedMemory + 8) = value; | ||
| *(sharedMemory + 9) = 0; | ||
| *(sharedMemory + 10) = 0; | ||
| *(sharedMemory + 11) = 0; | ||
| *(sharedMemory + 12) = 0; | ||
|
|
||
| clear_layout(); //FIXME: Find and replace with xtextbox::layout::clear() | ||
| return; | ||
| } |
There was a problem hiding this comment.
This is something I wouldn't want to include, it's very rough and only raises the function to 28%, so it's a big work in progress still, and doesn't necessarily give us anything useful to work off of. I'd remove it for now from this PR.
|
* ship it, YOLO * test * BossSB2 functions and mem offsets * wip push * push fix * couple of bossplankton functions. * znpcmessenger function fix * More xMath3 work (#513) * More xMath3 work * This isnt matching * Update 🆗 bot * zNPCGoalAmbient: zNPCGoalJellyBumped Near 100% Match (#514) * zNPCTypeCommon: Add declaration for zNPCCommon::HaveLOSToPos * zNPCTypeAmbient: Add declarations for zNPCJellly ActLikeOctopus and JellyBoneWorldPos * zFX: Add overload declarations for zFX_SpawnBubbleTrail * xFX: Add overload declaration for xFXStreakUpdate * zNPCGoalAmbient: Nearly 100% match for all zNPCGoalJellyBumped functions * zNPCGoalAmbient: Fix flipped registers in CalcEndPoint implementation * Robo-Sandy: Function Progress (#515) * zNPCTypeVillager: Limit scope of g_sndTrax_Villager * zNPCTypeBossSandy: Add SandyLimbSpring struct from DWARF data * zNPCTypeBossSandy: Unextern floats and match most data * Sandy: Several function matches + some WIP * Sandy: Fix regression in ZNPC_AnimTable_BossSandy and increase matchingness * zNPCFXCinematic -> NPARMgmt::KillAll() 100% (#516) * Fix zNPCFXCinematic implementation * All NPCCone functions 100% * forgot one change. * Moved Static S32 init to the top of file in zNPCFXCinematic.cpp * Removed commented code in zNPCFXCinematic.cpp * Removed commented code at the bottom of zNPCFXCinematic.cpp * Removed commented code at the top of zNPCFXCinematic.h * Added parameter names for UVSliceSet, UVBaseSet, ColorSet * Removed the blank git file * xSnd work (#517) * 40% - 92% for some NCIN_Par functions in zNPCFXCinematic (#518) * Fix zNPCFXCinematic implementation * All NPCCone functions 100% * forgot one change. * Moved Static S32 init to the top of file in zNPCFXCinematic.cpp * Removed commented code in zNPCFXCinematic.cpp * Removed commented code at the bottom of zNPCFXCinematic.cpp * Removed commented code at the top of zNPCFXCinematic.h * Added parameter names for UVSliceSet, UVBaseSet, ColorSet * Removed the blank git file * 40% - 92% for some NCIN_Par functions in zNPCFXCinematic * Pointer name fixes for NCIN_Par functions in zNPCFXCinematic + one 100% zTalkBox function * Deleted static variables top of script * xCM work (#520) * Robo-Sandy Callback Funcs and Idle Goal Impl (#521) * zNPCTypeBossSandy: Add SandyLimbSpring struct from DWARF data * zNPCTypeBossSandy: sit, getUp, runToRope, clothesline callbacks * zNPCTypeBossSandy: zNPCGoalBossSandyIdle virtual implementations * Fix: Remove redef of SandyLimbSpring bc rebasing is hard * Working more on zNPCFXCinematic with one 100% and started on other functions (#519) * Fix zNPCFXCinematic implementation * All NPCCone functions 100% * forgot one change. * Moved Static S32 init to the top of file in zNPCFXCinematic.cpp * Removed commented code in zNPCFXCinematic.cpp * Removed commented code at the bottom of zNPCFXCinematic.cpp * Removed commented code at the top of zNPCFXCinematic.h * Added parameter names for UVSliceSet, UVBaseSet, ColorSet * Removed the blank git file * 40% - 92% for some NCIN_Par functions in zNPCFXCinematic * Pointer name fixes for NCIN_Par functions in zNPCFXCinematic + one 100% zTalkBox function * Deleted static variables top of script * Working more on zNPCFXCinematic with one 100% and started some others. * Working more on zNPCFXCinematic with one 100% and started some others. * Fixed a minor error in zNPCFXCinematic * Fixed a minor error in zTalkBox * Fixed another minor error in zTalkBox * Fixed formatting and removed a zTalkBox function * Match most of iMix (#522) * Match most of iMix * Correct MIXUnMute signature * Hack around not being able to use _AXVPB. Having issues including it for some reason. * Robosandy: Progress (#523) * zNPCTypeBossSandy: Add SandyLimbSpring struct from DWARF data * Fix: Remove redef of SandyLimbSpring bc rebasing is hard * zNPCTypeBossSandy: Taunt, Chase, and Melee goal virtual method impls * zNPCTypeBossSandy: NoHead Goal Enter match, Process WIP * zEntHangable progress (#524) * first fn * save * moreo prrogress * static vars * hangable_reset * setfollow * setupfx * stub fns * cleanup * fix build * zCamera: 95% match on zCameraFlyUpdate (#525) * zNPCSupplement work (#526) * zCamera: Equiv/Near Equiv for more functions (#527) * zNPCSupport work (#528) * zCamera: zCameraFlyRestoreBackup and zCameraRewardUpdate functions (#529) * zNPCSpawner: Matches and additional function definitions (#530) * zNPCSpawner: Matches and additional function definitions * Config: Use more VS Code-friendly settings * Little bit of zNPCtypeBossPlankton --------- Co-authored-by: Matt P <mattp3259@gmail.com> Co-authored-by: escape209 <agtescape@gmail.com> Co-authored-by: mattbruv <5638426+mattbruv@users.noreply.github.com> Co-authored-by: Joshua Sanchez <joshuaesanch@gmail.com> Co-authored-by: Red <53205920+Redberd36@users.noreply.github.com>
2 participants
No description provided.