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

Run format.sh

Browse source
This commit is contained in:
Random 2020-04-08 18:45:50 +02:00
parent d0cf6e153b
commit 0c0c15018f
6 changed files with 21 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
View file

@ -36,31 +36,19 @@ const ActorInit Bg_Hidan_Firewall_InitVars = {
};
static ColliderCylinderInit cylinderInitData = {
0x0A, 0x11, 0x00, 0x09,
0x20, 0x01, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x20000000,
0x01, 0x04, 0x00, 0x00,
0xFFCFFFFF,
0x00, 0x00, 0x00, 0x00,
0x19, 0x00, 0x01, 0x00,
0x001E, 0x0053,
0x0000,
0x0A, 0x11, 0x00, 0x09, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20000000, 0x01, 0x04,
0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x19, 0x00, 0x01, 0x00, 0x001E, 0x0053, 0x0000,
};
static Sub98Init4 actor98InitData = {
0x01, 0x0050, 0x0064, 0xFF,
0x01,
0x0050,
0x0064,
0xFF,
};
UNK_PTR D_80886D04[] = {
0x06015D20,
0x06016120,
0x06016520,
0x06016920,
0x06016D20,
0x06017120,
0x06017520,
0x06017920,
0x06015D20, 0x06016120, 0x06016520, 0x06016920, 0x06016D20, 0x06017120, 0x06017520, 0x06017920,
};
void BgHidanFirewall_Init(BgHidanFirewall* this, GlobalContext* globalCtx) {
@ -124,7 +112,7 @@ void BgHidanFirewall_Countdown(BgHidanFirewall* this, GlobalContext* globalCtx)
void BgHidanFirewall_Erupt(BgHidanFirewall* this, GlobalContext* globalCtx) {
if (BgHidanFirewall_CheckProximity(this, globalCtx) != 0) {
Math_ApproxF(&this->actor.scale.y, 0.1f, 0.01f/0.4f);
Math_ApproxF(&this->actor.scale.y, 0.1f, 0.01f / 0.4f);
} else {
if (Math_ApproxF(&this->actor.scale.y, 0.01f, 0.01f) != 0) {
this->actor.draw = NULL;

2
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View file

@ -9,7 +9,7 @@
#define ROOM 0x00
#define FLAGS 0x00000015
#define TIMER_SCALE ((f32)OS_CLOCK_RATE/10000000000)
#define TIMER_SCALE ((f32)OS_CLOCK_RATE / 10000000000)
#define DEGREE_60_RAD 1.0471975803375244140625f
#define DEGREE_15_RAD 0.261799395084381103515625f