diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-09-28 16:11:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-28 13:11:07 -0700 |
| commit | 9eea9289b1c4316d5856d1cb9602ee463d7de989 (patch) | |
| tree | dde3385855941d12a306de3ca8fb316338be288b /src/d/d_s_menu.cpp | |
| parent | c9a710a939c7bccee7eb16e90ed70c9d3f6c78ad (diff) | |
Fix JUT_ASSERT and several other macros (#2711)
* Fix JUT_ASSERT to be a nested define
* Switch names that appear in asserts to be constants instead of defines
* Replace `0` in asserts with `NULL` or `FALSE`
* Fix fpclassify
* Fix ARRAY_SIZE
* Use G_CM3D_F_INF
* More fixes for fpclassify
* Remove FLOAT_LABEL
* Remove incorrect FLAG_ON macro
* Remove UNK_BSS macro
* Silence clangd unused header warning for PCH
Diffstat (limited to 'src/d/d_s_menu.cpp')
| -rw-r--r-- | src/d/d_s_menu.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 22b5ef3e49..7c5aa27d08 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -3,7 +3,7 @@ * Debug Level Select Menu */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_menu.h" #include "d/d_com_inf_game.h" @@ -1504,10 +1504,10 @@ int phase_1(dScnMenu_c* i_this) { OS_REPORT("Menu Create !!\n"); i_this->command = mDoDvdThd_toMainRam_c::create("/res/Menu/Menu1.dat", 0, NULL); - JUT_ASSERT(3083, i_this->command != 0); + JUT_ASSERT(3083, i_this->command != NULL); i_this->fontCommand = mDoDvdThd_toMainRam_c::create("/res/Menu/kanfont_fix16.bfn", 0, NULL); - JUT_ASSERT(3086, i_this->fontCommand != 0); + JUT_ASSERT(3086, i_this->fontCommand != NULL); dComIfG_playerStatusD(); dComIfGs_offDarkClearLV(0); @@ -1574,7 +1574,7 @@ int phase_2(dScnMenu_c* i_this) { } i_this->info = (menu_info_class*)i_this->command->getMemAddress(); - JUT_ASSERT(3237, i_this->info != 0); + JUT_ASSERT(3237, i_this->info != NULL); menu_info_class* menu_info = i_this->info; menu_info->stage_data = (menu_stage_class*)((uintptr_t)menu_info->stage_data + (uintptr_t)menu_info); @@ -1586,7 +1586,7 @@ int phase_2(dScnMenu_c* i_this) { if (l_groupPoint == NULL) { l_groupPoint = new s8[menu_info->num]; - JUT_ASSERT(3252, l_groupPoint != 0); + JUT_ASSERT(3252, l_groupPoint != NULL); if (mDoExt_getSafeZeldaHeapSize() >= 0) { mDoExt_addSafeZeldaHeapSize(-(mDoExt_getZeldaHeap()->getSize(l_groupPoint) + 0x10)); @@ -1607,7 +1607,7 @@ int phase_2(dScnMenu_c* i_this) { } i_this->category_info = (menu_category_class*)((uintptr_t)i_this->command->getMemAddress() + category_offset); - JUT_ASSERT(3282, i_this->category_info != 0); + JUT_ASSERT(3282, i_this->category_info != NULL); category_info = i_this->category_info; category_info->data = (menu_category_data_class*)((uintptr_t)category_info->data + (uintptr_t)menu_info); |