diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-10-24 14:35:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-24 23:35:00 +0200 |
| commit | 5020395dfd34d4dc846e3ea228f6271bfca1c72a (patch) | |
| tree | 9b553bbfc8b0807d7f860964d6044d6ccf6d1342 /libs/JSystem/J2DGraph/J2DTextBox.cpp | |
| parent | b88cb8cdc0b7a8af4df22e303ff81e0e617dbc85 (diff) | |
J2D structs + print / fix GX + MSL string headers (#157)
* J2D structs + print / fix GX + MSL string headers
* remove msl_c/string.h
Diffstat (limited to 'libs/JSystem/J2DGraph/J2DTextBox.cpp')
| -rw-r--r-- | libs/JSystem/J2DGraph/J2DTextBox.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp index bd7e7dfe77..1ae9a76625 100644 --- a/libs/JSystem/J2DGraph/J2DTextBox.cpp +++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp @@ -4,23 +4,10 @@ // #include "JSystem/J2DGraph/J2DTextBox.h" +#include "JSystem/J2DGraph/J2DPrint.h" +#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h" #include "dol2asm.h" #include "dolphin/types.h" -#include "msl_c/string.h" - -// -// Types: -// - -struct J2DPrint { - /* 802F4394 */ J2DPrint(JUTFont*, f32, f32, JUtility::TColor, JUtility::TColor, - JUtility::TColor, JUtility::TColor); - /* 802F4420 */ ~J2DPrint(); - /* 802F475C */ void locate(f32, f32); - /* 802F4778 */ void print(f32, f32, u8, char const*, ...); - /* 802F4828 */ void printReturn(char const*, f32, f32, J2DTextBoxHBinding, J2DTextBoxVBinding, - f32, f32, u8); -}; // // Forward References: @@ -109,11 +96,6 @@ extern "C" void setAnimationVF__7J2DPaneFP20J2DAnmVisibilityFull(); extern "C" void setAnimationVC__7J2DPaneFP14J2DAnmVtxColor(); extern "C" void setCullBack__7J2DPaneFb(); extern "C" void update__7J2DPaneFv(); -extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevDirect(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXSetCurrentMtx(); extern "C" void _savegpr_25(); extern "C" void _savegpr_26(); extern "C" void _savegpr_27(); |