diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2024-10-31 20:36:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-31 17:36:11 -0700 |
| commit | 09423b6fa00029d0325cbade59c78ae42f1014de (patch) | |
| tree | 15c444d2b60c559bbfd15385a4cfa83b8fe33521 /src/d/d_msg_scrn_3select.cpp | |
| parent | 30777a85b5357a60f0d57f9127ff4e04d3b2bdd5 (diff) | |
more misc. cleanup (#2232)
Diffstat (limited to 'src/d/d_msg_scrn_3select.cpp')
| -rw-r--r-- | src/d/d_msg_scrn_3select.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index c8b97d2a1a..d9dc0793fb 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -14,13 +14,6 @@ #include "d/d_msg_object.h" #include "d/d_pane_class.h" -extern "C" void __dl__FPv(); -extern "C" extern void* __vt__10J2DAnmBase[4]; -extern "C" extern void* __vt__10JUTNameTab[3]; -extern "C" extern void* __vt__14J2DAnmColorKey[5]; -extern "C" extern void* __vt__11J2DAnmColor[5]; -extern "C" extern dMsgObject_HIO_c g_MsgObject_HIO_c; - /* 803C0C00-803C0C0C 01DD20 000C+00 1/1 0/0 0/0 .data cNullVec__6Z2Calc */ static u8 cNullVec__6Z2Calc[12] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -68,7 +61,7 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mBckFrame = 190.0f; mOffsetX = 0.0f; - mpAnmBpk = (J2DAnmColor*)J2DAnmLoaderDataBase::load( + mpAnmBpk = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load( JKRGetNameResource("zelda_window_3menu.bpk", dComIfGp_getMsgArchive(0))); mpAnmBpk->searchUpdateMaterialID(mpScreen); mBpkFrame = 0.0f; @@ -228,12 +221,6 @@ dMsgScrn3Select_c::~dMsgScrn3Select_c() { } } -/* 80239BE0-80239C64 234520 0084+00 0/0 1/0 0/0 .text __dt__14J2DAnmColorKeyFv */ -// J2DAnmColorKey::~J2DAnmColorKey() { -extern "C" void __dt__14J2DAnmColorKeyFv() { - // NONMATCHING -} - /* 80239C64-80239C78 2345A4 0014+00 0/0 5/5 0/0 .text isSelect__17dMsgScrn3Select_cFv */ bool dMsgScrn3Select_c::isSelect() { return mProcess == PROC_SELECT_e ? TRUE : FALSE; @@ -977,4 +964,4 @@ void dMsgScrn3Select_c::selectAnimeTransform(int i_sel) { mpSel_c[i_sel]->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); onAnimeUpdate(i_sel); -}
\ No newline at end of file +} |