mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-09 14:55:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename gFadeControl

Browse Source
This commit is contained in:
Marcus Huderle
2020-08-12 20:12:47 -05:00
parent 4c0217a782
commit 76aa792c35
26 changed files with 245 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_0804AA84.c
+2 -3
View File
@@ -17,7 +17,6 @@ extern void (*const gUnk_080D412C[])();
extern struct_02018EB0 gUnk_02018EB0;
extern u8 gUnk_03000FD0;
u32 sub_0804AA84(void)
{
@@ -62,12 +61,12 @@ void sub_0804AB04(void)
void sub_0804AB24(void)
{
if (gUnk_03000FD0 == 0) {
if (!gFadeControl.active) {
gScreen.lcd.lcdControl2 = 0;
sub_0801E104();
gArea.filler[8] = 0;
MenuFadeIn(6, 0);
gUnk_03000FD0 = 0;
gFadeControl.active = 0;
}
}
src/introSetTransition.c
+10 -20
View File
@@ -18,16 +18,6 @@ static void (*const gUnk_081320F0[])(void) = {
sub_080AD834,
};
typedef struct {
u8 field_0x0;
u8 field_0x1;
u8 field_0x2;
u8 field_0x3;
u32 field_0x4;
} struct_03000FD0;
extern struct_03000FD0 gUnk_03000FD0;
extern const u16 gUnk_081320FC[];
u32 IntroSetTransition(u32 transition)
@@ -51,7 +41,7 @@ void HandleIntroScreen(void)
gUnk_081320F0[gUnk_02032EC0.transitionType]();
break;
case 2:
if (gUnk_03000FD0.field_0x0 != 0) {
if (gFadeControl.active) {
return;
}
sub_0801DA90(1);
@@ -153,7 +143,7 @@ static void sub_080AD474(void)
DoFade(6, 8);
break;
case 1:
if (gUnk_03000FD0.field_0x0 != 0) {
if (gFadeControl.active) {
return;
}
if (((struct_02000000*)0x2000000)->gameLanguage == 0) {
@@ -228,7 +218,7 @@ void sub_080AD6AC(void)
switch (gMenu.overlayType) {
case 0:
if (gUnk_03000FD0.field_0x0 == 0) {
if (!gFadeControl.active) {
if ((gMenu.field_0x12 & 1) == 0) {
gScreen.bg2.bg0Control++;
}
@@ -237,15 +227,15 @@ void sub_080AD6AC(void)
gMenu.overlayType++;
gScreen.bg2.bg0Control = 0;
gScreen.bg1.unk = 0xc09;
gUnk_03000FD0.field_0x4 = 0x40;
gFadeControl.field_0x4 = 0x40;
DoFade(6,0x10);
PlaySFX(0xf8);
}
}
break;
case 1:
if (gUnk_03000FD0.field_0x0 == 0) {
gUnk_03000FD0.field_0x4 = -1;
if (!gFadeControl.active) {
gFadeControl.field_0x4 = -1;
gMenu.overlayType++;
gMenu.transitionTimer = 0x5a;
pEVar2 = CreateObject(0xb4,0,0);
@@ -266,7 +256,7 @@ void sub_080AD6AC(void)
void sub_080AD76C(void) {
switch (gMenu.overlayType) {
case 0:
if (gUnk_03000FD0.field_0x0 == 0) {
if (!gFadeControl.active) {
gMenu.overlayType = 1;
gScreen.lcd.lcdControl2 |= 0x400;
PlaySFX(0xF6);
@@ -292,7 +282,7 @@ void sub_080AD76C(void) {
}
break;
default:
if (gUnk_03000FD0.field_0x0 == 0 && sub_080AD84C()) {
if (!gFadeControl.active && sub_080AD84C()) {
gMenu.menuType++;
gMenu.transitionTimer = 60;
}
@@ -301,7 +291,7 @@ void sub_080AD76C(void) {
}
static void sub_080AD834(void) {
if (gUnk_03000FD0.field_0x0 == 0) {
if (!gFadeControl.active) {
InitScreen(SCREEN_CHOOSE_FILE);
}
}
@@ -309,7 +299,7 @@ static void sub_080AD834(void) {
u32 sub_080AD84C(void) {
u32 newKeys;
if (gUnk_03000FD0.field_0x0 != 0) {
if (gFadeControl.active) {
return 0;
}
src/room.c
+1 -2
View File
@@ -2223,7 +2223,6 @@ u32 sub_0804CD44() {
extern EntityData gUnk_080DF94C;
extern u8 gUnk_02000070;
extern u8 gUnk_03000FD0;
extern u32 gUsedPalettes;
void sub_0804CD48(void) {
@@ -2232,7 +2231,7 @@ void sub_0804CD48(void) {
SetLocalFlag(0x48);
MenuFadeIn(5, 0);
gUnk_02000070 = 0;
gUnk_03000FD0 = 0;
gFadeControl.active = 0;
gUsedPalettes = 0;
*(u16*)0x5000000 = 0x7fff;
sub_0801DA90(1);
src/sub_08050008.c
+2 -2
View File
@@ -1,7 +1,7 @@
#include "global.h"
extern u32 gUnk_020354C0;
extern s32 gUnk_03000FD0;
extern s32 gFadeControl;
extern void _DmaZero(u32, u32, u32);
void sub_08050008(u32 param_1, u32 param_2, u32 param_3) {
@@ -9,7 +9,7 @@ void sub_08050008(u32 param_1, u32 param_2, u32 param_3) {
_DmaZero((u32)&gUnk_020354C0, 128, param_3);
unk = &gUnk_03000FD0;
unk = &gFadeControl;
*(unk + 1) = -1;
return;
src/sub_08050024.c
+24 -43
View File
@@ -2,25 +2,6 @@
#include "functions.h"
#include "screen.h"
typedef struct {
u8 field_0x0;
u8 field_0x1;
u8 field_0x2;
u8 field_0x3;
u32 field_0x4;
u16 fadeType; // fade in or out, are there others?
u16 fadeSpeed; // subtracted from duration
u16 fadeDuration;
u16 field_0xe;
s16 field_0x10;
s16 field_0x12;
s16 field_0x14;
u16 field_0x16;
u16 field_0x18;
} struct_03000FD0;
extern struct_03000FD0 gUnk_03000FD0;
typedef struct {
u8 field_0x0;
u8 field_0x1;
@@ -42,26 +23,26 @@ void sub_08050024() {
void sub_08050038(u32 arg0)
{
if ((gUnk_03000FD0.fadeType & 1) != 0) {
gUnk_03000FD0.field_0xe = arg0;
if ((gFadeControl.fadeType & 1) != 0) {
gFadeControl.field_0xe = arg0;
}
else {
gUnk_03000FD0.fadeDuration = arg0;
gFadeControl.fadeDuration = arg0;
}
}
void DoFade(u32 fadeType, u32 fadeSpeed)
{
gUnk_03000FD0.fadeSpeed = fadeSpeed;
gUnk_03000FD0.fadeType = fadeType;
gUnk_03000FD0.field_0x0 = 1;
gUnk_03000FD0.fadeDuration = 0x100;
gUnk_03000FD0.field_0xe = 0;
if ((gUnk_03000FD0.fadeType & 2) != 0) {
gUnk_03000FD0.field_0x2 = 0xf8;
gFadeControl.fadeSpeed = fadeSpeed;
gFadeControl.fadeType = fadeType;
gFadeControl.active = 1;
gFadeControl.fadeDuration = 0x100;
gFadeControl.field_0xe = 0;
if ((gFadeControl.fadeType & 2) != 0) {
gFadeControl.field_0x2 = 0xf8;
}
else {
gUnk_03000FD0.field_0x2 = 0;
gFadeControl.field_0x2 = 0;
}
if ((fadeType & 8) != 0) {
gUnk_03000000.spritesOffset = 1;
@@ -70,10 +51,10 @@ void DoFade(u32 fadeType, u32 fadeSpeed)
gScreen.affine.unk2 |= 0x40;
}
if ((fadeType & 0x10) != 0) {
sub_0801E1B8(gUnk_03000FD0.field_0x16, gUnk_03000FD0.field_0x18);
sub_0801E1EC(gUnk_03000FD0.field_0x12, gUnk_03000FD0.field_0x14, gUnk_03000FD0.field_0x10);
sub_0801E1B8(gFadeControl.field_0x16, gFadeControl.field_0x18);
sub_0801E1EC(gFadeControl.field_0x12, gFadeControl.field_0x14, gFadeControl.field_0x10);
if ((fadeType & 1) == 0) {
gUnk_03000FD0.fadeType &= 0xfffb;
gFadeControl.fadeType &= 0xfffb;
sub_08050008();
gUsedPalettes = 0xffffffff;
}
@@ -82,23 +63,23 @@ void DoFade(u32 fadeType, u32 fadeSpeed)
void sub_080500F4(u32 arg0)
{
gUnk_03000FD0.fadeSpeed = arg0;
gUnk_03000FD0.fadeType ^= 1;
gUnk_03000FD0.field_0x0 = 1;
gUnk_03000FD0.fadeDuration = 0x100;
gFadeControl.fadeSpeed = arg0;
gFadeControl.fadeType ^= 1;
gFadeControl.active = 1;
gFadeControl.fadeDuration = 0x100;
}
void sub_08050110(u32 param_1, u32 param_2, u32 fadeType, u32 fadeSpeed)
{
if ((fadeType & 1) != 0) {
gUnk_03000FD0.field_0x10 = 0x96;
gFadeControl.field_0x10 = 0x96;
}
else {
gUnk_03000FD0.field_0x10 = 0;
gFadeControl.field_0x10 = 0;
}
gUnk_03000FD0.field_0x12 = param_1;
gUnk_03000FD0.field_0x14 = param_2;
gUnk_03000FD0.field_0x16 = 0x3f3f;
gUnk_03000FD0.field_0x18 = 0;
gFadeControl.field_0x12 = param_1;
gFadeControl.field_0x14 = param_2;
gFadeControl.field_0x16 = 0x3f3f;
gFadeControl.field_0x18 = 0;
DoFade(fadeType, fadeSpeed);
}