falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

managerC: matched sub_08058D34

This commit is contained in:
Ibot02 2021-09-29 10:38:33 +02:00
parent f1447af6f8
commit 8be102db29
2 changed files with 4 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
asm/non_matching/managerC/sub_08058D34.inc
View File

@ -1,65 +0,0 @@
push {r4, lr}
mov r0, #0x28
bl LoadPaletteGroup
ldr r0, _08058DAC @ =gUnk_02017700
mov r2, #0x90
lsl r2, r2, #0x2
add r1, r0, r2
mov r2, #0x20
bl MemCopy
ldr r2, _08058DB0 @ =gUsedPalettes
ldr r0, [r2]
mov r1, #0x80
lsl r1, r1, #0xe
orr r0, r0, r1
str r0, [r2]
mov r0, #0x16
bl LoadGfxGroup
ldr r1, _08058DB4 @ =gScreen
ldrh r0, [r1]
mov r3, #0
mov r2, #0x1
mov r4, #0
orr r0, r0, r2
strh r0, [r1]
ldr r0, _08058DB8 @ =0x0000BC82
strh r0, [r1, #0x20]
ldr r0, _08058DBC @ =0x00005E86
strh r0, [r1, #0x14]
strh r3, [r1, #0x16]
strh r3, [r1, #0x18]
add r2, r1, #0
add r2, r2, #0x66
ldr r0, _08058DC0 @ =0x00003456
strh r0, [r2]
add r1, r1, #0x68
ldr r0, _08058DC4 @ =0x00000909
strh r0, [r1]
ldr r0, _08058DC8 @ =gArea
mov r2, #0x86
lsl r2, r2, #0x4
add r1, r0, r2
add r2, r2, #0x4
add r0, r0, r2
ldr r0, [r0]
str r0, [r1]
ldr r0, _08058DCC @ =gUnk_02000070
strb r4, [r0]
mov r0, #0x17
bl CheckGlobalFlag
cmp r0, #0
beq _08058DA8
mov r0, #0x4a
bl LoadGfxGroup
_08058DA8:
pop {r4, pc}
.align 2,0
_08058DAC: .4byte gUnk_02017700
_08058DB0: .4byte gUsedPalettes
_08058DB4: .4byte gScreen
_08058DB8: .4byte 0x0000BC82
_08058DBC: .4byte 0x00005E86
_08058DC0: .4byte 0x00003456
_08058DC4: .4byte 0x00000909
_08058DC8: .4byte gArea
_08058DCC: .4byte gUnk_02000070

10
src/manager/managerC.c
View File

@ -277,27 +277,25 @@ void sub_08058CFC() {
}
}
NONMATCH("asm/non_matching/managerC/sub_08058D34.inc", void sub_08058D34()) {
void sub_08058D34() {
u16 tmp;
u32 tmp2;
LoadPaletteGroup(0x28);
MemCopy(gUnk_02017700, gUnk_02017700 + 0x240, 0x20);
gUsedPalettes |= 0x200000;
LoadGfxGroup(0x16);
tmp = gScreen.lcd.displayControl;
tmp2 = 0;
gScreen.lcd.displayControl |= 1;
gScreen.affine.bg2Control = 0xBC82;
gScreen.bg.bg1Control = 0x5E86;
gScreen.bg.bg1xOffset = 0;
gScreen.bg.bg1yOffset = 0;
gScreen.bg.bg1Tilemap = 0;
gScreen.bg.bg1yOffset = tmp2;
gScreen.controls.layerFXControl = 0x3456;
gScreen.controls.alphaBlend = 0x909;
gArea.musicIndex = gArea.pMusicIndex;
gUnk_02000070 = 0;
if (CheckGlobalFlag(LV1TARU_OPEN)) {
LoadGfxGroup(0x4A);
}
}
END_NONMATCH