mirror of
https://github.com/zeldaret/tmc
synced 2026-07-29 23:48:33 -04:00
def ScreenTransition
This commit is contained in:
+2
-2
@@ -5,7 +5,7 @@
|
||||
extern void (*gUnk_081140D4[])(Entity*);
|
||||
|
||||
extern u16 gUnk_081140CC[];
|
||||
extern u32 gUnk_030010A0;
|
||||
extern u32 gScreenTransition;
|
||||
extern void sub_0805E3A0(Entity*, u32);
|
||||
extern void sub_0806D0B0(Entity*);
|
||||
extern void sub_0807DD64(Entity*);
|
||||
@@ -40,7 +40,7 @@ void sub_0806CF30(Entity* this) {
|
||||
if (this->previousActionFlag != 2) {
|
||||
|
||||
if (this->previousActionFlag < 3) {
|
||||
if ((gUnk_030010A0 & 3) == 0) {
|
||||
if ((gScreenTransition & 3) == 0) {
|
||||
iVar3 = this->x.HALF.HI;
|
||||
if (gLinkEntity.x.HALF.HI < iVar3) {
|
||||
if ((this->field_0x68 - 32) < iVar3) {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
typedef struct {
|
||||
/*0x00*/ u8 filler[0x2C];
|
||||
/*0x2C*/ u8 unk;
|
||||
} struct_030010A0;
|
||||
} ScreenTransition;
|
||||
|
||||
typedef struct {
|
||||
u8 filler[0xa8];
|
||||
@@ -20,7 +20,7 @@ typedef struct {
|
||||
extern void (*gUnk_081115C0[])(Entity*);
|
||||
extern void (*gUnk_081115D0[])(Entity*);
|
||||
|
||||
extern struct_030010A0 gUnk_030010A0;
|
||||
extern ScreenTransition gScreenTransition;
|
||||
extern u16 gUnk_081115DC[];
|
||||
extern u8 gUnk_08111618[];
|
||||
extern u32* gUnk_081115EC[];
|
||||
@@ -60,7 +60,7 @@ void sub_08068A1C(Entity* this) {
|
||||
int offset;
|
||||
|
||||
(this->entityType).parameter = (this->entityType).form;
|
||||
if (gUnk_030010A0.unk != 0) {
|
||||
if (gScreenTransition.unk != 0) {
|
||||
offset = 6;
|
||||
bVar1 = 3;
|
||||
|
||||
@@ -114,7 +114,7 @@ void sub_08068AA4(Entity* this) {
|
||||
}
|
||||
|
||||
void sub_08068ADC(Entity* this) {
|
||||
if (gUnk_030010A0.unk == 2) {
|
||||
if (gScreenTransition.unk == 2) {
|
||||
GetNextFrame(this);
|
||||
}
|
||||
sub_0806FD3C(this);
|
||||
|
||||
@@ -27,7 +27,7 @@ void GoronMerchant(Entity *this)
|
||||
|
||||
void sub_08069584(Entity *this)
|
||||
{
|
||||
if (gUnk_030010A0.field_0x24[8] != 0) {
|
||||
if (gScreenTransition.field_0x24[8] != 0) {
|
||||
this->action = 3;
|
||||
}
|
||||
else {
|
||||
@@ -65,7 +65,7 @@ void sub_080695E8(Entity *this)
|
||||
|
||||
void sub_0806961C(Entity *this)
|
||||
{
|
||||
if (gUnk_030010A0.field_0x24[8] == 2) {
|
||||
if (gScreenTransition.field_0x24[8] == 2) {
|
||||
UpdateAnimationSingleFrame(this);
|
||||
}
|
||||
sub_0806FD3C(this);
|
||||
|
||||
+3
-3
@@ -13,7 +13,7 @@ typedef struct {
|
||||
typedef struct {
|
||||
u8 filler[8];
|
||||
u8 unk;
|
||||
} struct_030010A0;
|
||||
} ScreenTransition;
|
||||
|
||||
typedef struct {
|
||||
u32 unk;
|
||||
@@ -38,7 +38,7 @@ extern void (*const gUnk_0810F550[])(Entity*);
|
||||
extern u8 gUnk_03003DBC;
|
||||
extern SpriteLoadData gUnk_0810F524[];
|
||||
extern void* gUnk_0810F6BC[];
|
||||
extern struct_030010A0 gUnk_030010A0;
|
||||
extern ScreenTransition gScreenTransition;
|
||||
|
||||
void Guard(Entity *this)
|
||||
{
|
||||
@@ -175,7 +175,7 @@ void sub_08064030(Entity *arg0,Entity *arg1)
|
||||
|
||||
void sub_08064044(void)
|
||||
{
|
||||
gUnk_030010A0.unk = 1;
|
||||
gScreenTransition.unk = 1;
|
||||
}
|
||||
|
||||
void sub_08064050(Entity *arg0, struct_08064050 *arg1)
|
||||
|
||||
+4
-4
@@ -7,7 +7,7 @@
|
||||
typedef struct {
|
||||
u8 filler[9];
|
||||
u8 unk;
|
||||
} struct_030010A0;
|
||||
} ScreenTransition;
|
||||
|
||||
typedef struct {
|
||||
u8 filler[4];
|
||||
@@ -21,7 +21,7 @@ extern void DoFade(u32, u32);
|
||||
|
||||
extern void gUnk_0813AD60;
|
||||
extern void gUnk_0813AD74;
|
||||
extern struct_030010A0 gUnk_030010A0;
|
||||
extern ScreenTransition gScreenTransition;
|
||||
|
||||
void Simon(Entity *this)
|
||||
{
|
||||
@@ -37,7 +37,7 @@ void Simon(Entity *this)
|
||||
void sub_0806C224(void)
|
||||
{
|
||||
DoExitTransition(&gUnk_0813AD60);
|
||||
gUnk_030010A0.unk = 6;
|
||||
gScreenTransition.unk = 6;
|
||||
}
|
||||
|
||||
void Simon_CreateChest(Entity *this)
|
||||
@@ -51,7 +51,7 @@ void sub_0806C280(void)
|
||||
{
|
||||
SetGlobalFlag(MAROYA_WAKEUP);
|
||||
DoExitTransition(&gUnk_0813AD74);
|
||||
gUnk_030010A0.unk = 6;
|
||||
gScreenTransition.unk = 6;
|
||||
}
|
||||
|
||||
void sub_0806C2A0(u32 *param_1,struct_0806C2A0 *param_2)
|
||||
|
||||
+2
-2
@@ -11,7 +11,7 @@ extern void (*gUnk_081121D4[])(Entity*);
|
||||
|
||||
extern SpriteLoadData gUnk_081121C4;
|
||||
extern SpriteLoadData gUnk_081121B4;
|
||||
extern u32 gUnk_030010A0;
|
||||
extern u32 gScreenTransition;
|
||||
extern void sub_0807DD94(Entity*, u32);
|
||||
extern void sub_0806A26C(Entity*);
|
||||
extern void sub_080042BA(Entity*, u32);
|
||||
@@ -42,7 +42,7 @@ void sub_0806A234(Entity *this)
|
||||
{
|
||||
sub_0807DD94(this, 0);
|
||||
if ((this->field_0x82.HWORD & 4) != 0) {
|
||||
if ((gUnk_030010A0 & 7) == 0) {
|
||||
if ((gScreenTransition & 7) == 0) {
|
||||
sub_0806A26C(this);
|
||||
}
|
||||
sub_080042BA(this, 2);
|
||||
|
||||
Reference in New Issue
Block a user