diff options
Diffstat (limited to 'src/overlays/misc')
6 files changed, 25 insertions, 15 deletions
diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index 78dcccb57..8dbf40b7f 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -1,6 +1,7 @@ #include "z_kaleido_scope.h" #include "array_count.h" +#include "attributes.h" #include "controller.h" #include "gfx.h" #include "printf.h" @@ -9,6 +10,7 @@ #include "ocarina.h" #include "play_state.h" #include "save.h" +#include "stack_pad.h" #include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" @@ -75,11 +77,11 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { gOcarinaBtnIconCLeftTex, // OCARINA_BTN_C_LEFT gOcarinaBtnIconCUpTex, // OCARINA_BTN_C_UP }; - static u16 D_8082A144[] = { + UNUSED static u16 D_8082A144[] = { 0xFFCC, 0xFFCC, 0xFFCC, 0xFFCC, 0xFFCC, }; static s16 sPlayedSongBtnsAlpha[SONG_MAX_LENGTH] = { 0 }; - static s32 sUnused1 = 0; + UNUSED static s32 sUnused1 = 0; static s16 sSongsPrimRed[] = { 150, // QUEST_SONG_MINUET @@ -161,7 +163,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { /* QUEST_SKULL_TOKEN */ { QUEST_STONE_OF_AGONY, QUEST_SONG_LULLABY, CURSOR_TO_LEFT, QUEST_HEART_PIECE }, /* QUEST_HEART_PIECE */ { CURSOR_NONE, QUEST_SONG_TIME, QUEST_GERUDOS_CARD, QUEST_MEDALLION_SHADOW }, }; - static s32 sUnused2 = 0; + UNUSED static s32 sUnused2 = 0; PauseContext* pauseCtx = &play->pauseCtx; Input* input = &play->state.input[0]; @@ -176,7 +178,7 @@ void KaleidoScope_DrawQuestStatus(PlayState* play, GraphicsContext* gfxCtx) { s16 cursor; s16 i; s16 targetColorIndex; - s16 pad2; + STACK_PAD(s16); s16 cursorItem; s16 gsTokenDigits[3]; diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index 2ba3fd113..269bc5815 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -6,6 +6,7 @@ #include "gfx_setupdl.h" #include "gfxalloc.h" #include "printf.h" +#include "stack_pad.h" #include "translation.h" #include "play_state.h" #include "save.h" @@ -176,7 +177,7 @@ static s16 sSlotItems[] = { void KaleidoScope_DrawInventoryEditorText(Gfx** gfxP) { GfxPrint printer; - s32 pad[2]; + STACK_PADS(s32, 2); GfxPrint_Init(&printer); GfxPrint_Open(&printer, *gfxP); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index 58cb01589..c67f59110 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -6,6 +6,7 @@ #include "printf.h" #include "regs.h" #include "sfx.h" +#include "stack_pad.h" #include "translation.h" #include "play_state.h" #include "player.h" @@ -78,7 +79,7 @@ void KaleidoScope_DrawEquipmentImage(PlayState* play, void* texture, u32 width, s32 textureHeight; s32 remainingSize; s32 textureSize; - s32 pad; + STACK_PAD(s32); s32 i; OPEN_DISPS(play->state.gfxCtx, "../z_kaleido_equipment.c", 68); diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c index f454594b4..7e3f46427 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c @@ -1,5 +1,6 @@ #include "z_kaleido_scope.h" +#include "attributes.h" #include "gfx.h" #include "gfx_setupdl.h" #include "language_array.h" @@ -7,6 +8,7 @@ #include "printf.h" #include "regs.h" #include "sfx.h" +#include "stack_pad.h" #include "sys_ucode.h" #include "versions.h" #include "play_state.h" @@ -416,7 +418,7 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) { }; static s16 pointPulseStage = 1; static s16 pointPulseTimer = 20; - static s16 D_8082A5B8[] = { 64, 64, 64, 28 }; + UNUSED static s16 D_8082A5B8[] = { 64, 64, 64, 28 }; static s16 areaBoxPosX[] = { -41, // WORLD_MAP_AREA_HYRULE_FIELD 19, // WORLD_MAP_AREA_KAKARIKO_VILLAGE @@ -646,7 +648,7 @@ void KaleidoScope_DrawWorldMap(PlayState* play, GraphicsContext* gfxCtx) { #if PLATFORM_N64 && OOT_VERSION != NTSC_1_2 if (0) { - s32 pad[3]; + STACK_PADS(s32, 3); } #endif diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index 75cbb25b8..f41a29510 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -1,5 +1,6 @@ #include "z_kaleido_scope.h" +#include "attributes.h" #include "libc64/sleep.h" #include "array_count.h" #include "controller.h" @@ -17,6 +18,7 @@ #include "segmented_address.h" #include "seqcmd.h" #include "sfx.h" +#include "stack_pad.h" #include "sys_matrix.h" #include "terminal.h" #include "title_setup_state.h" @@ -910,8 +912,9 @@ static s16 sCursorColors[][3] = { static void* sSavePromptMessageTexs[] = LANGUAGE_ARRAY(gPauseSavePromptJPNTex, gPauseSavePromptENGTex, gPauseSavePromptGERTex, gPauseSavePromptFRATex); -static void* sSaveConfirmationTexs[] = LANGUAGE_ARRAY(gPauseSaveConfirmationJPNTex, gPauseSaveConfirmationENGTex, - gPauseSaveConfirmationGERTex, gPauseSaveConfirmationFRATex); +UNUSED static void* sSaveConfirmationTexs[] = + LANGUAGE_ARRAY(gPauseSaveConfirmationJPNTex, gPauseSaveConfirmationENGTex, gPauseSaveConfirmationGERTex, + gPauseSaveConfirmationFRATex); static void* sContinuePromptTexs[] = LANGUAGE_ARRAY(gContinuePlayingJPNTex, gContinuePlayingENGTex, gContinuePlayingGERTex, gContinuePlayingFRATex); @@ -1140,7 +1143,7 @@ void KaleidoScope_HandlePageToggles(PauseContext* pauseCtx, Input* input) { void KaleidoScope_DrawCursor(PlayState* play, u16 pageIndex) { PauseContext* pauseCtx = &play->pauseCtx; - s32 pad; + STACK_PAD(s32); OPEN_DISPS(play->state.gfxCtx, "../z_kaleido_scope_PAL.c", 955); @@ -1690,7 +1693,7 @@ void KaleidoScope_DrawUIOverlay(PlayState* play) { }; static s16 sLRSelectedPrimTimer = 20; static s16 sLRSelectedPrimState = 0; - static s16 D_8082AE08[] = { + UNUSED static s16 D_8082AE08[] = { 10, 16, 16, 17, 12, 13, 18, 17, 17, 19, 13, 21, 20, 21, 14, 15, 15, 15, 11, 14, }; static s16 D_8082AE30[] = { @@ -3617,7 +3620,7 @@ void KaleidoScope_UpdateCursorVtx(PlayState* play) { void KaleidoScope_LoadDungeonMap(PlayState* play) { InterfaceContext* interfaceCtx = &play->interfaceCtx; #if PLATFORM_N64 || OOT_PAL - s32 pad; + STACK_PAD(s32); #endif DMA_REQUEST_SYNC(interfaceCtx->mapSegment, diff --git a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c index 05371b714..953d786d8 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c @@ -1,6 +1,7 @@ #if PLATFORM_N64 #include "n64dd.h" #endif +#include "attributes.h" #include "regs.h" #include "sys_matrix.h" #include "z_kaleido_scope.h" @@ -31,7 +32,7 @@ static PauseMapMarkInfo sMapMarkInfoTable[] = { extern PauseMapMarksData gPauseMapMarkDataTable[]; -void PauseMapMark_Init(PlayState* play) { +void PauseMapMark_Init(UNUSED PlayState* play) { gBossMarkState = 0; gBossMarkScale = 1.0f; gLoadedPauseMarkDataTable = gPauseMapMarkDataTable; @@ -42,7 +43,7 @@ void PauseMapMark_Init(PlayState* play) { #endif } -void PauseMapMark_Clear(PlayState* play) { +void PauseMapMark_Clear(UNUSED PlayState* play) { #if PLATFORM_N64 if ((B_80121220 != NULL) && (B_80121220->unk_38 != NULL)) { B_80121220->unk_38(&gLoadedPauseMarkDataTable); |