diff --git a/.clang-tidy b/.clang-tidy index a0e0eab4fd..caf62ab7f8 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -3,3 +3,7 @@ WarningsAsErrors: '' HeaderFilterRegex: '(src|include)\/.*\.h$' FormatStyle: 'file' CheckOptions: + # Require argument names to match exactly (instead of allowing a name to be a prefix/suffix of another) + # Note: 'true' is expected by clang-tidy 12+ but '1' is used for compatibility with older versions + - key: readability-inconsistent-declaration-parameter-name.Strict + value: 1 diff --git a/assets/xml/textures/backgrounds.xml b/assets/xml/textures/backgrounds.xml index 195fdbbbe3..c60ff57a8a 100644 --- a/assets/xml/textures/backgrounds.xml +++ b/assets/xml/textures/backgrounds.xml @@ -243,4 +243,4 @@ - \ No newline at end of file + diff --git a/format.sh b/format.sh index 62133bf5c4..004274bfc8 100755 --- a/format.sh +++ b/format.sh @@ -1,9 +1,20 @@ #!/usr/bin/env bash +# Clang-Format version and options (see .clang-format for rules applied) +# Version 11 is used when available for more consistency between contributors FORMAT_VER="11" FORMAT_OPTS="-i -style=file" + +# Clang-Tidy options (see .clang-tidy for checks enabled) TIDY_OPTS="-p . --fix --fix-errors" -COMPILER_OPTS="-fno-builtin -fsyntax-only -std=gnu90 -Iinclude -Isrc -Ibuild -I. -D_LANGUAGE_C -DNON_MATCHING" + +# Compiler options used with Clang-Tidy +# Normal warnings are disabled with -Wno-everything to focus only on tidying +INCLUDES="-Iinclude -Isrc -Ibuild -I." +DEFINES="-D_LANGUAGE_C -DNON_MATCHING" +COMPILER_OPTS="-fno-builtin -std=gnu90 -m32 -Wno-everything ${INCLUDES} ${DEFINES}" + +TIDY_VERSION_REGEX="LLVM version ([0-9]+)" # https://backreference.org/2010/05/23/sanitizing-files-with-no-trailing-newline/index.html # "gets the last character of the file pipes it into read, which will exit with @@ -34,18 +45,28 @@ else fi fi -if [ ! $(command -v clang-tidy) ] +if [ $(command -v clang-tidy) ] then + CLANG_TIDY="clang-tidy" +else echo "clang-tidy not found. Exiting." exit 1 fi +# Try to detect the clang-tidy version and add --fix-notes for version 13+ +# This is used to ensure all fixes are applied properly in recent versions +if [[ $(${CLANG_TIDY} --version) =~ $TIDY_VERSION_REGEX ]]; then + if (( ${BASH_REMATCH[1]} >= 13 )); then + TIDY_OPTS="${TIDY_OPTS} --fix-notes" + fi +fi + if (( $# > 0 )); then echo "Formatting file(s) $*" echo "Running clang-format..." ${CLANG_FORMAT} ${FORMAT_OPTS} "$@" echo "Running clang-tidy..." - clang-tidy ${TIDY_OPTS} "$@" -- ${COMPILER_OPTS} &> /dev/null + ${CLANG_TIDY} ${TIDY_OPTS} "$@" -- ${COMPILER_OPTS} &> /dev/null echo "Adding missing final new lines..." add_final_newline "$@" echo "Done formatting file(s) $*" @@ -56,7 +77,7 @@ echo "Formatting C files. This will take a bit" echo "Running clang-format..." ${CLANG_FORMAT} ${FORMAT_OPTS} src/**/*.c echo "Running clang-tidy..." -clang-tidy ${TIDY_OPTS} src/**/*.c -- ${COMPILER_OPTS} &> /dev/null +${CLANG_TIDY} ${TIDY_OPTS} src/**/*.c -- ${COMPILER_OPTS} &> /dev/null echo "Adding missing final new lines..." find src/ -type f -name "*.c" -exec bash -c 'add_final_newline "$@"' bash {} + find assets/xml/ -type f -name "*.xml" -exec bash -c 'add_final_newline "$@"' bash {} + diff --git a/include/functions.h b/include/functions.h index 9d12c98b60..2b61d165ee 100644 --- a/include/functions.h +++ b/include/functions.h @@ -795,7 +795,7 @@ void CollisionCheck_SpawnRedBlood(PlayState* play, Vec3f* v); void CollisionCheck_SpawnWaterDroplets(PlayState* play, Vec3f* v); void CollisionCheck_SpawnShieldParticles(PlayState* play, Vec3f* v); void CollisionCheck_SpawnShieldParticlesMetal(PlayState* play, Vec3f* v); -void CollisionCheck_SpawnShieldParticlesMetalSound(PlayState* play, Vec3f* v, Vec3f* actorPos); +void CollisionCheck_SpawnShieldParticlesMetalSound(PlayState* play, Vec3f* v, Vec3f* pos); void CollisionCheck_SpawnShieldParticlesMetal2(PlayState* play, Vec3f* v); void CollisionCheck_SpawnShieldParticlesWood(PlayState* play, Vec3f* v, Vec3f* actorPos); s32 CollisionCheck_CylSideVsLineSeg(f32 radius, f32 height, f32 offset, Vec3f* actorPos, Vec3f* itemPos, @@ -842,7 +842,7 @@ void func_8006D0EC(PlayState* play, Player* player); void func_8006D684(PlayState* play, Player* player); void func_8006DC68(PlayState* play, Player* player); void func_8006DD9C(Actor* actor, Vec3f* arg1, s16 arg2); -s32 Jpeg_Decode(void* data, void* zbuffer, void* workBuff, u32 workSize); +s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize); void KaleidoSetup_Update(PlayState* play); void KaleidoSetup_Init(PlayState* play); void KaleidoSetup_Destroy(PlayState* play); @@ -853,7 +853,7 @@ void Font_LoadOrderedFont(Font* font); s32 Environment_ZBufValToFixedPoint(s32 zBufferVal); u16 Environment_GetPixelDepth(s32 x, s32 y); void Environment_GraphCallback(GraphicsContext* gfxCtx, void* param); -void Environment_Init(PlayState* play, EnvironmentContext* envCtx, s32 unused); +void Environment_Init(PlayState* play2, EnvironmentContext* envCtx, s32 unused); u8 Environment_SmoothStepToU8(u8* pvalue, u8 target, u8 scale, u8 step, u8 minStep); u8 Environment_SmoothStepToS8(s8* pvalue, s8 target, u8 scale, u8 step, u8 minStep); f32 Environment_LerpWeight(u16 max, u16 min, u16 val); @@ -986,8 +986,8 @@ VecSph* OLib_Vec3fToVecSph(VecSph* dest, Vec3f* vec); VecSph* OLib_Vec3fToVecSphGeo(VecSph* dest, Vec3f* vec); VecSph* OLib_Vec3fDiffToVecSphGeo(VecSph* dest, Vec3f* a, Vec3f* b); Vec3f* OLib_Vec3fDiffRad(Vec3f* dest, Vec3f* a, Vec3f* b); -s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s16 camId); -s16 OnePointCutscene_EndCutscene(PlayState* play, s16 camId); +s16 OnePointCutscene_Init(PlayState* play, s16 csId, s16 timer, Actor* actor, s16 parentCamId); +s16 OnePointCutscene_EndCutscene(PlayState* play, s16 subCamId); s32 OnePointCutscene_Attention(PlayState* play, Actor* actor); s32 OnePointCutscene_AttentionSetSfx(PlayState* play, Actor* actor, s32 sfxId); void OnePointCutscene_EnableAttention(void); @@ -1099,7 +1099,7 @@ s16 Quake_Callback4(QuakeRequest* req, ShakeInfo* shake); s16 Quake_Callback5(QuakeRequest* req, ShakeInfo* shake); s16 Quake_Callback6(QuakeRequest* req, ShakeInfo* shake); s16 Quake_GetFreeIndex(void); -QuakeRequest* Quake_AddImpl(Camera* cam, u32 callbackIdx); +QuakeRequest* Quake_AddImpl(Camera* camera, u32 callbackIdx); void Quake_Remove(QuakeRequest* req); QuakeRequest* Quake_GetRequest(s16 idx); QuakeRequest* Quake_SetValue(s16 idx, s16 valueType, s16 value); @@ -1109,7 +1109,7 @@ s16 Quake_GetCountdown(s16 idx); u32 Quake_SetQuakeValues(s16 idx, s16 y, s16 x, s16 zoom, s16 rotZ); u32 Quake_SetUnkValues(s16 idx, s16 arg1, SubQuakeRequest14 arg2); void Quake_Init(void); -s16 Quake_Add(Camera* cam, u32 callbackIdx); +s16 Quake_Add(Camera* camera, u32 callbackIdx); u32 Quake_RemoveFromIdx(s16 idx); s16 Quake_Calc(Camera* camera, QuakeCamCalc* camData); Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); @@ -1289,7 +1289,7 @@ s32 Skin_ApplyAnimTransformations(Skin* skin, MtxF* limbMatrices, Actor* actor, void SkinMatrix_Vec3fMtxFMultXYZW(MtxF* mf, Vec3f* src, Vec3f* xyzDest, f32* wDest); void SkinMatrix_Vec3fMtxFMultXYZ(MtxF* mf, Vec3f* src, Vec3f* dest); void SkinMatrix_MtxFMtxFMult(MtxF* mfA, MtxF* mfB, MtxF* dest); -void SkinMatrix_GetClear(MtxF** mf); +void SkinMatrix_GetClear(MtxF** mfp); void SkinMatrix_MtxFCopy(MtxF* src, MtxF* dest); s32 SkinMatrix_Invert(MtxF* src, MtxF* dest); void SkinMatrix_SetScale(MtxF* mf, f32 x, f32 y, f32 z); @@ -1305,10 +1305,10 @@ void Sram_InitNewSave(void); void Sram_InitDebugSave(void); void Sram_OpenSave(SramContext* sramCtx); void Sram_WriteSave(SramContext* sramCtx); -void Sram_VerifyAndLoadAllSaves(FileChooseContext* fileChoose, SramContext* sramCtx); -void Sram_InitSave(FileChooseContext* fileChoose, SramContext* sramCtx); -void Sram_EraseSave(FileChooseContext* fileChoose, SramContext* sramCtx); -void Sram_CopySave(FileChooseContext* fileChoose, SramContext* sramCtx); +void Sram_VerifyAndLoadAllSaves(FileChooseContext* fileChooseCtx, SramContext* sramCtx); +void Sram_InitSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx); +void Sram_EraseSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx); +void Sram_CopySave(FileChooseContext* fileChooseCtx, SramContext* sramCtx); void Sram_WriteSramHeader(SramContext* sramCtx); void Sram_InitSram(GameState* gameState, SramContext* sramCtx); void Sram_Alloc(GameState* gameState, SramContext* sramCtx); @@ -1329,8 +1329,8 @@ void func_800AA178(u32); View* View_New(GraphicsContext* gfxCtx); void View_Free(View* view); void View_Init(View*, GraphicsContext*); -void View_LookAt(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up); -void View_LookAtUnsafe(View* view, Vec3f* eye, Vec3f* lookAt, Vec3f* up); +void View_LookAt(View* view, Vec3f* eye, Vec3f* at, Vec3f* up); +void View_LookAtUnsafe(View* view, Vec3f* eye, Vec3f* at, Vec3f* up); void View_SetScale(View* view, f32 scale); void View_GetScale(View* view, f32* scale); void View_SetPerspective(View* view, f32 fovy, f32 zNear, f32 zFar); @@ -1350,9 +1350,9 @@ void View_Apply(View* view, s32 mask); s32 View_ApplyOrthoToOverlay(View* view); s32 View_ApplyPerspectiveToOverlay(View* view); s32 View_UpdateViewingMatrix(View* view); -s32 View_ApplyTo(View* view, s32 mask, Gfx** p); +s32 View_ApplyTo(View* view, s32 mask, Gfx** gfxp); s32 View_ErrorCheckEyePosition(f32 eyeX, f32 eyeY, f32 eyeZ); -void ViMode_LogPrint(OSViMode* viMode); +void ViMode_LogPrint(OSViMode* osViMode); void ViMode_Configure(ViMode* viMode, s32 mode, s32 type, s32 unk_70, s32 unk_74, s32 unk_78, s32 unk_7C, s32 width, s32 height, s32 unk_left, s32 unk_right, s32 unk_top, s32 unk_bottom); void ViMode_Save(ViMode* viMode); @@ -1382,22 +1382,22 @@ TransitionUnk* TransitionUnk_Init(TransitionUnk* this, s32 row, s32 col); void TransitionUnk_SetData(TransitionUnk* this); void TransitionUnk_Draw(TransitionUnk* this, Gfx**); void func_800B23E8(TransitionUnk* this); -void TransitionTriforce_Start(void* this); -void* TransitionTriforce_Init(void* this); -void TransitionTriforce_Destroy(void* this); -void TransitionTriforce_Update(void* this, s32 updateRate); -void TransitionTriforce_SetColor(void* this, u32 color); -void TransitionTriforce_SetType(void* this, s32 type); -void TransitionTriforce_Draw(void* this, Gfx** gfxP); -s32 TransitionTriforce_IsDone(void* this); -void TransitionWipe_Start(void* this); -void* TransitionWipe_Init(void* this); -void TransitionWipe_Destroy(void* this); -void TransitionWipe_Update(void* this, s32 updateRate); -void TransitionWipe_Draw(void* this, Gfx** gfxP); -s32 TransitionWipe_IsDone(void* this); -void TransitionWipe_SetType(void* this, s32 type); -void TransitionWipe_SetColor(void* this, u32 color); +void TransitionTriforce_Start(void* thisx); +void* TransitionTriforce_Init(void* thisx); +void TransitionTriforce_Destroy(void* thisx); +void TransitionTriforce_Update(void* thisx, s32 updateRate); +void TransitionTriforce_SetColor(void* thisx, u32 color); +void TransitionTriforce_SetType(void* thisx, s32 type); +void TransitionTriforce_Draw(void* thisx, Gfx** gfxP); +s32 TransitionTriforce_IsDone(void* thisx); +void TransitionWipe_Start(void* thisx); +void* TransitionWipe_Init(void* thisx); +void TransitionWipe_Destroy(void* thisx); +void TransitionWipe_Update(void* thisx, s32 updateRate); +void TransitionWipe_Draw(void* thisx, Gfx** gfxP); +s32 TransitionWipe_IsDone(void* thisx); +void TransitionWipe_SetType(void* thisx, s32 type); +void TransitionWipe_SetColor(void* thisx, u32 color); void TransitionCircle_Start(void* thisx); void* TransitionCircle_Init(void* thisx); void TransitionCircle_Destroy(void* thisx); @@ -1406,15 +1406,15 @@ void TransitionCircle_Draw(void* thisx, Gfx** gfxP); s32 TransitionCircle_IsDone(void* thisx); void TransitionCircle_SetType(void* thisx, s32 type); void TransitionCircle_SetColor(void* thisx, u32 color); -void TransitionCircle_SetUnkColor(void* thisx, u32 color); -void TransitionFade_Start(void* this); -void* TransitionFade_Init(void* this); -void TransitionFade_Destroy(void* this); -void TransitionFade_Update(void* this, s32 updateRate); -void TransitionFade_Draw(void* this, Gfx** gfxP); -s32 TransitionFade_IsDone(void* this); -void TransitionFade_SetColor(void* this, u32 color); -void TransitionFade_SetType(void* this, s32 type); +void TransitionCircle_SetUnkColor(void* thisx, u32 unkColor); +void TransitionFade_Start(void* thisx); +void* TransitionFade_Init(void* thisx); +void TransitionFade_Destroy(void* thisx); +void TransitionFade_Update(void* thisx, s32 updateRate); +void TransitionFade_Draw(void* thisx, Gfx** gfxP); +s32 TransitionFade_IsDone(void* thisx); +void TransitionFade_SetColor(void* thisx, u32 color); +void TransitionFade_SetType(void* thisx, s32 type); void ShrinkWindow_SetVal(s32 value); u32 ShrinkWindow_GetVal(void); void ShrinkWindow_SetCurrentVal(s32 currentVal); @@ -1612,21 +1612,21 @@ void ListAlloc_Free(ListAlloc* this, void* data); void ListAlloc_FreeAll(ListAlloc* this); void Main_LogSystemHeap(void); void Main(void* arg); -OSMesgQueue* PadMgr_LockSerialMesgQueue(PadMgr* padmgr); -void PadMgr_UnlockSerialMesgQueue(PadMgr* padmgr, OSMesgQueue* serialEventQueue); -void PadMgr_LockPadData(PadMgr* padmgr); -void PadMgr_UnlockPadData(PadMgr* padmgr); -void PadMgr_RumbleControl(PadMgr* padmgr); -void PadMgr_RumbleStop(PadMgr* padmgr); -void PadMgr_RumbleReset(PadMgr* padmgr); -void PadMgr_RumbleSet(PadMgr* padmgr, u8* ctrlrRumbles); -void PadMgr_ProcessInputs(PadMgr* padmgr); -void PadMgr_HandleRetraceMsg(PadMgr* padmgr); -void PadMgr_HandlePreNMI(PadMgr* padmgr); +OSMesgQueue* PadMgr_LockSerialMesgQueue(PadMgr* padMgr); +void PadMgr_UnlockSerialMesgQueue(PadMgr* padMgr, OSMesgQueue* serialEventQueue); +void PadMgr_LockPadData(PadMgr* padMgr); +void PadMgr_UnlockPadData(PadMgr* padMgr); +void PadMgr_RumbleControl(PadMgr* padMgr); +void PadMgr_RumbleStop(PadMgr* padMgr); +void PadMgr_RumbleReset(PadMgr* padMgr); +void PadMgr_RumbleSet(PadMgr* padMgr, u8* ctrlrRumbles); +void PadMgr_ProcessInputs(PadMgr* padMgr); +void PadMgr_HandleRetraceMsg(PadMgr* padMgr); +void PadMgr_HandlePreNMI(PadMgr* padMgr); // This function must remain commented out, because it is called incorrectly in // fault.c (actual bug in game), and the compiler notices and won't compile it // void PadMgr_RequestPadData(PadMgr* padmgr, Input* inputs, s32 mode); -void PadMgr_Init(PadMgr* padmgr, OSMesgQueue* serialEventQueue, IrqMgr* irqMgr, OSId id, OSPri priority, void* stack); +void PadMgr_Init(PadMgr* padMgr, OSMesgQueue* serialEventQueue, IrqMgr* irqMgr, OSId id, OSPri priority, void* stack); void SpeedMeter_InitImpl(SpeedMeter* this, u32 arg1, u32 y); void SpeedMeter_Init(SpeedMeter* this); void SpeedMeter_Destroy(SpeedMeter* this); @@ -1875,7 +1875,7 @@ Note* Audio_AllocNote(SequenceLayer* layer); void Audio_NoteInitAll(void); void Audio_SequenceChannelProcessSound(SequenceChannel* channel, s32 recalculateVolume, s32 applyBend); void Audio_SequencePlayerProcessSound(SequencePlayer* seqPlayer); -f32 Audio_GetPortamentoFreqScale(Portamento* p); +f32 Audio_GetPortamentoFreqScale(Portamento* portamento); s16 Audio_GetVibratoPitchChange(VibratoState* vib); f32 Audio_GetVibratoFreqScale(VibratoState* vib); void Audio_NoteVibratoUpdate(Note* note); @@ -2019,7 +2019,7 @@ void* Overlay_AllocateAndLoad(uintptr_t vRomStart, uintptr_t vRomEnd, void* vRam void MtxConv_F2L(Mtx* m1, MtxF* m2); void MtxConv_L2F(MtxF* m1, Mtx* m2); void Overlay_Relocate(void* allocatedVRamAddress, OverlayRelocationSection* overlayInfo, void* vRamStart); -s32 Overlay_Load(uintptr_t vRomStart, uintptr_t vRomEnd, void* vRamStart, void* vRamEnd, void* allocatedVRamAddress); +s32 Overlay_Load(uintptr_t vRomStart, uintptr_t vRomEnd, void* vRamStart, void* vRamEnd, void* allocatedVRamAddr); // ? func_800FC800(?); // ? func_800FC83C(?); // ? func_800FCAB4(?); @@ -2195,7 +2195,7 @@ void guPositionF(f32 mf[4][4], f32 rot, f32 pitch, f32 yaw, f32 scale, f32 x, f3 void guPosition(Mtx*, f32, f32, f32, f32, f32, f32, f32); OSYieldResult osSpTaskYielded(OSTask* task); void guRotateF(f32 m[4][4], f32 a, f32 x, f32 y, f32 z); -void guRotate(Mtx*, f32 angle, f32 x, f32 y, f32 z); +void guRotate(Mtx*, f32 a, f32 x, f32 y, f32 z); s32 osAiSetFrequency(u32 frequency); OSThread* __osGetActiveQueue(void); void guNormalize(f32* x, f32* y, f32* z); @@ -2207,7 +2207,7 @@ void guOrthoF(f32[4][4], f32, f32, f32, f32, f32, f32, f32); void guOrtho(Mtx*, f32, f32, f32, f32, f32, f32, f32); f32 cosf(f32); s16 coss(u16); -void osViSetEvent(OSMesgQueue* mq, OSMesg m, u32 retraceCount); +void osViSetEvent(OSMesgQueue* mq, OSMesg msg, u32 retraceCount); s32 osPfsIsPlug(OSMesgQueue* mq, u8* pattern); void __osPfsRequestData(u8 poll); void __osPfsGetInitData(u8* pattern, OSContStatus* contData); diff --git a/src/code/audio_heap.c b/src/code/audio_heap.c index 520d522749..0f5abc4425 100644 --- a/src/code/audio_heap.c +++ b/src/code/audio_heap.c @@ -1371,7 +1371,7 @@ void AudioHeap_ChangeStorage(StorageChange* change, Sample* sample) { } } -void AudioHeap_ApplySampleBankCacheInternal(s32 apply, s32 id); +void AudioHeap_ApplySampleBankCacheInternal(s32 apply, s32 sampleBankId); void AudioHeap_DiscardSampleBank(s32 sampleBankId) { AudioHeap_ApplySampleBankCacheInternal(false, sampleBankId); diff --git a/src/code/audio_load.c b/src/code/audio_load.c index e83cd92193..846ca1a486 100644 --- a/src/code/audio_load.c +++ b/src/code/audio_load.c @@ -27,22 +27,22 @@ typedef struct { typedef void SoundFontData; /* forward declarations */ -s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 skipTicks); +s32 AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2); SoundFontData* AudioLoad_SyncLoadFont(u32 fontId); Sample* AudioLoad_GetFontSample(s32 fontId, s32 instId); void AudioLoad_ProcessAsyncLoads(s32 resetStatus); void AudioLoad_ProcessAsyncLoadUnkMedium(AudioAsyncLoad* asyncLoad, s32 resetStatus); void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus); void AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, SoundFontData* fontData, SampleBankRelocInfo* sampleBankReloc, - s32 async); + s32 isAsync); void AudioLoad_RelocateSample(TunedSample* tunedSample, SoundFontData* fontData, SampleBankRelocInfo* sampleBankReloc); void AudioLoad_DiscardFont(s32 fontId); u32 AudioLoad_TrySyncLoadSampleBank(u32 sampleBankId, u32* outMedium, s32 noLoad); -void* AudioLoad_SyncLoad(u32 tableType, u32 tableId, s32* didAllocate); -u32 AudioLoad_GetRealTableIndex(s32 tableType, u32 tableId); +void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate); +u32 AudioLoad_GetRealTableIndex(s32 tableType, u32 id); void* AudioLoad_SearchCaches(s32 tableType, s32 id); AudioTable* AudioLoad_GetLoadTable(s32 tableType); -void AudioLoad_SyncDma(u32 devAddr, u8* addr, u32 size, s32 medium); +void AudioLoad_SyncDma(u32 devAddr, u8* ramAddr, u32 size, s32 medium); void AudioLoad_SyncDmaUnkMedium(u32 devAddr, u8* addr, u32 size, s32 unkMediumParam); s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void* ramAddr, u32 size, OSMesgQueue* reqQueue, s32 medium, const char* dmaFuncType); diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 61b4cc5492..913f973a91 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -12,7 +12,7 @@ void ArrowFire_Init(Actor* thisx, PlayState* play); void ArrowFire_Destroy(Actor* thisx, PlayState* play); void ArrowFire_Update(Actor* thisx, PlayState* play); -void ArrowFire_Draw(Actor* thisx, PlayState* play); +void ArrowFire_Draw(Actor* thisx, PlayState* play2); void ArrowFire_Charge(ArrowFire* this, PlayState* play); void ArrowFire_Fly(ArrowFire* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index 35ef40e940..26b9b8faa0 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -15,7 +15,7 @@ void BgBowlWall_Init(Actor* thisx, PlayState* play); void BgBowlWall_Destroy(Actor* thisx, PlayState* play); void BgBowlWall_Update(Actor* thisx, PlayState* play); -void BgBowlWall_Draw(Actor* thisx, PlayState* play); +void BgBowlWall_Draw(Actor* thisx, PlayState* play2); void BgBowlWall_SpawnBullseyes(BgBowlWall* this, PlayState* play); void BgBowlWall_WaitForHit(BgBowlWall* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index bcce86d943..9fc9460452 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -25,9 +25,9 @@ typedef enum { /* 2 */ FAIRY_SPELL_NAYRUS_LOVE } BgDyYoseizoSpellType; -void BgDyYoseizo_Init(Actor* thisx, PlayState* play); +void BgDyYoseizo_Init(Actor* thisx, PlayState* play2); void BgDyYoseizo_Destroy(Actor* thisx, PlayState* play); -void BgDyYoseizo_Update(Actor* thisx, PlayState* play); +void BgDyYoseizo_Update(Actor* thisx, PlayState* play2); void BgDyYoseizo_Draw(Actor* thisx, PlayState* play); void BgDyYoseizo_CheckMagicAcquired(BgDyYoseizo* this, PlayState* play); @@ -94,7 +94,7 @@ void BgDyYoseizo_Init(Actor* thisx, PlayState* play2) { this->actionFunc = BgDyYoseizo_CheckMagicAcquired; } -void BgDyYoseizo_Destroy(Actor* this, PlayState* play) { +void BgDyYoseizo_Destroy(Actor* thisx, PlayState* play) { } static Color_RGB8 sEffectPrimColors[] = { diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 0ddc5be0a3..c81e7155d4 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -16,8 +16,8 @@ typedef enum { /* 0x02 */ FLASH_SHRINK } FlashState; -void BgGanonOtyuka_Init(Actor* thisx, PlayState* play); -void BgGanonOtyuka_Destroy(Actor* thisx, PlayState* play); +void BgGanonOtyuka_Init(Actor* thisx, PlayState* play2); +void BgGanonOtyuka_Destroy(Actor* thisx, PlayState* play2); void BgGanonOtyuka_Update(Actor* thisx, PlayState* play); void BgGanonOtyuka_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c index c1ccffb60b..977963a651 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c @@ -9,9 +9,9 @@ #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) -void BgGndDarkmeiro_Init(Actor* thisx, PlayState* play); -void BgGndDarkmeiro_Destroy(Actor* thisx, PlayState* play); -void BgGndDarkmeiro_Update(Actor* thisx, PlayState* play); +void BgGndDarkmeiro_Init(Actor* thisx, PlayState* play2); +void BgGndDarkmeiro_Destroy(Actor* thisx, PlayState* play2); +void BgGndDarkmeiro_Update(Actor* thisx, PlayState* play2); void BgGndDarkmeiro_DrawInvisiblePath(Actor* thisx, PlayState* play); void BgGndDarkmeiro_DrawSwitchBlock(Actor* thisx, PlayState* play); void BgGndDarkmeiro_DrawStaticBlock(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index 3df86910cf..b60f4958a4 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -10,7 +10,7 @@ #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) void BgGndFiremeiro_Init(Actor* thisx, PlayState* play); -void BgGndFiremeiro_Destroy(Actor* thisx, PlayState* play); +void BgGndFiremeiro_Destroy(Actor* thisx, PlayState* play2); void BgGndFiremeiro_Update(Actor* thisx, PlayState* play); void BgGndFiremeiro_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index b8fe94a57d..c0d19f28bf 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -33,7 +33,7 @@ void BgHakaGate_Init(Actor* thisx, PlayState* play); void BgHakaGate_Destroy(Actor* thisx, PlayState* play); void BgHakaGate_Update(Actor* thisx, PlayState* play); -void BgHakaGate_Draw(Actor* this, PlayState* play); +void BgHakaGate_Draw(Actor* thisx, PlayState* play); void BgHakaGate_DoNothing(BgHakaGate* this, PlayState* play); void BgHakaGate_StatueInactive(BgHakaGate* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index 39802b5c5d..6815631d60 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c @@ -11,7 +11,7 @@ void BgHidanCurtain_Init(Actor* thisx, PlayState* play); void BgHidanCurtain_Destroy(Actor* thisx, PlayState* play); -void BgHidanCurtain_Update(Actor* thisx, PlayState* play); +void BgHidanCurtain_Update(Actor* thisx, PlayState* play2); void BgHidanCurtain_Draw(Actor* thisx, PlayState* play); void BgHidanCurtain_WaitForSwitchOn(BgHidanCurtain* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 6f03f1a3de..7e5c9cb5d9 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c @@ -17,7 +17,7 @@ typedef enum { /* 2 */ FWBIG_KILL } HidanFwbigMoveState; -void BgHidanFwbig_Init(Actor* thisx, PlayState* play); +void BgHidanFwbig_Init(Actor* thisx, PlayState* play2); void BgHidanFwbig_Destroy(Actor* thisx, PlayState* play); void BgHidanFwbig_Update(Actor* thisx, PlayState* play); void BgHidanFwbig_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index 3d71454c4e..d904c2216b 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -10,9 +10,9 @@ #define FLAGS 0 void BgHidanSekizou_Init(Actor* thisx, PlayState* play); -void BgHidanSekizou_Destroy(Actor* thisx, PlayState* play); -void BgHidanSekizou_Update(Actor* thisx, PlayState* play); -void BgHidanSekizou_Draw(Actor* thisx, PlayState* play); +void BgHidanSekizou_Destroy(Actor* thisx, PlayState* play2); +void BgHidanSekizou_Update(Actor* thisx, PlayState* play2); +void BgHidanSekizou_Draw(Actor* thisx, PlayState* play2); void func_8088D434(BgHidanSekizou* this, PlayState* play); void func_8088D720(BgHidanSekizou* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 9d78b421ce..bc6d877489 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -6,7 +6,7 @@ void BgIceShelter_Init(Actor* thisx, PlayState* play); void BgIceShelter_Destroy(Actor* thisx, PlayState* play); void BgIceShelter_Update(Actor* thisx, PlayState* play); -void BgIceShelter_Draw(Actor* thisx, PlayState* play); +void BgIceShelter_Draw(Actor* thisx, PlayState* play2); void func_80891064(BgIceShelter* this); void func_808911BC(BgIceShelter* this); diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index 09999d827f..1721755e29 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -14,9 +14,9 @@ void BgIceShutter_Destroy(Actor* thisx, PlayState* play); void BgIceShutter_Update(Actor* thisx, PlayState* play); void BgIceShutter_Draw(Actor* thisx, PlayState* play); -void func_80891CF4(BgIceShutter* thisx, PlayState* play); -void func_80891D6C(BgIceShutter* thisx, PlayState* play); -void func_80891DD4(BgIceShutter* thisx, PlayState* play); +void func_80891CF4(BgIceShutter* this, PlayState* play); +void func_80891D6C(BgIceShutter* this, PlayState* play); +void func_80891DD4(BgIceShutter* this, PlayState* play); const ActorInit Bg_Ice_Shutter_InitVars = { ACTOR_BG_ICE_SHUTTER, diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 0229d84741..5cf654a565 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -11,7 +11,7 @@ void BgJya1flift_Init(Actor* thisx, PlayState* play); void BgJya1flift_Destroy(Actor* thisx, PlayState* play); -void BgJya1flift_Update(Actor* thisx, PlayState* play); +void BgJya1flift_Update(Actor* thisx, PlayState* play2); void BgJya1flift_Draw(Actor* thisx, PlayState* play); void BgJya1flift_SetupWaitForSwitch(BgJya1flift* this); diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c index f9f52bc889..27b244307c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c @@ -4,7 +4,7 @@ #define FLAGS ACTOR_FLAG_0 void BgJyaBombchuiwa_Init(Actor* thisx, PlayState* play); -void BgJyaBombchuiwa_Destroy(Actor* thisx, PlayState* play); +void BgJyaBombchuiwa_Destroy(Actor* thisx, PlayState* play2); void BgJyaBombchuiwa_Update(Actor* thisx, PlayState* play); void BgJyaBombchuiwa_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 4d625fca85..83fcf3750b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -8,7 +8,7 @@ void BgJyaCobra_Init(Actor* thisx, PlayState* play); void BgJyaCobra_Destroy(Actor* thisx, PlayState* play); -void BgJyaCobra_Update(Actor* thisx, PlayState* play); +void BgJyaCobra_Update(Actor* thisx, PlayState* play2); void BgJyaCobra_Draw(Actor* thisx, PlayState* play); void func_80896918(BgJyaCobra* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index eb6dc61e52..e6e1c2b038 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -11,7 +11,7 @@ void BgJyaLift_Init(Actor* thisx, PlayState* play); void BgJyaLift_Destroy(Actor* thisx, PlayState* play); -void BgJyaLift_Update(Actor* thisx, PlayState* play); +void BgJyaLift_Update(Actor* thisx, PlayState* play2); void BgJyaLift_Draw(Actor* thisx, PlayState* play); void BgJyaLift_SetFinalPosY(BgJyaLift* this); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 61ec553942..27aa6da11e 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -13,7 +13,7 @@ void BgMizuBwall_Init(Actor* thisx, PlayState* play); void BgMizuBwall_Destroy(Actor* thisx, PlayState* play); void BgMizuBwall_Update(Actor* thisx, PlayState* play); -void BgMizuBwall_Draw(Actor* thisx, PlayState* play); +void BgMizuBwall_Draw(Actor* thisx, PlayState* play2); void BgMizuBwall_Idle(BgMizuBwall* this, PlayState* play); void BgMizuBwall_Break(BgMizuBwall* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index 45ed58506e..4db250ef3f 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -19,7 +19,7 @@ void BgMizuMovebg_Init(Actor* thisx, PlayState* play); void BgMizuMovebg_Destroy(Actor* thisx, PlayState* play); void BgMizuMovebg_Update(Actor* thisx, PlayState* play); -void BgMizuMovebg_Draw(Actor* thisx, PlayState* play); +void BgMizuMovebg_Draw(Actor* thisx, PlayState* play2); void func_8089E318(BgMizuMovebg* this, PlayState* play); void func_8089E650(BgMizuMovebg* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index e3ebec645e..bfbcb9cb86 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c @@ -12,7 +12,7 @@ void BgTokiSwd_Init(Actor* thisx, PlayState* play); void BgTokiSwd_Destroy(Actor* thisx, PlayState* play); void BgTokiSwd_Update(Actor* thisx, PlayState* play); -void BgTokiSwd_Draw(Actor* thisx, PlayState* play); +void BgTokiSwd_Draw(Actor* thisx, PlayState* play2); void func_808BAF40(BgTokiSwd* this, PlayState* play); void func_808BB0AC(BgTokiSwd* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 8c737b1c04..3e298869b8 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -7,7 +7,7 @@ void BossDodongo_Init(Actor* thisx, PlayState* play); void BossDodongo_Destroy(Actor* thisx, PlayState* play); -void BossDodongo_Update(Actor* thisx, PlayState* play); +void BossDodongo_Update(Actor* thisx, PlayState* play2); void BossDodongo_Draw(Actor* thisx, PlayState* play); void BossDodongo_SetupIntroCutscene(BossDodongo* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index 85d10dcc54..a2e58fe507 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -29,7 +29,7 @@ typedef enum { void BossFd2_Init(Actor* thisx, PlayState* play); void BossFd2_Destroy(Actor* thisx, PlayState* play); -void BossFd2_Update(Actor* thisx, PlayState* play); +void BossFd2_Update(Actor* thisx, PlayState* play2); void BossFd2_Draw(Actor* thisx, PlayState* play); void BossFd2_SetupEmerge(BossFd2* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index e7d0d107c2..aff2697823 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -11,15 +11,15 @@ #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5) -void BossGanon_Init(Actor* thisx, PlayState* play); +void BossGanon_Init(Actor* thisx, PlayState* play2); void BossGanon_Destroy(Actor* thisx, PlayState* play); -void BossGanon_Update(Actor* thisx, PlayState* play); +void BossGanon_Update(Actor* thisx, PlayState* play2); void BossGanon_Draw(Actor* thisx, PlayState* play); -void func_808E1EB4(Actor* thisx, PlayState* play); // update -void func_808E2544(Actor* thisx, PlayState* play); // update -void BossGanon_LightBall_Update(Actor* thisx, PlayState* play); -void func_808E229C(Actor* thisx, PlayState* play); // draw -void func_808E324C(Actor* thisx, PlayState* play); // draw +void func_808E1EB4(Actor* thisx, PlayState* play2); // update +void func_808E2544(Actor* thisx, PlayState* play); // update +void BossGanon_LightBall_Update(Actor* thisx, PlayState* play2); +void func_808E229C(Actor* thisx, PlayState* play2); // draw +void func_808E324C(Actor* thisx, PlayState* play); // draw void BossGanon_LightBall_Draw(Actor* thisx, PlayState* play); void BossGanon_SetupIntroCutscene(BossGanon* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 0f3da3e550..c5fd72bfa0 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -44,7 +44,7 @@ typedef struct { #define MO_FX_STRETCH 1 #define MO_FX_MAX_SCALE 1 -void BossMo_Init(Actor* thisx, PlayState* play); +void BossMo_Init(Actor* thisx, PlayState* play2); void BossMo_Destroy(Actor* thisx, PlayState* play); void BossMo_UpdateCore(Actor* thisx, PlayState* play); void BossMo_UpdateTent(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index b31e044254..106ce0b266 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -46,7 +46,7 @@ typedef enum { /* 3 */ BONGO_SHADOW } BossSstEffectMode; -void BossSst_Init(Actor* thisx, PlayState* play); +void BossSst_Init(Actor* thisx, PlayState* play2); void BossSst_Destroy(Actor* thisx, PlayState* play); void BossSst_UpdateHand(Actor* thisx, PlayState* play); void BossSst_UpdateHead(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 4b326126ba..6d7d586ab6 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -60,10 +60,10 @@ typedef struct { /* 0x0044 */ Actor* target; } BossTwEffect; -void BossTw_Init(Actor* thisx, PlayState* play); +void BossTw_Init(Actor* thisx, PlayState* play2); void BossTw_Destroy(Actor* thisx, PlayState* play); void BossTw_Update(Actor* thisx, PlayState* play); -void BossTw_Draw(Actor* thisx, PlayState* play); +void BossTw_Draw(Actor* thisx, PlayState* play2); void BossTw_TwinrovaDamage(BossTw* this, PlayState* play, u8 damage); void BossTw_TwinrovaSetupFly(BossTw* this, PlayState* play); @@ -97,18 +97,18 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play); void BossTw_FlyTo(BossTw* this, PlayState* play); void BossTw_SetupShootBeam(BossTw* this, PlayState* play); void BossTw_TurnToPlayer(BossTw* this, PlayState* play); -void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play); -void BossTw_TwinrovaDraw(Actor* thisx, PlayState* play); +void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2); +void BossTw_TwinrovaDraw(Actor* thisx, PlayState* play2); void BossTw_SetupWait(BossTw* this, PlayState* play); void BossTw_TwinrovaSetupIntroCS(BossTw* this, PlayState* play); void BossTw_SetupFlyTo(BossTw* this, PlayState* play); void BossTw_SetupCSWait(BossTw* this, PlayState* play); void BossTw_BlastUpdate(Actor* thisx, PlayState* play); -void BossTw_BlastDraw(Actor* thisx, PlayState* play); +void BossTw_BlastDraw(Actor* thisx, PlayState* play2); void BossTw_BlastFire(BossTw* this, PlayState* play); void BossTw_BlastIce(BossTw* this, PlayState* play); void BossTw_DeathBall(BossTw* this, PlayState* play); -void BossTw_DrawDeathBall(Actor* thisx, PlayState* play); +void BossTw_DrawDeathBall(Actor* thisx, PlayState* play2); void BossTw_TwinrovaStun(BossTw* this, PlayState* play); void BossTw_TwinrovaSpin(BossTw* this, PlayState* play); void BossTw_TwinrovaShootBlast(BossTw* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 7653d434dc..bae9216c0d 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -113,9 +113,9 @@ typedef enum { /* 24 */ DEATH_FINISH } BossVaCutscene; -void BossVa_Init(Actor* thisx, PlayState* play); +void BossVa_Init(Actor* thisx, PlayState* play2); void BossVa_Destroy(Actor* thisx, PlayState* play); -void BossVa_Update(Actor* thisx, PlayState* play); +void BossVa_Update(Actor* thisx, PlayState* play2); void BossVa_Draw(Actor* thisx, PlayState* play); void BossVa_UpdateEffects(PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index fbf41fba52..82f925a478 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -32,7 +32,7 @@ void func_80967F10(Demo6K* this, PlayState* play); void func_80967FFC(Actor* thisx, PlayState* play); void func_80968298(Actor* thisx, PlayState* play); void func_8096865C(Actor* thisx, PlayState* play); -void func_809688C4(Actor* thisx, PlayState* play); +void func_809688C4(Actor* thisx, PlayState* play2); void func_80968B70(Actor* thisx, PlayState* play); void func_80968FB0(Actor* thisx, PlayState* play); void func_809691BC(Demo6K* this, PlayState* play, s32 params); diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index a051416528..a8b9c76550 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -12,7 +12,7 @@ #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5) -void DemoEffect_Init(Actor* thisx, PlayState* play); +void DemoEffect_Init(Actor* thisx, PlayState* play2); void DemoEffect_Destroy(Actor* thisx, PlayState* play); void DemoEffect_Update(Actor* thisx, PlayState* play); @@ -21,12 +21,12 @@ void DemoEffect_DrawFireBall(Actor* thisx, PlayState* play); void DemoEffect_DrawBlueOrb(Actor* thisx, PlayState* play); void DemoEffect_DrawLgtShower(Actor* thisx, PlayState* play); void DemoEffect_DrawGodLgt(Actor* thisx, PlayState* play); -void DemoEffect_DrawLightRing(Actor* thisx, PlayState* play); +void DemoEffect_DrawLightRing(Actor* thisx, PlayState* play2); void DemoEffect_DrawTriforceSpot(Actor* thisx, PlayState* play); void DemoEffect_DrawGetItem(Actor* thisx, PlayState* play); void DemoEffect_DrawLightEffect(Actor* thisx, PlayState* play); void DemoEffect_DrawTimeWarp(Actor* thisx, PlayState* play); -void DemoEffect_DrawJewel(Actor* thisx, PlayState* play); +void DemoEffect_DrawJewel(Actor* thisx, PlayState* play2); void DemoEffect_Wait(DemoEffect* this, PlayState* play); void DemoEffect_InitTimeWarp(DemoEffect* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 9a9d2692d2..8f35f57ad0 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -12,12 +12,12 @@ void DemoKekkai_Init(Actor* thisx, PlayState* play); void DemoKekkai_Destroy(Actor* thisx, PlayState* play); -void DemoKekkai_Update(Actor* thisx, PlayState* play); +void DemoKekkai_Update(Actor* thisx, PlayState* play2); void DemoKekkai_DrawTowerBarrier(Actor* thisx, PlayState* play); void DemoKekkai_TrialBarrierDispel(Actor* thisx, PlayState* play); void DemoKekkai_TrialBarrierIdle(Actor* thisx, PlayState* play); -void DemoKekkai_DrawTrialBarrier(Actor* thisx, PlayState* play); +void DemoKekkai_DrawTrialBarrier(Actor* thisx, PlayState* play2); void DemoKekkai_TowerBarrier(DemoKekkai* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 751c249b14..f65c0611eb 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -21,7 +21,7 @@ typedef enum { /* 4 */ DOOR_KILLER_RUBBLE_PIECE_4 } DoorKillerBehaviour; -void DoorKiller_Init(Actor* thisx, PlayState* play); +void DoorKiller_Init(Actor* thisx, PlayState* play2); void DoorKiller_Destroy(Actor* thisx, PlayState* play); void DoorKiller_Update(Actor* thisx, PlayState* play); void DoorKiller_Wait(DoorKiller* this, PlayState* play); diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 370edc3ae8..1432d8bdc1 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -26,7 +26,7 @@ #define FLAGS ACTOR_FLAG_4 -void DoorShutter_Init(Actor* thisx, PlayState* play); +void DoorShutter_Init(Actor* thisx, PlayState* play2); void DoorShutter_Destroy(Actor* thisx, PlayState* play); void DoorShutter_Update(Actor* thisx, PlayState* play); void DoorShutter_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 0d8c480d5b..9c36e3057b 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -19,8 +19,8 @@ void EffDust_InitPosAndDistance(EffDust* this); void EffDust_UpdateFunc_8099DB28(EffDust* this, PlayState* play); void EffDust_UpdateFunc_8099DD74(EffDust* this, PlayState* play); void EffDust_UpdateFunc_8099DFC0(EffDust* this, PlayState* play); -void EffDust_DrawFunc_8099E4F4(Actor* thisx, PlayState* play); -void EffDust_DrawFunc_8099E784(Actor* thisx, PlayState* play); +void EffDust_DrawFunc_8099E4F4(Actor* thisx, PlayState* play2); +void EffDust_DrawFunc_8099E784(Actor* thisx, PlayState* play2); const ActorInit Eff_Dust_InitVars = { ACTOR_EFF_DUST, diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index bf99d9f8fa..70edb68e6b 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -55,8 +55,8 @@ typedef enum { void EnBb_Init(Actor* thisx, PlayState* play); void EnBb_Destroy(Actor* thisx, PlayState* play); -void EnBb_Update(Actor* this, PlayState* play); -void EnBb_Draw(Actor* this, PlayState* play); +void EnBb_Update(Actor* thisx, PlayState* play2); +void EnBb_Draw(Actor* thisx, PlayState* play); // Helper functions diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 583877ba18..0fcc182810 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -5,7 +5,7 @@ void EnBigokuta_Init(Actor* thisx, PlayState* play); void EnBigokuta_Destroy(Actor* thisx, PlayState* play); -void EnBigokuta_Update(Actor* thisx, PlayState* play); +void EnBigokuta_Update(Actor* thisx, PlayState* play2); void EnBigokuta_Draw(Actor* thisx, PlayState* play); void func_809BD318(EnBigokuta* this); diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 124580b99a..72963957d6 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -11,7 +11,7 @@ void EnBili_Init(Actor* thisx, PlayState* play); void EnBili_Destroy(Actor* thisx, PlayState* play); -void EnBili_Update(Actor* thisx, PlayState* play); +void EnBili_Update(Actor* thisx, PlayState* play2); void EnBili_Draw(Actor* thisx, PlayState* play); void EnBili_SetupFloatIdle(EnBili* this); diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.c b/src/overlays/actors/ovl_En_Bom/z_en_bom.c index 87b37cca06..0d3e85b865 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -12,7 +12,7 @@ void EnBom_Init(Actor* thisx, PlayState* play); void EnBom_Destroy(Actor* thisx, PlayState* play); -void EnBom_Update(Actor* thisx, PlayState* play); +void EnBom_Update(Actor* thisx, PlayState* play2); void EnBom_Draw(Actor* thisx, PlayState* play); void EnBom_Move(EnBom* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index e66683d974..2ea9ea0bed 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -13,7 +13,7 @@ typedef enum { /* 3 */ CHU_GIRL_EYES_AWAKE } BombchuGirlEyeMode; -void EnBomBowlMan_Init(Actor* thisx, PlayState* play); +void EnBomBowlMan_Init(Actor* thisx, PlayState* play2); void EnBomBowlMan_Destroy(Actor* thisx, PlayState* play); void EnBomBowlMan_Update(Actor* thisx, PlayState* play); void EnBomBowlMan_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 263468e941..70a11b868e 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -8,7 +8,7 @@ void EnBomChu_Init(Actor* thisx, PlayState* play); void EnBomChu_Destroy(Actor* thisx, PlayState* play); -void EnBomChu_Update(Actor* thisx, PlayState* play); +void EnBomChu_Update(Actor* thisx, PlayState* play2); void EnBomChu_Draw(Actor* thisx, PlayState* play); void EnBomChu_WaitForRelease(EnBomChu* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index c54f9ec303..40d0e4d6cf 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -35,7 +35,7 @@ typedef enum { ENBOX_STATE_2 // waiting for something message context-related } EnBoxStateUnk1FB; -void EnBox_Init(Actor* thisx, PlayState* play); +void EnBox_Init(Actor* thisx, PlayState* play2); void EnBox_Destroy(Actor* thisx, PlayState* play); void EnBox_Update(Actor* thisx, PlayState* play); void EnBox_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index e183979129..6c257b3f9c 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -11,7 +11,7 @@ void EnBrob_Init(Actor* thisx, PlayState* play); void EnBrob_Destroy(Actor* thisx, PlayState* play); -void EnBrob_Update(Actor* thisx, PlayState* play); +void EnBrob_Update(Actor* thisx, PlayState* play2); void EnBrob_Draw(Actor* thisx, PlayState* play); void func_809CADDC(EnBrob* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c index 26287ae06c..437740daaa 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -12,7 +12,7 @@ #define FLAGS 0 void EnButte_Init(Actor* thisx, PlayState* play); -void EnButte_Destroy(Actor* thisx, PlayState* play); +void EnButte_Destroy(Actor* thisx, PlayState* play2); void EnButte_Update(Actor* thisx, PlayState* play); void EnButte_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 799020d62c..360cc0f27c 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -12,8 +12,8 @@ void EnBw_Init(Actor* thisx, PlayState* play); void EnBw_Destroy(Actor* thisx, PlayState* play); -void EnBw_Update(Actor* thisx, PlayState* play); -void EnBw_Draw(Actor* thisx, PlayState* play); +void EnBw_Update(Actor* thisx, PlayState* play2); +void EnBw_Draw(Actor* thisx, PlayState* play2); void func_809CE884(EnBw* this, PlayState* play); void func_809CE9A8(EnBw* this); diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c index 68366f8d36..85f55f5bb6 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -16,7 +16,7 @@ typedef enum { /* 1 */ CHEST_RIGHT } ChangerChestSide; -void EnChanger_Init(Actor* thisx, PlayState* play); +void EnChanger_Init(Actor* thisx, PlayState* play2); void EnChanger_Destroy(Actor* thisx, PlayState* play); void EnChanger_Update(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index 15554acf1e..68bf2f0c31 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -4,7 +4,7 @@ void EnClearTag_Init(Actor* thisx, PlayState* play); void EnClearTag_Destroy(Actor* thisx, PlayState* play); -void EnClearTag_Update(Actor* thisx, PlayState* play); +void EnClearTag_Update(Actor* thisx, PlayState* play2); void EnClearTag_Draw(Actor* thisx, PlayState* play); void EnClearTag_UpdateEffects(PlayState* play); diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index a3370b54ee..e1e41ff69d 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -11,7 +11,7 @@ void EnCow_Init(Actor* thisx, PlayState* play); void EnCow_Destroy(Actor* thisx, PlayState* play); -void EnCow_Update(Actor* thisx, PlayState* play); +void EnCow_Update(Actor* thisx, PlayState* play2); void EnCow_Draw(Actor* thisx, PlayState* play); void func_809DFE98(Actor* thisx, PlayState* play); void func_809E0070(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index f5705a6f0a..a8e0eeec6e 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -13,7 +13,7 @@ typedef enum { /* 6 */ DH_DAMAGE } EnDhAction; -void EnDh_Init(Actor* this, PlayState* play); +void EnDh_Init(Actor* thisx, PlayState* play); void EnDh_Destroy(Actor* thisx, PlayState* play); void EnDh_Update(Actor* thisx, PlayState* play); void EnDh_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 568e57a1d1..ca952234ef 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -13,7 +13,7 @@ void EnDivingGame_Init(Actor* thisx, PlayState* play); void EnDivingGame_Destroy(Actor* thisx, PlayState* play); -void EnDivingGame_Update(Actor* thisx, PlayState* play); +void EnDivingGame_Update(Actor* thisx, PlayState* play2); void EnDivingGame_Draw(Actor* thisx, PlayState* play); void func_809EDCB0(EnDivingGame* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index 32930b07d3..a6983284c3 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -18,9 +18,9 @@ typedef enum { /* 2 */ DNT_LOVE } EnDntDemoResults; -void EnDntDemo_Init(Actor* thisx, PlayState* play); +void EnDntDemo_Init(Actor* thisx, PlayState* play2); void EnDntDemo_Destroy(Actor* thisx, PlayState* play); -void EnDntDemo_Update(Actor* this, PlayState* play); +void EnDntDemo_Update(Actor* thisx, PlayState* play); void EnDntDemo_Judge(EnDntDemo* this, PlayState* play); void EnDntDemo_Results(EnDntDemo* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 1b3a1fc79b..12d2afc168 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -20,7 +20,7 @@ typedef enum { void EnDodongo_Init(Actor* thisx, PlayState* play); void EnDodongo_Destroy(Actor* thisx, PlayState* play); void EnDodongo_Update(Actor* thisx, PlayState* play); -void EnDodongo_Draw(Actor* thisx, PlayState* play); +void EnDodongo_Draw(Actor* thisx, PlayState* play2); void EnDodongo_SetupDeath(EnDodongo* this, PlayState* play); void EnDodongo_ShiftVecRadial(s16 yaw, f32 radius, Vec3f* vec); diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 17291606bd..057ef258d8 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -18,7 +18,7 @@ #define DOOR_CHECK_RANGE 40.0f -void EnDoor_Init(Actor* thisx, PlayState* play); +void EnDoor_Init(Actor* thisx, PlayState* play2); void EnDoor_Destroy(Actor* thisx, PlayState* play); void EnDoor_Update(Actor* thisx, PlayState* play); void EnDoor_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 71c52b8f38..d343a43da9 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -12,7 +12,7 @@ typedef enum { } Encount2State; void EnEncount2_Init(Actor* thisx, PlayState* play); -void EnEncount2_Update(Actor* thisx, PlayState* play); +void EnEncount2_Update(Actor* thisx, PlayState* play2); void EnEncount2_Draw(Actor* thisx, PlayState* play); void EnEncount2_Wait(EnEncount2* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index c3887af5db..9030102846 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -12,7 +12,7 @@ void EnFirefly_Init(Actor* thisx, PlayState* play); void EnFirefly_Destroy(Actor* thisx, PlayState* play); -void EnFirefly_Update(Actor* thisx, PlayState* play); +void EnFirefly_Update(Actor* thisx, PlayState* play2); void EnFirefly_Draw(Actor* thisx, PlayState* play); void EnFirefly_DrawInvisible(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 113d035530..d492f23256 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -11,7 +11,7 @@ #define FLAGS 0 void EnFish_Init(Actor* thisx, PlayState* play); -void EnFish_Destroy(Actor* thisx, PlayState* play); +void EnFish_Destroy(Actor* thisx, PlayState* play2); void EnFish_Update(Actor* thisx, PlayState* play); void EnFish_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 7fdb80b62c..ddf7ca49b2 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -15,7 +15,7 @@ #define MERGE_MASTER 0x40 #define MERGE_SLAVE 0x20 -void EnFloormas_Init(Actor* thisx, PlayState* play); +void EnFloormas_Init(Actor* thisx, PlayState* play2); void EnFloormas_Destroy(Actor* thisx, PlayState* play); void EnFloormas_Update(Actor* thisx, PlayState* play); void EnFloormas_Draw(Actor* thisx, PlayState* play); @@ -23,7 +23,7 @@ void EnFloormas_Draw(Actor* thisx, PlayState* play); void EnFloormas_GrabLink(EnFloormas* this, PlayState* play); void EnFloormas_Split(EnFloormas* this, PlayState* play); void EnFloormas_Recover(EnFloormas* this, PlayState* play); -void EnFloormas_DrawHighlighted(Actor* this, PlayState* play); +void EnFloormas_DrawHighlighted(Actor* thisx, PlayState* play); void EnFloormas_SmWait(EnFloormas* this, PlayState* play); void EnFloormas_SetupBigDecideAction(EnFloormas* this); void EnFloormas_Freeze(EnFloormas* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 27f0751de3..cd9536dbb0 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -11,7 +11,7 @@ void EnGb_Init(Actor* thisx, PlayState* play); void EnGb_Destroy(Actor* thisx, PlayState* play); -void EnGb_Update(Actor* thisx, PlayState* play); +void EnGb_Update(Actor* thisx, PlayState* play2); void EnGb_Draw(Actor* thisx, PlayState* play); void func_80A2F83C(EnGb* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 7b0ebc43c8..2248ade02a 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -53,7 +53,7 @@ void EnGe2_ForceTalk(EnGe2* this, PlayState* play); // Update functions void EnGe2_UpdateFriendly(Actor* thisx, PlayState* play); void EnGe2_UpdateAfterTalk(Actor* thisx, PlayState* play); -void EnGe2_UpdateStunned(Actor* thisx, PlayState* play); +void EnGe2_UpdateStunned(Actor* thisx, PlayState* play2); const ActorInit En_Ge2_InitVars = { ACTOR_EN_GE2, diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 6e1112982f..e870a59250 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -9,10 +9,10 @@ #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3 | ACTOR_FLAG_4) -void EnGe3_Init(Actor* thisx, PlayState* play); +void EnGe3_Init(Actor* thisx, PlayState* play2); void EnGe3_Destroy(Actor* thisx, PlayState* play); void EnGe3_Update(Actor* thisx, PlayState* play); -void EnGe3_Draw(Actor* thisx, PlayState* play); +void EnGe3_Draw(Actor* thisx, PlayState* play2); void EnGe3_WaitLookAtPlayer(EnGe3* this, PlayState* play); void EnGe3_ForceTalk(EnGe3* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index ebb4ce4012..189ffc7f6b 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -27,7 +27,7 @@ void EnGoma_Stunned(EnGoma* this, PlayState* play); void EnGoma_LookAtPlayer(EnGoma* this, PlayState* play); void EnGoma_UpdateHit(EnGoma* this, PlayState* play); void EnGoma_Debris(EnGoma* this, PlayState* play); -void EnGoma_SpawnHatchDebris(EnGoma* this, PlayState* play); +void EnGoma_SpawnHatchDebris(EnGoma* this, PlayState* play2); void EnGoma_BossLimb(EnGoma* this, PlayState* play); void EnGoma_SetupFlee(EnGoma* this); diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index 3f63560b9d..9a43bfde93 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -27,7 +27,7 @@ typedef void (*EnGoroiwaUnkFunc2)(EnGoroiwa* this); #define ENGOROIWA_LOOPMODE_ROUNDTRIP 3 void EnGoroiwa_Init(Actor* thisx, PlayState* play); -void EnGoroiwa_Destroy(Actor* thisx, PlayState* play); +void EnGoroiwa_Destroy(Actor* thisx, PlayState* play2); void EnGoroiwa_Update(Actor* thisx, PlayState* play); void EnGoroiwa_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index fa17e59b70..78d62f28f6 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -13,7 +13,7 @@ void EnGs_Init(Actor* thisx, PlayState* play); void EnGs_Destroy(Actor* thisx, PlayState* play); -void EnGs_Update(Actor* thisx, PlayState* play); +void EnGs_Update(Actor* thisx, PlayState* play2); void EnGs_Draw(Actor* thisx, PlayState* play); void func_80A4F734(EnGs* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index a6219d6898..dded1c812d 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -11,7 +11,7 @@ void EnHata_Init(Actor* thisx, PlayState* play); void EnHata_Destroy(Actor* thisx, PlayState* play); -void EnHata_Update(Actor* thisx, PlayState* play); +void EnHata_Update(Actor* thisx, PlayState* play2); void EnHata_Draw(Actor* thisx, PlayState* play); const ActorInit En_Hata_InitVars = { diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index d85389ac76..eddf488023 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -15,9 +15,9 @@ typedef void (*EnHorseCsFunc)(EnHorse*, PlayState*, CsCmdActorAction*); typedef void (*EnHorseActionFunc)(EnHorse*, PlayState*); -void EnHorse_Init(Actor* thisx, PlayState* play); +void EnHorse_Init(Actor* thisx, PlayState* play2); void EnHorse_Destroy(Actor* thisx, PlayState* play); -void EnHorse_Update(Actor* thisx, PlayState* play); +void EnHorse_Update(Actor* thisx, PlayState* play2); void EnHorse_Draw(Actor* thisx, PlayState* play); void EnHorse_InitCutscene(EnHorse* this, PlayState* play); @@ -29,7 +29,7 @@ void EnHorse_InitInactive(EnHorse* this); void EnHorse_InitIngoHorse(EnHorse* this); void EnHorse_Frozen(EnHorse* this, PlayState* play); -void EnHorse_Inactive(EnHorse* this, PlayState* play); +void EnHorse_Inactive(EnHorse* this, PlayState* play2); void EnHorse_Idle(EnHorse* this, PlayState* play); void EnHorse_FollowPlayer(EnHorse* this, PlayState* play); void EnHorse_UpdateIngoRace(EnHorse* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index eff54a9dd8..fbe94395a1 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -10,7 +10,7 @@ #define FLAGS 0 -void EnInsect_Init(Actor* thisx, PlayState* play); +void EnInsect_Init(Actor* thisx, PlayState* play2); void EnInsect_Destroy(Actor* thisx, PlayState* play); void EnInsect_Update(Actor* thisx, PlayState* play); void EnInsect_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 711a1c115c..54551d4098 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -14,7 +14,7 @@ #define FLAGS ACTOR_FLAG_23 void EnIshi_Init(Actor* thisx, PlayState* play); -void EnIshi_Destroy(Actor* thisx, PlayState* play); +void EnIshi_Destroy(Actor* thisx, PlayState* play2); void EnIshi_Update(Actor* thisx, PlayState* play); void EnIshi_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index 07593b6cd6..bc83cfc8c3 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -17,10 +17,10 @@ typedef enum { /* 3 */ JABUJABU_EYE_MAX } EnJjEyeState; -void EnJj_Init(Actor* thisx, PlayState* play); +void EnJj_Init(Actor* thisx, PlayState* play2); void EnJj_Destroy(Actor* thisx, PlayState* play); void EnJj_Update(Actor* thisx, PlayState* play); -void EnJj_Draw(Actor* thisx, PlayState* play); +void EnJj_Draw(Actor* thisx, PlayState* play2); void EnJj_UpdateStaticCollision(Actor* thisx, PlayState* play); void EnJj_WaitToOpenMouth(EnJj* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index c516bfd750..44f0cdafbe 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -11,8 +11,8 @@ void EnJsjutan_Init(Actor* thisx, PlayState* play); void EnJsjutan_Destroy(Actor* thisx, PlayState* play); -void EnJsjutan_Update(Actor* thisx, PlayState* play); -void EnJsjutan_Draw(Actor* thisx, PlayState* play); +void EnJsjutan_Update(Actor* thisx, PlayState* play2); +void EnJsjutan_Draw(Actor* thisx, PlayState* play2); const ActorInit En_Jsjutan_InitVars = { ACTOR_EN_JSJUTAN, diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index c13a51dab5..8430270c89 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -32,7 +32,7 @@ static ColliderCylinderInit sCylinderInit = { void EnKakasi2_Init(Actor* thisx, PlayState* play); void EnKakasi2_Destroy(Actor* thisx, PlayState* play); -void EnKakasi2_Update(Actor* thisx, PlayState* play); +void EnKakasi2_Update(Actor* thisx, PlayState* play2); void func_80A90948(Actor* thisx, PlayState* play); void func_80A9062C(EnKakasi2* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 82dc41bde4..8d65285117 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -72,7 +72,7 @@ typedef enum { void EnKanban_Init(Actor* thisx, PlayState* play); void EnKanban_Destroy(Actor* thisx, PlayState* play); -void EnKanban_Update(Actor* thisx, PlayState* play); +void EnKanban_Update(Actor* thisx, PlayState* play2); void EnKanban_Draw(Actor* thisx, PlayState* play); const ActorInit En_Kanban_InitVars = { diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index e6c08e10f2..091b36db14 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -15,7 +15,7 @@ #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_23) void EnKusa_Init(Actor* thisx, PlayState* play); -void EnKusa_Destroy(Actor* thisx, PlayState* play); +void EnKusa_Destroy(Actor* thisx, PlayState* play2); void EnKusa_Update(Actor* thisx, PlayState* play); void EnKusa_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index bf15a3de85..5ea75dda85 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -3,10 +3,10 @@ #define FLAGS 0 -void EnMThunder_Init(Actor* thisx, PlayState* play); +void EnMThunder_Init(Actor* thisx, PlayState* play2); void EnMThunder_Destroy(Actor* thisx, PlayState* play); void EnMThunder_Update(Actor* thisx, PlayState* play); -void EnMThunder_Draw(Actor* thisx, PlayState* play); +void EnMThunder_Draw(Actor* thisx, PlayState* play2); void func_80A9F314(PlayState* play, f32 arg1); void func_80A9F408(EnMThunder* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index d7c3b91ec1..c02d28eb95 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -14,8 +14,8 @@ void EnMa1_Destroy(Actor* thisx, PlayState* play); void EnMa1_Update(Actor* thisx, PlayState* play); void EnMa1_Draw(Actor* thisx, PlayState* play); -u16 EnMa1_GetText(PlayState* play, Actor* this); -s16 func_80AA0778(PlayState* play, Actor* this); +u16 EnMa1_GetText(PlayState* play, Actor* thisx); +s16 func_80AA0778(PlayState* play, Actor* thisx); void func_80AA0D88(EnMa1* this, PlayState* play); void func_80AA0EA0(EnMa1* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index c7fb5bf9f9..eb31c40193 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -8,8 +8,8 @@ void EnMa2_Destroy(Actor* thisx, PlayState* play); void EnMa2_Update(Actor* thisx, PlayState* play); void EnMa2_Draw(Actor* thisx, PlayState* play); -u16 func_80AA19A0(PlayState* play, Actor* this); -s16 func_80AA1A38(PlayState* play, Actor* this); +u16 func_80AA19A0(PlayState* play, Actor* thisx); +s16 func_80AA1A38(PlayState* play, Actor* thisx); void func_80AA1AE4(EnMa2* this, PlayState* play); s32 func_80AA1C68(EnMa2* this); diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index 8897339f0f..d23aeef5f5 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -14,8 +14,8 @@ void EnMa3_Destroy(Actor* thisx, PlayState* play); void EnMa3_Update(Actor* thisx, PlayState* play); void EnMa3_Draw(Actor* thisx, PlayState* play); -u16 func_80AA2AA0(PlayState* play, Actor* this); -s16 func_80AA2BD4(PlayState* play, Actor* this); +u16 func_80AA2AA0(PlayState* play, Actor* thisx); +s16 func_80AA2BD4(PlayState* play, Actor* thisx); void func_80AA2E54(EnMa3* this, PlayState* play); s32 func_80AA2EC8(EnMa3* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index f488e76729..274af17c9e 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -25,7 +25,7 @@ typedef enum { /* 1 */ RM2_MOUTH_OPEN } RunningManMouthTex; -void EnMm2_Init(Actor* thisx, PlayState* play); +void EnMm2_Init(Actor* thisx, PlayState* play2); void EnMm2_Destroy(Actor* thisx, PlayState* play); void EnMm2_Update(Actor* thisx, PlayState* play); void EnMm2_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index c99aa7954e..9dcdf2e08c 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -8,7 +8,7 @@ void EnNy_Destroy(Actor* thisx, PlayState* play); void EnNy_Update(Actor* thisx, PlayState* play); void EnNy_Draw(Actor* thisx, PlayState* play); -void EnNy_UpdateUnused(Actor* thisx, PlayState* play); +void EnNy_UpdateUnused(Actor* thisx, PlayState* play2); void EnNy_Move(EnNy* this, PlayState* play); void EnNy_Die(EnNy* this, PlayState* play); void func_80ABCD40(EnNy* this); diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 50fed43d5a..81f4c66ae6 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -5,7 +5,7 @@ void EnOkuta_Init(Actor* thisx, PlayState* play); void EnOkuta_Destroy(Actor* thisx, PlayState* play); -void EnOkuta_Update(Actor* thisx, PlayState* play); +void EnOkuta_Update(Actor* thisx, PlayState* play2); void EnOkuta_Draw(Actor* thisx, PlayState* play); void EnOkuta_SetupWaitToAppear(EnOkuta* this); diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 02d45f9227..54f8af944a 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -65,9 +65,9 @@ void EnOssan_State_LookToRightShelf(EnOssan* this, PlayState* play, Player* play void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* player); void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* player); void EnOssan_State_LookFromShelfToShopkeeper(EnOssan* this, PlayState* play, Player* player); -void EnOssan_State_ItemSelected(EnOssan* this, PlayState* play, Player* player); -void EnOssan_State_SelectMilkBottle(EnOssan* this, PlayState* play, Player* player); -void EnOssan_State_SelectWeirdEgg(EnOssan* this, PlayState* play, Player* player); +void EnOssan_State_ItemSelected(EnOssan* this, PlayState* play2, Player* player); +void EnOssan_State_SelectMilkBottle(EnOssan* this, PlayState* play2, Player* player); +void EnOssan_State_SelectWeirdEgg(EnOssan* this, PlayState* play2, Player* player); void EnOssan_State_SelectUnimplementedItem(EnOssan* this, PlayState* play, Player* player); void EnOssan_State_SelectBombs(EnOssan* this, PlayState* play, Player* player); void EnOssan_State_CantGetItem(EnOssan* this, PlayState* play, Player* player); diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c index da5ecc4f3e..2b21a2967e 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -14,7 +14,7 @@ void EnReeba_Init(Actor* thisx, PlayState* play); void EnReeba_Destroy(Actor* thisx, PlayState* play); -void EnReeba_Update(Actor* thisx, PlayState* play); +void EnReeba_Update(Actor* thisx, PlayState* play2); void EnReeba_Draw(Actor* thisx, PlayState* play); void func_80AE4F40(EnReeba* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 3ae66adfc5..5a5b187814 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -46,7 +46,7 @@ typedef enum { /* 5 */ RR_DROP_RUPEE_RED } EnRrDropType; -void EnRr_Init(Actor* thisx, PlayState* play); +void EnRr_Init(Actor* thisx, PlayState* play2); void EnRr_Destroy(Actor* thisx, PlayState* play); void EnRr_Update(Actor* thisx, PlayState* play); void EnRr_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index ff565fabb6..1476a9e032 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -4,7 +4,7 @@ #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_25) -void EnSkj_Init(Actor* thisx, PlayState* play); +void EnSkj_Init(Actor* thisx, PlayState* play2); void EnSkj_Destroy(Actor* thisx, PlayState* play); void EnSkj_Update(Actor* thisx, PlayState* play); void EnSkj_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c index e8c29dcb88..e8c3371957 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -11,7 +11,7 @@ void EnSkjneedle_Init(Actor* thisx, PlayState* play); void EnSkjneedle_Destroy(Actor* thisx, PlayState* play); -void EnSkjneedle_Update(Actor* thisx, PlayState* play); +void EnSkjneedle_Update(Actor* thisx, PlayState* play2); void EnSkjneedle_Draw(Actor* thisx, PlayState* play); s32 EnSkjNeedle_CollisionCheck(EnSkjneedle* this); diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 0557c30207..01f23135b0 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -16,7 +16,7 @@ typedef enum { SYATEKI_ROUND_MAX } EnSyatekItemRound; -void EnSyatekiItm_Init(Actor* thisx, PlayState* play); +void EnSyatekiItm_Init(Actor* thisx, PlayState* play2); void EnSyatekiItm_Destroy(Actor* thisx, PlayState* play); void EnSyatekiItm_Update(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 3145dc8c11..7228c96bbf 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -10,7 +10,7 @@ #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3) -void EnTa_Init(Actor* thisx, PlayState* play); +void EnTa_Init(Actor* thisx, PlayState* play2); void EnTa_Destroy(Actor* thisx, PlayState* play); void EnTa_Update(Actor* thisx, PlayState* play); void EnTa_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 0fb912f064..893af07c3c 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -16,10 +16,10 @@ typedef enum { /* 3 */ ENTORCH2_DAMAGE } EnTorch2ActionStates; -void EnTorch2_Init(Actor* thisx, PlayState* play); +void EnTorch2_Init(Actor* thisx, PlayState* play2); void EnTorch2_Destroy(Actor* thisx, PlayState* play); -void EnTorch2_Update(Actor* thisx, PlayState* play); -void EnTorch2_Draw(Actor* thisx, PlayState* play); +void EnTorch2_Update(Actor* thisx, PlayState* play2); +void EnTorch2_Draw(Actor* thisx, PlayState* play2); const ActorInit En_Torch2_InitVars = { ACTOR_EN_TORCH2, diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index a67104cffb..9d11b8c07d 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -9,7 +9,7 @@ #define FLAGS 0 -void EnTp_Init(Actor* thisx, PlayState* play); +void EnTp_Init(Actor* thisx, PlayState* play2); void EnTp_Destroy(Actor* thisx, PlayState* play); void EnTp_Update(Actor* thisx, PlayState* play); void EnTp_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index 563b4dd20c..cbe807cc90 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -13,7 +13,7 @@ void EnVbBall_Init(Actor* thisx, PlayState* play); void EnVbBall_Destroy(Actor* thisx, PlayState* play); -void EnVbBall_Update(Actor* thisx, PlayState* play); +void EnVbBall_Update(Actor* thisx, PlayState* play2); void EnVbBall_Draw(Actor* thisx, PlayState* play); const ActorInit En_Vb_Ball_InitVars = { diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 408fc65ecf..550860379b 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -14,7 +14,7 @@ void EnVm_Init(Actor* thisx, PlayState* play); void EnVm_Destroy(Actor* thisx, PlayState* play); void EnVm_Update(Actor* thisx, PlayState* play); -void EnVm_Draw(Actor* thisx, PlayState* play); +void EnVm_Draw(Actor* thisx, PlayState* play2); void EnVm_SetupWait(EnVm* this); void EnVm_Wait(EnVm* this, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 3ab251c789..ef1161dda9 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -9,9 +9,9 @@ #define FLAGS 0 -void EnWood02_Init(Actor* thisx, PlayState* play); +void EnWood02_Init(Actor* thisx, PlayState* play2); void EnWood02_Destroy(Actor* thisx, PlayState* play); -void EnWood02_Update(Actor* thisx, PlayState* play); +void EnWood02_Update(Actor* thisx, PlayState* play2); void EnWood02_Draw(Actor* thisx, PlayState* play); /** diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 65fbf75ef2..93970c064b 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -31,7 +31,7 @@ typedef enum { /* 15 */ INTRO_READY = 15 } EnfHGIntroState; -void EnfHG_Init(Actor* thisx, PlayState* play); +void EnfHG_Init(Actor* thisx, PlayState* play2); void EnfHG_Destroy(Actor* thisx, PlayState* play); void EnfHG_Update(Actor* thisx, PlayState* play); void EnfHG_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 71edd623af..fb466d4886 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -14,10 +14,10 @@ #define WATER_SURFACE_Y(play) play->colCtx.colHeader->waterBoxes->ySurface -void Fishing_Init(Actor* thisx, PlayState* play); -void Fishing_Destroy(Actor* thisx, PlayState* play); -void Fishing_UpdateFish(Actor* thisx, PlayState* play); -void Fishing_UpdateOwner(Actor* thisx, PlayState* play); +void Fishing_Init(Actor* thisx, PlayState* play2); +void Fishing_Destroy(Actor* thisx, PlayState* play2); +void Fishing_UpdateFish(Actor* thisx, PlayState* play2); +void Fishing_UpdateOwner(Actor* thisx, PlayState* play2); void Fishing_DrawFish(Actor* thisx, PlayState* play); void Fishing_DrawOwner(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 5252b521aa..e938f6c29c 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -12,7 +12,7 @@ void ObjBombiwa_Init(Actor* thisx, PlayState* play); void ObjBombiwa_InitCollision(Actor* thisx, PlayState* play); -void ObjBombiwa_Destroy(Actor* thisx, PlayState* play); +void ObjBombiwa_Destroy(Actor* thisx, PlayState* play2); void ObjBombiwa_Update(Actor* thisx, PlayState* play); void ObjBombiwa_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 2b7d564222..e69e436509 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -11,7 +11,7 @@ #define FLAGS 0 void ObjComb_Init(Actor* thisx, PlayState* play); -void ObjComb_Destroy(Actor* thisx, PlayState* play); +void ObjComb_Destroy(Actor* thisx, PlayState* play2); void ObjComb_Update(Actor* thisx, PlayState* play); void ObjComb_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index ded88b9a87..bc62183e47 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -10,7 +10,7 @@ #define FLAGS 0 void ObjHamishi_Init(Actor* thisx, PlayState* play); -void ObjHamishi_Destroy(Actor* thisx, PlayState* play); +void ObjHamishi_Destroy(Actor* thisx, PlayState* play2); void ObjHamishi_Update(Actor* thisx, PlayState* play); void ObjHamishi_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index fa40e59ff6..654b9fd384 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -11,7 +11,7 @@ #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_26) void ObjKibako_Init(Actor* thisx, PlayState* play); -void ObjKibako_Destroy(Actor* thisx, PlayState* play); +void ObjKibako_Destroy(Actor* thisx, PlayState* play2); void ObjKibako_Update(Actor* thisx, PlayState* play); void ObjKibako_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c index cf8da35b49..10029079f8 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -18,8 +18,8 @@ typedef enum { } FaceTextureIndex; void ObjLightswitch_Init(Actor* thisx, PlayState* play); -void ObjLightswitch_Destroy(Actor* thisx, PlayState* play); -void ObjLightswitch_Update(Actor* thisx, PlayState* play); +void ObjLightswitch_Destroy(Actor* thisx, PlayState* play2); +void ObjLightswitch_Update(Actor* thisx, PlayState* play2); void ObjLightswitch_Draw(Actor* thisx, PlayState* play); void ObjLightswitch_SetupOff(ObjLightswitch* this); diff --git a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c index 76c0e9f77e..296acb27c7 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -10,7 +10,7 @@ #define FLAGS ACTOR_FLAG_4 -void ObjOshihiki_Init(Actor* thisx, PlayState* play); +void ObjOshihiki_Init(Actor* thisx, PlayState* play2); void ObjOshihiki_Destroy(Actor* thisx, PlayState* play); void ObjOshihiki_Update(Actor* thisx, PlayState* play); void ObjOshihiki_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c index a0b7bc505d..92ee4585c5 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -13,7 +13,7 @@ void ObjSyokudai_Init(Actor* thisx, PlayState* play); void ObjSyokudai_Destroy(Actor* thisx, PlayState* play); -void ObjSyokudai_Update(Actor* thisx, PlayState* play); +void ObjSyokudai_Update(Actor* thisx, PlayState* play2); void ObjSyokudai_Draw(Actor* thisx, PlayState* play); const ActorInit Obj_Syokudai_InitVars = { diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index c71254ef72..6217588e09 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -12,7 +12,7 @@ #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_23) void ObjTsubo_Init(Actor* thisx, PlayState* play); -void ObjTsubo_Destroy(Actor* thisx, PlayState* play); +void ObjTsubo_Destroy(Actor* thisx, PlayState* play2); void ObjTsubo_Update(Actor* thisx, PlayState* play); void ObjTsubo_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index 9376019d64..79a04433a9 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -10,7 +10,7 @@ #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_4 | ACTOR_FLAG_25 | ACTOR_FLAG_27) -void ObjWarp2block_Init(Actor* thisx, PlayState* play); +void ObjWarp2block_Init(Actor* thisx, PlayState* play2); void ObjWarp2block_Destroy(Actor* thisx, PlayState* play); void ObjWarp2block_Update(Actor* thisx, PlayState* play); void ObjWarp2block_Draw(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index b8c4a57379..532a39fa5a 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -27,11 +27,11 @@ void ObjectKankyo_SunGraveSpark(ObjectKankyo* this, PlayState* play); void ObjectKankyo_WaitForBeamObject(ObjectKankyo* this, PlayState* play); void ObjectKankyo_Beams(ObjectKankyo* this, PlayState* play); -void ObjectKankyo_DrawFairies(Actor* this, PlayState* play); -void ObjectKankyo_DrawSnow(Actor* this, PlayState* play); -void ObjectKankyo_DrawLightning(Actor* this, PlayState* play); -void ObjectKankyo_DrawSunGraveSpark(Actor* this, PlayState* play); -void ObjectKankyo_DrawBeams(Actor* this, PlayState* play); +void ObjectKankyo_DrawFairies(Actor* thisx, PlayState* play2); +void ObjectKankyo_DrawSnow(Actor* thisx, PlayState* play2); +void ObjectKankyo_DrawLightning(Actor* thisx, PlayState* play); +void ObjectKankyo_DrawSunGraveSpark(Actor* thisx, PlayState* play2); +void ObjectKankyo_DrawBeams(Actor* thisx, PlayState* play2); static void* sEffLightningTextures[] = { gEffLightning1Tex, gEffLightning2Tex, gEffLightning3Tex, gEffLightning4Tex,