diff --git a/asm/code_08019444.s b/asm/code_08019444.s index 02ca3f7f..d71f4fff 100644 --- a/asm/code_08019444.s +++ b/asm/code_08019444.s @@ -382,7 +382,7 @@ _0801973C: .4byte gUnk_02018EB0 thumb_func_start sub_08019740 sub_08019740: @ 0x08019740 push {lr} - ldr r0, _0801975C @ =gUnk_03000FD0 + ldr r0, _0801975C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08019758 @@ -396,7 +396,7 @@ sub_08019740: @ 0x08019740 _08019758: pop {pc} .align 2, 0 -_0801975C: .4byte gUnk_03000FD0 +_0801975C: .4byte gFadeControl _08019760: .4byte gUnk_02018EB0 thumb_func_start sub_08019764 @@ -3726,7 +3726,7 @@ _0801B068: bne _0801B0BA cmp r3, #0 bne _0801B0B8 - ldr r0, _0801B0B4 @ =gUnk_03000FD0 + ldr r0, _0801B0B4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _0801B08C @@ -3753,7 +3753,7 @@ _0801B0AC: b _0801B0BA .align 2, 0 _0801B0B0: .4byte gUnk_02000CC0 -_0801B0B4: .4byte gUnk_03000FD0 +_0801B0B4: .4byte gFadeControl _0801B0B8: strh r1, [r4, #6] _0801B0BA: diff --git a/asm/code_0801D79C.s b/asm/code_0801D79C.s index 8872b96b..c6f9b660 100644 --- a/asm/code_0801D79C.s +++ b/asm/code_0801D79C.s @@ -298,7 +298,7 @@ sub_0801DA90: @ 0x0801DA90 strb r0, [r1] ldr r0, _0801DAF0 @ =gUnk_03003DE0 strb r3, [r0] - ldr r0, _0801DAF4 @ =gUnk_03000FD0 + ldr r0, _0801DAF4 @ =gFadeControl strb r3, [r0] ldr r5, _0801DAF8 @ =gScreen adds r0, r5, #0 @@ -333,7 +333,7 @@ sub_0801DA90: @ 0x0801DA90 .align 2, 0 _0801DAEC: .4byte gUnk_03001000 _0801DAF0: .4byte gUnk_03003DE0 -_0801DAF4: .4byte gUnk_03000FD0 +_0801DAF4: .4byte gFadeControl _0801DAF8: .4byte gScreen _0801DAFC: .4byte 0x040000B0 _0801DB00: .4byte 0x0000C5FF diff --git a/asm/code_0804AA84.s b/asm/code_0804AA84.s index 9aba3867..00e8af4f 100644 --- a/asm/code_0804AA84.s +++ b/asm/code_0804AA84.s @@ -168,7 +168,7 @@ _0804ACC6: thumb_func_start sub_0804ACC8 sub_0804ACC8: @ 0x0804ACC8 push {lr} - ldr r0, _0804ACEC @ =gUnk_03000FD0 + ldr r0, _0804ACEC @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _0804ACE8 @@ -183,7 +183,7 @@ sub_0804ACC8: @ 0x0804ACC8 _0804ACE8: pop {pc} .align 2, 0 -_0804ACEC: .4byte gUnk_03000FD0 +_0804ACEC: .4byte gFadeControl _0804ACF0: .4byte gArea _0804ACF4: .4byte gUnk_02032EDC diff --git a/asm/code_0804B9F8.s b/asm/code_0804B9F8.s index 4f274385..20a8b123 100644 --- a/asm/code_0804B9F8.s +++ b/asm/code_0804B9F8.s @@ -47,7 +47,7 @@ _0804FFE0: .4byte gPaletteBuffer thumb_func_start sub_0804FFE4 sub_0804FFE4: @ 0x0804FFE4 push {r4, lr} - ldr r4, _08050000 @ =gUnk_03000FD0 + ldr r4, _08050000 @ =gFadeControl adds r0, r4, #0 movs r1, #0x1c bl _DmaZero @@ -59,5 +59,5 @@ sub_0804FFE4: @ 0x0804FFE4 str r0, [r4, #4] pop {r4, pc} .align 2, 0 -_08050000: .4byte gUnk_03000FD0 +_08050000: .4byte gFadeControl _08050004: .4byte gUnk_020354C0 diff --git a/asm/code_08050038.s b/asm/code_08050038.s index a795ad0d..1751d8d8 100644 --- a/asm/code_08050038.s +++ b/asm/code_08050038.s @@ -8,7 +8,7 @@ thumb_func_start sub_08050154 sub_08050154: @ 0x08050154 push {r4, r5, r6, lr} - ldr r4, _08050180 @ =gUnk_03000FD0 + ldr r4, _08050180 @ =gFadeControl ldrh r0, [r4, #8] movs r5, #0x1c ands r5, r0 @@ -30,7 +30,7 @@ sub_08050154: @ 0x08050154 strh r2, [r4, #0xc] b _080501B8 .align 2, 0 -_08050180: .4byte gUnk_03000FD0 +_08050180: .4byte gFadeControl _08050184: mvns r0, r5 adds r0, #1 @@ -86,7 +86,7 @@ _080501DA: movs r2, #0xc ldrsh r5, [r3, r2] _080501DE: - ldr r0, _080501F8 @ =gUnk_03000FD0 + ldr r0, _080501F8 @ =gFadeControl ldr r2, [r0, #4] ldr r1, _080501FC @ =gUnk_020354C0 movs r4, #0 @@ -101,7 +101,7 @@ _080501EA: strh r5, [r1, #2] b _08050208 .align 2, 0 -_080501F8: .4byte gUnk_03000FD0 +_080501F8: .4byte gFadeControl _080501FC: .4byte gUnk_020354C0 _08050200: .4byte gUsedPalettes _08050204: @@ -198,7 +198,7 @@ sub_080502A4: @ 0x080502A4 ands r0, r1 cmp r0, #0 beq _080502E4 - ldr r4, _080502E0 @ =gUnk_03000FD0 + ldr r4, _080502E0 @ =gFadeControl ldrh r0, [r4, #0x10] ldrh r1, [r4, #0xa] subs r0, r0, r1 @@ -223,9 +223,9 @@ _080502C4: movs r0, #0 b _08050316 .align 2, 0 -_080502E0: .4byte gUnk_03000FD0 +_080502E0: .4byte gFadeControl _080502E4: - ldr r4, _08050310 @ =gUnk_03000FD0 + ldr r4, _08050310 @ =gFadeControl ldrh r0, [r4, #0xa] ldrh r2, [r4, #0x10] adds r0, r0, r2 @@ -245,7 +245,7 @@ _080502E4: movs r0, #0 b _08050316 .align 2, 0 -_08050310: .4byte gUnk_03000FD0 +_08050310: .4byte gFadeControl _08050314: movs r0, #1 _08050316: @@ -588,7 +588,7 @@ nullsub_479: @ 0x08050608 thumb_func_start sub_0805060C sub_0805060C: @ 0x0805060C push {lr} - ldr r0, _08050620 @ =gUnk_03000FD0 + ldr r0, _08050620 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _0805061C @@ -597,7 +597,7 @@ sub_0805060C: @ 0x0805060C _0805061C: pop {pc} .align 2, 0 -_08050620: .4byte gUnk_03000FD0 +_08050620: .4byte gFadeControl thumb_func_start sub_08050624 sub_08050624: @ 0x08050624 @@ -906,7 +906,7 @@ _08050884: .4byte gMenu thumb_func_start sub_08050888 sub_08050888: @ 0x08050888 push {r4, lr} - ldr r0, _080508C4 @ =gUnk_03000FD0 + ldr r0, _080508C4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080508DC @@ -934,7 +934,7 @@ sub_08050888: @ 0x08050888 movs r0, #1 b _080508DA .align 2, 0 -_080508C4: .4byte gUnk_03000FD0 +_080508C4: .4byte gFadeControl _080508C8: .4byte gUnk_02019EE0 _080508CC: .4byte gMenu _080508D0: @@ -3127,7 +3127,7 @@ _080519AC: .4byte gUnk_03001000 thumb_func_start sub_080519B0 sub_080519B0: @ 0x080519B0 push {r4, r5, lr} - ldr r0, _08051A04 @ =gUnk_03000FD0 + ldr r0, _08051A04 @ =gFadeControl ldrb r5, [r0] cmp r5, #0 bne _08051A02 @@ -3159,7 +3159,7 @@ sub_080519B0: @ 0x080519B0 _08051A02: pop {r4, r5, pc} .align 2, 0 -_08051A04: .4byte gUnk_03000FD0 +_08051A04: .4byte gFadeControl _08051A08: .4byte gScreenTransition _08051A0C: .4byte gUnk_02002AC8 _08051A10: .4byte gUnk_03001000 @@ -3169,7 +3169,7 @@ sub_08051A14: @ 0x08051A14 push {lr} movs r0, #1 bl sub_0801DA90 - ldr r1, _08051A70 @ =gUnk_03000FD0 + ldr r1, _08051A70 @ =gFadeControl movs r0, #1 rsbs r0, r0, #0 str r0, [r1, #4] @@ -3202,7 +3202,7 @@ sub_08051A14: @ 0x08051A14 strb r0, [r1, #3] pop {pc} .align 2, 0 -_08051A70: .4byte gUnk_03000FD0 +_08051A70: .4byte gFadeControl _08051A74: .4byte gUnk_03000000 _08051A78: .4byte 0x00000B74 _08051A7C: .4byte gUnk_02032EC0 @@ -3272,7 +3272,7 @@ _08051B02: bl sub_08078CB4 bl sub_080AD9B0 bl sub_080AD918 - ldr r0, _08051BB0 @ =gUnk_03000FD0 + ldr r0, _08051BB0 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08051BAE @@ -3332,7 +3332,7 @@ _08051B96: _08051BAE: pop {r4, r5, pc} .align 2, 0 -_08051BB0: .4byte gUnk_03000FD0 +_08051BB0: .4byte gFadeControl _08051BB4: .4byte gRoomControls _08051BB8: .4byte gArea _08051BBC: .4byte 0x00000864 @@ -3442,7 +3442,7 @@ sub_08051CA8: @ 0x08051CA8 bl sub_0805291C bl sub_080528B4 bl sub_080AD918 - ldr r0, _08051CEC @ =gUnk_03000FD0 + ldr r0, _08051CEC @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08051CEA @@ -3450,7 +3450,7 @@ sub_08051CA8: @ 0x08051CA8 _08051CEA: pop {pc} .align 2, 0 -_08051CEC: .4byte gUnk_03000FD0 +_08051CEC: .4byte gFadeControl thumb_func_start sub_08051CF0 sub_08051CF0: @ 0x08051CF0 @@ -3462,7 +3462,7 @@ sub_08051CF0: @ 0x08051CF0 movs r6, #1 strb r6, [r5, #0xb] bl sub_080AD918 - ldr r0, _08051D24 @ =gUnk_03000FD0 + ldr r0, _08051D24 @ =gFadeControl ldrb r4, [r0] cmp r4, #0 bne _08051D1E @@ -3476,7 +3476,7 @@ _08051D1E: pop {r4, r5, r6, pc} .align 2, 0 _08051D20: .4byte gUnk_03001000 -_08051D24: .4byte gUnk_03000FD0 +_08051D24: .4byte gFadeControl _08051D28: .4byte gScreenTransition thumb_func_start sub_08051D2C @@ -3911,7 +3911,7 @@ _080520D4: .4byte gUnk_03001000 thumb_func_start sub_080520D8 sub_080520D8: @ 0x080520D8 push {r4, lr} - ldr r4, _08052118 @ =gUnk_03000FD0 + ldr r4, _08052118 @ =gFadeControl ldrb r0, [r4] cmp r0, #0 bne _08052114 @@ -3939,7 +3939,7 @@ sub_080520D8: @ 0x080520D8 _08052114: pop {r4, pc} .align 2, 0 -_08052118: .4byte gUnk_03000FD0 +_08052118: .4byte gFadeControl _0805211C: .4byte gMenu _08052120: .4byte gUnk_02002A40 _08052124: .4byte gUnk_03001000 @@ -3948,7 +3948,7 @@ _08052128: .4byte 0xFFFF0001 thumb_func_start sub_0805212C sub_0805212C: @ 0x0805212C push {r4, lr} - ldr r4, _0805214C @ =gUnk_03000FD0 + ldr r4, _0805214C @ =gFadeControl ldrb r0, [r4] cmp r0, #0 bne _0805219C @@ -3964,7 +3964,7 @@ sub_0805212C: @ 0x0805212C strb r0, [r1, #0x10] b _0805219C .align 2, 0 -_0805214C: .4byte gUnk_03000FD0 +_0805214C: .4byte gFadeControl _08052150: .4byte gUnk_03001000 _08052154: .4byte gMenu _08052158: @@ -4005,7 +4005,7 @@ _0805219C: thumb_func_start sub_080521A0 sub_080521A0: @ 0x080521A0 push {r4, lr} - ldr r0, _080521C4 @ =gUnk_03000FD0 + ldr r0, _080521C4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 beq _080521AC @@ -4024,7 +4024,7 @@ _080521B8: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080521C4: .4byte gUnk_03000FD0 +_080521C4: .4byte gFadeControl _080521C8: .4byte gMenu _080521CC: .4byte _080521D0 _080521D0: @ jump table @@ -4043,13 +4043,13 @@ _080521E4: movs r0, #0 movs r1, #0 bl sub_08052418 - ldr r1, _08052204 @ =gUnk_03000FD0 + ldr r1, _08052204 @ =gFadeControl movs r0, #1 rsbs r0, r0, #0 str r0, [r1, #4] b _080522E8 .align 2, 0 -_08052204: .4byte gUnk_03000FD0 +_08052204: .4byte gFadeControl _08052208: ldrh r0, [r2, #8] cmp r0, #0 @@ -4262,7 +4262,7 @@ _0805238C: .align 2, 0 _080523A8: .4byte gMenu _080523AC: - ldr r0, _080523C4 @ =gUnk_03000FD0 + ldr r0, _080523C4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080523CC @@ -4273,7 +4273,7 @@ _080523AC: bl InitScreen b _080523CC .align 2, 0 -_080523C4: .4byte gUnk_03000FD0 +_080523C4: .4byte gFadeControl _080523C8: bl DoSoftReset _080523CC: diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index d107e8ff..e40df276 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -1923,7 +1923,7 @@ _080535F0: .4byte gUnk_080FCB94 thumb_func_start sub_080535F4 sub_080535F4: @ 0x080535F4 push {lr} - ldr r0, _0805360C @ =gUnk_03000FD0 + ldr r0, _0805360C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08053608 @@ -1934,7 +1934,7 @@ sub_080535F4: @ 0x080535F4 _08053608: pop {pc} .align 2, 0 -_0805360C: .4byte gUnk_03000FD0 +_0805360C: .4byte gFadeControl _08053610: .4byte gMenu thumb_func_start nullsub_481 @@ -2190,7 +2190,7 @@ _080537FC: .4byte 0x00001DC1 thumb_func_start sub_08053800 sub_08053800: @ 0x08053800 push {r4, r5, lr} - ldr r0, _0805387C @ =gUnk_03000FD0 + ldr r0, _0805387C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _0805387A @@ -2248,7 +2248,7 @@ sub_08053800: @ 0x08053800 _0805387A: pop {r4, r5, pc} .align 2, 0 -_0805387C: .4byte gUnk_03000FD0 +_0805387C: .4byte gFadeControl _08053880: .4byte gMenu _08053884: .4byte gUnk_080FCCB4 _08053888: .4byte gUnk_02021F30 @@ -2258,7 +2258,7 @@ _08053890: .4byte gScreen thumb_func_start sub_08053894 sub_08053894: @ 0x08053894 push {r4, lr} - ldr r0, _080538B4 @ =gUnk_03000FD0 + ldr r0, _080538B4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080538F8 @@ -2274,7 +2274,7 @@ sub_08053894: @ 0x08053894 strh r0, [r4, #0xa] b _080538E4 .align 2, 0 -_080538B4: .4byte gUnk_03000FD0 +_080538B4: .4byte gFadeControl _080538B8: .4byte gMenu _080538BC: ldr r0, _080538FC @ =gScreenTransition @@ -2316,7 +2316,7 @@ _08053900: .4byte gScreen thumb_func_start sub_08053904 sub_08053904: @ 0x08053904 push {r4, lr} - ldr r0, _08053924 @ =gUnk_03000FD0 + ldr r0, _08053924 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08053968 @@ -2332,7 +2332,7 @@ sub_08053904: @ 0x08053904 strh r0, [r4, #0xa] b _08053954 .align 2, 0 -_08053924: .4byte gUnk_03000FD0 +_08053924: .4byte gFadeControl _08053928: .4byte gMenu _0805392C: ldr r0, _0805396C @ =gScreenTransition @@ -2374,7 +2374,7 @@ _08053970: .4byte gScreen thumb_func_start sub_08053974 sub_08053974: @ 0x08053974 push {lr} - ldr r0, _080539AC @ =gUnk_03000FD0 + ldr r0, _080539AC @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080539A8 @@ -2396,7 +2396,7 @@ sub_08053974: @ 0x08053974 _080539A8: pop {pc} .align 2, 0 -_080539AC: .4byte gUnk_03000FD0 +_080539AC: .4byte gFadeControl _080539B0: .4byte gUnk_080FCBC4 _080539B4: .4byte gMenu @@ -2432,7 +2432,7 @@ _080539F0: .4byte gMenu thumb_func_start sub_080539F4 sub_080539F4: @ 0x080539F4 push {lr} - ldr r0, _08053A14 @ =gUnk_03000FD0 + ldr r0, _08053A14 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08053A10 @@ -2447,7 +2447,7 @@ sub_080539F4: @ 0x080539F4 _08053A10: pop {pc} .align 2, 0 -_08053A14: .4byte gUnk_03000FD0 +_08053A14: .4byte gFadeControl _08053A18: .4byte gMenu thumb_func_start sub_08053A1C @@ -2513,7 +2513,7 @@ _08053A8C: .4byte gMenu thumb_func_start sub_08053A90 sub_08053A90: @ 0x08053A90 push {lr} - ldr r0, _08053AA8 @ =gUnk_03000FD0 + ldr r0, _08053AA8 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08053AA4 @@ -2524,7 +2524,7 @@ sub_08053A90: @ 0x08053A90 _08053AA4: pop {pc} .align 2, 0 -_08053AA8: .4byte gUnk_03000FD0 +_08053AA8: .4byte gFadeControl _08053AAC: .4byte gUnk_02032EC0 thumb_func_start sub_08053AB0 @@ -2878,7 +2878,7 @@ _08053D5C: movs r2, #1 bl SetTileType _08053D72: - ldr r0, _08053D8C @ =gUnk_03000FD0 + ldr r0, _08053D8C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08053D86 @@ -2892,7 +2892,7 @@ _08053D86: pop {r4, pc} .align 2, 0 _08053D88: .4byte gMenu -_08053D8C: .4byte gUnk_03000FD0 +_08053D8C: .4byte gFadeControl thumb_func_start sub_08053D90 sub_08053D90: @ 0x08053D90 @@ -2917,7 +2917,7 @@ _08053DB0: .4byte gMenu thumb_func_start sub_08053DB4 sub_08053DB4: @ 0x08053DB4 push {r4, r5, lr} - ldr r0, _08053E20 @ =gUnk_03000FD0 + ldr r0, _08053E20 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08053E1C @@ -2963,7 +2963,7 @@ sub_08053DB4: @ 0x08053DB4 _08053E1C: pop {r4, r5, pc} .align 2, 0 -_08053E20: .4byte gUnk_03000FD0 +_08053E20: .4byte gFadeControl _08053E24: .4byte gMenu _08053E28: .4byte gUnk_02000070 _08053E2C: .4byte gRoomControls @@ -2971,7 +2971,7 @@ _08053E2C: .4byte gRoomControls thumb_func_start sub_08053E30 sub_08053E30: @ 0x08053E30 push {lr} - ldr r0, _08053E50 @ =gUnk_03000FD0 + ldr r0, _08053E50 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08053E4E @@ -2988,7 +2988,7 @@ sub_08053E30: @ 0x08053E30 _08053E4E: pop {pc} .align 2, 0 -_08053E50: .4byte gUnk_03000FD0 +_08053E50: .4byte gFadeControl _08053E54: .4byte gMenu thumb_func_start sub_08053E58 @@ -3045,7 +3045,7 @@ _08053EC0: .4byte gUnk_02000070 thumb_func_start sub_08053EC4 sub_08053EC4: @ 0x08053EC4 push {r4, lr} - ldr r0, _08053EF4 @ =gUnk_03000FD0 + ldr r0, _08053EF4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08053EF0 @@ -3068,7 +3068,7 @@ sub_08053EC4: @ 0x08053EC4 _08053EF0: pop {r4, pc} .align 2, 0 -_08053EF4: .4byte gUnk_03000FD0 +_08053EF4: .4byte gFadeControl _08053EF8: .4byte gMenu thumb_func_start sub_08053EFC @@ -3094,7 +3094,7 @@ _08053F1C: .4byte gMenu thumb_func_start sub_08053F20 sub_08053F20: @ 0x08053F20 push {r4, r5, lr} - ldr r0, _08053F78 @ =gUnk_03000FD0 + ldr r0, _08053F78 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08053F74 @@ -3133,7 +3133,7 @@ sub_08053F20: @ 0x08053F20 _08053F74: pop {r4, r5, pc} .align 2, 0 -_08053F78: .4byte gUnk_03000FD0 +_08053F78: .4byte gFadeControl _08053F7C: .4byte gMenu _08053F80: .4byte gUnk_02000070 _08053F84: .4byte gRoomControls @@ -3141,7 +3141,7 @@ _08053F84: .4byte gRoomControls thumb_func_start sub_08053F88 sub_08053F88: @ 0x08053F88 push {lr} - ldr r0, _08053FAC @ =gUnk_03000FD0 + ldr r0, _08053FAC @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08053FAA @@ -3159,7 +3159,7 @@ sub_08053F88: @ 0x08053F88 _08053FAA: pop {pc} .align 2, 0 -_08053FAC: .4byte gUnk_03000FD0 +_08053FAC: .4byte gFadeControl _08053FB0: .4byte gMenu thumb_func_start sub_08053FB4 diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s index 67cb224e..16f8ca8e 100644 --- a/asm/code_0805436C.s +++ b/asm/code_0805436C.s @@ -478,7 +478,7 @@ _08054C54: .4byte gUnk_02000070 thumb_func_start sub_08054C58 sub_08054C58: @ 0x08054C58 push {lr} - ldr r0, _08054C80 @ =gUnk_03000FD0 + ldr r0, _08054C80 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08054C7C @@ -496,13 +496,13 @@ sub_08054C58: @ 0x08054C58 _08054C7C: pop {pc} .align 2, 0 -_08054C80: .4byte gUnk_03000FD0 +_08054C80: .4byte gFadeControl _08054C84: .4byte gMenu thumb_func_start sub_08054C88 sub_08054C88: @ 0x08054C88 push {r4, lr} - ldr r0, _08054CB8 @ =gUnk_03000FD0 + ldr r0, _08054CB8 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08054CB4 @@ -523,13 +523,13 @@ sub_08054C88: @ 0x08054C88 _08054CB4: pop {r4, pc} .align 2, 0 -_08054CB8: .4byte gUnk_03000FD0 +_08054CB8: .4byte gFadeControl _08054CBC: .4byte gMenu thumb_func_start sub_08054CC0 sub_08054CC0: @ 0x08054CC0 push {lr} - ldr r0, _08054CE0 @ =gUnk_03000FD0 + ldr r0, _08054CE0 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08054CDE @@ -546,7 +546,7 @@ sub_08054CC0: @ 0x08054CC0 _08054CDE: pop {pc} .align 2, 0 -_08054CE0: .4byte gUnk_03000FD0 +_08054CE0: .4byte gFadeControl _08054CE4: .4byte gMenu thumb_func_start sub_08054CE8 @@ -594,7 +594,7 @@ _08054D38: .4byte gUnk_02000070 thumb_func_start sub_08054D3C sub_08054D3C: @ 0x08054D3C push {r4, lr} - ldr r0, _08054D6C @ =gUnk_03000FD0 + ldr r0, _08054D6C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08054D6A @@ -616,7 +616,7 @@ sub_08054D3C: @ 0x08054D3C _08054D6A: pop {r4, pc} .align 2, 0 -_08054D6C: .4byte gUnk_03000FD0 +_08054D6C: .4byte gFadeControl _08054D70: .4byte gMenu thumb_func_start sub_08054D74 @@ -739,7 +739,7 @@ _08054E58: .4byte gUnk_02000070 thumb_func_start sub_08054E5C sub_08054E5C: @ 0x08054E5C push {r4, lr} - ldr r0, _08054E94 @ =gUnk_03000FD0 + ldr r0, _08054E94 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08054E92 @@ -764,7 +764,7 @@ sub_08054E5C: @ 0x08054E5C _08054E92: pop {r4, pc} .align 2, 0 -_08054E94: .4byte gUnk_03000FD0 +_08054E94: .4byte gFadeControl _08054E98: .4byte gMenu thumb_func_start sub_08054E9C @@ -1229,7 +1229,7 @@ _08055220: .4byte gUnk_02000070 thumb_func_start sub_08055224 sub_08055224: @ 0x08055224 push {lr} - ldr r0, _08055244 @ =gUnk_03000FD0 + ldr r0, _08055244 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055240 @@ -1244,7 +1244,7 @@ sub_08055224: @ 0x08055224 _08055240: pop {pc} .align 2, 0 -_08055244: .4byte gUnk_03000FD0 +_08055244: .4byte gFadeControl _08055248: .4byte gMenu thumb_func_start sub_0805524C @@ -1382,7 +1382,7 @@ _0805534C: .4byte gUnk_02000070 thumb_func_start sub_08055350 sub_08055350: @ 0x08055350 push {lr} - ldr r0, _08055378 @ =gUnk_03000FD0 + ldr r0, _08055378 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055374 @@ -1400,13 +1400,13 @@ sub_08055350: @ 0x08055350 _08055374: pop {pc} .align 2, 0 -_08055378: .4byte gUnk_03000FD0 +_08055378: .4byte gFadeControl _0805537C: .4byte gMenu thumb_func_start sub_08055380 sub_08055380: @ 0x08055380 push {r4, lr} - ldr r0, _080553B0 @ =gUnk_03000FD0 + ldr r0, _080553B0 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080553AC @@ -1427,13 +1427,13 @@ sub_08055380: @ 0x08055380 _080553AC: pop {r4, pc} .align 2, 0 -_080553B0: .4byte gUnk_03000FD0 +_080553B0: .4byte gFadeControl _080553B4: .4byte gMenu thumb_func_start sub_080553B8 sub_080553B8: @ 0x080553B8 push {lr} - ldr r0, _080553D8 @ =gUnk_03000FD0 + ldr r0, _080553D8 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080553D6 @@ -1450,7 +1450,7 @@ sub_080553B8: @ 0x080553B8 _080553D6: pop {pc} .align 2, 0 -_080553D8: .4byte gUnk_03000FD0 +_080553D8: .4byte gFadeControl _080553DC: .4byte gMenu thumb_func_start sub_080553E0 @@ -1525,7 +1525,7 @@ _08055464: .4byte gUnk_02000070 thumb_func_start sub_08055468 sub_08055468: @ 0x08055468 push {lr} - ldr r0, _08055490 @ =gUnk_03000FD0 + ldr r0, _08055490 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _0805548C @@ -1543,13 +1543,13 @@ sub_08055468: @ 0x08055468 _0805548C: pop {pc} .align 2, 0 -_08055490: .4byte gUnk_03000FD0 +_08055490: .4byte gFadeControl _08055494: .4byte gMenu thumb_func_start sub_08055498 sub_08055498: @ 0x08055498 push {r4, lr} - ldr r0, _080554CC @ =gUnk_03000FD0 + ldr r0, _080554CC @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080554CA @@ -1572,13 +1572,13 @@ sub_08055498: @ 0x08055498 _080554CA: pop {r4, pc} .align 2, 0 -_080554CC: .4byte gUnk_03000FD0 +_080554CC: .4byte gFadeControl _080554D0: .4byte gMenu thumb_func_start sub_080554D4 sub_080554D4: @ 0x080554D4 push {lr} - ldr r0, _080554F4 @ =gUnk_03000FD0 + ldr r0, _080554F4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080554F2 @@ -1595,7 +1595,7 @@ sub_080554D4: @ 0x080554D4 _080554F2: pop {pc} .align 2, 0 -_080554F4: .4byte gUnk_03000FD0 +_080554F4: .4byte gFadeControl _080554F8: .4byte gMenu thumb_func_start sub_080554FC @@ -1639,7 +1639,7 @@ _08055544: .4byte gUnk_02000070 thumb_func_start sub_08055548 sub_08055548: @ 0x08055548 push {r4, lr} - ldr r0, _08055578 @ =gUnk_03000FD0 + ldr r0, _08055578 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055576 @@ -1661,7 +1661,7 @@ sub_08055548: @ 0x08055548 _08055576: pop {r4, pc} .align 2, 0 -_08055578: .4byte gUnk_03000FD0 +_08055578: .4byte gFadeControl _0805557C: .4byte gMenu thumb_func_start sub_08055580 @@ -1737,7 +1737,7 @@ _08055608: .4byte gUnk_02000070 thumb_func_start sub_0805560C sub_0805560C: @ 0x0805560C push {lr} - ldr r0, _0805562C @ =gUnk_03000FD0 + ldr r0, _0805562C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055628 @@ -1752,7 +1752,7 @@ sub_0805560C: @ 0x0805560C _08055628: pop {pc} .align 2, 0 -_0805562C: .4byte gUnk_03000FD0 +_0805562C: .4byte gFadeControl _08055630: .4byte gMenu thumb_func_start sub_08055634 @@ -1916,7 +1916,7 @@ _08055768: .4byte gUnk_02000070 thumb_func_start sub_0805576C sub_0805576C: @ 0x0805576C push {lr} - ldr r0, _08055790 @ =gUnk_03000FD0 + ldr r0, _08055790 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _0805578C @@ -1933,7 +1933,7 @@ sub_0805576C: @ 0x0805576C _0805578C: pop {pc} .align 2, 0 -_08055790: .4byte gUnk_03000FD0 +_08055790: .4byte gFadeControl _08055794: .4byte gMenu thumb_func_start sub_08055798 @@ -2157,7 +2157,7 @@ _08055944: .4byte gUnk_02000070 thumb_func_start sub_08055948 sub_08055948: @ 0x08055948 push {lr} - ldr r0, _08055970 @ =gUnk_03000FD0 + ldr r0, _08055970 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _0805596C @@ -2175,7 +2175,7 @@ sub_08055948: @ 0x08055948 _0805596C: pop {pc} .align 2, 0 -_08055970: .4byte gUnk_03000FD0 +_08055970: .4byte gFadeControl _08055974: .4byte gMenu thumb_func_start sub_08055978 @@ -2283,7 +2283,7 @@ _08055A38: .4byte gUnk_02000070 thumb_func_start sub_08055A3C sub_08055A3C: @ 0x08055A3C push {lr} - ldr r0, _08055A64 @ =gUnk_03000FD0 + ldr r0, _08055A64 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055A60 @@ -2301,13 +2301,13 @@ sub_08055A3C: @ 0x08055A3C _08055A60: pop {pc} .align 2, 0 -_08055A64: .4byte gUnk_03000FD0 +_08055A64: .4byte gFadeControl _08055A68: .4byte gMenu thumb_func_start sub_08055A6C sub_08055A6C: @ 0x08055A6C push {r4, lr} - ldr r0, _08055AA0 @ =gUnk_03000FD0 + ldr r0, _08055AA0 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055A9E @@ -2330,13 +2330,13 @@ sub_08055A6C: @ 0x08055A6C _08055A9E: pop {r4, pc} .align 2, 0 -_08055AA0: .4byte gUnk_03000FD0 +_08055AA0: .4byte gFadeControl _08055AA4: .4byte gMenu thumb_func_start sub_08055AA8 sub_08055AA8: @ 0x08055AA8 push {lr} - ldr r0, _08055AC8 @ =gUnk_03000FD0 + ldr r0, _08055AC8 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055AC6 @@ -2353,7 +2353,7 @@ sub_08055AA8: @ 0x08055AA8 _08055AC6: pop {pc} .align 2, 0 -_08055AC8: .4byte gUnk_03000FD0 +_08055AC8: .4byte gFadeControl _08055ACC: .4byte gMenu thumb_func_start sub_08055AD0 @@ -2410,7 +2410,7 @@ _08055B34: .4byte gUnk_02000070 thumb_func_start sub_08055B38 sub_08055B38: @ 0x08055B38 push {lr} - ldr r0, _08055B4C @ =gUnk_03000FD0 + ldr r0, _08055B4C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055B48 @@ -2420,7 +2420,7 @@ sub_08055B38: @ 0x08055B38 _08055B48: pop {pc} .align 2, 0 -_08055B4C: .4byte gUnk_03000FD0 +_08055B4C: .4byte gFadeControl _08055B50: .4byte gMenu thumb_func_start sub_08055B54 @@ -2518,7 +2518,7 @@ _08055C00: .4byte gUnk_02000070 thumb_func_start sub_08055C04 sub_08055C04: @ 0x08055C04 push {lr} - ldr r0, _08055C2C @ =gUnk_03000FD0 + ldr r0, _08055C2C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055C28 @@ -2536,14 +2536,14 @@ sub_08055C04: @ 0x08055C04 _08055C28: pop {pc} .align 2, 0 -_08055C2C: .4byte gUnk_03000FD0 +_08055C2C: .4byte gFadeControl _08055C30: .4byte gMenu thumb_func_start sub_08055C34 sub_08055C34: @ 0x08055C34 push {r4, r5, lr} sub sp, #4 - ldr r0, _08055C64 @ =gUnk_03000FD0 + ldr r0, _08055C64 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055CA6 @@ -2563,7 +2563,7 @@ sub_08055C34: @ 0x08055C34 bl sub_08054974 b _08055C8C .align 2, 0 -_08055C64: .4byte gUnk_03000FD0 +_08055C64: .4byte gFadeControl _08055C68: .4byte gMenu _08055C6C: str r0, [sp] @@ -2600,7 +2600,7 @@ _08055CAC: .4byte gMenu thumb_func_start sub_08055CB0 sub_08055CB0: @ 0x08055CB0 push {lr} - ldr r0, _08055CD0 @ =gUnk_03000FD0 + ldr r0, _08055CD0 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055CCE @@ -2617,7 +2617,7 @@ sub_08055CB0: @ 0x08055CB0 _08055CCE: pop {pc} .align 2, 0 -_08055CD0: .4byte gUnk_03000FD0 +_08055CD0: .4byte gFadeControl _08055CD4: .4byte gMenu thumb_func_start sub_08055CD8 @@ -2665,7 +2665,7 @@ _08055D28: .4byte gUnk_02000070 thumb_func_start sub_08055D2C sub_08055D2C: @ 0x08055D2C push {r4, lr} - ldr r0, _08055D5C @ =gUnk_03000FD0 + ldr r0, _08055D5C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055D5A @@ -2687,7 +2687,7 @@ sub_08055D2C: @ 0x08055D2C _08055D5A: pop {r4, pc} .align 2, 0 -_08055D5C: .4byte gUnk_03000FD0 +_08055D5C: .4byte gFadeControl _08055D60: .4byte gMenu thumb_func_start sub_08055D64 @@ -2744,7 +2744,7 @@ _08055DBC: .4byte gUnk_02000070 thumb_func_start sub_08055DC0 sub_08055DC0: @ 0x08055DC0 push {lr} - ldr r0, _08055DE0 @ =gUnk_03000FD0 + ldr r0, _08055DE0 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08055DDC @@ -2759,7 +2759,7 @@ sub_08055DC0: @ 0x08055DC0 _08055DDC: pop {pc} .align 2, 0 -_08055DE0: .4byte gUnk_03000FD0 +_08055DE0: .4byte gFadeControl _08055DE4: .4byte 0x00000A01 _08055DE8: .4byte gMenu diff --git a/asm/code_0806FA6C.s b/asm/code_0806FA6C.s index d948543c..fd6a614f 100644 --- a/asm/code_0806FA6C.s +++ b/asm/code_0806FA6C.s @@ -1468,7 +1468,7 @@ sub_080705AC: @ 0x080705AC ands r0, r1 cmp r0, #0 beq _08070674 - ldr r0, _08070618 @ =gUnk_03000FD0 + ldr r0, _08070618 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08070674 @@ -1514,7 +1514,7 @@ sub_080705AC: @ 0x080705AC b _08070632 .align 2, 0 _08070614: .4byte gUnk_03000FF0 -_08070618: .4byte gUnk_03000FD0 +_08070618: .4byte gFadeControl _0807061C: .4byte gUnk_02034490 _08070620: .4byte gTextBox _08070624: .4byte gUnk_02002A40 diff --git a/asm/code_08070698.s b/asm/code_08070698.s index 3d9d7eac..738b3fa8 100644 --- a/asm/code_08070698.s +++ b/asm/code_08070698.s @@ -2108,7 +2108,7 @@ _080717CA: sub_080717CC: @ 0x080717CC push {lr} adds r1, r0, #0 - ldr r0, _080717E4 @ =gUnk_03000FD0 + ldr r0, _080717E4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080717F4 @@ -2119,7 +2119,7 @@ sub_080717CC: @ 0x080717CC strb r0, [r1, #0xe] b _080717F4 .align 2, 0 -_080717E4: .4byte gUnk_03000FD0 +_080717E4: .4byte gFadeControl _080717E8: adds r0, r1, #0 bl sub_080717F8 diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index 0db4b4d8..c1a22a53 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -3343,7 +3343,7 @@ _0807E758: .4byte gUnk_02033280 thumb_func_start sub_0807E75C sub_0807E75C: @ 0x0807E75C push {lr} - ldr r0, _0807E770 @ =gUnk_03000FD0 + ldr r0, _0807E770 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 beq _0807E76C @@ -3353,7 +3353,7 @@ sub_0807E75C: @ 0x0807E75C _0807E76C: pop {pc} .align 2, 0 -_0807E770: .4byte gUnk_03000FD0 +_0807E770: .4byte gFadeControl _0807E774: .4byte gUnk_02033280 thumb_func_start sub_0807E778 @@ -3371,11 +3371,11 @@ sub_0807E788: @ 0x0807E788 push {lr} ldr r0, [r1] bl GetNextScriptCommandWordAfterCommandMetadata - ldr r1, _0807E798 @ =gUnk_03000FD0 + ldr r1, _0807E798 @ =gFadeControl str r0, [r1, #4] pop {pc} .align 2, 0 -_0807E798: .4byte gUnk_03000FD0 +_0807E798: .4byte gFadeControl thumb_func_start sub_0807E79C sub_0807E79C: @ 0x0807E79C diff --git a/asm/code_080A3480.s b/asm/code_080A3480.s index 37d5acc4..2f809081 100644 --- a/asm/code_080A3480.s +++ b/asm/code_080A3480.s @@ -337,7 +337,7 @@ _080A36F4: .4byte gMenu thumb_func_start sub_080A36F8 sub_080A36F8: @ 0x080A36F8 push {r4, r5, lr} - ldr r0, _080A3754 @ =gUnk_03000FD0 + ldr r0, _080A3754 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A3752 @@ -380,7 +380,7 @@ _080A374A: _080A3752: pop {r4, r5, pc} .align 2, 0 -_080A3754: .4byte gUnk_03000FD0 +_080A3754: .4byte gFadeControl _080A3758: .4byte gMenu _080A375C: .4byte gUnk_08127CEC _080A3760: .4byte gUnk_02021F30 @@ -433,7 +433,7 @@ _080A37B8: .4byte gUnk_02021F30 _080A37BC: .4byte gUnk_081272E0 _080A37C0: .4byte gScreen _080A37C4: - ldr r0, _080A37F8 @ =gUnk_03000FD0 + ldr r0, _080A37F8 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A385E @@ -460,7 +460,7 @@ _080A37C4: bls _080A385E b _080A383C .align 2, 0 -_080A37F8: .4byte gUnk_03000FD0 +_080A37F8: .4byte gFadeControl _080A37FC: .4byte gScreenTransition _080A3800: .4byte gScreen _080A3804: @@ -502,7 +502,7 @@ _080A383C: _080A3844: .4byte gScreenTransition _080A3848: .4byte gScreen _080A384C: - ldr r1, _080A3860 @ =gUnk_03000FD0 + ldr r1, _080A3860 @ =gFadeControl ldrb r0, [r1] cmp r0, #0 bne _080A385E @@ -513,7 +513,7 @@ _080A384C: _080A385E: pop {r4, pc} .align 2, 0 -_080A3860: .4byte gUnk_03000FD0 +_080A3860: .4byte gFadeControl thumb_func_start sub_080A3864 sub_080A3864: @ 0x080A3864 @@ -537,7 +537,7 @@ _080A3884: .4byte gMenu thumb_func_start sub_080A3888 sub_080A3888: @ 0x080A3888 push {lr} - ldr r1, _080A38A8 @ =gUnk_03000FD0 + ldr r1, _080A38A8 @ =gFadeControl ldr r0, _080A38AC @ =0xFFFF7FFF str r0, [r1, #4] movs r0, #5 @@ -549,7 +549,7 @@ sub_080A3888: @ 0x080A3888 bl sub_080A3954 pop {pc} .align 2, 0 -_080A38A8: .4byte gUnk_03000FD0 +_080A38A8: .4byte gFadeControl _080A38AC: .4byte 0xFFFF7FFF _080A38B0: .4byte gMenu @@ -572,7 +572,7 @@ sub_080A38D0: @ 0x080A38D0 push {r4, r5, r6, lr} mov r6, r8 push {r6} - ldr r0, _080A391C @ =gUnk_03000FD0 + ldr r0, _080A391C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A3914 @@ -605,7 +605,7 @@ _080A3914: mov r8, r3 pop {r4, r5, r6, pc} .align 2, 0 -_080A391C: .4byte gUnk_03000FD0 +_080A391C: .4byte gFadeControl _080A3920: .4byte gUnk_02021F30 _080A3924: .4byte gScreen _080A3928: .4byte gUnk_020344B0 @@ -614,7 +614,7 @@ _080A392C: .4byte gMenu thumb_func_start sub_080A3930 sub_080A3930: @ 0x080A3930 push {lr} - ldr r0, _080A394C @ =gUnk_03000FD0 + ldr r0, _080A394C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A3948 @@ -627,7 +627,7 @@ sub_080A3930: @ 0x080A3930 _080A3948: pop {pc} .align 2, 0 -_080A394C: .4byte gUnk_03000FD0 +_080A394C: .4byte gFadeControl _080A3950: .4byte gUnk_03001000 thumb_func_start sub_080A3954 @@ -657,7 +657,7 @@ _080A397C: .4byte gMenu thumb_func_start sub_080A3980 sub_080A3980: @ 0x080A3980 push {lr} - ldr r0, _080A3990 @ =gUnk_03000FD0 + ldr r0, _080A3990 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A398E @@ -665,7 +665,7 @@ sub_080A3980: @ 0x080A3980 _080A398E: pop {pc} .align 2, 0 -_080A3990: .4byte gUnk_03000FD0 +_080A3990: .4byte gFadeControl thumb_func_start sub_080A3994 sub_080A3994: @ 0x080A3994 @@ -737,7 +737,7 @@ _080A3A2C: .4byte gScreen _080A3A30: .4byte 0x00001C01 _080A3A34: .4byte 0x00001D05 _080A3A38: - ldr r0, _080A3A50 @ =gUnk_03000FD0 + ldr r0, _080A3A50 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 beq _080A3A42 @@ -750,7 +750,7 @@ _080A3A42: strh r0, [r2, #8] b _080A3B36 .align 2, 0 -_080A3A50: .4byte gUnk_03000FD0 +_080A3A50: .4byte gFadeControl _080A3A54: ldrb r4, [r2, #3] ldr r0, _080A3A68 @ =gUnk_03000FF0 diff --git a/asm/code_080A3BD0.s b/asm/code_080A3BD0.s index 03a65575..659d61f3 100644 --- a/asm/code_080A3BD0.s +++ b/asm/code_080A3BD0.s @@ -9,7 +9,7 @@ thumb_func_start sub_080A3C6C sub_080A3C6C: @ 0x080A3C6C push {r4, r5, lr} - ldr r0, _080A3C9C @ =gUnk_03000FD0 + ldr r0, _080A3C9C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 beq _080A3C78 @@ -35,7 +35,7 @@ _080A3C92: str r2, [r5, #0x10] b _080A3CDE .align 2, 0 -_080A3C9C: .4byte gUnk_03000FD0 +_080A3C9C: .4byte gFadeControl _080A3CA0: .4byte gMenu _080A3CA4: .4byte 0x00001FFD _080A3CA8: @@ -1354,7 +1354,7 @@ sub_080A46DC: @ 0x080A46DC thumb_func_start sub_080A46EC sub_080A46EC: @ 0x080A46EC push {lr} - ldr r0, _080A4714 @ =gUnk_03000FD0 + ldr r0, _080A4714 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A4710 @@ -1372,7 +1372,7 @@ sub_080A46EC: @ 0x080A46EC _080A4710: pop {pc} .align 2, 0 -_080A4714: .4byte gUnk_03000FD0 +_080A4714: .4byte gFadeControl _080A4718: .4byte gUnk_080FC3E4 _080A471C: .4byte gMenu @@ -1543,7 +1543,7 @@ _080A4860: .4byte gMenu thumb_func_start sub_080A4864 sub_080A4864: @ 0x080A4864 push {r4, r5, r6, lr} - ldr r0, _080A4894 @ =gUnk_03000FD0 + ldr r0, _080A4894 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A4926 @@ -1567,7 +1567,7 @@ sub_080A4864: @ 0x080A4864 beq _080A48D8 b _080A48DE .align 2, 0 -_080A4894: .4byte gUnk_03000FD0 +_080A4894: .4byte gFadeControl _080A4898: .4byte gMenu _080A489C: .4byte gUnk_03000FF0 _080A48A0: @@ -2459,7 +2459,7 @@ _080A4F9C: .4byte gUnk_08128A38 thumb_func_start sub_080A4FA0 sub_080A4FA0: @ 0x080A4FA0 push {lr} - ldr r0, _080A4FB4 @ =gUnk_03000FD0 + ldr r0, _080A4FB4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A4FB0 @@ -2468,7 +2468,7 @@ sub_080A4FA0: @ 0x080A4FA0 _080A4FB0: pop {pc} .align 2, 0 -_080A4FB4: .4byte gUnk_03000FD0 +_080A4FB4: .4byte gFadeControl thumb_func_start sub_080A4FB8 sub_080A4FB8: @ 0x080A4FB8 @@ -2773,7 +2773,7 @@ _080A51F0: .4byte gMenu sub_080A51F4: @ 0x080A51F4 push {lr} movs r1, #1 - ldr r0, _080A5210 @ =gUnk_03000FD0 + ldr r0, _080A5210 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 beq _080A5202 @@ -2788,7 +2788,7 @@ _080A520C: adds r0, r1, #0 pop {pc} .align 2, 0 -_080A5210: .4byte gUnk_03000FD0 +_080A5210: .4byte gFadeControl _080A5214: .4byte gUnk_02034490 thumb_func_start sub_080A5218 diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index 57a76b63..b0893ba6 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -821,7 +821,7 @@ _080A5BB6: thumb_func_start sub_080A5BB8 sub_080A5BB8: @ 0x080A5BB8 push {lr} - ldr r0, _080A5BE4 @ =gUnk_03000FD0 + ldr r0, _080A5BE4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A5BE2 @@ -841,7 +841,7 @@ sub_080A5BB8: @ 0x080A5BB8 _080A5BE2: pop {pc} .align 2, 0 -_080A5BE4: .4byte gUnk_03000FD0 +_080A5BE4: .4byte gFadeControl _080A5BE8: .4byte gUnk_03001000 _080A5BEC: .4byte gUnk_02034490 @@ -2057,7 +2057,7 @@ _080A65A8: .4byte gMenu thumb_func_start sub_080A65AC sub_080A65AC: @ 0x080A65AC push {r4, lr} - ldr r0, _080A65E4 @ =gUnk_03000FD0 + ldr r0, _080A65E4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A6600 @@ -2084,7 +2084,7 @@ _080A65DA: strh r0, [r4, #8] b _080A6600 .align 2, 0 -_080A65E4: .4byte gUnk_03000FD0 +_080A65E4: .4byte gFadeControl _080A65E8: .4byte gMenu _080A65EC: ldr r0, _080A6604 @ =gUnk_03000FF0 @@ -2866,7 +2866,7 @@ _080A6C18: .4byte gUnk_08128E94 thumb_func_start sub_080A6C1C sub_080A6C1C: @ 0x080A6C1C push {lr} - ldr r0, _080A6C34 @ =gUnk_03000FD0 + ldr r0, _080A6C34 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A6C6A @@ -2878,7 +2878,7 @@ sub_080A6C1C: @ 0x080A6C1C beq _080A6C5C b _080A6C62 .align 2, 0 -_080A6C34: .4byte gUnk_03000FD0 +_080A6C34: .4byte gFadeControl _080A6C38: .4byte gMenu _080A6C3C: bl sub_080A66D0 @@ -2955,7 +2955,7 @@ _080A6CD4: .4byte gMenu thumb_func_start sub_080A6CD8 sub_080A6CD8: @ 0x080A6CD8 push {r4, lr} - ldr r0, _080A6D08 @ =gUnk_03000FD0 + ldr r0, _080A6D08 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A6D6E @@ -2978,7 +2978,7 @@ sub_080A6CD8: @ 0x080A6CD8 beq _080A6D38 b _080A6D54 .align 2, 0 -_080A6D08: .4byte gUnk_03000FD0 +_080A6D08: .4byte gFadeControl _080A6D0C: .4byte gMenu _080A6D10: .4byte gUnk_03000FF0 _080A6D14: @@ -3149,7 +3149,7 @@ _080A6E40: .4byte gUnk_02034490 thumb_func_start sub_080A6E44 sub_080A6E44: @ 0x080A6E44 push {lr} - ldr r0, _080A6E64 @ =gUnk_03000FD0 + ldr r0, _080A6E64 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A6E60 @@ -3164,7 +3164,7 @@ sub_080A6E44: @ 0x080A6E44 _080A6E60: pop {pc} .align 2, 0 -_080A6E64: .4byte gUnk_03000FD0 +_080A6E64: .4byte gFadeControl _080A6E68: .4byte gMenu _080A6E6C: .4byte gUnk_08128024 @@ -3672,7 +3672,7 @@ _080A724C: .4byte gUnk_0812901C thumb_func_start sub_080A7250 sub_080A7250: @ 0x080A7250 push {r4, lr} - ldr r0, _080A72E8 @ =gUnk_03000FD0 + ldr r0, _080A72E8 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A72E4 @@ -3740,7 +3740,7 @@ sub_080A7250: @ 0x080A7250 _080A72E4: pop {r4, pc} .align 2, 0 -_080A72E8: .4byte gUnk_03000FD0 +_080A72E8: .4byte gFadeControl _080A72EC: .4byte gScreen _080A72F0: .4byte gUnk_03001020 _080A72F4: .4byte gPaletteBuffer @@ -3760,7 +3760,7 @@ _080A7324: .4byte gUnk_0200B650 thumb_func_start sub_080A7328 sub_080A7328: @ 0x080A7328 push {r4, lr} - ldr r0, _080A7388 @ =gUnk_03000FD0 + ldr r0, _080A7388 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A7384 @@ -3799,7 +3799,7 @@ sub_080A7328: @ 0x080A7328 _080A7384: pop {r4, pc} .align 2, 0 -_080A7388: .4byte gUnk_03000FD0 +_080A7388: .4byte gFadeControl _080A738C: .4byte gMenu _080A7390: .4byte gRoomControls _080A7394: .4byte gUnk_03000420 @@ -3811,7 +3811,7 @@ _080A73A4: .4byte gScreenTransition thumb_func_start sub_080A73A8 sub_080A73A8: @ 0x080A73A8 push {r4, r5, lr} - ldr r0, _080A7468 @ =gUnk_03000FD0 + ldr r0, _080A7468 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 beq _080A73B4 @@ -3893,7 +3893,7 @@ _080A73B4: bl DoFade b _080A74AE .align 2, 0 -_080A7468: .4byte gUnk_03000FD0 +_080A7468: .4byte gFadeControl _080A746C: .4byte gUnk_02017654 _080A7470: .4byte gUnk_02032EC0 _080A7474: .4byte gPlayerState @@ -3930,7 +3930,7 @@ _080A74C4: .4byte gScreenTransition sub_080A74C8: @ 0x080A74C8 push {lr} bl sub_080A74F4 - ldr r0, _080A74E8 @ =gUnk_03000FD0 + ldr r0, _080A74E8 @ =gFadeControl ldrb r3, [r0] cmp r3, #0 bne _080A74E6 @@ -3944,7 +3944,7 @@ sub_080A74C8: @ 0x080A74C8 _080A74E6: pop {pc} .align 2, 0 -_080A74E8: .4byte gUnk_03000FD0 +_080A74E8: .4byte gFadeControl _080A74EC: .4byte gUnk_03001000 _080A74F0: .4byte gUnk_02032EC0 diff --git a/asm/enemy64.s b/asm/enemy64.s index 83499cc1..2c5b8bfd 100644 --- a/asm/enemy64.s +++ b/asm/enemy64.s @@ -1022,7 +1022,7 @@ sub_08049804: @ 0x08049804 push {r4, lr} adds r4, r0, #0 bl sub_08049944 - ldr r0, _0804987C @ =gUnk_03000FD0 + ldr r0, _0804987C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08049878 @@ -1077,7 +1077,7 @@ sub_08049804: @ 0x08049804 _08049878: pop {r4, pc} .align 2, 0 -_0804987C: .4byte gUnk_03000FD0 +_0804987C: .4byte gFadeControl _08049880: .4byte gPlayerEntity _08049884: .4byte gRoomControls @@ -1085,7 +1085,7 @@ _08049884: .4byte gRoomControls sub_08049888: @ 0x08049888 push {lr} adds r1, r0, #0 - ldr r0, _080498B0 @ =gUnk_03000FD0 + ldr r0, _080498B0 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080498AE @@ -1102,7 +1102,7 @@ sub_08049888: @ 0x08049888 _080498AE: pop {pc} .align 2, 0 -_080498B0: .4byte gUnk_03000FD0 +_080498B0: .4byte gFadeControl thumb_func_start sub_080498B4 sub_080498B4: @ 0x080498B4 diff --git a/asm/fourElements.s b/asm/fourElements.s index aee5a5f2..2c64461e 100644 --- a/asm/fourElements.s +++ b/asm/fourElements.s @@ -240,7 +240,7 @@ sub_080A0390: @ 0x080A0390 movs r0, #0 movs r1, #0x3c bl sub_0805E4E0 - ldr r0, _080A03B4 @ =gUnk_03000FD0 + ldr r0, _080A03B4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _080A03B2 @@ -254,7 +254,7 @@ sub_080A0390: @ 0x080A0390 _080A03B2: pop {r4, pc} .align 2, 0 -_080A03B4: .4byte gUnk_03000FD0 +_080A03B4: .4byte gFadeControl thumb_func_start sub_080A03B8 sub_080A03B8: @ 0x080A03B8 diff --git a/asm/gleerok.s b/asm/gleerok.s index d9ff5716..82a2098a 100644 --- a/asm/gleerok.s +++ b/asm/gleerok.s @@ -178,7 +178,7 @@ _0802D16C: .4byte gUnk_02034490 sub_0802D170: @ 0x0802D170 push {r4, r5, r6, lr} adds r5, r0, #0 - ldr r0, _0802D1F0 @ =gUnk_03000FD0 + ldr r0, _0802D1F0 @ =gFadeControl ldrb r3, [r0] cmp r3, #0 bne _0802D216 @@ -237,7 +237,7 @@ sub_0802D170: @ 0x0802D170 bl DoFade b _0802D216 .align 2, 0 -_0802D1F0: .4byte gUnk_03000FD0 +_0802D1F0: .4byte gFadeControl _0802D1F4: .4byte gPlayerEntity _0802D1F8: .4byte gRoomControls _0802D1FC: diff --git a/asm/manager37.s b/asm/manager37.s index 24af0735..106e9932 100644 --- a/asm/manager37.s +++ b/asm/manager37.s @@ -218,7 +218,7 @@ _0805DFCA: thumb_func_start sub_0805DFCC sub_0805DFCC: @ 0x0805DFCC push {lr} - ldr r0, _0805DFE4 @ =gUnk_03000FD0 + ldr r0, _0805DFE4 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _0805DFE0 @@ -228,7 +228,7 @@ sub_0805DFCC: @ 0x0805DFCC _0805DFE0: pop {pc} .align 2, 0 -_0805DFE4: .4byte gUnk_03000FD0 +_0805DFE4: .4byte gFadeControl thumb_func_start sub_0805DFE8 sub_0805DFE8: @ 0x0805DFE8 @@ -302,7 +302,7 @@ _0805E074: .4byte 0x80010000 sub_0805E078: @ 0x0805E078 push {lr} adds r1, r0, #0 - ldr r0, _0805E090 @ =gUnk_03000FD0 + ldr r0, _0805E090 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _0805E08E @@ -313,7 +313,7 @@ sub_0805E078: @ 0x0805E078 _0805E08E: pop {pc} .align 2, 0 -_0805E090: .4byte gUnk_03000FD0 +_0805E090: .4byte gFadeControl thumb_func_start sub_0805E094 sub_0805E094: @ 0x0805E094 diff --git a/asm/manager39.s b/asm/manager39.s index b41cee8c..f5c9a542 100644 --- a/asm/manager39.s +++ b/asm/manager39.s @@ -80,7 +80,7 @@ _0805E188: .4byte gArea sub_0805E18C: @ 0x0805E18C push {r4, lr} adds r4, r0, #0 - ldr r0, _0805E1D0 @ =gUnk_03000FD0 + ldr r0, _0805E1D0 @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _0805E1CC @@ -112,7 +112,7 @@ _0805E1BA: _0805E1CC: pop {r4, pc} .align 2, 0 -_0805E1D0: .4byte gUnk_03000FD0 +_0805E1D0: .4byte gFadeControl _0805E1D4: .4byte gPlayerState thumb_func_start sub_0805E1D8 diff --git a/asm/vaatiWrath.s b/asm/vaatiWrath.s index a02a4eb0..0c7960ff 100644 --- a/asm/vaatiWrath.s +++ b/asm/vaatiWrath.s @@ -1399,7 +1399,7 @@ sub_08041E20: @ 0x08041E20 ldr r0, [r4, #0x64] ldr r0, [r0, #8] bl GetNextFrame - ldr r0, _08041E4C @ =gUnk_03000FD0 + ldr r0, _08041E4C @ =gFadeControl ldrb r0, [r0] cmp r0, #0 bne _08041E48 @@ -1410,7 +1410,7 @@ sub_08041E20: @ 0x08041E20 _08041E48: pop {r4, pc} .align 2, 0 -_08041E4C: .4byte gUnk_03000FD0 +_08041E4C: .4byte gFadeControl thumb_func_start sub_08041E50 sub_08041E50: @ 0x08041E50 diff --git a/include/structures.h b/include/structures.h index e44f6f76..8b485074 100644 --- a/include/structures.h +++ b/include/structures.h @@ -107,4 +107,23 @@ typedef struct { extern struct_02019EE0 gUnk_02019EE0; +typedef struct { + u8 active; + 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 gFadeControl; + #endif \ No newline at end of file diff --git a/linker.ld b/linker.ld index e995eee5..e05becff 100644 --- a/linker.ld +++ b/linker.ld @@ -169,7 +169,7 @@ SECTIONS { . = 0x00000F70; gBGAffSettings = .; . = 0x00000F88; gBgControls = .; . = 0x00000FBC; gUnk_03000FBC = .; - . = 0x00000FD0; gUnk_03000FD0 = .; + . = 0x00000FD0; gFadeControl = .; . = 0x00000FF0; gUnk_03000FF0 = .; . = 0x00001000; gUnk_03001000 = .; . = 0x00001010; gUnk_03001010 = .; diff --git a/src/code_0804AA84.c b/src/code_0804AA84.c index f861d4f0..6cdfb99e 100644 --- a/src/code_0804AA84.c +++ b/src/code_0804AA84.c @@ -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; } } diff --git a/src/introSetTransition.c b/src/introSetTransition.c index 7ed39ce4..1e33651b 100644 --- a/src/introSetTransition.c +++ b/src/introSetTransition.c @@ -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; } diff --git a/src/room.c b/src/room.c index a8127253..ea0b8d51 100644 --- a/src/room.c +++ b/src/room.c @@ -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); diff --git a/src/sub_08050008.c b/src/sub_08050008.c index 8e370727..263baef1 100644 --- a/src/sub_08050008.c +++ b/src/sub_08050008.c @@ -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; diff --git a/src/sub_08050024.c b/src/sub_08050024.c index 70cd1019..2911de17 100644 --- a/src/sub_08050024.c +++ b/src/sub_08050024.c @@ -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); } \ No newline at end of file