mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 07:07:09 +00:00
Code Issues Projects Releases Wiki Activity

Fixes in PR #41

Browse source 
- Use  VT macros in code_800D31A0.c
- Change D_8012DBC0 to false instead of 0
- Fix brace style
This commit is contained in:
Random 2020-03-29 11:57:52 +02:00
parent 5f027cb431
commit 462c284a17
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/z64.h
View file

@ -1277,15 +1277,13 @@ typedef struct {
/* 0x10 */ OSTime resetTime; /* 0x10 */ OSTime resetTime;
} PreNmiBuff; // size = 0x18 (actually osAppNmiBuffer is 0x40 bytes large but the rest is unused) } PreNmiBuff; // size = 0x18 (actually osAppNmiBuffer is 0x40 bytes large but the rest is unused)
typedef struct typedef struct {
{
/* 0x00 */ s16 unk_00; /* 0x00 */ s16 unk_00;
/* 0x02 */ s16 unk_02; /* 0x02 */ s16 unk_02;
/* 0x04 */ s16 unk_04; /* 0x04 */ s16 unk_04;
} SubQuakeRequest14; } SubQuakeRequest14;
typedef struct typedef struct {
{
/* 0x00 */ s16 randIdx; /* 0x00 */ s16 randIdx;
/* 0x02 */ s16 countdownMax; /* 0x02 */ s16 countdownMax;
/* 0x04 */ Camera* cam; /* 0x04 */ Camera* cam;
@ -1301,8 +1299,7 @@ typedef struct
/* 0x20 */ s16 camPtrIdx; /* 0x20 */ s16 camPtrIdx;
} QuakeRequest; // size = 0x24 } QuakeRequest; // size = 0x24
typedef struct typedef struct {
{
/* 0x00 */ Vec3f vec1; /* 0x00 */ Vec3f vec1;
/* 0x0C */ Vec3f vec2; /* 0x0C */ Vec3f vec2;
/* 0x18 */ s16 rotZ; /* 0x18 */ s16 rotZ;
@ -1310,8 +1307,7 @@ typedef struct
/* 0x1C */ s16 zoom; /* 0x1C */ s16 zoom;
} ShakeInfo; // size = 0x1E } ShakeInfo; // size = 0x1E
typedef struct typedef struct {
{
/* 0x00 */ Vec3f vec1; /* 0x00 */ Vec3f vec1;
/* 0x0C */ Vec3f vec2; /* 0x0C */ Vec3f vec2;
/* 0x18 */ s16 rotZ; /* 0x18 */ s16 rotZ;

5
src/code/code_800D31A0.c
View file

@ -1,12 +1,13 @@
#include <global.h> #include <global.h>
#include <padmgr.h> #include <padmgr.h>
#include <vt.h>
extern PadMgr gPadMgr; extern PadMgr gPadMgr;
u32 D_8012DBC0 = 0; u32 D_8012DBC0 = false;
void func_800D31A0() { void func_800D31A0() {
osSyncPrintf("\x1b[31m\n**** Freeze!! ****\n\x1b[m"); osSyncPrintf(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST);
while (true) { while (true) {
func_800FF4AC(1000); // msleep func_800FF4AC(1000); // msleep
} }