mirror of
https://github.com/zeldaret/oot
synced 2026-07-11 15:18:59 -04:00
Decompiled ovl_En_Ta (#518)
* First steps * more * done * format * PR comments * PR comments
This commit is contained in:
+10
-13
@@ -151,19 +151,16 @@ void func_8006390C(Input* input) {
|
||||
gGameInfo->dpadLast = dpad;
|
||||
}
|
||||
|
||||
increment = (CHECK_BTN_ANY(dpad, BTN_DRIGHT))
|
||||
? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B)
|
||||
? 1000
|
||||
: CHECK_BTN_ALL(input->cur.button, BTN_A)
|
||||
? 100
|
||||
: CHECK_BTN_ALL(input->cur.button, BTN_B) ? 10 : 1)
|
||||
: (CHECK_BTN_ANY(dpad, BTN_DLEFT))
|
||||
? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B)
|
||||
? -1000
|
||||
: CHECK_BTN_ALL(input->cur.button, BTN_A)
|
||||
? -100
|
||||
: CHECK_BTN_ALL(input->cur.button, BTN_B) ? -10 : -1)
|
||||
: 0;
|
||||
increment = (CHECK_BTN_ANY(dpad, BTN_DRIGHT)) ? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) ? 1000
|
||||
: CHECK_BTN_ALL(input->cur.button, BTN_A) ? 100
|
||||
: CHECK_BTN_ALL(input->cur.button, BTN_B) ? 10
|
||||
: 1)
|
||||
: (CHECK_BTN_ANY(dpad, BTN_DLEFT))
|
||||
? (CHECK_BTN_ALL(input->cur.button, BTN_A | BTN_B) ? -1000
|
||||
: CHECK_BTN_ALL(input->cur.button, BTN_A) ? -100
|
||||
: CHECK_BTN_ALL(input->cur.button, BTN_B) ? -10
|
||||
: -1)
|
||||
: 0;
|
||||
|
||||
gGameInfo->data[gGameInfo->regCur + regGroup] += increment;
|
||||
if (CHECK_BTN_ANY(dpad, BTN_DUP)) {
|
||||
|
||||
+1184
-146
File diff suppressed because it is too large
Load Diff
@@ -4,11 +4,36 @@
|
||||
#include "ultra64.h"
|
||||
#include "global.h"
|
||||
|
||||
#include "overlays/actors/ovl_En_Niw/z_en_niw.h"
|
||||
|
||||
struct EnTa;
|
||||
|
||||
typedef void (*EnTaActionFunc)(struct EnTa*, GlobalContext*);
|
||||
typedef void (*EnTaUnkFunc)(struct EnTa*);
|
||||
|
||||
typedef struct EnTa {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x014C */ char unk_14C[0x19C];
|
||||
/* 0x014C */ SkelAnime skelAnime;
|
||||
/* 0x0190 */ Vec3s limbDrawTable[17];
|
||||
/* 0x01F6 */ Vec3s transitionDrawTable[17];
|
||||
/* 0x025C */ EnTaActionFunc unk_25C;
|
||||
/* 0x0260 */ EnTaUnkFunc unk_260;
|
||||
/* 0x0264 */ ColliderCylinder collider;
|
||||
/* 0x02B0 */ EnTaUnkFunc unk_2B0;
|
||||
/* 0x02B4 */ s16 unk_2B4;
|
||||
/* 0x02B6 */ s16 unk_2B6;
|
||||
/* 0x02B8 */ EnNiw* unk_2B8[3];
|
||||
/* 0x02C4 */ s16 unk_2C4[3];
|
||||
/* 0x02CA */ u8 unk_2CA;
|
||||
/* 0x02CC */ s16 unk_2CC;
|
||||
/* 0x02CE */ s16 unk_2CE;
|
||||
/* 0x02D0 */ s16 unk_2D0;
|
||||
/* 0x02D2 */ s16 unk_2D2;
|
||||
/* 0x02D4 */ Vec3s unk_2D4;
|
||||
/* 0x02DA */ Vec3s unk_2DA;
|
||||
/* 0x02E0 */ u16 unk_2E0;
|
||||
/* 0x02E2 */ s16 unk_2E2;
|
||||
/* 0x02E4 */ AnimationHeader* unk_2E4;
|
||||
} EnTa; // size = 0x02E8
|
||||
|
||||
extern const ActorInit En_Ta_InitVars;
|
||||
|
||||
Reference in New Issue
Block a user