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

En_Fishing OK (three functions matched) (#742) 

* EnFishing_UpdateOwner OK

* EnFishing_UpdateFish OK

* Respond to engineer's review

* EnFishing_UpdateLure OK, thanks Synray!

* Remove NON_MATCHING from spec
This commit is contained in:
Tom Overton 2022-03-24 17:32:24 -07:00 committed by GitHub
parent 1599192b85
commit 17489d9a1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec
View File

@ -1317,11 +1317,7 @@ beginseg
name "ovl_En_Fishing"
compress
include "build/src/overlays/actors/ovl_En_Fishing/z_en_fishing.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Fishing/ovl_En_Fishing_reloc.o"
#else
include "build/data/ovl_En_Fishing/ovl_En_Fishing.reloc.o"
#endif
endseg
beginseg

86
src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
View File

@ -2058,32 +2058,23 @@ void EnFishing_DrawRod(GlobalContext* globalCtx) {
static Vec3f D_8090D614 = { 0.0f, 0.0f, 0.0f };
#ifdef NON_MATCHING
// Stack memes, the pad on line ~2410 makes stack too big, but needed for ordering
void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
f32 spE4;
f32 spE0;
s16 phi_v0;
s16 i;
s16 spDC;
f32 spD8;
f32 spD4;
f32 spD0;
f32 phi_f16;
f32 spC8;
s16 i;
f32 phi_f0;
Player* player = GET_PLAYER(globalCtx);
Vec3f zeroVec = { 0.0f, 0.0f, 0.0f };
Vec3f spA8;
Vec3f sp9C;
Vec3f sp90;
Input* input = CONTROLLER1(globalCtx);
// Vec3f sp80;
f32 phi_f0;
// f32 sp70;
// Vec3f sp64;
// Vec3f sp58;
// s32 pad;
D_809171FE++;
@ -2240,8 +2231,6 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
spC8 = SQ(sLurePos.x) + SQ(sLurePos.z);
if (spC8 > SQ(920.0f)) {
f32 temp;
if ((sLurePos.y > 160.0f) || (sLurePos.x < 80.0f) || (sLurePos.x > 180.0f) || (sLurePos.z > 1350.0f) ||
(sLurePos.z < 1100.0f) || (sLurePos.y < 45.0f)) {
Vec3f sp80 = this->actor.world.pos;
@ -2266,10 +2255,9 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
}
}
temp = ((sqrtf(spC8) - 920.0f) * 0.11f) + WATER_SURFACE_Y(globalCtx);
// spE4 = ((sqrtf(spC8) - 920.0f) * 0.11f) + WATER_SURFACE_Y(globalCtx);
if (sLurePos.y <= temp) {
sLurePos.y = temp;
spE0 = ((sqrtf(spC8) - 920.0f) * 0.11f) + WATER_SURFACE_Y(globalCtx);
if (sLurePos.y <= spE0) {
sLurePos.y = spE0;
D_80917238.x = D_80917238.y = D_80917238.z = 0.0f;
D_8090CD14 = 3;
D_809101D0 = 0.0;
@ -2281,7 +2269,6 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
} else {
f32 sp7C = WATER_SURFACE_Y(globalCtx);
f32 sp78;
// spE4 = WATER_SURFACE_Y(globalCtx);
if (sLurePos.y <= sp7C) {
D_8090CD14 = 2;
@ -2356,7 +2343,10 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
break;
case 3: {
f32 pad;
f32 sp70;
Vec3f sp64;
Vec3f sp58;
D_80911F20 = 0;
@ -2432,7 +2422,7 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
sLurePos.y += D_80917278.y;
}
} else if (CHECK_BTN_ALL(input->cur.button, BTN_A)) {
s32 pad;
s8 requiredScopeTemp;
spDC = 0x500;
D_809101B0 = sReelLineRot[LINE_SEG_COUNT - 2].y + M_PI;
@ -2483,7 +2473,7 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
Matrix_InsertYRotation_f(sLureRot.y, MTXMODE_NEW);
if (D_80917206 == 2) {
Vec3f sp64;
s8 requiredScopeTemp;
Matrix_MultiplyVector3fByState(&sp90, &sp64);
D_80917278.x = sp64.x;
@ -2506,7 +2496,9 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
}
} else if (sReelLinePos[LINE_SEG_COUNT - 1].y < (WATER_SURFACE_Y(globalCtx) + phi_f0)) {
if (D_80917206 == 2) {
Vec3f sp58 = this->actor.world.pos;
s8 requiredScopeTemp;
sp58 = this->actor.world.pos;
this->actor.prevPos = this->actor.world.pos = sLurePos;
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 15.0f, 30.0f, 30.0f, 0x44);
this->actor.world.pos = sp58;
@ -2579,7 +2571,8 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
if ((sLurePos.y <= (WATER_SURFACE_Y(globalCtx) + 4.0f)) &&
(sLurePos.y >= (WATER_SURFACE_Y(globalCtx) - 4.0f))) {
phi_v0 = 63;
s8 phi_v0 = 63;
if (CHECK_BTN_ALL(input->cur.button, BTN_A) || (D_809101B4 > 1.0f)) {
phi_v0 = 1;
}
@ -2590,8 +2583,7 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
EnFishing_SpawnRipple(NULL, globalCtx->specialEffects, &spA8, 30.0f, 300.0f, 150, 90);
}
}
break;
}
} break; // must be outside of the block
case 4:
if (this->unk_14F != 0) {
@ -2626,10 +2618,6 @@ void EnFishing_UpdateLure(EnFishing* this, GlobalContext* globalCtx) {
break;
}
}
#else
static Vec3f D_8090D620 = { 0.0f, 0.0f, 0.0f };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Fishing/EnFishing_UpdateLure.s")
#endif
s32 func_809033F0(EnFishing* this, GlobalContext* globalCtx, u8 ignorePosCheck) {
s16 i;
@ -2851,8 +2839,6 @@ void EnFishing_HandleAquariumDialog(EnFishing* this, GlobalContext* globalCtx) {
}
}
#ifdef NON_MATCHING
// D_80917266 in case 5 around the large branching
void EnFishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
s16 i;
s16 sp134 = 10;
@ -2868,7 +2854,7 @@ void EnFishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
s16 spFE;
s16 spFC;
s16 spFA;
s16 phi_v0;
s16 spF8;
s16 spF6;
s16 spF4;
s16 spF2;
@ -2883,11 +2869,9 @@ void EnFishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
f32 phi_f2;
Vec3f spC4;
Vec3f spB8;
u8 phi_v0_2;
f32 temp_f0;
f32 temp;
s32 pad;
f32 spA4;
f32 temp2;
this->actor.uncullZoneForward = 700.0f;
this->actor.uncullZoneScale = 50.0f;
@ -3435,6 +3419,8 @@ void EnFishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
this->unk_188 = 1.0f;
this->unk_18C = 2000.0f;
} else if (sp124 < 10.0f) {
s16 phi_v0;
if (func_809033F0(this, globalCtx, false)) {
func_80903C60(this, 0);
}
@ -3565,15 +3551,15 @@ void EnFishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
D_809171F6 = 0;
if (this->unk_148 == 1) {
spA4 = (this->unk_1A4 * 3.0f) + 120.0f;
temp2 = (this->unk_1A4 * 3.0f) + 120.0f;
} else {
spA4 = (2.0f * this->unk_1A4) + 120.0f;
temp2 = (2.0f * this->unk_1A4) + 120.0f;
}
if (spA4 > 255.0f) {
spA4 = 255.0f;
if (temp2 > 255.0f) {
temp2 = 255.0f;
}
func_8013EC44(0.0f, spA4, 120, 5);
func_8013EC44(0.0f, temp2, 120, 5);
D_809171F4 = 40;
D_80911E28 = 10;
play_sound(NA_SE_IT_FISHING_HIT);
@ -3581,6 +3567,9 @@ void EnFishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
}
if (this->actor.world.pos.y < WATER_SURFACE_Y(globalCtx)) {
u8 phi_v0_2;
f32 spA4;
if (this->unk_172[1] > 30) {
phi_v0_2 = 7;
} else {
@ -4181,9 +4170,6 @@ void EnFishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
}
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Fishing/EnFishing_UpdateFish.s")
#endif
s32 EnFishing_FishOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
Actor* thisx) {
@ -5053,8 +5039,6 @@ static Vec3s sSinkingLureLocationPos[] = {
{ 553, -48, -508 },
};
#ifdef NON_MATCHING
// Register flip around target near the end of the function
void EnFishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
EnFishing* this = THIS;
@ -5066,10 +5050,9 @@ void EnFishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
f32 target;
f32 camAtFraction;
f32 lureDistXZ;
s32 pad;
Camera* camera;
Player* player = GET_PLAYER(globalCtx);
Input* input = CONTROLLER1(globalCtx);
Camera* camera;
playerShadowAlpha = player->actor.shape.shadowAlpha;
@ -5334,7 +5317,7 @@ void EnFishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
player->actor.speedXZ = 0.0f;
if (Message_GetState(&globalCtx->msgCtx) == 0) {
camera = Play_GetCamera(globalCtx, CAM_ID_MAIN);
Camera* camera = Play_GetCamera(globalCtx, CAM_ID_MAIN);
camera->eye = sCameraEye;
camera->eyeNext = sCameraEye;
@ -5533,7 +5516,8 @@ void EnFishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
Math_ApproachF(&D_8090CCD0, D_8090CCD4, 1.0f, 0.05f);
if (D_8090CCD0 > 0.0f) {
target = (D_8090CCD0 * 0.03f) + 0.8f;
f32 target = (D_8090CCD0 * 0.03f) + 0.8f;
if (target > 1.2f) {
target = 1.2f;
}
@ -5561,9 +5545,8 @@ void EnFishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
if ((u8)D_8090CCD0 > 0) {
s32 pad;
Camera* camera = Play_GetCamera(globalCtx, CAM_ID_MAIN);
s16 i;
s32 pad1;
Camera* camera = Play_GetCamera(globalCtx, CAM_ID_MAIN);
Vec3f pos;
Vec3f rot;
Vec3f projectedPos;
@ -5601,9 +5584,6 @@ void EnFishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
gSaveContext.minigameScore = (SQ((f32)D_8090CCF8) * 0.0036f) + 0.5f;
}
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Fishing/EnFishing_UpdateOwner.s")
#endif
s32 EnFishing_OwnerOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
Actor* thisx) {