questionable UNUSED and STACK_PAD more usage

src/audio/internal/seqplayer.c

@@ -477,9 +477,9 @@ void AudioSeq_SequencePlayerDisableAsFinished(SequencePlayer* seqPlayer) {
  * original name: Nas_ReleaseGroup
  */
 void AudioSeq_SequencePlayerDisable(SequencePlayer* seqPlayer) {
+#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64)
     s32 finished = 0;
 
-#if !(OOT_VERSION < NTSC_1_1 || !PLATFORM_N64)
     if (seqPlayer->finished == 1) {
         finished = 1;
     }

src/boot/inflate.c

@@ -299,7 +299,7 @@ void* gzip_malloc(size_t size) {
     return ret;
 }
 
-void gzip_free(void* ptr) {
+void gzip_free(UNUSED void* ptr) {
     gzip_malloc_tmp = 0;
     gzip_malloc_addr = gzip_mem_buff;
 }

src/boot/z_locale.c

@@ -1,5 +1,6 @@
 #include "libu64/debug.h"
 #include "alignment.h"
+#include "attributes.h"
 #include "carthandle.h"
 #include "line_numbers.h"
 #include "padmgr.h"
@@ -29,6 +30,9 @@ typedef struct LocaleCartInfo {
 void Locale_Init(void) {
 #if !PLATFORM_GC
     ALIGNED(4) u8 regionInfo[4];
+#if PLATFORM_IQUE
+    UNUSED
+#endif
     u8 countryCode;
 
     osEPiReadIo(gCartHandle, 0x3C, (u32*)regionInfo);

src/boot/z_std_dma.c

@@ -380,7 +380,9 @@ void DmaMgr_ProcessRequest(DmaRequest* req) {
     u8 found = false;
     DmaEntry* iter;
     UNUSED_NDEBUG const char* filename;
+#if !PLATFORM_GC
     s32 i = 0;
+#endif
 
 #if DEBUG_FEATURES
     // Get the filename (for debugging)

src/code/z_collision_check.c

@@ -1902,7 +1902,6 @@ void CollisionCheck_ATCylVsACJntSph(PlayState* play, UNUSED CollisionCheckContex
                 Vec3f hitPos;
                 Vec3f atPos;
                 Vec3f acPos;
-                f32 acToHit;
 
                 atPos.x = atCyl->dim.pos.x;
                 atPos.y = atCyl->dim.pos.y;

src/code/z_kanfont.c

@@ -1,4 +1,5 @@
 #include "kanread.h"
+#include "attributes.h"
 #include "message_data_static.h"
 #include "printf.h"
 #include "segment_symbols.h"
@@ -12,11 +13,13 @@
  * Loads a texture from kanji for the requested `character` into the character texture buffer
  * at `codePointIndex`. The value of `character` is the SHIFT-JIS encoding of the character.
  */
-void Font_LoadCharWide(Font* font, u16 character, u16 codePointIndex) {
 #if OOT_NTSC
+void Font_LoadCharWide(Font* font, u16 character, u16 codePointIndex) {
     DMA_REQUEST_SYNC(&font->charTexBuf[codePointIndex],
                      (uintptr_t)_kanjiSegmentRomStart + Kanji_OffsetFromShiftJIS(character), FONT_CHAR_TEX_SIZE,
                      "../z_kanfont.c", UNK_LINE);
+#else
+void Font_LoadCharWide(UNUSED Font* font, UNUSED u16 character, UNUSED u16 codePointIndex) {
 #endif
 }
 
@@ -63,7 +66,9 @@ void Font_LoadOrderedFont(Font* font) {
     s32 fontBufIndex;
     u32 offset;
     const char* messageDataStart;
+#if PLATFORM_IQUE
     u16* msgBufWide;
+#endif
 
 #if OOT_NTSC && !PLATFORM_IQUE
     messageDataStart = (const char*)_jpn_message_data_staticSegmentStart;

src/code/z_message.c

@@ -1769,7 +1769,11 @@ void Message_Decode(PlayState* play) {
     s32 charTexIdx = 0;
     s16 i;
 #if !(PLATFORM_GC && OOT_PAL)
+#if OOT_NTSC
     s16 j;
+#else
+    STACK_PAD(s16);
+#endif
 #endif
     s16 decodedBufPos = 0;
     s16 numLines = 0;
@@ -1780,8 +1784,12 @@ void Message_Decode(PlayState* play) {
     u16 value;
     u8 curChar;
 #if !(PLATFORM_GC && OOT_PAL)
+#if OOT_NTSC
     u16 curCharWide;
     u8* fontBuf;
+#else
+    STACK_PADS(s32, 2);
+#endif
 #endif
 
     msgCtx->textDelayTimer = 0;
@@ -4147,9 +4155,9 @@ void Message_Update(PlayState* play) {
         0x0015, 0x0016, 0x0017, 0x0003, 0x0000, 0x270B, 0x00C8, 0x012C, 0x012D, 0xFFDA, 0x0014, 0x0016, 0x0014, 0x0016,
     };
 #if OOT_VERSION < GC_US
-    static s32 sUnknown = 0;
+    UNUSED static s32 sUnknown = 0;
 #elif PLATFORM_IQUE
-    static u16 sUnknown = 0;
+    UNUSED static u16 sUnknown = 0;
 #endif
     static char D_80153D74 = 0;
     MessageContext* msgCtx = &play->msgCtx;

src/code/z_parameter.c

@@ -2814,6 +2814,9 @@ void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) {
 void Interface_DrawItemButtons(PlayState* play) {
     static void* cUpLabelTextures[] = LANGUAGE_ARRAY(gNaviCUpJPNTex, gNaviCUpENGTex, gNaviCUpENGTex, gNaviCUpENGTex);
 #if OOT_VERSION >= PAL_1_0
+#if OOT_NTSC
+    UNUSED
+#endif
     static s16 startButtonLeftPos[] = { 132, 130, 130 };
 #endif
     InterfaceContext* interfaceCtx = &play->interfaceCtx;

src/libu64/stackcheck.c

@@ -10,7 +10,9 @@ StackEntry* sStackInfoListEnd = NULL;
 
 void StackCheck_Init(StackEntry* entry, void* stackBottom, void* stackTop, u32 initValue, s32 minSpace,
                      const char* name) {
+#if !PLATFORM_N64
     StackEntry* iter;
+#endif
     u32* addr;
 
     if (entry == NULL) {

src/libultra/audio/drvrnew.c

@@ -2,6 +2,7 @@
 #include "synthInternals.h"
 #include "stdbool.h"
 #include "stddef.h"
+#include "attributes.h"
 
 // WARNING: THE FOLLOWING CONSTANT MUST BE KEPT IN SYNC WITH SCALING IN MICROCODE!!!
 #define SCALE 16384
@@ -211,7 +212,7 @@ void alEnvmixerNew(ALEnvMixer* e, ALHeap* hp) {
 }
 
 void alLoadNew(ALLoadFilter* f, ALDMANew dmaNew, ALHeap* hp) {
-    s32 i;
+    UNUSED s32 i;
 
     // init filter superclass
     alFilterNew(&f->filter, alAdpcmPull, alLoadParam, AL_ADPCM);

src/libultra/audio/env.c

@@ -3,6 +3,7 @@
 #include "stdbool.h"
 #include "stddef.h"
 #include "ultra64/convert.h"
+#include "attributes.h"
 
 #define EQPOWER_LENGTH 128
 static s16 eqpower[EQPOWER_LENGTH] = {
@@ -20,7 +21,7 @@ static Acmd* _pullSubFrame(void* filter, s16* inp, s16* outp, s32 outCount, s32
 static s16 _getRate(f64 vol, f64 tgt, s32 count, u16* ratel);
 static f32 _getVol(f32 ivol, s32 samples, s16 ratem, u16 ratel);
 
-Acmd* alEnvmixerPull(void* filter, s16* outp, s32 outCount, s32 sampleOffset, Acmd* p) {
+Acmd* alEnvmixerPull(void* filter, UNUSED s16* outp, s32 outCount, s32 sampleOffset, Acmd* p) {
     Acmd* ptr = p;
     ALEnvMixer* e = (ALEnvMixer*)filter;
     s16 inp;

src/libultra/audio/heapalloc.c

@@ -1,8 +1,9 @@
 #include "libaudio.h"
 #include "synthInternals.h"
 #include "stddef.h"
+#include "attributes.h"
 
-void* alHeapDBAlloc(u8* file, s32 line, ALHeap* hp, s32 num, s32 size) {
+void* alHeapDBAlloc(UNUSED u8* file, UNUSED s32 line, ALHeap* hp, s32 num, s32 size) {
     s32 bytes;
     u8* ptr = NULL;
 

src/libultra/audio/load.c

@@ -4,6 +4,7 @@
 #include "stddef.h"
 #include "stdint.h"
 #include "ultra64/R4300.h"
+#include "attributes.h"
 
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
@@ -14,7 +15,7 @@
 
 static Acmd* _decodeChunk(Acmd* ptr, ALLoadFilter* f, s32 tsam, s32 nbytes, s16 outp, s16 inp, u32 flags);
 
-Acmd* alAdpcmPull(void* filter, s16* outp, s32 outCount, s32 sampleOffset, Acmd* p) {
+Acmd* alAdpcmPull(void* filter, s16* outp, s32 outCount, UNUSED s32 sampleOffset, Acmd* p) {
     Acmd* ptr = p;
     s16 inp;
     s32 tsam;
@@ -155,7 +156,7 @@ Acmd* alAdpcmPull(void* filter, s16* outp, s32 outCount, s32 sampleOffset, Acmd*
     return ptr;
 }
 
-Acmd* alRaw16Pull(void* filter, s16* outp, s32 outCount, s32 sampleOffset, Acmd* p) {
+Acmd* alRaw16Pull(void* filter, s16* outp, s32 outCount, UNUSED s32 sampleOffset, Acmd* p) {
     Acmd* ptr = p;
     s32 nbytes;
     s32 dramLoc;
@@ -166,7 +167,7 @@ Acmd* alRaw16Pull(void* filter, s16* outp, s32 outCount, s32 sampleOffset, Acmd*
     s32 nSam;
     s32 op;
     ALLoadFilter* f = (ALLoadFilter*)filter;
-    ALFilter* a = (ALFilter*)filter;
+    UNUSED ALFilter* a = (ALFilter*)filter;
 
     if (outCount == 0) {
         return ptr;

src/libultra/audio/reverb.c

@@ -4,6 +4,7 @@
 #include "stddef.h"
 #include "stdint.h"
 #include "ultra64/convert.h"
+#include "attributes.h"
 
 #define RANGE 2.0
 
@@ -26,10 +27,10 @@ Acmd* alFxPull(void* filter, s16* outp, s32 outCount, s32 sampleOffset, Acmd* p)
     s16 output;
     s16* in_ptr;
     s16* out_ptr;
-    s16 gain;
+    UNUSED s16 gain;
     s16* prev_out_ptr = NULL;
     ALDelay* d;
-    ALDelay* pd;
+    UNUSED ALDelay* pd;
 
     // pull channels going into this effect first
     ptr = (*source->handler)(source, outp, outCount, sampleOffset, p);

src/libultra/audio/synthesizer.c

@@ -1,6 +1,7 @@
 #include "libaudio.h"
 #include "synthInternals.h"
 #include "stddef.h"
+#include "attributes.h"
 
 #ifndef MIN
 #define MIN(a, b) (((a) < (b)) ? (a) : (b))
@@ -11,9 +12,9 @@ static s32 _timeToSamplesNoRound(ALSynth* synth, s32 micros);
 
 void alSynNew(ALSynth* drvr, ALSynConfig* c) {
     s32 i;
-    ALVoice* vv;
+    UNUSED ALVoice* vv;
     PVoice* pv;
-    ALVoice* vvoices;
+    UNUSED ALVoice* vvoices;
     PVoice* pvoices;
     ALHeap* hp = c->heap;
     ALSave* save;

src/libultra/io/motor.c

@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "attributes.h"
 
 #define MOTOR_ID 0x80
 
@@ -6,8 +7,8 @@
 OSPifRam __MotorDataBuf[MAXCONTROLLERS];
 #endif
 
-s32 __osMotorAccess(OSPfs* pfs, s32 vibrate) {
 #ifndef BBPLAYER
+s32 __osMotorAccess(OSPfs* pfs, s32 vibrate) {
     s32 i;
     s32 ret;
     u8* ptr = (u8*)&__MotorDataBuf[pfs->channel];
@@ -47,6 +48,7 @@ s32 __osMotorAccess(OSPfs* pfs, s32 vibrate) {
 
     return ret;
 #else
+s32 __osMotorAccess(UNUSED OSPfs* pfs, UNUSED s32 vibrate) {
     return PFS_ERR_INVALID;
 #endif
 }
@@ -76,8 +78,8 @@ void _MakeMotorData(s32 channel, OSPifRam* mdata) {
 }
 #endif
 
-s32 osMotorInit(OSMesgQueue* ctrlrqueue, OSPfs* pfs, s32 channel) {
 #ifndef BBPLAYER
+s32 osMotorInit(OSMesgQueue* ctrlrqueue, OSPfs* pfs, s32 channel) {
     s32 ret;
     u8 temp[BLOCKSIZE];
 
@@ -133,6 +135,7 @@ s32 osMotorInit(OSMesgQueue* ctrlrqueue, OSPfs* pfs, s32 channel) {
     pfs->status = PFS_MOTOR_INITIALIZED;
     return 0; // "Recognized rumble pak"
 #else
+s32 osMotorInit(UNUSED OSMesgQueue* ctrlrqueue, UNUSED OSPfs* pfs, UNUSED s32 channel) {
     return PFS_ERR_DEVICE;
 #endif
 }

src/overlays/actors/ovl_En_Kz/z_en_kz.c

@@ -292,9 +292,9 @@ s32 EnKz_UpdateTalking(PlayState* play, Actor* thisx, s16* talkState, f32 intera
 
 void func_80A9CB18(EnKz* this, PlayState* play) {
     Player* player = GET_PLAYER(play);
+#if OOT_VERSION < PAL_1_0
     f32 yaw;
 
-#if OOT_VERSION < PAL_1_0
     yaw = Math_Vec3f_Yaw(&this->actor.home.pos, &player->actor.world.pos);
     yaw -= this->actor.shape.rot.y;
     if (fabsf(yaw) > 1820.0f) {

src/overlays/gamestates/ovl_file_choose/z_file_choose.c

@@ -402,12 +402,14 @@ void FileSelect_InitModeUpdate(GameState* thisx) {
 #endif
 }
 
-void FileSelect_InitModeDraw(GameState* thisx) {
 #if OOT_PAL_N64
+void FileSelect_InitModeDraw(GameState* thisx) {
     FileSelectState* this = (FileSelectState*)thisx;
 
     Gfx_SetupDL_39Opa(this->state.gfxCtx);
     FileSelect_DrawInitialLanguageMenu(this);
+#else
+void FileSelect_InitModeDraw(UNUSED GameState* thisx) {
 #endif
 }