mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup symbols from undefined_syms.txt (2nd round) (#934)

Browse source
This commit is contained in:
Dragorn421 2021-09-01 01:00:55 +02:00 • committed by GitHub
parent 4444c5ea35
commit 89634377c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 162 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
View file

@ -6,6 +6,7 @@
#include "z_eff_ss_fhg_flash.h"
#include "overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h"
#include "objects/object_fhg/object_fhg.h"
#define rAlpha regs[0]
#define rObjBankIdx regs[2]
@ -26,7 +27,6 @@ EffectSsInit Effect_Ss_Fhg_Flash_InitVars = {
UNK_TYPE D_809A5178[];
Gfx D_809A5100[];
extern Gfx D_06012160[];
u32 EffectSsFhgFlash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
EffectSsFhgFlashInitParams* initParams = (EffectSsFhgFlashInitParams*)initParamsx;
@ -52,7 +52,7 @@ u32 EffectSsFhgFlash_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, v
this->rAlpha = 255;
this->draw = EffectSsFhgFlash_DrawLightBall;
this->update = EffectSsFhgFlash_UpdateLightBall;
this->gfx = SEGMENTED_TO_VIRTUAL(D_06012160);
this->gfx = SEGMENTED_TO_VIRTUAL(gPhantomEnergyBallDL);
gSegments[6] = oldSeg6;
} else {
osSyncPrintf("Effect_Ss_Fhg_Flash_ct():pffd->modeエラー\n");

5
src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c
View file

@ -5,6 +5,7 @@
*/
#include "z_eff_ss_g_magma2.h"
#include "objects/object_kingdodongo/object_kingdodongo.h"
#define rPrimColorR regs[0]
#define rPrimColorG regs[1]
@ -33,8 +34,6 @@ EffectSsInit Effect_Ss_G_Magma2_InitVars = {
EffectSsGMagma2_Init,
};
extern Gfx D_06025A90[];
u32 EffectSsGMagma2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, void* initParamsx) {
s32 objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_KINGDODONGO);
s32 pad;
@ -51,7 +50,7 @@ u32 EffectSsGMagma2_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, vo
this->life = 100;
this->draw = EffectSsGMagma2_Draw;
this->update = EffectSsGMagma2_Update;
this->gfx = SEGMENTED_TO_VIRTUAL(D_06025A90);
this->gfx = SEGMENTED_TO_VIRTUAL(object_kingdodongo_DL_025A90);
this->rTexIdx = 0;
this->rDrawMode = initParams->drawMode;
this->rUpdateRate = initParams->updateRate;