manager10.c: ok

This commit is contained in:
Ibot02
2021-09-30 12:22:00 +02:00
parent 820b3a6829
commit 2709802f33
14 changed files with 215 additions and 555 deletions
@@ -1,56 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
adds r4, r0, #0
ldrb r5, [r4, #0xc]
cmp r5, #0
bne _080595C8
movs r6, #1
strb r6, [r4, #0xc]
adds r0, #0x21
strb r5, [r0]
adds r0, #2
strb r5, [r0]
bl sub_0805986C
cmp r0, #0
beq _080595A8
adds r0, r4, #0
adds r0, #0x20
strb r6, [r0]
adds r1, r4, #0
adds r1, #0x22
movs r0, #2
strb r0, [r1]
ldr r0, _080595A4 @ =gUnk_0200B650
str r5, [r0]
b _080595B8
.align 2, 0
_080595A4: .4byte gUnk_0200B650
_080595A8:
adds r0, r4, #0
adds r0, #0x20
movs r1, #0x1f
strb r1, [r0]
adds r1, r4, #0
adds r1, #0x22
movs r0, #5
strb r0, [r1]
_080595B8:
ldr r0, _080595DC @ =gRoomVars
movs r1, #0xff
strb r1, [r0, #0x10]
ldr r1, _080595E0 @ =sub_080595E4
adds r0, r4, #0
movs r2, #0
bl sub_08052D74
_080595C8:
adds r0, r4, #0
bl sub_08059608
adds r0, r4, #0
bl sub_08059690
adds r0, r4, #0
bl sub_080596E0
pop {r4, r5, r6, pc}
.align 2, 0
_080595DC: .4byte gRoomVars
_080595E0: .4byte sub_080595E4
.syntax divided
@@ -1,16 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
ldr r1, _08059604 @ =gRoomVars
movs r0, #0xff
strb r0, [r1, #0x10]
adds r0, r4, #0
bl sub_08059690
adds r0, r4, #0
bl sub_080596E0
movs r0, #0
bl sub_0805B4D0
pop {r4, pc}
.align 2, 0
_08059604: .4byte gRoomVars
.syntax divided
@@ -1,65 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
adds r4, #0x23
ldrb r0, [r4]
cmp r0, #0
beq _08059638
subs r0, #1
strb r0, [r4]
lsls r0, r0, #0x18
cmp r0, #0
bne _08059682
ldr r0, _08059634 @ =gArea
movs r2, #0x86
lsls r2, r2, #4
adds r1, r0, r2
adds r2, #4
adds r0, r0, r2
ldr r0, [r0]
str r0, [r1]
bl SoundReq
b _08059682
.align 2, 0
_08059634: .4byte gArea
_08059638:
bl sub_0805986C
cmp r0, #0
beq _08059668
ldr r0, _0805965C @ =gArea
ldr r2, _08059660 @ =0x00000864
adds r1, r0, r2
ldr r0, [r1]
cmp r0, #0x1e
beq _08059682
movs r0, #0x1e
str r0, [r1]
movs r0, #0x78
strb r0, [r4]
ldr r0, _08059664 @ =0x800D0000
bl SoundReq
b _08059682
.align 2, 0
_0805965C: .4byte gArea
_08059660: .4byte 0x00000864
_08059664: .4byte 0x800D0000
_08059668:
ldr r0, _08059684 @ =gArea
ldr r2, _08059688 @ =0x00000864
adds r1, r0, r2
ldr r0, [r1]
cmp r0, #0x37
beq _08059682
movs r0, #0x37
str r0, [r1]
movs r0, #0x78
strb r0, [r4]
ldr r0, _0805968C @ =0x800D0000
bl SoundReq
_08059682:
pop {r4, pc}
.align 2, 0
_08059684: .4byte gArea
_08059688: .4byte 0x00000864
_0805968C: .4byte 0x800D0000
.syntax divided
@@ -1,41 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
bl sub_08059844
cmp r0, #0
beq _080596BC
adds r4, #0x20
ldrb r0, [r4]
cmp r0, #0
beq _080596D8
ldr r0, _080596B8 @ =gUnk_085A7320
movs r2, #0xd0
lsls r2, r2, #1
adds r1, r0, r2
ldrb r2, [r4]
bl sub_08059894
ldrb r0, [r4]
subs r0, #1
b _080596D6
.align 2, 0
_080596B8: .4byte gUnk_085A7320
_080596BC:
adds r4, #0x20
ldrb r0, [r4]
cmp r0, #0x1f
bhi _080596D8
ldr r0, _080596DC @ =gUnk_085A7320
movs r2, #0xd0
lsls r2, r2, #1
adds r1, r0, r2
ldrb r2, [r4]
bl sub_08059894
ldrb r0, [r4]
adds r0, #1
_080596D6:
strb r0, [r4]
_080596D8:
pop {r4, pc}
.align 2, 0
_080596DC: .4byte gUnk_085A7320
.syntax divided
-175
View File
@@ -1,175 +0,0 @@
.syntax unified
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r0, _08059730 @ =gScreenTransition
ldr r0, [r0]
movs r1, #7
ands r0, r1
cmp r0, #0
bne _080596FC
ldr r0, _08059734 @ =gScreen
ldrh r1, [r0, #0x16]
adds r1, #8
movs r2, #0x1f
ands r1, r2
strh r1, [r0, #0x16]
_080596FC:
bl sub_0805986C
cmp r0, #0
beq _08059740
adds r0, r4, #0
adds r0, #0x21
ldrb r1, [r0]
adds r5, r0, #0
adds r2, r4, #0
adds r2, #0x22
cmp r1, #0
bne _08059764
ldrb r0, [r2]
cmp r0, #2
beq _08059764
movs r0, #1
strb r0, [r5]
movs r0, #3
strb r0, [r2]
ldr r0, _08059738 @ =gUnk_08108390
ldrb r0, [r0, #3]
strb r0, [r4, #0xe]
ldr r0, _0805973C @ =gUnk_0200B650
str r1, [r0]
b _08059764
.align 2, 0
_08059730: .4byte gScreenTransition
_08059734: .4byte gScreen
_08059738: .4byte gUnk_08108390
_0805973C: .4byte gUnk_0200B650
_08059740:
adds r0, r4, #0
adds r0, #0x21
ldrb r1, [r0]
adds r5, r0, #0
adds r2, r4, #0
adds r2, #0x22
cmp r1, #0
bne _08059764
ldrb r0, [r2]
cmp r0, #5
beq _08059764
movs r0, #2
strb r0, [r5]
ldr r1, _08059774 @ =gUnk_08108390
ldrb r0, [r2]
adds r0, r0, r1
ldrb r0, [r0]
strb r0, [r4, #0xe]
_08059764:
adds r6, r5, #0
ldrb r0, [r6]
cmp r0, #1
beq _08059778
cmp r0, #2
beq _080597A8
b _080597D0
.align 2, 0
_08059774: .4byte gUnk_08108390
_08059778:
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
movs r3, #0xff
lsls r0, r0, #0x18
lsrs r5, r0, #0x18
cmp r5, #0
bne _080597D0
ldr r1, _080597A4 @ =gUnk_08108390
ldrb r0, [r2]
subs r0, #1
strb r0, [r2]
ands r0, r3
adds r0, r0, r1
ldrb r0, [r0]
strb r0, [r4, #0xe]
ldrb r0, [r2]
cmp r0, #2
bne _080597D0
strb r5, [r6]
b _080597D0
.align 2, 0
_080597A4: .4byte gUnk_08108390
_080597A8:
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
movs r3, #0xff
lsls r0, r0, #0x18
lsrs r6, r0, #0x18
cmp r6, #0
bne _080597D0
ldr r1, _080597EC @ =gUnk_08108390
ldrb r0, [r2]
adds r0, #1
strb r0, [r2]
ands r0, r3
adds r0, r0, r1
ldrb r0, [r0]
strb r0, [r4, #0xe]
ldrb r0, [r2]
cmp r0, #5
bne _080597D0
strb r6, [r5]
_080597D0:
ldr r3, _080597F0 @ =gRoomVars
ldrb r1, [r2]
ldrb r0, [r3, #0x10]
cmp r0, r1
beq _08059838
strb r1, [r3, #0x10]
ldrb r0, [r2]
cmp r0, #4
beq _08059800
cmp r0, #4
ble _080597F4
cmp r0, #5
beq _08059824
b _08059838
.align 2, 0
_080597EC: .4byte gUnk_08108390
_080597F0: .4byte gRoomVars
_080597F4:
cmp r0, #0
blt _08059838
adds r0, #0x2b
bl LoadGfxGroup
b _08059838
_08059800:
ldr r4, _0805981C @ =gBG3Buffer
movs r5, #0x80
lsls r5, r5, #4
adds r0, r4, #0
adds r1, r5, #0
bl MemClear
ldr r1, _08059820 @ =0x0600E800
adds r0, r4, #0
adds r2, r5, #0
bl LoadResourceAsync
b _08059838
.align 2, 0
_0805981C: .4byte gBG3Buffer
_08059820: .4byte 0x0600E800
_08059824:
ldr r0, _0805983C @ =gUnk_0200B650
ldr r1, _08059840 @ =gBG1Settings
str r1, [r0]
subs r1, #0x14
ldrh r2, [r1]
movs r3, #0x80
lsls r3, r3, #2
adds r0, r3, #0
orrs r0, r2
strh r0, [r1]
_08059838:
pop {r4, r5, r6, pc}
.align 2, 0
_0805983C: .4byte gUnk_0200B650
_08059840: .4byte gBG1Settings
.syntax divided
@@ -1,21 +0,0 @@
.syntax unified
push {lr}
movs r3, #0
ldr r0, _08059864 @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r0, r2]
ldr r2, _08059868 @ =gRoomControls
ldrh r0, [r2, #6]
subs r1, r1, r0
ldrh r0, [r2, #0x1e]
lsrs r0, r0, #1
cmp r1, r0
ble _0805985E
movs r3, #1
_0805985E:
adds r0, r3, #0
pop {pc}
.align 2, 0
_08059864: .4byte gPlayerEntity
_08059868: .4byte gRoomControls
.syntax divided
@@ -1,21 +0,0 @@
.syntax unified
push {lr}
movs r2, #0
ldr r0, _0805988C @ =gPlayerEntity
movs r3, #0x2e
ldrsh r1, [r0, r3]
ldr r0, _08059890 @ =gRoomControls
ldrh r0, [r0, #6]
subs r1, r1, r0
movs r0, #0x80
lsls r0, r0, #2
cmp r1, r0
ble _08059886
movs r2, #1
_08059886:
adds r0, r2, #0
pop {pc}
.align 2, 0
_0805988C: .4byte gPlayerEntity
_08059890: .4byte gRoomControls
.syntax divided
@@ -1,47 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, sb
mov r6, r8
push {r6, r7}
adds r5, r0, #0
adds r4, r1, #0
ldr r0, _080598E8 @ =gUnk_020176E0
mov sb, r0
movs r6, #0
lsls r2, r2, #0x18
mov r8, r2
_080598AA:
adds r0, r5, #0
adds r1, r4, #0
mov r2, sb
mov r7, r8
lsrs r3, r7, #0x18
bl sub_08059960
adds r5, #0x20
adds r4, #0x20
movs r0, #0x20
add sb, r0
adds r6, #1
cmp r6, #0xc
bls _080598AA
ldr r0, _080598EC @ =gUnk_02017700
movs r2, #0x90
lsls r2, r2, #2
adds r1, r0, r2
movs r2, #0x20
bl MemCopy
ldr r2, _080598F0 @ =gUsedPalettes
ldr r0, [r2]
ldr r1, _080598F4 @ =0x00207FFC
orrs r0, r1
str r0, [r2]
pop {r3, r4}
mov r8, r3
mov sb, r4
pop {r4, r5, r6, r7, pc}
.align 2, 0
_080598E8: .4byte gUnk_020176E0
_080598EC: .4byte gUnk_02017700
_080598F0: .4byte gUsedPalettes
_080598F4: .4byte 0x00207FFC
.syntax divided
@@ -1,54 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
movs r4, #0x1f
adds r3, r0, #0
ands r3, r4
lsls r6, r3, #8
adds r3, r6, #0
muls r3, r2, r3
lsrs r6, r3, #5
adds r3, r1, #0
ands r3, r4
lsls r3, r3, #8
movs r4, #0x20
subs r4, r4, r2
muls r3, r4, r3
lsrs r3, r3, #5
adds r3, r6, r3
lsrs r6, r3, #8
movs r5, #0xf8
lsls r5, r5, #2
adds r3, r0, #0
ands r3, r5
lsls r7, r3, #3
adds r3, r7, #0
muls r3, r2, r3
lsrs r7, r3, #5
adds r3, r1, #0
ands r3, r5
lsls r3, r3, #3
muls r3, r4, r3
lsrs r3, r3, #5
adds r3, r7, r3
lsrs r7, r3, #8
movs r3, #0xf8
lsls r3, r3, #7
ands r0, r3
lsrs r5, r0, #2
adds r0, r5, #0
muls r0, r2, r0
lsrs r5, r0, #5
ands r1, r3
lsrs r0, r1, #2
muls r0, r4, r0
lsrs r0, r0, #5
adds r0, r5, r0
lsrs r5, r0, #8
lsls r0, r7, #5
orrs r6, r0
lsls r0, r5, #0xa
orrs r6, r0
adds r0, r6, #0
pop {r4, r5, r6, r7, pc}
.align 2, 0
.syntax divided
@@ -1,28 +0,0 @@
.syntax unified
push {r4, r5, r6, r7, lr}
mov r7, r8
push {r7}
adds r6, r0, #0
adds r5, r1, #0
adds r4, r2, #0
lsls r3, r3, #0x18
lsrs r3, r3, #0x18
mov r8, r3
movs r7, #0
_08059974:
ldrh r0, [r6]
adds r6, #2
ldrh r1, [r5]
adds r5, #2
mov r2, r8
bl sub_080598F8
strh r0, [r4]
adds r4, #2
adds r7, #1
cmp r7, #0xf
bls _08059974
pop {r3}
mov r8, r3
pop {r4, r5, r6, r7, pc}
.align 2, 0
.syntax divided
@@ -1,18 +0,0 @@
.syntax unified
push {lr}
bl sub_0805986C
cmp r0, #0
beq _080599AE
movs r0, #0x5b
bl LoadPaletteGroup
ldr r0, _080599B0 @ =gArea
ldr r1, _080599B4 @ =0x00000864
adds r0, r0, r1
movs r1, #0x1e
str r1, [r0]
_080599AE:
pop {pc}
.align 2, 0
_080599B0: .4byte gArea
_080599B4: .4byte 0x00000864
.syntax divided
+10 -1
View File
@@ -112,6 +112,15 @@ typedef struct {
u16 unk_3e;
} ManagerF;
typedef struct {
Manager manager;
u8 unk_20;
u8 unk_21;
u8 unk_22;
u8 unk_23;
u8 filler_0x24[0x1C];
} Manager10;
typedef struct Manager11 {
Manager manager;
u8 unk_20[0x1C];
@@ -164,7 +173,7 @@ extern void ManagerC_Main();
extern void ManagerD_Main();
extern void ManagerE_Main();
extern void sub_08058ECC(ManagerF*);
extern void Manager10_Main();
extern void Manager10_Main(Manager10*);
extern void Manager11_Main(Manager11*);
extern void Manager12_Main();
extern void Manager13_Main();
+1 -1
View File
@@ -1204,7 +1204,7 @@ SECTIONS {
src/manager/managerC.o(.rodata);
data/const/manager/managerD.o(.rodata);
src/manager/managerF.o(.rodata);
data/const/manager/manager10.o(.rodata);
src/manager/manager10.o(.rodata);
data/const/manager/manager12.o(.rodata);
data/const/manager/manager13.o(.rodata);
data/const/manager/manager14.o(.rodata);
+204 -11
View File
@@ -1,23 +1,216 @@
#include "global.h"
#include "manager.h"
#include "room.h"
#include "area.h"
#include "audio.h"
#include "screen.h"
#include "utils.h"
#include "fileScreen.h"
#include "functions.h"
ASM_FUNC("asm/non_matching/manager10/Manager10_Main.inc", void Manager10_Main())
void Manager10_Main(Manager10*);
void sub_080595E4(Manager10*);
void sub_08059608(Manager10*);
void sub_08059690(Manager10*);
void sub_080596E0(Manager10*);
u32 sub_08059844(void);
u32 sub_0805986C(void);
void sub_08059894(const u16*, const u16*, u32);
u32 sub_080598F8(u32, u32, u32);
void sub_08059960(const u16*, const u16*, u16*, u8);
void sub_08059994(void);
ASM_FUNC("asm/non_matching/manager10/sub_080595E4.inc", void sub_080595E4())
const u8 gUnk_08108390[6] = {
0x0F, 0x1E, 0x2D, 0x3C, 0x01, 0x01,
};
ASM_FUNC("asm/non_matching/manager10/sub_08059608.inc", void sub_08059608())
extern void* gUnk_0200B650;
extern u16 gUnk_020176E0[];
extern u8 gUnk_02017700[];
ASM_FUNC("asm/non_matching/manager10/sub_08059690.inc", void sub_08059690())
extern const u16 gUnk_085A7320[];
ASM_FUNC("asm/non_matching/manager10/sub_080596E0.inc", void sub_080596E0())
void Manager10_Main(Manager10* this) {
if (!this->manager.action) {
this->manager.action = 1;
this->unk_21 = 0;
this->unk_23 = 0;
if (sub_0805986C()) {
this->unk_20 = 1;
this->unk_22 = 2;
gUnk_0200B650 = 0;
} else {
this->unk_20 = 0x1F;
this->unk_22 = 5;
}
gRoomVars.unk_10[0] = 0xFF;
sub_08052D74(this, sub_080595E4, 0);
}
sub_08059608(this);
sub_08059690(this);
sub_080596E0(this);
}
ASM_FUNC("asm/non_matching/manager10/sub_08059844.inc", void sub_08059844())
void sub_080595E4(Manager10* this) {
gRoomVars.unk_10[0] = 0xFF;
sub_08059690(this);
sub_080596E0(this);
sub_0805B4D0(0);
}
ASM_FUNC("asm/non_matching/manager10/sub_0805986C.inc", void sub_0805986C())
void sub_08059608(Manager10* this) {
if (this->unk_23) {
if (!--this->unk_23) {
gArea.musicIndex = gArea.pMusicIndex;
SoundReq(gArea.musicIndex);
}
return;
}
if (sub_0805986C()) {
if (gArea.pMusicIndex != 0x1E) {
gArea.pMusicIndex = 0x1E;
this->unk_23 = 0x78;
SoundReq(0x800d0000);
}
return;
}
if (gArea.pMusicIndex != 0x37) {
gArea.pMusicIndex = 0x37;
this->unk_23 = 0x78;
SoundReq(0x800d0000);
}
}
ASM_FUNC("asm/non_matching/manager10/sub_08059894.inc", void sub_08059894())
void sub_08059690(Manager10* this) {
if (sub_08059844()) {
if (this->unk_20 == 0)
return;
sub_08059894(gUnk_085A7320, gUnk_085A7320 + 0xD0, this->unk_20);
this->unk_20--;
} else {
if (this->unk_20 > 0x1F)
return;
sub_08059894(gUnk_085A7320, gUnk_085A7320 + 0xD0, this->unk_20);
this->unk_20++;
}
}
ASM_FUNC("asm/non_matching/manager10/sub_080598F8.inc", void sub_080598F8())
void sub_080596E0(Manager10* this) {
if ((gScreenTransition.frameCount & 7) == 0) {
gScreen.bg.bg1xOffset += 8;
gScreen.bg.bg1xOffset &= 0x1F;
}
if (sub_0805986C()) {
if (this->unk_21 == 0 && this->unk_22 != 2) {
this->unk_21 = 1;
this->unk_22 = 3;
this->manager.unk_0e = gUnk_08108390[3];
gUnk_0200B650 = 0;
}
} else {
if (this->unk_21 == 0 && this->unk_22 != 5) {
this->unk_21 = 2;
this->manager.unk_0e = gUnk_08108390[this->unk_22];
}
}
switch (this->unk_21) {
case 1:
if (--this->manager.unk_0e == 0) {
this->manager.unk_0e = gUnk_08108390[--this->unk_22];
if (this->unk_22 == 2) {
this->unk_21 = 0;
}
}
break;
case 2:
if (--this->manager.unk_0e == 0) {
this->manager.unk_0e = gUnk_08108390[++this->unk_22];
if (this->unk_22 == 5) {
this->unk_21 = 0;
}
}
break;
}
if (gRoomVars.unk_10[0] != this->unk_22) {
gRoomVars.unk_10[0] = this->unk_22;
switch (this->unk_22) {
case 0 ... 3:
LoadGfxGroup(this->unk_22 + 0x2B);
break;
case 4:
MemClear(gBG3Buffer, 0x800);
LoadResourceAsync(gBG3Buffer, 0x600e800, 0x800);
break;
case 5:
gUnk_0200B650 = &gScreen.bg.bg1Control;
gScreen.lcd.displayControl |= 0x200;
break;
}
}
}
ASM_FUNC("asm/non_matching/manager10/sub_08059960.inc", void sub_08059960())
u32 sub_08059844() {
return gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX > gRoomControls.width >> 1;
}
ASM_FUNC("asm/non_matching/manager10/sub_08059994.inc", void sub_08059994())
u32 sub_0805986C() {
return gPlayerEntity.x.HALF.HI - gRoomControls.roomOriginX > 0x200;
}
void sub_08059894(const u16* unk1, const u16* unk2, u32 unk3) {
const u16* tmp1;
const u16* tmp2;
u16* tmp3;
u32 tmp4;
u32 i;
tmp1 = unk1;
tmp2 = unk2;
tmp3 = gUnk_020176E0;
for (i = 0; i < 13; i++) {
sub_08059960(tmp1, tmp2, tmp3, unk3);
tmp1 += 0x10;
tmp2 += 0x10;
tmp3 += 0x10;
}
MemCopy(gUnk_02017700, gUnk_02017700 + 0x240, 0x20);
gUsedPalettes |= 0x207ffc;
}
u32 sub_080598F8(u32 unk1, u32 unk2, u32 unk3) {
u32 tmp1, tmp2, tmp3;
u32 tmp4, tmp5, tmp6;
tmp1 = (unk1 & 0x1F) << 8;
tmp1 = (tmp1 * unk3) >> 5;
tmp4 = (unk2 & 0x1F) << 8;
tmp4 = (tmp4 * (0x20 - unk3)) >> 5;
tmp1 = (tmp1 + tmp4) >> 8;
tmp2 = (unk1 & 0x3E0) << 3;
tmp2 = (tmp2 * unk3) >> 5;
tmp5 = (unk2 & 0x3E0) << 3;
tmp5 = (tmp5 * (0x20 - unk3)) >> 5;
tmp2 = (tmp2 + tmp5) >> 8;
tmp3 = (unk1 & 0x7C00) >> 2;
tmp3 = (tmp3 * unk3) >> 5;
tmp6 = (unk2 & 0x7C00) >> 2;
tmp6 = (tmp6 * (0x20 - unk3)) >> 5;
tmp3 = (tmp3 + tmp6) >> 8;
return tmp1 | (tmp2 << 5) | (tmp3 << 10);
}
void sub_08059960(const u16* unk1, const u16* unk2, u16* unk3, u8 unk4) {
u32 i;
for (i = 0; i < 0x10; i++) {
*unk3++ = sub_080598F8(*unk1++, *unk2++, unk4);
}
}
void sub_08059994() {
if (sub_0805986C()) {
LoadPaletteGroup(0x5B);
gArea.pMusicIndex = 0x1E;
}
}