mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-13 04:39:36 +00:00
Code Issues Projects Releases Wiki Activity

Fixed floats in ovl_En_Ds

Browse source
This commit is contained in:
zelda2773 2020-03-27 16:26:10 -04:00
parent 4621e066a9
commit 6e2872ba6c
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/functions.h
View file

@ -856,7 +856,7 @@ f32 func_800746DC();
// ? func_800766C4(?); // ? func_800766C4(?);
// ? func_8007672C(?); // ? func_8007672C(?);
// ? func_80076934(?); // ? func_80076934(?);
void func_800773A8(GlobalContext* globalCtx, f32 arg1, f32 arg2, u32 arg3, f32 arg4); void func_800773A8(GlobalContext* globalCtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
s32 func_800775CC(); s32 func_800775CC();
void func_800775D8(); void func_800775D8();
s32 func_800775E4(); s32 func_800775E4();

14
src/overlays/actors/ovl_En_Ds/z_en_ds.c
View file

@ -59,7 +59,7 @@ void EnDs_Init(EnDs* this, GlobalContext* globalCtx) {
this->actor.sub_98.mass = 0xFF; this->actor.sub_98.mass = 0xFF;
Actor_SetScale(this, 0.0130000002682f); Actor_SetScale(this, 0.013f);
this->actionFunc = EnDs_Wait; this->actionFunc = EnDs_Wait;
this->actor.unk_1F = 1; this->actor.unk_1F = 1;
@ -131,8 +131,8 @@ void EnDs_BrewOddPotion3(EnDs* this, GlobalContext* globalCtx) {
func_8010B720(globalCtx, 0x504D); func_8010B720(globalCtx, 0x504D);
} }
Math_ApproxF(&this->unk_1E4, 0, 0.0299999993294f); Math_ApproxF(&this->unk_1E4, 0, 0.03f);
func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0x3DCCCCCD, 1.0f); func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0.1f, 1.0f);
} }
void EnDs_BrewOddPotion2(EnDs* this, GlobalContext* globalCtx) { void EnDs_BrewOddPotion2(EnDs* this, GlobalContext* globalCtx) {
@ -153,8 +153,8 @@ void EnDs_BrewOddPotion1(EnDs* this, GlobalContext* globalCtx) {
this->brewTimer = 20; this->brewTimer = 20;
} }
Math_ApproxF(&this->unk_1E4, 1.0f, 0.00999999977648f); Math_ApproxF(&this->unk_1E4, 1.0f, 0.01f);
func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0x3DCCCCCD, 1.0f); func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0.1f, 1.0f);
} }
void EnDs_OfferOddPotion(EnDs* this, GlobalContext* globalCtx) { void EnDs_OfferOddPotion(EnDs* this, GlobalContext* globalCtx) {
@ -182,7 +182,9 @@ int EnDs_CheckRupeesAndBottle() {
} else if (Inventory_HasEmptyBottle() == 0) { } else if (Inventory_HasEmptyBottle() == 0) {
return 1; return 1;
} }
return 2; else {
return 2;
}
} }
void EnDs_GiveBluePotion(EnDs* this, GlobalContext* globalCtx) { void EnDs_GiveBluePotion(EnDs* this, GlobalContext* globalCtx) {