diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2021-09-24 08:11:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 11:11:10 -0400 |
| commit | 7d271be857c95c4a6c28d4d185378fba5c762c16 (patch) | |
| tree | f74ae846c613588585a07d81199a6495968b7257 /src/f_ap | |
| parent | ea42afb6f8a29f3a279b34efffcca365e308ca1e (diff) | |
m_Do cleanup, d_resource, drawlist stuff (#145)
* d_resource / some d_stage
* setup dDlst_list_c / d_select_icon OK
* JUTXfb / some JUTVideo + various
* some J2D classes / JUTVideo/Fader attempts
* bunch of m_Do cleanup + matches / f_ap_game OK
* mDoLib_clipper::setup OK
* most of d_meter_HIO OK
* pane_class / kantera_icon_meter
Diffstat (limited to 'src/f_ap')
| -rw-r--r-- | src/f_ap/f_ap_game.cpp | 182 |
1 files changed, 55 insertions, 127 deletions
diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index 30263ba138..4fb6a4652d 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -1,139 +1,67 @@ -// -// Generated By: dol2asm -// Translation Unit: f_ap/f_ap_game -// - #include "f_ap/f_ap_game.h" +#include "SSystem/SComponent/c_counter.h" #include "dol2asm.h" #include "dolphin/types.h" - -// -// Types: -// - -struct fapGm_HIO_c { - /* 80018944 */ fapGm_HIO_c(); - /* 80018AE0 */ ~fapGm_HIO_c(); -}; - -// -// Forward References: -// - -extern "C" void __ct__11fapGm_HIO_cFv(); -extern "C" static void fapGm_After__Fv(); -extern "C" void fapGm_Execute__Fv(); -extern "C" void fapGm_Create__Fv(); -extern "C" void __dt__11fapGm_HIO_cFv(); -extern "C" void __sinit_f_ap_game_cpp(); - -// -// External References: -// - -extern "C" void fopCamM_Management__Fv(); -extern "C" void fopCamM_Init__Fv(); -extern "C" void fopOvlpM_Management__Fv(); -extern "C" void fopOvlpM_Init__Fv(); -extern "C" void fopScnM_Management__Fv(); -extern "C" void fopScnM_Init__Fv(); -extern "C" void fopDwTg_CreateQueue__Fv(); -extern "C" void fpcM_Management__FPFv_vPFv_v(); -extern "C" void fpcM_Init__Fv(); -extern "C" void cCt_Counter__Fi(); -extern "C" void __dl__FPv(); -extern "C" void __register_global_object(); -extern "C" extern u32 data_80450580; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803A35A0-803A35B0 0006C0 000C+04 2/2 0/0 0/0 .data __vt__11fapGm_HIO_c */ -SECTION_DATA extern void* __vt__11fapGm_HIO_c[3 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)__dt__11fapGm_HIO_cFv, - /* padding */ - NULL, -}; - -/* 80451BC0-80451BC4 0001C0 0004+00 1/1 0/0 0/0 .sdata2 @3689 */ -SECTION_SDATA2 static f32 lit_3689 = 9.0f / 10.0f; - -/* 80451BC4-80451BC8 0001C4 0004+00 1/1 0/0 0/0 .sdata2 @3690 */ -SECTION_SDATA2 static f32 lit_3690 = 3.0f / 5.0f; - -/* 80018944-80018A44 013284 0100+00 1/1 0/0 0/0 .text __ct__11fapGm_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm fapGm_HIO_c::fapGm_HIO_c() { - nofralloc -#include "asm/f_ap/f_ap_game/__ct__11fapGm_HIO_cFv.s" -} -#pragma pop - -/* 80018A44-80018A6C 013384 0028+00 1/1 0/0 0/0 .text fapGm_After__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void fapGm_After() { - nofralloc -#include "asm/f_ap/f_ap_game/fapGm_After__Fv.s" +#include "f_op/f_op_camera_mng.h" +#include "f_op/f_op_draw_tag.h" +#include "f_op/f_op_overlap_mng.h" +#include "f_op/f_op_scene_mng.h" +#include "f_pc/f_pc_manager.h" +#include "m_Do/m_Do_main.h" + +fapGm_HIO_c::fapGm_HIO_c() + : mColor(-1), mLetterTopColor(-1), mLetterBottomColor(-1), mLetterTopShadowColor(-1), + mLetterBottomShadowColor(-1) { + mUsingHostIO = true; + + if (data_80450580) { + mDisplayMeter = true; + mDisplayPrint = true; + } else { + mDisplayMeter = false; + mDisplayPrint = false; + mDisplay2D = false; + } + + mDisplay2D = true; + mDisplayParticle = true; + mDisplayProcessID = false; + mMemBlockOff = false; + mColor.set(255, 255, 255, 255); + field_0xc = 0.9f; + field_0x10 = 0.6f; + mLetterTopColor.set(255, 150, 0, 255); + mLetterBottomColor.set(255, 120, 0, 255); + mLetterTopShadowColor.set(0, 0, 0, 255); + mLetterBottomShadowColor.set(0, 0, 0, 255); + mLetterPositionX = 0; + mLetterPositionY = 10; + mLetterFontSize = 27; + mLineSpacing = 0; + mLetterSpacing = 0; + mBackgroundAlpha = 130; } -#pragma pop -/* 80018A6C-80018AA0 0133AC 0034+00 0/0 1/1 0/0 .text fapGm_Execute__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void fapGm_Execute() { - nofralloc -#include "asm/f_ap/f_ap_game/fapGm_Execute__Fv.s" +void fapGm_After() { + fopScnM_Management(); + fopOvlpM_Management(); + fopCamM_Management(); } -#pragma pop - -/* ############################################################################################## */ -/* 803F1BB0-803F1BBC 01E8D0 000C+00 1/1 0/0 0/0 .bss @3691 */ -static u8 lit_3691[12]; -/* 803F1BBC-803F1C00 01E8DC 0040+04 2/2 3/3 0/0 .bss g_HIO */ -extern u8 g_HIO[64 + 4 /* padding */]; -u8 g_HIO[64 + 4 /* padding */]; - -/* 80018AA0-80018AE0 0133E0 0040+00 0/0 1/1 0/0 .text fapGm_Create__Fv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void fapGm_Create() { - nofralloc -#include "asm/f_ap/f_ap_game/fapGm_Create__Fv.s" +void fapGm_Execute() { + fpcM_Management(NULL, fapGm_After); + cCt_Counter(0); } -#pragma pop -/* 80018AE0-80018B28 013420 0048+00 2/1 0/0 0/0 .text __dt__11fapGm_HIO_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm fapGm_HIO_c::~fapGm_HIO_c() { - nofralloc -#include "asm/f_ap/f_ap_game/__dt__11fapGm_HIO_cFv.s" -} -#pragma pop +fapGm_HIO_c g_HIO; -/* 80018B28-80018B64 013468 003C+00 0/0 1/0 0/0 .text __sinit_f_ap_game_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_f_ap_game_cpp() { - nofralloc -#include "asm/f_ap/f_ap_game/__sinit_f_ap_game_cpp.s" +void fapGm_Create() { + fpcM_Init(); + fopScnM_Init(); + fopOvlpM_Init(); + fopCamM_Init(); + fopDwTg_CreateQueue(); + g_HIO.field_0x04 = -1; } -#pragma pop -#pragma push -#pragma force_active on -REGISTER_CTORS(0x80018B28, __sinit_f_ap_game_cpp); -#pragma pop +fapGm_HIO_c::~fapGm_HIO_c() {}
\ No newline at end of file |
