mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-30 11:51:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
theo3
2020-08-15 14:19:22 -07:00
parent f08b8a7865 666a6f3b0b
commit 2a7a92cf54
70 changed files with 25391 additions and 25991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/object/greatFairy.c
+2 -2
View File
@@ -152,8 +152,8 @@ void GreatFairy_WingsInit(Entity* this) {
this->spritePriority.b0 = 5;
this->spriteSettings.b.draw = 1;
this->spriteRendering.alphaBlend = 1;
gScreen.controls.windowOutsideControl = 3904;
gScreen.controls.mosaicSize = 2057;
gScreen.controls.layerFXControl = 0xF40;
gScreen.controls.alphaBlend = BLDALPHA_BLEND(9, 8);
this->nonPlanarMovement = 1024;
sub_0805EC9C(this, 1024, 256, 0);
}
src/object/object48.c
+3 -3
View File
@@ -10,7 +10,7 @@
#include "structures.h"
extern int sub_0807A094(int);
extern u32 sub_0801D754(const u8*, u8, u8);
extern void LoadPalettes(const u8*, int, int);
extern u32 sub_080041EC(int, int);
extern u32 sub_080045DA(int, int);
@@ -39,7 +39,7 @@ typedef struct {
extern void (*const gUnk_08121C64[])(Entity*);
extern void (*const gUnk_08121CCC[])(Entity*);
extern const int gUnk_08133368[];
extern const u8 gUnk_085A2E80[];
extern const u8 gGlobalGfxAndPalettes[];
extern const struct_08121CD4 gUnk_08121CD4[][4];
extern const u8 gUnk_08121D10[];
extern const u8 gUnk_08121D38[][8];
@@ -88,7 +88,7 @@ void sub_0808E818(Entity* this) {
this->field_0x70.BYTES.byte0 = 4;
this->animationState = 2;
var1 = gUnk_08133368[sub_0807A094(1) - 22] & 0xFFFFFF;
sub_0801D754(&gUnk_085A2E80[var1], 31, 1);
LoadPalettes(&gGlobalGfxAndPalettes[var1], 31, 1);
}
if (gUnk_02032EC0.transitionType == 0) {