diff options
| author | theo3 <arisstephenson2@gmail.com> | 2020-08-15 14:19:22 -0700 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2020-08-15 14:19:22 -0700 |
| commit | 2a7a92cf54afbfb9434e650857bf3e52e47659ca (patch) | |
| tree | 3564f766235768063075f1129ce4160f237de104 /src/object | |
| parent | f08b8a7865ff680de87d85e90c0be17c60ed3875 (diff) | |
| parent | 666a6f3b0b9bc45702696ac3c42f6829ef1896a4 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/greatFairy.c | 4 | ||||
| -rwxr-xr-x | src/object/object48.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c index bfdf0807..69893d1a 100644 --- a/src/object/greatFairy.c +++ b/src/object/greatFairy.c @@ -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); } diff --git a/src/object/object48.c b/src/object/object48.c index 57d772a9..bbac3950 100755 --- a/src/object/object48.c +++ b/src/object/object48.c @@ -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) { |