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
+5 -4
View File
@@ -17,6 +17,7 @@
#if DEBUG
#include "JSystem/JHostIO/JORFile.h"
#include "d/d_debug_viewer.h"
#include <cstring>
#endif
enum Aru_RES_File_ID {
@@ -1402,19 +1403,19 @@ int daNpc_Aru_c::duck(int param_1) {
switch (field_0xfca) {
case 1:
sVar1 -= (s16) 0x1000;
ANGLE_SUB(sVar1, 0x1000);
break;
case 7:
sVar1 += (s16) 0x1000;
ANGLE_ADD(sVar1, 0x1000);
break;
case 2:
sVar1 -= (s16) 0x4000;
ANGLE_SUB(sVar1, 0x4000);
break;
case 6:
sVar1 += (s16) 0x4000;
ANGLE_ADD(sVar1, 0x4000);
break;
}