From 5554195c8a00cf5e76e2c5e0584b8cddc66eeb1f Mon Sep 17 00:00:00 2001 From: coah <100182500+coah80@users.noreply.github.com> Date: Thu, 1 Oct 2026 17:07:55 -0500 Subject: [PATCH] cleanup(iplCSPane): name fatal OSFatal color/msg and zero float MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit lbl_81697844..47 → scCsFatalColorR/G/B/A, lbl_8166A6E3 → scCsFatalMsg, lbl_81694FC0 → scCsZeroF. --- config/43U/symbols.txt | 12 ++++---- src/channelScript/systemmenu/iplCSPane.cpp | 32 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/config/43U/symbols.txt b/config/43U/symbols.txt index eb40aab5..40069531 100644 --- a/config/43U/symbols.txt +++ b/config/43U/symbols.txt @@ -18149,7 +18149,7 @@ lbl_8166A6B1 = .data:0x8166A6B1; // type:object size:0xD data:string lbl_8166A6BE = .data:0x8166A6BE; // type:object size:0xD data:string lbl_8166A6CB = .data:0x8166A6CB; // type:object size:0xC data:string lbl_8166A6D7 = .data:0x8166A6D7; // type:object size:0xC data:string -lbl_8166A6E3 = .data:0x8166A6E3; // type:object size:0x41 data:string +scCsFatalMsg = .data:0x8166A6E3; // type:object size:0x41 data:string lbl_8166A728 = .data:0x8166A728; // type:object size:0xB data:string lbl_8166A733 = .data:0x8166A733; // type:object size:0x9 data:string lbl_8166A73C = .data:0x8166A73C; // type:object size:0xB data:string @@ -20741,7 +20741,7 @@ lbl_81694FA0 = .sdata2:0x81694FA0; // type:object size:0x7 data:string lbl_81694FA7 = .sdata2:0x81694FA7; // type:object size:0x5 data:string lbl_81694FAC = .sdata2:0x81694FAC; // type:object size:0xC align:4 lbl_81694FB8 = .sdata2:0x81694FB8; // type:object size:0x8 align:8 data:double -lbl_81694FC0 = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float +scCsZeroF = .sdata2:0x81694FC0; // type:object size:0x4 align:4 data:float @10105 = .sdata2:0x81694FC8; // type:object size:0x4 scope:local align:4 data:float @9941 = .sdata2:0x81694FD0; // type:object size:0x8 scope:local data:4byte @10304 = .sdata2:0x81694FD8; // type:object size:0x8 scope:local align:8 data:double @@ -22466,10 +22466,10 @@ lbl_81697824 = .sdata:0x81697824; // type:object size:0x8 data:string lbl_8169782C = .sdata:0x8169782C; // type:object size:0x8 data:string lbl_81697834 = .sdata:0x81697834; // type:object size:0x8 data:string lbl_8169783C = .sdata:0x8169783C; // type:object size:0x8 data:string -lbl_81697844 = .sdata:0x81697844; // type:object size:0x1 data:byte -lbl_81697845 = .sdata:0x81697845; // type:object size:0x1 data:byte -lbl_81697846 = .sdata:0x81697846; // type:object size:0x1 data:byte -lbl_81697847 = .sdata:0x81697847; // type:object size:0x1 data:byte +scCsFatalColorR = .sdata:0x81697844; // type:object size:0x1 data:byte +scCsFatalColorG = .sdata:0x81697845; // type:object size:0x1 data:byte +scCsFatalColorB = .sdata:0x81697846; // type:object size:0x1 data:byte +scCsFatalColorA = .sdata:0x81697847; // type:object size:0x1 data:byte lbl_81697848 = .sdata:0x81697848; // type:object size:0x8 data:string lbl_81697850 = .sdata:0x81697850; // type:object size:0x6 data:string lbl_81697858 = .sdata:0x81697858; // type:object size:0x6 data:string diff --git a/src/channelScript/systemmenu/iplCSPane.cpp b/src/channelScript/systemmenu/iplCSPane.cpp index 64c0a2e0..c47ea524 100644 --- a/src/channelScript/systemmenu/iplCSPane.cpp +++ b/src/channelScript/systemmenu/iplCSPane.cpp @@ -1,19 +1,19 @@ #include #include -extern "C" const char lbl_8166A6E3[]; -extern "C" const u8 lbl_81697844; -extern "C" const u8 lbl_81697845; -extern "C" const u8 lbl_81697846; -extern "C" const u8 lbl_81697847; +extern "C" const char scCsFatalMsg[]; +extern "C" const u8 scCsFatalColorR; +extern "C" const u8 scCsFatalColorG; +extern "C" const u8 scCsFatalColorB; +extern "C" const u8 scCsFatalColorA; #define NW4R_DB_ASSERT_H #define NW4R_ASSERT(x) \ { \ if (!(x)) { \ - GXColor front = {lbl_81697844, lbl_81697845, lbl_81697846, lbl_81697847}; \ + GXColor front = {scCsFatalColorR, scCsFatalColorG, scCsFatalColorB, scCsFatalColorA}; \ GXColor back = {0, 0, 0, 0}; \ - OSFatal((GXColor)front, (GXColor)back, lbl_8166A6E3); \ + OSFatal((GXColor)front, (GXColor)back, scCsFatalMsg); \ } \ } @@ -29,7 +29,7 @@ extern "C" const u8 lbl_81697847; #include "math/iplMathTypes.h" -extern "C" const f32 lbl_81694FC0 = 0.0f; +extern "C" const f32 scCsZeroF = 0.0f; extern "C" nw4r::ut::Color GetTextColor__Q34nw4r3lyt7TextBoxCFUl(const nw4r::lyt::TextBox*, u32); @@ -130,7 +130,7 @@ namespace ipl { nw4r::math::VEC2 scale; scale.x = pane->GetScale().x; scale.y = pane->GetScale().y; - result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, lbl_81694FC0) == TRUE; + result = vec3::_ctor(VmInst, VmReturnObj, scale.x, scale.y, scCsZeroF) == TRUE; } } return result; @@ -514,7 +514,7 @@ namespace ipl { nw4r::math::VEC3 get_vec_(CHANSVm* vm) { u32 argc = CHANSVmGetArgc(vm); CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0); - nw4r::math::VEC3 out(lbl_81694FC0, lbl_81694FC0, lbl_81694FC0); + nw4r::math::VEC3 out(scCsZeroF, scCsZeroF, scCsZeroF); if (argc == 1 && util::is_valid_class(arg, "VEC3")) { f32* src = static_cast(*arg->value.ptr_v); out.x = src[0]; @@ -540,7 +540,7 @@ namespace ipl { nw4r::lyt::Size get_size_(CHANSVm* vm) { u32 argc = CHANSVmGetArgc(vm); CHANSVmObjHdr* arg = CHANSVmGetArg(vm, 0); - nw4r::lyt::Size out(lbl_81694FC0, lbl_81694FC0); + nw4r::lyt::Size out(scCsZeroF, scCsZeroF); if (argc == 1 && util::is_valid_class(arg, "Size")) { f32* src = static_cast(*arg->value.ptr_v); out.width = src[0]; @@ -622,15 +622,15 @@ namespace ipl { namespace pane { #pragma push #pragma section const_type ".data" - extern "C" const char lbl_8166A6E3[] = "Error#004\nAn error has occurred.\nThe system files are corrupted."; + extern "C" const char scCsFatalMsg[] = "Error#004\nAn error has occurred.\nThe system files are corrupted."; #pragma pop #pragma push #pragma section data_type ".sdata" - extern "C" __declspec(section ".sdata") const u8 lbl_81697844 = 0xff; - extern "C" __declspec(section ".sdata") const u8 lbl_81697845 = 0xff; - extern "C" __declspec(section ".sdata") const u8 lbl_81697846 = 0xff; - extern "C" __declspec(section ".sdata") const u8 lbl_81697847 = 0; + extern "C" __declspec(section ".sdata") const u8 scCsFatalColorR = 0xff; + extern "C" __declspec(section ".sdata") const u8 scCsFatalColorG = 0xff; + extern "C" __declspec(section ".sdata") const u8 scCsFatalColorB = 0xff; + extern "C" __declspec(section ".sdata") const u8 scCsFatalColorA = 0; #pragma pop } } -- 2.49.1