Merge branch 'main' into 26-02-27-allocator-isolation

This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
5530 changed files with 252979 additions and 26830 deletions
+3 -2
View File
@@ -27,7 +27,8 @@
#include "d/d_item.h"
#include "d/d_lib.h"
#include "d/d_meter2_info.h"
#include <dolphin/os.h>
#include <os.h>
#include <cstring>
#include "m_Do/m_Do_graphic.h"
#include "m_Do/m_Do_mtx.h"
#include "JSystem/J2DGraph/J2DAnmLoader.h"
@@ -2266,7 +2267,7 @@ void dMenu_Collect3D_c::_move(u8 param_0, u8 param_1) {
toItem3Dpos(linkPos.x, posY, posZ, &itemPos);
if (param_0 == 0 && param_1 == 0) {
f32 temp = 450.0f;
mLinkAngle += (s16)temp;
ANGLE_ADD(mLinkAngle, temp);
} else {
s16 target = mIsWolf != 0 ? (s16)-0x510C : (s16)-0x5B1C;
cLib_addCalcAngleS(&mLinkAngle, target, 4, 0x800, 0x80);