diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2024-10-10 07:29:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-10 08:29:58 -0600 |
| commit | 12eb254d769d84743b5cc6cd5424057c57eaf0ad (patch) | |
| tree | 4509be332b2ccfc6fe939f47740d68f7746eca3e /src/m_Do/m_Do_graphic.cpp | |
| parent | 2fd702c0ac170a789af879b8b92a82d4dcc9080c (diff) | |
switch to dtk setup (#2203)
* switch to dtk setup
* some cleanup / fixes
* cleanup d_a_alink literals
* Restore doxygen, update CI & README.md (#1)
* Fix build image ref (#2)
---------
Co-authored-by: Luke Street <luke@street.dev>
Diffstat (limited to 'src/m_Do/m_Do_graphic.cpp')
| -rw-r--r-- | src/m_Do/m_Do_graphic.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 7cbf5eec8a..220d1729a4 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -9,9 +9,9 @@ #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTProcBar.h" #include "JSystem/JUtility/JUTTexture.h" -#include "d/a/d_a_player.h" -#include "d/com/d_com_inf_game.h" -#include "d/menu/d_menu_collect.h" +#include "d/actor/d_a_player.h" +#include "d/d_com_inf_game.h" +#include "d/d_menu_collect.h" #include "dol2asm.h" #include "f_ap/f_ap_game.h" #include "m_Do/m_Do_controller_pad.h" @@ -1150,13 +1150,8 @@ int mDoGph_Create() { } /* 8000B1D0-8000B1E4 005B10 0014+00 0/0 1/0 0/0 .text __sinit_m_Do_graphic_cpp */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __sinit_m_Do_graphic_cpp(){nofralloc -#include "asm/m_Do/m_Do_graphic/__sinit_m_Do_graphic_cpp.s" +void __sinit_m_Do_graphic_cpp(){// NONMATCHING } -#pragma pop #pragma push #pragma force_active on @@ -1167,4 +1162,4 @@ REGISTER_CTORS(0x8000B1D0, __sinit_m_Do_graphic_cpp); // s32 daPy_py_c::getAtnActorID() const { extern "C" s32 getAtnActorID__9daPy_py_cCFv() { return -1; -} +}
\ No newline at end of file |