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
@@ -17,6 +17,7 @@
#include "d/d_msg_scrn_explain.h"
#include "m_Do/m_Do_graphic.h"
#include "d/actor/d_a_midna.h"
#include <cstring>
dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() {
dMeter2Info_setMapDrugFlag(0);
@@ -938,9 +939,9 @@ void dMenu_Fmap2DBack_c::scrollCalc(f32 param_0) {
}
void dMenu_Fmap2DBack_c::mapBlink(s16* param_0) {
*param_0 += (s16)1;
S16_ADD(*param_0, 1);
if (*param_0 >= 30) {
*param_0 -= (s16)30;
S16_SUB(*param_0, 30);
}
}