diff --git a/mm/2s2h/DeveloperTools/DebugConsole.cpp b/mm/2s2h/DeveloperTools/DebugConsole.cpp index 181d728c2..63c45de3c 100644 --- a/mm/2s2h/DeveloperTools/DebugConsole.cpp +++ b/mm/2s2h/DeveloperTools/DebugConsole.cpp @@ -211,6 +211,7 @@ static bool EntranceHandler(std::shared_ptr Console, const std::v gPlayState->transitionTrigger = TRANS_TRIGGER_START; gPlayState->transitionType = TRANS_TYPE_INSTANT; gSaveContext.nextTransitionType = TRANS_TYPE_INSTANT; + return 0; } static bool VoidHandler(std::shared_ptr Console, const std::vector& args, diff --git a/mm/CMakeLists.txt b/mm/CMakeLists.txt index 36a71ec27..02e06c2ff 100644 --- a/mm/CMakeLists.txt +++ b/mm/CMakeLists.txt @@ -304,15 +304,9 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows") set_target_properties(${PROJECT_NAME} PROPERTIES VS_GLOBAL_KEYWORD "Win32Proj" ) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - set_target_properties(${PROJECT_NAME} PROPERTIES - INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" - ) - endif() + set_target_properties(${PROJECT_NAME} PROPERTIES + INTERPROCEDURAL_OPTIMIZATION_RELEASE "TRUE" + ) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") set_target_properties(${PROJECT_NAME} PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES @@ -328,27 +322,15 @@ endif() ################################################################################ if (CMAKE_SYSTEM_NAME STREQUAL "Windows") get_property(MSVC_RUNTIME_LIBRARY_DEFAULT TARGET ${PROJECT_NAME} PROPERTY MSVC_RUNTIME_LIBRARY) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" - $<$: - MultiThreadedDebug - > - $<$: - MultiThreaded - > - $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" - $<$: - MultiThreadedDebug - > - $<$: - MultiThreaded - > - $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> - ) - endif() + string(CONCAT "MSVC_RUNTIME_LIBRARY_STR" + $<$: + MultiThreadedDebug + > + $<$: + MultiThreaded + > + $<$,$>>:${MSVC_RUNTIME_LIBRARY_DEFAULT}> + ) set_target_properties(${PROJECT_NAME} PROPERTIES MSVC_RUNTIME_LIBRARY ${MSVC_RUNTIME_LIBRARY_STR}) endif() ################################################################################ @@ -428,46 +410,25 @@ target_include_directories(${PROJECT_NAME} PRIVATE assets . ) -if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "_DEBUG;" - "_CRT_SECURE_NO_WARNINGS;" - "ENABLE_DX11;" - ">" - "$<$:" - "NDEBUG" - ">" - # "$<$:ENABLE_CROWD_CONTROL>" - "INCLUDE_GAME_PRINTF;" - "UNICODE;" - "_UNICODE" - STORMLIB_NO_AUTO_LINK +if (CMAKE_SYSTEM_NAME STREQUAL "Windows") + target_compile_definitions(${PROJECT_NAME} PRIVATE + "$<$:" + "_DEBUG;" "_CRT_SECURE_NO_WARNINGS;" - NOMINMAX - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - target_compile_definitions(${PROJECT_NAME} PRIVATE - "$<$:" - "NOINCLUDE_GAME_PRINTF;" - "_DEBUG;" - "_CRT_SECURE_NO_WARNINGS;" - "ENABLE_OPENGL" - ">" - "$<$:" - "NDEBUG;" - ">" - "INCLUDE_GAME_PRINTF;" - "NON_EQUIVALENT;" - "NON_MATCHING;" - "WIN32;" - "UNICODE;" - "_UNICODE" - STORMLIB_NO_AUTO_LINK - NOMINMAX - ) - endif() + "ENABLE_DX11;" + ">" + "$<$:" + "NDEBUG" + ">" + #"$<$:ENABLE_CROWD_CONTROL>" + "INCLUDE_GAME_PRINTF;" + #"ENABLE_CROWD_CONTROL;" + "UNICODE;" + "_UNICODE" + STORMLIB_NO_AUTO_LINK + "_CRT_SECURE_NO_WARNINGS;" + NOMINMAX + ) elseif (CMAKE_SYSTEM_NAME STREQUAL "CafeOS") target_compile_definitions(${PROJECT_NAME} PRIVATE "$<$:" @@ -504,75 +465,44 @@ endif() # Compile and link options ################################################################################ if(MSVC) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /w; - /Od - > - $<$: - /Oi; - /Gy; - /W3 - > - /sdl-; - /permissive-; - /MP; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - target_compile_options(${PROJECT_NAME} PRIVATE $<$:/ZI;>) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - target_compile_options(${PROJECT_NAME} PRIVATE - $<$: - /RTCs - /w - /Od - > - $<$: - /O2; - /Oi; - /Gy - > - /permissive-; - /MP; - /sdl-; + target_compile_options(${PROJECT_NAME} PRIVATE + $<$: /w; - ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; - ${DEFAULT_CXX_EXCEPTION_HANDLING} - ) - endif() - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /INCREMENTAL - > - $<$: - /OPT:REF; - /OPT:ICF; - /INCREMENTAL:NO; - /FORCE:MULTIPLE - > - /MANIFEST:NO; - /DEBUG; - /SUBSYSTEM:WINDOWS - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - target_link_options(${PROJECT_NAME} PRIVATE - $<$: - /STACK:8777216 - > - $<$: - /OPT:REF; - /OPT:ICF; - /INCREMENTAL:NO; - /FORCE:MULTIPLE - > - /MANIFEST:NO; - /DEBUG; - /SUBSYSTEM:WINDOWS - ) - endif() + /Od + > + $<$: + /Oi; + /Gy; + /W3 + > + + /wd4024 #different types for formal and actual parameter [x]. Usually seen along side 4047. + /wd4047 #'uintptr_t' differs in levels of indirection from 'Gfx *'. Usually caused by passing a uintptr_t into a function expecting a pointer-types + /wd4090 #'initializing': different 'const' qualifiers. Caused when initializing a non const struct member with a const char*. + /wd4101 # unreferenced local variable. Things like stack pads. + /wd4133 #incompatible types. Usually caused by passing a c string into a function that takes a pointer. + /wd4244 #conversion from [a] to [b]. Used to warn when copying to smaller type without a cast. + /sdl-; + /permissive-; + /MP; + ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; + ${DEFAULT_CXX_EXCEPTION_HANDLING} + ) + target_compile_options(${PROJECT_NAME} PRIVATE $<$:/ZI;>) + target_link_options(${PROJECT_NAME} PRIVATE + $<$: + /INCREMENTAL + > + $<$: + /OPT:REF; + /OPT:ICF; + /INCREMENTAL:NO; + /FORCE:MULTIPLE + > + /MANIFEST:NO; + /DEBUG; + /SUBSYSTEM:WINDOWS + ) endif() if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang") @@ -709,34 +639,19 @@ endif() if (CMAKE_SYSTEM_NAME STREQUAL "Windows") find_package(glfw3 REQUIRED) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "libultraship;" - "ZAPDLib;" - "glu32;" - "SDL2::SDL2;" - "SDL2::SDL2main;" - # "$<$:SDL2_net::SDL2_net-static>" - "glfw;" - "winmm;" - "imm32;" - "version;" - "setupapi" - ) - elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") - set(ADDITIONAL_LIBRARY_DEPENDENCIES - "libultraship;" - "ZAPDLib;" - "glu32;" - "SDL2::SDL2;" - "SDL2::SDL2main;" - "glfw;" - "winmm;" - "imm32;" - "version;" - "setupapi" - ) - endif() + set(ADDITIONAL_LIBRARY_DEPENDENCIES + "libultraship;" + "ZAPDLib;" + "glu32;" + "SDL2::SDL2;" + "SDL2::SDL2main;" + #"$<$:SDL2_net::SDL2_net-static>" + "glfw;" + "winmm;" + "imm32;" + "version;" + "setupapi" + ) elseif(CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch") find_package(SDL2) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/mm/include/PR/mbi.h b/mm/include/PR/mbi.h index f72ad9acd..9b443e800 100644 --- a/mm/include/PR/mbi.h +++ b/mm/include/PR/mbi.h @@ -1,6 +1,7 @@ #ifndef PR_MBI_H #define PR_MBI_H - +#include +#if 0 /************************************************************************** * * * Copyright (C) 1994, Silicon Graphics, Inc. * @@ -94,5 +95,5 @@ #ifndef NULL #define NULL ((void*)0) #endif - +#endif #endif /* !_MBI_H_ */ diff --git a/mm/include/PR/os_exception.h b/mm/include/PR/os_exception.h index 37fcbd915..06c2cc098 100644 --- a/mm/include/PR/os_exception.h +++ b/mm/include/PR/os_exception.h @@ -1,6 +1,7 @@ #ifndef PR_OS_EXCEPTION_H #define PR_OS_EXCEPTION_H - +#include +#if 0 #include "ultratypes.h" @@ -44,6 +45,6 @@ typedef u32 OSHWIntr; //void __osGetHWIntrRoutine(OSHWIntr interrupt, s32 (**handler)(void), void** stackEnd); //void __osSetGlobalIntMask(OSHWIntr mask); //void __osResetGlobalIntMask(OSHWIntr mask); - +#endif #endif diff --git a/mm/include/PR/rdp.h b/mm/include/PR/rdp.h index 4bd6bc99d..5ab467ab8 100644 --- a/mm/include/PR/rdp.h +++ b/mm/include/PR/rdp.h @@ -1,6 +1,8 @@ #ifndef PR_RDP_H #define PR_RDP_H +#include +#if 0 /* DP Command Registers */ #define DPC_START_REG 0x04100000 #define DPC_END_REG 0x04100004 @@ -45,6 +47,6 @@ u32 osDpGetStatus(void); void osDpSetStatus(u32 data); - +#endif #endif diff --git a/mm/include/alignment.h b/mm/include/alignment.h index 9e6fe11e6..06d86ec7c 100644 --- a/mm/include/alignment.h +++ b/mm/include/alignment.h @@ -13,11 +13,7 @@ #define ALIGNED(x) __attribute__ ((aligned (x))) #endif -#ifdef __sgi /* IDO compiler */ -#define UNALIGNED __unaligned -#else -#define UNALIGNED -#endif +// 2S2H [Port] There was a macro for `UNALIGNED` here. We don't need it for PC and any file that does can include the proper header #ifdef __sgi /* IDO compiler */ #define ALIGNOF(x) __builtin_alignof(x) diff --git a/mm/include/gfx.h b/mm/include/gfx.h index f7f38849f..85705ba2f 100644 --- a/mm/include/gfx.h +++ b/mm/include/gfx.h @@ -278,11 +278,11 @@ extern Gfx gEmptyDL[]; // __gfxCtx shouldn't be used directly. // Use the DISP macros defined above when writing to display buffers. -// 2S2H [Port] Augmented to use our disps helpers +// 2S2H [Port] Augmented to use our disps helpers. +// 2S2H [Port] There originally a `__dispPad` variable here. Removed because it has no use on PC. #define OPEN_DISPS(gfxCtx) \ { \ GraphicsContext* __gfxCtx = gfxCtx; \ - s32 __dispPad; \ OPEN_DISPS_PORT_HELPERS(gfxCtx) #define CLOSE_DISPS(gfxCtx) \ diff --git a/mm/include/libc/math.h b/mm/include/libc/math.h index 57ea1d81e..bb35b93c1 100644 --- a/mm/include/libc/math.h +++ b/mm/include/libc/math.h @@ -11,13 +11,13 @@ #ifdef __GNUC__ #include #else -float fabsf(float f); -#pragma intrinsic(fabsf) +//float fabsf(float f); +//#pragma intrinsic(fabsf) #ifdef __GNUC__ -#define fabsf(f) __builtin_fabsf((float)(f)) +//#define fabsf(f) __builtin_fabsf((float)(f)) #endif -double sqrt(double d); +//double sqrt(double d); #pragma intrinsic(sqrt) #endif diff --git a/mm/include/libc/stdarg.h b/mm/include/libc/stdarg.h index 55f694385..fd77fe1c7 100644 --- a/mm/include/libc/stdarg.h +++ b/mm/include/libc/stdarg.h @@ -1,6 +1,7 @@ #ifndef LIBC_STDARG_H #define LIBC_STDARG_H - +#include +#if 0 // When building with GCC, use the official vaarg macros to avoid warnings // and possibly bad codegen. #ifdef __GNUC__ @@ -40,5 +41,5 @@ typedef char *va_list; #define va_end(__list) #endif /* __GNUC__ */ - +#endif #endif /* STDARG_H */ diff --git a/mm/include/libc/stdbool.h b/mm/include/libc/stdbool.h index 52546edb3..d83d6b7a0 100644 --- a/mm/include/libc/stdbool.h +++ b/mm/include/libc/stdbool.h @@ -1,6 +1,7 @@ #ifndef LIBC_STDBOOL_H #define LIBC_STDBOOL_H - +#include +#if 0 #define __bool_true_false_are_defined 1 #ifndef __cplusplus @@ -10,5 +11,5 @@ #define true 1 #endif /* __cplusplus */ - +#endif #endif /* STDBOOL */ diff --git a/mm/include/libc/stdint.h b/mm/include/libc/stdint.h index 7681b0c28..4d82e8431 100644 --- a/mm/include/libc/stdint.h +++ b/mm/include/libc/stdint.h @@ -9,7 +9,7 @@ typedef s32 intptr_t; typedef u32 uintptr_t; #endif // #endregion - +#if 0 #define INT8_MIN (-0x80) #define INT16_MIN (-0x8000) #define INT32_MIN (-0x80000000) @@ -28,6 +28,6 @@ typedef u32 uintptr_t; #define INTPTR_MIN (-0x80000000) #define INTPTR_MAX 0x7FFFFFFF #define UINTPTR_MAX 0xFFFFFFFF - +#endif #endif /* STDINT_H */ diff --git a/mm/include/segment_symbols.h b/mm/include/segment_symbols.h index 34136dfec..22b4d9cf0 100644 --- a/mm/include/segment_symbols.h +++ b/mm/include/segment_symbols.h @@ -4,44 +4,34 @@ #include "libc/stddef.h" #include "PR/ultratypes.h" -#define DECLARE_SEGMENT(name) \ - // extern u8 _##name##SegmentStart[]; \ -// extern u8 _##name##SegmentEnd[]; +#define DECLARE_SEGMENT(name) -#define DECLARE_ROM_SEGMENT(name) \ - // extern u8 _##name##SegmentRomStart[]; \ -// extern u8 _##name##SegmentRomEnd[]; +#define DECLARE_ROM_SEGMENT(name) + +#define DECLARE_BSS_SEGMENT(name) -#define DECLARE_BSS_SEGMENT(name) \ -// extern u8 _##name##SegmentBssStart[]; \ -// extern u8 _##name##SegmentBssEnd[]; \ -// #define DECLARE_OVERLAY_SEGMENT(name) \ DECLARE_SEGMENT(ovl_##name) \ DECLARE_ROM_SEGMENT(ovl_##name) #define SEGMENT_START(segment) 0 -//(_ ## segment ## SegmentStart) #define SEGMENT_END(segment) 0 -//(_ ## segment ## SegmentEnd) #define SEGMENT_SIZE(segment) (uintptr_t) 0 -//((uintptr_t)SEGMENT_END(segment) - (uintptr_t)SEGMENT_START(segment)) + #define SEGMENT_ROM_START(segment) NULL -//(_ ## segment ## SegmentRomStart) + #define SEGMENT_ROM_END(segment) NULL -//(_ ## segment ## SegmentRomEnd) + #define SEGMENT_ROM_SIZE(segment) 0 -//((uintptr_t)SEGMENT_ROM_END(segment) - (uintptr_t)SEGMENT_ROM_START(segment)) #define SEGMENT_BSS_START(segment) 0 -//(_ ## segment ## SegmentBssStart) + #define SEGMENT_BSS_END(segment) 0 -//(_ ## segment ## SegmentBssEnd) + #define SEGMENT_BSS_SIZE(segment) 0 -//((uintptr_t)SEGMENT_BSS_END(segment) - (uintptr_t)SEGMENT_BSS_START(segment)) #define ROM_FILE(name) \ { (uintptr_t) SEGMENT_ROM_START(name), (uintptr_t)SEGMENT_ROM_END(name) } diff --git a/mm/src/boot/yaz0.c b/mm/src/boot/yaz0.c index befaf6cdf..719250220 100644 --- a/mm/src/boot/yaz0.c +++ b/mm/src/boot/yaz0.c @@ -3,14 +3,18 @@ #include #include +// 2S2H [Port] We don't use any Yaz0 data. Applies to everything removed in this file. +#if 0 u8 sYaz0DataBuffer[0x400] ALIGNED(16); u8* sYaz0CurDataEnd; uintptr_t sYaz0CurRomStart; u32 sYaz0CurSize; u8* sYaz0MaxPtr; void* gYaz0DecompressDstEnd; +#endif void* Yaz0_FirstDMA() { + #if 0 u32 pad0; u32 dmaSize; u32 curSize; @@ -23,10 +27,12 @@ void* Yaz0_FirstDMA() { DmaMgr_DmaRomToRam(sYaz0CurRomStart, sYaz0DataBuffer, dmaSize); sYaz0CurRomStart += dmaSize; sYaz0CurSize -= dmaSize; - return sYaz0DataBuffer; + #endif + return NULL; } void* Yaz0_NextDMA(void* curSrcPos) { + #if 0 u8* dst; u32 restSize; u32 dmaSize; @@ -57,6 +63,7 @@ void* Yaz0_NextDMA(void* curSrcPos) { } return dst; + #endif } typedef struct { @@ -69,6 +76,7 @@ typedef struct { #define YAZ0_MAGIC 0x59617A30 // "Yaz0" s32 Yaz0_DecompressImpl(u8* src, u8* dst) { + #if 0 u32 bitIdx = 0; u8* dstEnd; u32 chunkHeader = 0; @@ -123,9 +131,12 @@ s32 Yaz0_DecompressImpl(u8* src, u8* dst) { gYaz0DecompressDstEnd = dstEnd; return 0; + #endif } void Yaz0_Decompress(uintptr_t romStart, void* dst, size_t size) { + +#if 0 s32 status; u32 pad; char sp80[0x50]; @@ -149,4 +160,5 @@ void Yaz0_Decompress(uintptr_t romStart, void* dst, size_t size) { } sYaz0CurDataEnd = NULL; + #endif } diff --git a/mm/src/code/stubs.c b/mm/src/code/stubs.c index db3badafc..da078b734 100644 --- a/mm/src/code/stubs.c +++ b/mm/src/code/stubs.c @@ -249,57 +249,7 @@ void gSPInvalidateTexCache(Gfx* pkt, uintptr_t texAddr) { __gSPInvalidateTexCache(pkt, texAddr); } -void func_801A1290(void) { -} - -void func_801A1904(void) { - -} - -void func_801A1E0C(void) { - -} - -void func_801A2090(void) { - -} - -void func_801A312C(void) { - -} - -void func_801A3AC0(void) { - -} - -void func_801A1FB4(u8 playerIndex, Vec3f* pos, u16 seqId, f32 maxDist) { - -} - -void func_801A3A7C(s32 arg0) { - -} - -void func_801A3CD8(s8 param_1) { - -} -void func_801A3CF4(s8 arg0) { -} -void func_801A3D98(s8 audioSetting) { -} -void func_801A3E38(u8 arg0) { -} -void func_801A3EC0(u8 arg0) { -} -void func_801A4058(UNK_TYPE arg0) { -} -void func_801A41C8(s32 arg0) { -} -void func_801A41F8(UNK_TYPE arg0) { -} -void func_801A3000(u16 seqId, u8 ioData) { -} u16 func_801A5100(void) { } void __osDispatchThread(void) { @@ -337,8 +287,6 @@ void osMapTLBRdb(void) { } u32 __osProbeTLB(void* param_1) { } -void func_801A31EC(u16 seqId, s8 arg1, u8 arg2) { -} s32 osAiSetFrequency(u32 frequency) { return 1; } diff --git a/mm/src/code/sys_cfb.c b/mm/src/code/sys_cfb.c index a4b5c1956..067231034 100644 --- a/mm/src/code/sys_cfb.c +++ b/mm/src/code/sys_cfb.c @@ -86,8 +86,6 @@ void SysCfb_SetHiResMode(void) { s32 rightAdjust; s32 lowerAdjust; - //! FAKE: - l1: rightAdjust = gCfbWidth - 610; lowerAdjust = gCfbHeight - 470; ViMode_Configure(&sNotebookViMode, -1, osTvType, 0, 1, 0, 1, gCfbWidth, gCfbHeight, 30, rightAdjust, 10, diff --git a/mm/src/code/sys_cmpdma.c b/mm/src/code/sys_cmpdma.c index 1b267a963..ee5e52616 100644 --- a/mm/src/code/sys_cmpdma.c +++ b/mm/src/code/sys_cmpdma.c @@ -99,6 +99,7 @@ void CmpDma_LoadFile(uintptr_t segmentVrom, s32 id, void* dst, size_t size) { void CmpDma_LoadAllFiles(uintptr_t segmentVrom, void* dst, size_t size) { return; +#if 0 uintptr_t rom = DmaMgr_TranslateVromToRom(segmentVrom); u32 i; u32 end; @@ -115,4 +116,5 @@ void CmpDma_LoadAllFiles(uintptr_t segmentVrom, void* dst, size_t size) { CmpDma_LoadFileImpl(rom, i, nextDst, 0); nextDst = gYaz0DecompressDstEnd; } + #endif } diff --git a/mm/src/code/z_actor.c b/mm/src/code/z_actor.c index 6a0eda8e4..00e7b6758 100644 --- a/mm/src/code/z_actor.c +++ b/mm/src/code/z_actor.c @@ -1951,17 +1951,17 @@ f32 Target_GetAdjustedDistSq(Actor* actor, Player* player, s16 playerShapeYaw) { { SQ(range), (f32)(range) / (leash) } TargetRangeParams gTargetRanges[TARGET_MODE_MAX] = { - TARGET_RANGE(70, 140), // TARGET_MODE_0 - TARGET_RANGE(170, 255), // TARGET_MODE_1 - TARGET_RANGE(280, 5600), // TARGET_MODE_2 - TARGET_RANGE(350, 525), // TARGET_MODE_3 - TARGET_RANGE(700, 1050), // TARGET_MODE_4 - TARGET_RANGE(1000, 1500), // TARGET_MODE_5 - TARGET_RANGE(100, 105.36842), // TARGET_MODE_6 - TARGET_RANGE(140, 163.33333), // TARGET_MODE_7 - TARGET_RANGE(240, 576), // TARGET_MODE_8 - TARGET_RANGE(280, 280000), // TARGET_MODE_9 - TARGET_RANGE(2500, 3750), // TARGET_MODE_10 + TARGET_RANGE(70.0f, 140.0f), // TARGET_MODE_0 + TARGET_RANGE(170.0f, 255.0f), // TARGET_MODE_1 + TARGET_RANGE(280.0f, 5600.0f), // TARGET_MODE_2 + TARGET_RANGE(350.0f, 525.0f), // TARGET_MODE_3 + TARGET_RANGE(700.0f, 1050.0f), // TARGET_MODE_4 + TARGET_RANGE(1000.0f, 1500.0f), // TARGET_MODE_5 + TARGET_RANGE(100.0f, 105.36842f), // TARGET_MODE_6 + TARGET_RANGE(140.0f, 163.33333f), // TARGET_MODE_7 + TARGET_RANGE(240.0f, 576.0f), // TARGET_MODE_8 + TARGET_RANGE(280.0f, 280000.0f), // TARGET_MODE_9 + TARGET_RANGE(2500.0f, 3750.0f), // TARGET_MODE_10 }; /** diff --git a/mm/src/code/z_camera.c b/mm/src/code/z_camera.c index 5277455fe..4d08584b6 100644 --- a/mm/src/code/z_camera.c +++ b/mm/src/code/z_camera.c @@ -2655,7 +2655,7 @@ s32 Camera_Normal0(Camera* camera) { camera->pitchUpdateRateInv = Camera_ScaledStepToCeilF(16.0f, camera->pitchUpdateRateInv, spA0, 0.1f); camera->yOffsetUpdateRate = Camera_ScaledStepToCeilF(0.05f, camera->yOffsetUpdateRate, spA4, 0.0001f); camera->xzOffsetUpdateRate = Camera_ScaledStepToCeilF(0.05f, camera->xzOffsetUpdateRate, spA0, 0.0001f); - camera->fovUpdateRate = Camera_ScaledStepToCeilF(0.05, camera->fovUpdateRate, camera->speedRatio * 0.05f, 0.0001f); + camera->fovUpdateRate = Camera_ScaledStepToCeilF(0.05f, camera->fovUpdateRate, camera->speedRatio * 0.05f, 0.0001f); if (!(roData->interfaceFlags & NORMAL0_FLAG_7)) { Camera_CalcAtDefault(camera, &sp78, roData->unk_00, roData->interfaceFlags & NORMAL0_FLAG_0); @@ -2858,8 +2858,6 @@ s32 Camera_Parallel1(Camera* camera) { rwData->unk_00 = (bgCamFuncData->unk_0E == -1) ? roData->unk_04 : CAM_RODATA_UNSCALE(bgCamFuncData->unk_0E) * focalActorHeight * yNormal; - //! FAKE - dummy:; } else { rwData->unk_08 = roData->unk_14; rwData->unk_00 = roData->unk_04; @@ -4922,8 +4920,6 @@ s32 Camera_Fixed2(Camera* camera) { rwData->unk_00 = OLib_AddVecGeoToVec3f(new_var1, &sp70); } else { rwData->unk_00 = *eye; - //! FAKE: - dummy:; } } else { rwData->unk_00 = camera->eye; diff --git a/mm/src/code/z_kaleido_manager.c b/mm/src/code/z_kaleido_manager.c index 960933749..c36351850 100644 --- a/mm/src/code/z_kaleido_manager.c +++ b/mm/src/code/z_kaleido_manager.c @@ -59,8 +59,8 @@ void KaleidoManager_ClearOvl(KaleidoMgrOverlay* ovl) { } void KaleidoManager_Init(PlayState* play) { - s32 largestSize = 0; - s32 size; + size_t largestSize = 0; + size_t size; u32 i; for (i = 0; i < ARRAY_COUNT(gKaleidoMgrOverlayTable); i++) { diff --git a/mm/src/code/z_kankyo.c b/mm/src/code/z_kankyo.c index 3f9a0c470..9745d5217 100644 --- a/mm/src/code/z_kankyo.c +++ b/mm/src/code/z_kankyo.c @@ -3167,7 +3167,8 @@ void Environment_DrawSkyboxStarsImpl(PlayState* play, Gfx** gfxP) { { 65, 164, 255, 255 }, { 131, 164, 230, 255 }, { 98, 205, 255, 255 }, { 82, 82, 255, 255 }, { 123, 164, 164, 255 }, { 98, 205, 255, 255 }, { 98, 164, 230, 255 }, { 255, 90, 0, 255 }, }; - UNALIGNED static const Color_RGBA8_u32 D_801DD900[] = { + // 2S2H [Port] This originally had `UNALIGNED` however we don't need that for PC and it was causing warnings in the header file + static const Color_RGBA8_u32 D_801DD900[] = { { 64, 80, 112, 255 }, { 96, 96, 128, 255 }, { 128, 112, 144, 255 }, { 160, 128, 160, 255 }, { 192, 144, 168, 255 }, { 224, 160, 176, 255 }, { 224, 160, 176, 255 }, { 104, 104, 136, 255 }, { 136, 120, 152, 255 }, { 168, 136, 168, 255 }, { 200, 152, 184, 255 }, { 232, 168, 184, 255 }, diff --git a/mm/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c b/mm/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c index 0140f96b5..ea94bdf0d 100644 --- a/mm/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c +++ b/mm/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c @@ -253,7 +253,6 @@ void BgDblueMovebg_Init(Actor* thisx, PlayState* play) { case 9: this->unk_2F8[1] = NULL; this->unk_2F8[0] = NULL; - label: for (i = 0; i < ARRAY_COUNT(sCsIdList); i++) { sCsIdList[i] = this->csIdList[i]; } diff --git a/mm/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c b/mm/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c index bd5053f63..4eb243e6f 100644 --- a/mm/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c +++ b/mm/src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c @@ -137,9 +137,6 @@ void func_80BD5E6C(BgHakaBombwall* this, PlayState* play) { scale = sRockScales[i & (ARRAY_COUNT(sRockScales) - 1)]; - //! FAKE - fake_label:; - if (scale >= 16) { gravity = -550; } else { diff --git a/mm/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c b/mm/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c index 747269179..2e6f2b887 100644 --- a/mm/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c +++ b/mm/src/overlays/actors/ovl_Bg_Ikana_Bombwall/z_bg_ikana_bombwall.c @@ -156,8 +156,6 @@ void func_80BD4720(BgIkanaBombwall* this, PlayState* play) { scale = D_80BD52C8[i & (ARRAY_COUNT(D_80BD52C8) - 1)]; - //! FAKE - fake_label:; if (scale >= 16) { gravity = -550; diff --git a/mm/src/overlays/actors/ovl_Boss_07/z_boss_07.c b/mm/src/overlays/actors/ovl_Boss_07/z_boss_07.c index a96a7fc9c..603c8e157 100644 --- a/mm/src/overlays/actors/ovl_Boss_07/z_boss_07.c +++ b/mm/src/overlays/actors/ovl_Boss_07/z_boss_07.c @@ -5895,7 +5895,6 @@ void Boss07_Static_Update(Actor* thisx, PlayState* play2) { if (sHeartbeatTimer != 0) { sHeartbeatTimer--; - dummy_label:; //!@fake Audio_PlaySfx(NA_SE_EN_LAST2_HEARTBEAT_OLD - SFX_FLAG); } if (this->lensFlareOn) { diff --git a/mm/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/mm/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index 4e1367ecd..1728f2980 100644 --- a/mm/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/mm/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -155,7 +155,7 @@ void DemoKakyo_LostWoodsSparkleActionFunc(DemoKankyo* this, PlayState* play) { this->effects[i].speedTarget = 0.0f; } - Math_SmoothStepToF(&this->effects[i].scale, 0.1, 0.1f, 0.001f, 0.00001f); + Math_SmoothStepToF(&this->effects[i].scale, 0.1f, 0.1f, 0.001f, 0.00001f); Math_SmoothStepToF(&this->effects[i].speed, this->effects[i].speedTarget, 0.5f, 0.2f, 0.02f); this->effects[i].posOffset.x += sinf(this->effects[i].speedClock.x) * this->effects[i].speed; this->effects[i].posOffset.y += sinf(this->effects[i].speedClock.y) * this->effects[i].speed; @@ -219,7 +219,7 @@ void DemoKakyo_LostWoodsSparkleActionFunc(DemoKankyo* this, PlayState* play) { this->effects[i].LostWoodsSkyFishPosOffsetMax; } else { // Tail Particles - Math_SmoothStepToF(&this->effects[i].scale, 0.1, 0.1f, 0.001f, 0.00001f); + Math_SmoothStepToF(&this->effects[i].scale, 0.1f, 0.1f, 0.001f, 0.00001f); // Unused calculation, speed only used in posOffset calculations, // but posOffset gets overwritten for tail particles immediately below diff --git a/mm/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c b/mm/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c index f4f56a630..b6434087d 100644 --- a/mm/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c +++ b/mm/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.c @@ -397,8 +397,6 @@ void EnAttackNiw_Update(Actor* thisx, PlayState* play) { } else { f32 viewOffset = 20.0f; - label: - if (this->actor.xyzDistToPlayerSq < SQ(viewOffset)) { parent = (EnNiw*)this->actor.parent; if ((this->actor.parent->update != NULL) && (this->actor.parent != NULL) && (parent != NULL) && diff --git a/mm/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/mm/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index c3fe78907..18ba7e05d 100644 --- a/mm/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/mm/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -1075,7 +1075,7 @@ void EnBigslime_Drop(EnBigslime* this, PlayState* play) { this->ceilingDropTimer--; this->ceilingMoveTimer--; EnBigslime_UpdateWavySurface(this); - EnBigslime_Scale(this, this->ceilingMoveTimer * 0x4000, 0.2f, 0.15); + EnBigslime_Scale(this, this->ceilingMoveTimer * 0x4000, 0.2f, 0.15f); this->actor.scale.z = this->actor.scale.x; if (this->ceilingDropTimer == 0) { this->actor.gravity = -2.0f; diff --git a/mm/src/overlays/actors/ovl_En_Estone/z_en_estone.c b/mm/src/overlays/actors/ovl_En_Estone/z_en_estone.c index 7a4f4ec28..bd4feebe6 100644 --- a/mm/src/overlays/actors/ovl_En_Estone/z_en_estone.c +++ b/mm/src/overlays/actors/ovl_En_Estone/z_en_estone.c @@ -147,8 +147,6 @@ void EnEstone_Active(EnEstone* this, PlayState* play) { Actor_PlaySfx(&this->actor, NA_SE_EV_WALL_BROKEN); this->actionFunc = EnEstone_Inactive; } else { - //! FAKE: https://decomp.me/scratch/YiPVN - label: this->actor.shape.shadowScale = 4500.0f * this->scale; Actor_SetScale(&this->actor, this->scale); } diff --git a/mm/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/mm/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c index febdaed83..ebeb68ef1 100644 --- a/mm/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/mm/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -418,8 +418,6 @@ s32 func_80B85A00(EnKaizoku* this, PlayState* play, s16 arg2) { if (arg2) { s16 sp2A; - //! FAKE: - label:; if (sp30 >= 10000) { func_80B87900(this); } else { diff --git a/mm/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/mm/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index b09cc23fa..ff0b1373d 100644 --- a/mm/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/mm/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -713,7 +713,6 @@ void func_80A5CB74(EnKusa2* this) { } D_80A5EB4C++; -label: D_80A5EB4C &= 0x7; temp_f0 = Rand_ZeroOne(); diff --git a/mm/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/mm/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index 56067b315..e3abe62d8 100644 --- a/mm/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/mm/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -412,7 +412,7 @@ void EnNeoReeba_SetupDamageAnim(EnNeoReeba* this) { this->actionFunc = EnNeoReeba_DamageAnim; } -static f32 sDamageAnimXZScales[] = { 0.04, 0.04, 0.039, 0.042, 0.045, 0.043, 0.04, 0.035, 0.03, 0.033, 0.04 }; +static f32 sDamageAnimXZScales[] = { 0.04f, 0.04f, 0.039f, 0.042f, 0.045f, 0.043f, 0.04f, 0.035f, 0.03f, 0.033f, 0.04f }; static f32 sDamageAnimYScales[] = { 0.04f, 0.04f, 0.041f, 0.038f, 0.035f, 0.037f, 0.04f, 0.045f, 0.05f, 0.047f, 0.04f }; void EnNeoReeba_DamageAnim(EnNeoReeba* this, PlayState* play) { diff --git a/mm/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/mm/src/overlays/actors/ovl_En_Zod/z_en_zod.c index b4227edee..33c833848 100644 --- a/mm/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/mm/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -107,7 +107,7 @@ void EnZod_Init(Actor* thisx, PlayState* play) { for (i = 0; i < ARRAY_COUNT(this->drumScales); i++) { this->drumScales[i] = 0.0f; - this->drumScaleVels[i] = 0.01; + this->drumScaleVels[i] = 0.01f; } EnZod_ChangeAnim(this, ENZOD_ANIM_PLAYING_LENTO, ANIMMODE_ONCE); diff --git a/mm/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c b/mm/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c index f64affaa4..4d0c011f5 100644 --- a/mm/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c +++ b/mm/src/overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.c @@ -65,7 +65,7 @@ static s16 sObjectIds[] = { * axes by using this table. */ static f32 oscillationTable[] = { - -1.0, -1.0, -1.0, -0.7, 0.0, 0.7, 1.0, 0.7, 0.0, -0.7, -1.0, -0.7, 0.0, 0.7, 1.0, 0.7, 0.0, -0.7, + -1.0f, -1.0f, -1.0f, -0.7f, 0.0f, 0.7f, 1.0f, 0.7f, 0.0f, -0.7f, -1.0f, -0.7f, 0.0f, 0.7f, 1.0f, 0.7f, 0.0f, -0.7f, }; void ObjEtcetera_Init(Actor* thisx, PlayState* play) { diff --git a/mm/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/mm/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index dc5b112a5..c20418a1f 100644 --- a/mm/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/mm/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -348,7 +348,7 @@ void ObjLightswitch_Update(Actor* thisx, PlayState* play) { } // why wouldn't this be in the action func? - if ((this->cutsceneTimer > 0) && ((s32)this->actionFunc != (s32)ObjLightswitch_PlayCinema)) { + if ((this->cutsceneTimer > 0) && (this->actionFunc != ObjLightswitch_PlayCinema)) { this->cutsceneTimer--; if (this->cutsceneTimer == 0) { CutsceneManager_Stop(this->actor.csId); diff --git a/mm/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/mm/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index e47b22e8f..ff1e5fcc4 100644 --- a/mm/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/mm/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -926,7 +926,6 @@ void ObjSwitch_Update(Actor* thisx, PlayState* play) { if (this->floorSwitchPlayerSnapState != 0) { s32 pad; - dummy: ObjSwitch_FloorSwitchSnapPlayerToSwitchEdge(this, play); if (this->floorSwitchPlayerSnapState == 2) { this->floorSwitchPlayerSnapState = 0; diff --git a/mm/src/overlays/actors/ovl_player_actor/z_player.c b/mm/src/overlays/actors/ovl_player_actor/z_player.c index eaee75ef9..617ef262a 100644 --- a/mm/src/overlays/actors/ovl_player_actor/z_player.c +++ b/mm/src/overlays/actors/ovl_player_actor/z_player.c @@ -17254,8 +17254,6 @@ void Player_Action_67(Player* this, PlayState* play) { : &gPlayerAnim_link_bottle_drink_demo_wait); this->av2.actionVar2 = 1; - //! FAKE - dummy_label_235515:; } else if (this->av2.actionVar2 < 0) { this->av2.actionVar2++; if (this->av2.actionVar2 == 0) { diff --git a/mm/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/mm/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index 90c142829..631b3c589 100644 --- a/mm/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/mm/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -84,7 +84,6 @@ void EffectSsBubble_Update(PlayState* play2, u32 index, EffectSs* this) { ripplePos.z = this->pos.z; EffectSsGRipple_Spawn(play, &ripplePos, 0, 80, 0); this->life = -1; - label: return; } if (((play->gameplayFrames + index) % 8) == 0) {