mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-09-02 18:02:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Format script improvements and use strict name checks (#1275)

Browse Source 
* Prioritize using clang-tidy 6 and improve format.sh

* Use clang-tidy-6.0 when available since it's better at applying 'readability-inconsistent-declaration-parameter-name'
* Add -m32 and -Wno-everything to compiler options to avoid unwanted errors and warnings
* Remove -fsyntax-only since it serves no purpose in the context of clang-tidy

* Apply clang-tidy fixes for argument names

* Run format.sh again

* Use 'Strict' option instead of relying on clang-tidy 6

* Run format script

* Add --fix-notes to clang-tidy options for version 13+
This commit is contained in:
Roman971
2022-06-20 22:31:53 +02:00
committed by GitHub
parent 017a3aaf5c
commit 6d52684020
106 changed files with 244 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/audio_heap.c
+1 -1
View File
@@ -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);
src/code/audio_load.c
+5 -5
View File
@@ -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);
src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+3 -3
View File
@@ -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[] = {
src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
+3 -3
View File
@@ -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);
src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
+3 -3
View File
@@ -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);
src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c
+3 -3
View File
@@ -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,
src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+7 -7
View File
@@ -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);
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+6 -6
View File
@@ -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);
src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+3 -3
View File
@@ -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);
src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_Door_Killer/z_door_killer.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
+2 -2
View File
@@ -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,
src/overlays/actors/ovl_En_Bb/z_en_bb.c
+2 -2
View File
@@ -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
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Bili/z_en_bili.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Bom/z_en_bom.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Box/z_en_box.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Brob/z_en_brob.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Butte/z_en_butte.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Bw/z_en_bw.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_En_Changer/z_en_changer.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Cow/z_en_cow.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Dh/z_en_dh.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Door/z_en_door.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Fish/z_en_fish.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_En_Gb/z_en_gb.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Ge2/z_en_ge2.c
+1 -1
View File
@@ -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,
src/overlays/actors/ovl_En_Ge3/z_en_ge3.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_En_Goma/z_en_goma.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Gs/z_en_gs.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Hata/z_en_hata.c
+1 -1
View File
@@ -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 = {
src/overlays/actors/ovl_En_Horse/z_en_horse.c
+3 -3
View File
@@ -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);
src/overlays/actors/ovl_En_Insect/z_en_insect.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Jj/z_en_jj.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
+2 -2
View File
@@ -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,
src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
+1 -1
View File
@@ -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 = {
src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Ny/z_en_ny.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Ossan/z_en_ossan.c
+3 -3
View File
@@ -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);
src/overlays/actors/ovl_En_Reeba/z_en_reeba.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Rr/z_en_rr.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Skj/z_en_skj.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Ta/z_en_ta.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
+3 -3
View File
@@ -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,
src/overlays/actors/ovl_En_Tp/z_en_tp.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c
+1 -1
View File
@@ -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 = {
src/overlays/actors/ovl_En_Vm/z_en_vm.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
+2 -2
View File
@@ -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);
/**
src/overlays/actors/ovl_En_fHG/z_en_fhg.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Fishing/z_fishing.c
+4 -4
View File
@@ -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);
src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
+2 -2
View File
@@ -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);
src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
+1 -1
View File
@@ -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);
src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c
+1 -1
View File
@@ -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 = {
src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
+1 -1
View File
@@ -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);

Some files were not shown because too many files have changed in this diff Show More