diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2025-01-24 07:21:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-24 10:21:15 -0500 |
| commit | 388eb487e393823fa3a4f31e30165ffc0193fd16 (patch) | |
| tree | 114ba710477bbc46fb865c8b6d719dfdbd9eaed7 /soh/include/macros.h | |
| parent | 6d94cf9bac2a07bc18a9df3a24e40f37f2c21542 (diff) | |
rework "Authentic Logo Screen" and "Fast File Select" (#4939)
* skip z_title with button press
* use `RegisterShipInitFunc`
* rip out a bunch of custom ztitle code
* ok now it's almost fully back to vanilla
* titles are back for a limited time
enjoy #Skipping
* move old customizations into new custom draw
* finally getting the hang of this shipinit thing
* vb should let it snow
* boot sequence logic
* clean up logic to better handle changing boot sequence settings
* remove fast file select stuff
* remove authentic logo screen setting
* about window - not super pretty but not ugly imo
* maybe this fixes windows
* maybe alloca? idk why it's working in other files
* just pulling in every include hoping something works
* Revert
This reverts commit c1d02c9a40a7b8c617a131cc5b0d7fd6f81fe1b4.
* try some macro fixing magic
* fix another c vs cpp thing
* do it without an extra var
* make `GitCommitHashTruncated` a private member on `AboutWindow` instead of truncating on draw
* move logo asset defs to `soh_assets.h`
* Apply suggestions from code review
Co-authored-by: Archez <Archez@users.noreply.github.com>
* VB_SHOULDN'T
---------
Co-authored-by: Archez <Archez@users.noreply.github.com>
Diffstat (limited to 'soh/include/macros.h')
| -rw-r--r-- | soh/include/macros.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/soh/include/macros.h b/soh/include/macros.h index 5db738735..acff90f19 100644 --- a/soh/include/macros.h +++ b/soh/include/macros.h @@ -275,7 +275,12 @@ extern GraphicsContext* __gfxCtx; : (((a2) >= (a3)) ? (a2) : (((a3) >= (a1)) ? (a1) : (a3)))) #define MATRIX_TOMTX(dest) Matrix_ToMtx(dest, __FILE__, __LINE__) +#ifdef __cplusplus +#define MATRIX_NEWMTX(gfxCtx) Matrix_NewMtx(gfxCtx, const_cast<char*>(__FILE__), __LINE__) +#else #define MATRIX_NEWMTX(gfxCtx) Matrix_NewMtx(gfxCtx, __FILE__, __LINE__) +#endif + #define MATRIX_CHECKFLOATS(mf) Matrix_CheckFloats(mf, __FILE__, __LINE__) #define ZELDA_ARENA_MALLOC_DEBUG(size) ZeldaArena_MallocDebug(size, __FILE__, __LINE__) |