diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-01-25 12:24:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 21:24:14 +0100 |
| commit | 612f26c132280da43ecfa5fa8c8cc32966f06eb6 (patch) | |
| tree | ac20d071712cf830ec526222c98d340d90721f77 /src/d/menu | |
| parent | 6f4d068f1d7c5a9f25f1920e64e5b10dc29aea07 (diff) | |
d_kankyo_wether / d_eye_hl (#178)
* d_eye_hl / d_kankyo_wether wip
* more d_kankyo_wether + format
* remove asm
* some d_kankyo wip
* fix dccs vtable
* some m_Do_graphic / d_meter2_draw work
Diffstat (limited to 'src/d/menu')
| -rw-r--r-- | src/d/menu/d_menu_letter.cpp | 4 | ||||
| -rw-r--r-- | src/d/menu/d_menu_window.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp index 5b4751f684..33d406e774 100644 --- a/src/d/menu/d_menu_letter.cpp +++ b/src/d/menu/d_menu_letter.cpp @@ -937,7 +937,7 @@ asm void J2DTextBox::getBlack() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPicture::getWhite() const { +asm JUtility::TColor J2DPicture::getWhite() const { nofralloc #include "asm/d/menu/d_menu_letter/getWhite__10J2DPictureCFv.s" } @@ -947,7 +947,7 @@ asm void J2DPicture::getWhite() const { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J2DPicture::getBlack() const { +asm JUtility::TColor J2DPicture::getBlack() const { nofralloc #include "asm/d/menu/d_menu_letter/getBlack__10J2DPictureCFv.s" } diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp index 5e5dbc971a..7100179a88 100644 --- a/src/d/menu/d_menu_window.cpp +++ b/src/d/menu/d_menu_window.cpp @@ -263,7 +263,6 @@ extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__12dDlst_base_c[3]; extern "C" extern void* __vt__10CSTControl[4]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; -extern "C" extern u8 g_clearColor[4]; extern "C" u8 mFader__13mDoGph_gInf_c[4]; extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; extern "C" u8 mFrameBufferTex__13mDoGph_gInf_c[4]; |