mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-29 07:21:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
parent 0ee3b2b197 7b7b9dd287
commit 942be208d2
5530 changed files with 252979 additions and 26830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_menu_item_explain.cpp
+3 -2
View File
@@ -10,6 +10,7 @@
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JUtility/JUTTexture.h"
#include <cstdio>
#include <cstring>
#include "d/actor/d_a_player.h"
#include "d/d_com_inf_game.h"
#include "d/d_item.h"
@@ -289,7 +290,7 @@ void dMenu_ItemExplain_c::move() {
if (status != mStatus) {
(this->*init_process[mStatus])();
}
if (mStatus != NULL) {
if (mStatus != 0) {
mpInfoScreen->animation();
}
if (g_ringHIO.mItemDescAlpha != mDescAlpha) {
@@ -784,7 +785,7 @@ void dMenu_ItemExplain_c::setNumber() {
}
}
bool dMenu_ItemExplain_c::getWarpMarkFlag() {
u8 dMenu_ItemExplain_c::getWarpMarkFlag() {
if (dStage_stagInfo_GetUpButton(dComIfGp_getStageStagInfo()) == 1) {
return dComIfGs_getWarpMarkFlag();
}