falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some more dummy label matches (#619) 

* Fix some more dummy label matches

* Add missing space

* Add a space to force Jenkins to run again

* Remove the previous space
This commit is contained in:
Tom Overton 2022-01-19 05:37:18 -08:00 committed by GitHub
parent 6d52cee5fe
commit 97b47fa14b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/boot_O2_g3/z_std_dma.c
View File

@ -211,24 +211,20 @@ s32 DmaMgr_SendRequest0(void* vramStart, uintptr_t vromStart, size_t size) {
}
void DmaMgr_Start(void) {
DmaEntry* iter;
u32 idx;
DmaMgr_DMARomToRam(SEGMENT_ROM_START(dmadata), dmadata, SEGMENT_ROM_SIZE(dmadata));
dummy_label:;
{
DmaEntry* iter = dmadata;
u32 idx = 0;
iter = dmadata;
idx = 0;
while (iter->vromEnd != 0) {
iter++;
idx++;
while (iter->vromEnd != 0) {
iter++;
idx++;
}
numDmaEntries = idx;
}
numDmaEntries = idx;
dummy_label_2:;
osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, ARRAY_COUNT(sDmaMgrMsgs));
StackCheck_Init(&sDmaMgrStackInfo, sDmaMgrStack, sDmaMgrStack + sizeof(sDmaMgrStack), 0, 0x100, "dmamgr");
osCreateThread(&sDmaMgrThread, Z_THREAD_ID_DMAMGR, DmaMgr_ThreadEntry, NULL, sDmaMgrStack + sizeof(sDmaMgrStack),

11
src/code/z_actor.c
View File

@ -320,13 +320,12 @@ void func_800B4AEC(GlobalContext* globalCtx, Actor* actor, f32 y) {
void func_800B4B50(Actor* actor, Lights* mapper, GlobalContext* globalCtx) {
f32 spEC;
f32 temp_f12;
f32 temp_f20;
f32 shadowScaleZ;
f32 temp_f22;
f32 temp_f24;
f32 temp_f8;
MtxF sp94;
s32 lightNum;
MtxF sp94;
s32 numLights;
s8 phi_v1;
u8 temp_v0;
@ -342,7 +341,8 @@ void func_800B4B50(Actor* actor, Lights* mapper, GlobalContext* globalCtx) {
spEC = actor->world.pos.y - actor->floorHeight;
if (spEC > 20.0f) {
temp_f20 = actor->shape.shadowScale;
f32 temp_f20 = actor->shape.shadowScale;
temp_v0 = actor->shape.shadowAlpha;
actor->shape.shadowScale *= 0.3f;
temp_f12 = (spEC - 20.0f) * 0.02f;
@ -350,7 +350,6 @@ void func_800B4B50(Actor* actor, Lights* mapper, GlobalContext* globalCtx) {
ActorShadow_DrawCircle(actor, mapper, globalCtx);
actor->shape.shadowScale = temp_f20;
actor->shape.shadowAlpha = temp_v0;
dummy_label_111649:;
} else if (spEC >= -1.0f) {
numLights = mapper->numLights - 2;
@ -377,8 +376,8 @@ void func_800B4B50(Actor* actor, Lights* mapper, GlobalContext* globalCtx) {
for (j = 0; j < 2; j++, phi_s0++) {
if (phi_s0->l.dir[1] > 0) {
lightNum = (ABS_ALT(phi_s0->l.dir[1]) * (phi_s0->l.col[0] + phi_s0->l.col[1] + phi_s0->l.col[2])) -
(lightNumMax * ((void)0, 8));
lightNum = ((phi_s0->l.col[0] + phi_s0->l.col[1] + phi_s0->l.col[2]) * ABS_ALT(phi_s0->l.dir[1])) -
(8 * lightNumMax);
if (lightNum > 0) {
ActorShadow_DrawFoot(globalCtx, phi_s0, &sp94, lightNum, temp_f22, temp_f24, shadowScaleZ);
}

3
src/code/z_eff_tire_mark.c
View File

@ -255,11 +255,12 @@ void EffectTireMark_Draw(void* thisx, GraphicsContext* gfxCtx) {
if ((elem - 1)->flags & 1) {
if (!(elem->flags & 1)) {
s32 requiredScopeTemp;
vtx[i * 2 + 0].v.tc[0] = 0;
vtx[i * 2 + 0].v.tc[1] = 0;
vtx[i * 2 + 1].v.tc[0] = 0;
vtx[i * 2 + 1].v.tc[1] = 1024;
dummy_label:;
} else if ((i >= 2) && !((elem - 2)->flags & 1)) {
vtx[i * 2 - 2].v.tc[0] = 0;
vtx[i * 2 - 2].v.tc[1] = 0;

44
src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
View File

@ -717,30 +717,32 @@ void EnFsn_Idle(EnFsn* this, GlobalContext* globalCtx) {
this->animationIdx = 5;
func_8013BC6C(&this->skelAnime, sAnimations, this->animationIdx);
}
} else if (this->flags & ENFSN_HAGGLE) {
dummy:;
return;
}
if (this->flags & ENFSN_HAGGLE) {
this->actionFunc = EnFsn_Haggle;
} else {
dummy2:;
if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
if (this->cutsceneState == 0) {
if (ActorCutscene_GetCurrentIndex() == 0x7C) {
ActorCutscene_Stop(0x7C);
}
this->cutscene = this->lookToShopkeeperCutscene;
ActorCutscene_SetIntentToPlay(this->cutscene);
this->cutsceneState = 1;
return;
}
if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
if (this->cutsceneState == 0) {
if (ActorCutscene_GetCurrentIndex() == 0x7C) {
ActorCutscene_Stop(0x7C);
}
this->actor.textId = EnFsn_GetWelcome(globalCtx);
func_801518B0(globalCtx, this->actor.textId, &this->actor);
player->actor.world.pos.x = 1.0f;
player->actor.world.pos.z = -34.0f;
this->actionFunc = EnFsn_BeginInteraction;
} else if (((player->actor.world.pos.x >= -50.0f) && (player->actor.world.pos.x <= 15.0f)) &&
(player->actor.world.pos.y > 0.0f) &&
((player->actor.world.pos.z >= -35.0f) && (player->actor.world.pos.z <= -20.0f))) {
func_800B8614(&this->actor, globalCtx, 400.0f);
this->cutscene = this->lookToShopkeeperCutscene;
ActorCutscene_SetIntentToPlay(this->cutscene);
this->cutsceneState = 1;
}
this->actor.textId = EnFsn_GetWelcome(globalCtx);
func_801518B0(globalCtx, this->actor.textId, &this->actor);
player->actor.world.pos.x = 1.0f;
player->actor.world.pos.z = -34.0f;
this->actionFunc = EnFsn_BeginInteraction;
} else if (((player->actor.world.pos.x >= -50.0f) && (player->actor.world.pos.x <= 15.0f)) &&
(player->actor.world.pos.y > 0.0f) &&
((player->actor.world.pos.z >= -35.0f) && (player->actor.world.pos.z <= -20.0f))) {
func_800B8614(&this->actor, globalCtx, 400.0f);
}
}