mirror of https://github.com/zeldaret/tmc.git
Merge pull request #68 from Ibot02:master
ManagerB.c and Manager3.c: ok
This commit is contained in:
notyouraveragehooman
GitHub
commit
dfcd7f3876
216
asm/manager3.s
216
asm/manager3.s
|
|
@ -1,216 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_080576C0
|
||||
sub_080576C0: @ 0x080576C0
|
||||
push {r4, r5, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xc]
|
||||
cmp r0, #0
|
||||
bne _080576EC
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
ldrh r0, [r4, #0x38]
|
||||
ldr r2, _080576E8 @ =gRoomControls
|
||||
ldrh r1, [r2, #6]
|
||||
adds r0, r0, r1
|
||||
subs r0, #0x20
|
||||
str r0, [r4, #0x20]
|
||||
ldrh r0, [r4, #0x3a]
|
||||
ldrh r1, [r2, #8]
|
||||
adds r0, r0, r1
|
||||
subs r0, #0x20
|
||||
str r0, [r4, #0x24]
|
||||
b _080577AA
|
||||
.align 2, 0
|
||||
_080576E8: .4byte gRoomControls
|
||||
_080576EC:
|
||||
ldr r0, [r4, #0x20]
|
||||
ldr r1, [r4, #0x24]
|
||||
movs r2, #0x40
|
||||
movs r3, #0x40
|
||||
bl sub_0806FBFC
|
||||
cmp r0, #0
|
||||
beq _080577A8
|
||||
ldr r5, _08057738 @ =gArea
|
||||
ldr r0, [r4, #0x20]
|
||||
adds r0, #0x20
|
||||
strh r0, [r5, #0x12]
|
||||
ldr r1, [r4, #0x24]
|
||||
ldr r2, _0805773C @ =gUnk_08107C6C
|
||||
ldrb r0, [r4, #0xa]
|
||||
adds r0, r0, r2
|
||||
ldrb r0, [r0]
|
||||
lsls r0, r0, #0x18
|
||||
asrs r0, r0, #0x18
|
||||
adds r0, #0x20
|
||||
adds r1, r1, r0
|
||||
strh r1, [r5, #0x14]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x34
|
||||
ldrb r0, [r0]
|
||||
strb r0, [r5, #0x16]
|
||||
ldrb r0, [r4, #0xa]
|
||||
strb r0, [r5, #0x17]
|
||||
movs r0, #0x14
|
||||
bl CheckGlobalFlag
|
||||
cmp r0, #0
|
||||
bne _08057740
|
||||
movs r0, #1
|
||||
strb r0, [r5, #0x18]
|
||||
movs r0, #5
|
||||
strb r0, [r5, #0x17]
|
||||
b _080577AA
|
||||
.align 2, 0
|
||||
_08057738: .4byte gArea
|
||||
_0805773C: .4byte gUnk_08107C6C
|
||||
_08057740:
|
||||
ldr r2, _08057758 @ =gPlayerState
|
||||
ldr r0, [r2, #0x30]
|
||||
movs r1, #0x20
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _0805775C
|
||||
ldrb r0, [r2, #2]
|
||||
cmp r0, #0
|
||||
bne _0805775C
|
||||
movs r0, #2
|
||||
strb r0, [r5, #0x18]
|
||||
b _0805776A
|
||||
.align 2, 0
|
||||
_08057758: .4byte gPlayerState
|
||||
_0805775C:
|
||||
bl sub_08057810
|
||||
cmp r0, #0
|
||||
beq _0805776A
|
||||
ldr r1, _080577A0 @ =gArea
|
||||
movs r0, #3
|
||||
strb r0, [r1, #0x18]
|
||||
_0805776A:
|
||||
ldrh r0, [r4, #0x38]
|
||||
ldrh r1, [r4, #0x3a]
|
||||
ldrb r2, [r4, #0xe]
|
||||
bl sub_080002C0
|
||||
cmp r0, #0x3d
|
||||
bne _080577AA
|
||||
ldrh r0, [r4, #0x38]
|
||||
ldr r2, _080577A4 @ =gRoomControls
|
||||
ldrh r1, [r2, #6]
|
||||
adds r0, r0, r1
|
||||
ldrh r1, [r4, #0x3a]
|
||||
ldrh r2, [r2, #8]
|
||||
adds r1, r1, r2
|
||||
ldrb r2, [r4, #0xe]
|
||||
bl sub_080577AC
|
||||
ldrb r0, [r4, #0xf]
|
||||
cmp r0, #0
|
||||
bne _080577AA
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xf]
|
||||
movs r0, #0xa9
|
||||
lsls r0, r0, #1
|
||||
bl PlaySFX
|
||||
b _080577AA
|
||||
.align 2, 0
|
||||
_080577A0: .4byte gArea
|
||||
_080577A4: .4byte gRoomControls
|
||||
_080577A8:
|
||||
strb r0, [r4, #0xf]
|
||||
_080577AA:
|
||||
pop {r4, r5, pc}
|
||||
|
||||
thumb_func_start sub_080577AC
|
||||
sub_080577AC: @ 0x080577AC
|
||||
push {r4, r5, r6, r7, lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
adds r6, r0, #0
|
||||
adds r7, r1, #0
|
||||
mov r8, r2
|
||||
bl Random
|
||||
adds r5, r0, #0
|
||||
movs r0, #7
|
||||
ands r0, r5
|
||||
cmp r0, #0
|
||||
bne _08057808
|
||||
movs r0, #0xf
|
||||
movs r1, #0x26
|
||||
movs r2, #0
|
||||
bl CreateObject
|
||||
adds r4, r0, #0
|
||||
cmp r4, #0
|
||||
beq _08057808
|
||||
lsrs r3, r5, #8
|
||||
movs r0, #0xf
|
||||
ands r3, r0
|
||||
lsrs r2, r5, #0x10
|
||||
ands r2, r0
|
||||
cmp r2, #4
|
||||
ble _080577E6
|
||||
rsbs r2, r2, #0
|
||||
_080577E6:
|
||||
lsrs r0, r5, #0x18
|
||||
movs r1, #1
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _080577F2
|
||||
rsbs r3, r3, #0
|
||||
_080577F2:
|
||||
adds r0, r6, r3
|
||||
strh r0, [r4, #0x2e]
|
||||
adds r0, r7, r2
|
||||
strh r0, [r4, #0x32]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x38
|
||||
mov r1, r8
|
||||
strb r1, [r0]
|
||||
adds r0, r4, #0
|
||||
bl UpdateSpriteForCollisionLayer
|
||||
_08057808:
|
||||
pop {r3}
|
||||
mov r8, r3
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_08057810
|
||||
sub_08057810: @ 0x08057810
|
||||
push {lr}
|
||||
ldr r2, _08057848 @ =gPlayerState
|
||||
ldr r0, [r2, #0x30]
|
||||
movs r1, #0x80
|
||||
ands r0, r1
|
||||
cmp r0, #0
|
||||
beq _08057850
|
||||
adds r0, r2, #0
|
||||
adds r0, #0xaa
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #0
|
||||
bne _08057850
|
||||
ldr r0, _0805784C @ =gArea
|
||||
ldrb r0, [r0, #0x17]
|
||||
cmp r0, #6
|
||||
beq _08057850
|
||||
ldrb r0, [r2, #5]
|
||||
cmp r0, #0
|
||||
bne _08057850
|
||||
adds r0, r2, #0
|
||||
adds r0, #0xa8
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #1
|
||||
bgt _08057850
|
||||
cmp r0, #0
|
||||
blt _08057850
|
||||
movs r0, #1
|
||||
b _08057852
|
||||
.align 2, 0
|
||||
_08057848: .4byte gPlayerState
|
||||
_0805784C: .4byte gArea
|
||||
_08057850:
|
||||
movs r0, #0
|
||||
_08057852:
|
||||
pop {pc}
|
||||
330
asm/managerB.s
330
asm/managerB.s
|
|
@ -1,330 +0,0 @@
|
|||
.include "asm/macros.inc"
|
||||
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.syntax unified
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_080585F0
|
||||
sub_080585F0: @ 0x080585F0
|
||||
push {lr}
|
||||
ldr r2, _08058604 @ =gUnk_08108208
|
||||
ldrb r1, [r0, #0xa]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_08058604: .4byte gUnk_08108208
|
||||
|
||||
thumb_func_start sub_08058608
|
||||
sub_08058608: @ 0x08058608
|
||||
push {lr}
|
||||
ldr r2, _0805861C @ =gUnk_08108210
|
||||
ldrb r1, [r0, #0xc]
|
||||
lsls r1, r1, #2
|
||||
adds r1, r1, r2
|
||||
ldr r1, [r1]
|
||||
bl _call_via_r1
|
||||
pop {pc}
|
||||
.align 2, 0
|
||||
_0805861C: .4byte gUnk_08108210
|
||||
|
||||
thumb_func_start sub_08058620
|
||||
sub_08058620: @ 0x08058620
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldrh r0, [r4, #0x3e]
|
||||
bl CheckFlags
|
||||
cmp r0, #0
|
||||
bne _08058648
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
ldrh r0, [r4, #0x3c]
|
||||
cmp r0, #0
|
||||
bne _0805863E
|
||||
adds r0, r4, #0
|
||||
bl sub_080586EC
|
||||
_0805863E:
|
||||
adds r0, r4, #0
|
||||
movs r1, #3
|
||||
bl sub_0805E3A0
|
||||
b _0805864C
|
||||
_08058648:
|
||||
bl DeleteThisEntity
|
||||
_0805864C:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_08058650
|
||||
sub_08058650: @ 0x08058650
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldrh r0, [r4, #0x3c]
|
||||
bl CheckFlags
|
||||
cmp r0, #0
|
||||
beq _08058698
|
||||
adds r0, r4, #0
|
||||
bl sub_080586EC
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x35
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #0
|
||||
bne _08058692
|
||||
ldr r1, _0805869C @ =gRoomVars
|
||||
ldrb r0, [r1, #9]
|
||||
movs r3, #0x33
|
||||
cmp r0, #0
|
||||
beq _0805867A
|
||||
adds r3, r0, #0
|
||||
_0805867A:
|
||||
ldr r0, _080586A0 @ =gArea
|
||||
movs r1, #0x86
|
||||
lsls r1, r1, #4
|
||||
adds r0, r0, r1
|
||||
ldr r2, [r0]
|
||||
adds r1, r4, #0
|
||||
adds r1, #0x20
|
||||
strb r2, [r1]
|
||||
str r3, [r0]
|
||||
adds r0, r3, #0
|
||||
bl PlaySFX
|
||||
_08058692:
|
||||
ldr r0, _080586A4 @ =0x00000B0F
|
||||
bl sub_080186C0
|
||||
_08058698:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_0805869C: .4byte gRoomVars
|
||||
_080586A0: .4byte gArea
|
||||
_080586A4: .4byte 0x00000B0F
|
||||
|
||||
thumb_func_start sub_080586A8
|
||||
sub_080586A8: @ 0x080586A8
|
||||
push {r4, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xe]
|
||||
cmp r0, #0
|
||||
bne _080586E4
|
||||
ldrh r0, [r4, #0x3e]
|
||||
bl SetFlag
|
||||
ldrh r0, [r4, #0x3c]
|
||||
cmp r0, #0
|
||||
beq _080586E0
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x35
|
||||
ldrb r0, [r0]
|
||||
cmp r0, #0
|
||||
bne _080586E0
|
||||
ldr r1, _080586E8 @ =gArea
|
||||
movs r0, #0x86
|
||||
lsls r0, r0, #4
|
||||
adds r1, r1, r0
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x20
|
||||
ldrb r0, [r0]
|
||||
str r0, [r1]
|
||||
bl PlaySFX
|
||||
bl sub_0801855C
|
||||
_080586E0:
|
||||
bl DeleteThisEntity
|
||||
_080586E4:
|
||||
pop {r4, pc}
|
||||
.align 2, 0
|
||||
_080586E8: .4byte gArea
|
||||
|
||||
thumb_func_start sub_080586EC
|
||||
sub_080586EC: @ 0x080586EC
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r7, r0, #0
|
||||
movs r1, #0
|
||||
movs r0, #2
|
||||
strb r0, [r7, #0xc]
|
||||
strb r1, [r7, #0xe]
|
||||
movs r6, #0
|
||||
adds r0, r7, #0
|
||||
bl sub_08058760
|
||||
adds r5, r0, #0
|
||||
cmp r5, #0
|
||||
bne _0805870A
|
||||
bl DeleteThisEntity
|
||||
_0805870A:
|
||||
ldrb r0, [r7, #0xb]
|
||||
bl GetCurrentRoomProperty
|
||||
adds r4, r0, #0
|
||||
cmp r4, #0
|
||||
beq _0805875C
|
||||
b _08058756
|
||||
_08058718:
|
||||
adds r0, r4, #0
|
||||
adds r4, #0x10
|
||||
bl LoadRoomEntity
|
||||
adds r3, r0, #0
|
||||
cmp r3, #0
|
||||
beq _08058744
|
||||
ldrb r0, [r3, #8]
|
||||
cmp r0, #3
|
||||
bne _08058744
|
||||
adds r2, r3, #0
|
||||
adds r2, #0x6d
|
||||
ldrb r0, [r2]
|
||||
movs r1, #0x40
|
||||
orrs r1, r0
|
||||
strb r1, [r2]
|
||||
adds r2, r6, #0
|
||||
adds r6, #1
|
||||
adds r0, r5, #0
|
||||
adds r1, r3, #0
|
||||
bl sub_08058798
|
||||
_08058744:
|
||||
cmp r6, #6
|
||||
bls _08058756
|
||||
movs r6, #0
|
||||
adds r0, r7, #0
|
||||
bl sub_08058760
|
||||
adds r5, r0, #0
|
||||
cmp r5, #0
|
||||
beq _0805875C
|
||||
_08058756:
|
||||
ldrb r0, [r4]
|
||||
cmp r0, #0xff
|
||||
bne _08058718
|
||||
_0805875C:
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_08058760
|
||||
sub_08058760: @ 0x08058760
|
||||
push {r4, r5, lr}
|
||||
adds r5, r0, #0
|
||||
bl GetEmptyManager
|
||||
adds r4, r0, #0
|
||||
cmp r4, #0
|
||||
beq _08058794
|
||||
movs r0, #9
|
||||
strb r0, [r4, #8]
|
||||
movs r0, #0xb
|
||||
strb r0, [r4, #9]
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xa]
|
||||
str r5, [r4, #0x14]
|
||||
ldrb r0, [r5, #0xe]
|
||||
adds r0, #1
|
||||
strb r0, [r5, #0xe]
|
||||
adds r0, r4, #0
|
||||
adds r0, #0x20
|
||||
movs r1, #0x20
|
||||
bl _DmaZero
|
||||
adds r0, r4, #0
|
||||
movs r1, #8
|
||||
bl AppendEntityToList
|
||||
_08058794:
|
||||
adds r0, r4, #0
|
||||
pop {r4, r5, pc}
|
||||
|
||||
thumb_func_start sub_08058798
|
||||
sub_08058798: @ 0x08058798
|
||||
lsls r2, r2, #2
|
||||
adds r3, r0, #0
|
||||
adds r3, #0x20
|
||||
adds r3, r3, r2
|
||||
str r1, [r3]
|
||||
ldrb r1, [r0, #0xe]
|
||||
adds r1, #1
|
||||
strb r1, [r0, #0xe]
|
||||
bx lr
|
||||
.align 2, 0
|
||||
|
||||
thumb_func_start sub_080587AC
|
||||
sub_080587AC: @ 0x080587AC
|
||||
push {r4, r5, lr}
|
||||
adds r4, r0, #0
|
||||
ldrb r0, [r4, #0xc]
|
||||
cmp r0, #0
|
||||
bne _080587C2
|
||||
movs r0, #1
|
||||
strb r0, [r4, #0xc]
|
||||
adds r0, r4, #0
|
||||
movs r1, #3
|
||||
bl sub_0805E3A0
|
||||
_080587C2:
|
||||
movs r3, #0
|
||||
movs r2, #0
|
||||
adds r5, r4, #0
|
||||
adds r5, #0x20
|
||||
_080587CA:
|
||||
lsls r0, r2, #2
|
||||
adds r1, r5, r0
|
||||
ldr r0, [r1]
|
||||
cmp r0, #0
|
||||
beq _080587E0
|
||||
ldr r0, [r0, #4]
|
||||
cmp r0, #0
|
||||
bne _080587DE
|
||||
str r0, [r1]
|
||||
b _080587E0
|
||||
_080587DE:
|
||||
movs r3, #1
|
||||
_080587E0:
|
||||
adds r0, r2, #1
|
||||
lsls r0, r0, #0x18
|
||||
lsrs r2, r0, #0x18
|
||||
cmp r2, #7
|
||||
bls _080587CA
|
||||
cmp r3, #0
|
||||
bne _080587FE
|
||||
ldr r1, [r4, #0x14]
|
||||
ldrb r0, [r1, #0xe]
|
||||
cmp r0, #0
|
||||
beq _080587FA
|
||||
subs r0, #1
|
||||
strb r0, [r1, #0xe]
|
||||
_080587FA:
|
||||
bl DeleteThisEntity
|
||||
_080587FE:
|
||||
pop {r4, r5, pc}
|
||||
|
||||
thumb_func_start sub_08058800
|
||||
sub_08058800: @ 0x08058800
|
||||
push {r4, r5, r6, r7, lr}
|
||||
adds r4, r0, #0
|
||||
adds r5, r1, #0
|
||||
ldr r6, _08058830 @ =gUnk_03003DB0
|
||||
ldr r3, [r6, #4]
|
||||
cmp r3, r6
|
||||
beq _0805884A
|
||||
ldr r0, _08058834 @ =0x0000FFFF
|
||||
mov ip, r0
|
||||
ldr r7, _08058838 @ =0x00000B09
|
||||
_08058814:
|
||||
ldrh r1, [r3, #8]
|
||||
mov r0, ip
|
||||
ands r0, r1
|
||||
cmp r0, r7
|
||||
bne _08058844
|
||||
movs r2, #0
|
||||
adds r1, r3, #0
|
||||
adds r1, #0x20
|
||||
_08058824:
|
||||
ldr r0, [r1]
|
||||
cmp r4, r0
|
||||
bne _0805883C
|
||||
str r5, [r1]
|
||||
b _0805884A
|
||||
.align 2, 0
|
||||
_08058830: .4byte gUnk_03003DB0
|
||||
_08058834: .4byte 0x0000FFFF
|
||||
_08058838: .4byte 0x00000B09
|
||||
_0805883C:
|
||||
adds r1, #4
|
||||
adds r2, #1
|
||||
cmp r2, #7
|
||||
bls _08058824
|
||||
_08058844:
|
||||
ldr r3, [r3, #4]
|
||||
cmp r3, r6
|
||||
bne _08058814
|
||||
_0805884A:
|
||||
pop {r4, r5, r6, r7, pc}
|
||||
|
|
@ -11,7 +11,12 @@ typedef struct {
|
|||
u16 localFlagOffset;
|
||||
u8 filler[10];
|
||||
u16 field_0x10;
|
||||
u8 filler3[7];
|
||||
u16 field_0x12;
|
||||
u16 field_0x14;
|
||||
u8 field_0x16;
|
||||
u8 field_0x17;
|
||||
u8 field_0x18;
|
||||
//u8 filler3[7];
|
||||
u8 fadeOut;
|
||||
u8 filler2[14];
|
||||
u8 filler4[0x835];
|
||||
|
|
@ -25,4 +30,4 @@ typedef struct {
|
|||
|
||||
extern Area gArea;
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
#include "global.h"
|
||||
#include "entity.h"
|
||||
#include "manager.h"
|
||||
#include "position.h"
|
||||
#include "player.h"
|
||||
#include "structures.h"
|
||||
|
|
@ -61,7 +62,7 @@ extern void sub_0805EC60();
|
|||
extern void sub_080873D0();
|
||||
extern u8 sub_080045D4(s16, s16, u16, u16);
|
||||
extern void sub_0806F69C(Entity*);
|
||||
extern void sub_0805E3A0(Entity*, u32);
|
||||
extern void sub_0805E3A0(void*, u32);
|
||||
extern void sub_0806D0B0(Entity*);
|
||||
extern void sub_0807DD64(Entity*);
|
||||
extern void sub_0807DDAC(Entity*, u32);
|
||||
|
|
@ -196,8 +197,8 @@ extern u32 sub_0807953C(void);
|
|||
extern void ResetPlayer(void);
|
||||
extern void sub_080A29BC(Entity*);
|
||||
extern void sub_080AE068(Entity*);
|
||||
extern Entity* GetEmptyManager(void);
|
||||
extern void AppendEntityToList(Entity*, u32);
|
||||
extern Manager* GetEmptyManager(void);
|
||||
extern void AppendEntityToList(void*, u32);
|
||||
extern u32 sub_0800445C(Entity*);
|
||||
extern void sub_0807A108(void);
|
||||
extern void sub_0801766C(Entity*);
|
||||
|
|
@ -217,7 +218,6 @@ extern void sub_0807D20C(u32, char*, u32);
|
|||
extern u32 sub_0807CF88(u32, u8*);
|
||||
extern u32 sub_0807D008(u32, void*);
|
||||
extern void sub_0807D184(u32, char*);
|
||||
extern void sub_0805E3A0(Entity*, u32);
|
||||
extern u32 sub_0806F520();
|
||||
extern void sub_0806F4E8();
|
||||
extern u32 sub_0806F3E4(Entity*);
|
||||
|
|
@ -255,4 +255,4 @@ extern u32 sub_080044EC(Entity*, u32);
|
|||
extern u32 sub_080002B8(Entity*);
|
||||
extern u32 sub_08049F84(Entity*, u32);
|
||||
extern void sub_0802F45C(Entity*);
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#define MANAGER_H
|
||||
|
||||
#include "global.h"
|
||||
#include "entity.h"
|
||||
|
||||
union SplitSHWord {
|
||||
s16 SHWORD;
|
||||
|
|
@ -10,33 +11,39 @@ union SplitSHWord {
|
|||
} PACKED HALF;
|
||||
} PACKED;
|
||||
|
||||
typedef struct {
|
||||
u8 unk_00[0x0a];
|
||||
u8 unk_0a;
|
||||
u8 unk_0b;
|
||||
u8 unk_0c;
|
||||
u8 unk_0d;
|
||||
u8 unk_0e;
|
||||
u8 unk_0f[0x11];
|
||||
u16 unk_20;
|
||||
u16 unk_22;
|
||||
u16 unk_24;
|
||||
u16 unk_26;
|
||||
u8 unk_28[0x0D];
|
||||
u8 unk_35;
|
||||
u16 unk_36;
|
||||
union SplitSHWord unk_38;
|
||||
union SplitSHWord unk_3a;
|
||||
u16 unk_3c;
|
||||
u16 unk_3e;
|
||||
typedef struct Manager {
|
||||
/*0x00*/ struct Manager* previous;
|
||||
/*0x00*/ struct Manager* next;
|
||||
/*0x08*/ u8 type;
|
||||
/*0x09*/ u8 subtype;
|
||||
/*0x0a*/ u8 unk_0a;
|
||||
/*0x0b*/ u8 unk_0b;
|
||||
/*0x0c*/ u8 action;
|
||||
/*0x0d*/ u8 unk_0d;
|
||||
/*0x0e*/ u8 unk_0e;
|
||||
/*0x0f*/ u8 unk_0f;
|
||||
/*0x10*/ u8 unk_10[0x4];
|
||||
/*0x14*/ struct Manager * parent;
|
||||
/*0x18*/ u8 unk_18[0x8];
|
||||
// union SplitHWord unk_20;
|
||||
// u16 unk_22;
|
||||
// u16 unk_24;
|
||||
// u16 unk_26;
|
||||
// u8 unk_28[0x0D];
|
||||
// u8 unk_35;
|
||||
// u16 unk_36;
|
||||
// union SplitSHWord unk_38;
|
||||
// union SplitSHWord unk_3a;
|
||||
// u16 unk_3c;
|
||||
// u16 unk_3e;
|
||||
} Manager;
|
||||
|
||||
typedef struct {
|
||||
u16 field_0x00;
|
||||
u16 field_0x02;
|
||||
u8 field_0x04;
|
||||
u8 field_0x05;
|
||||
u8 field_0x06;
|
||||
u16 posX;
|
||||
u16 posY;
|
||||
u8 width;
|
||||
u8 height;
|
||||
u8 unk_06;
|
||||
union {
|
||||
u8 all;
|
||||
struct {
|
||||
|
|
@ -45,8 +52,55 @@ typedef struct {
|
|||
u8 unk2 : 1;
|
||||
u8 unk3 : 3;
|
||||
} PACKED b;
|
||||
} PACKED field_0x07;
|
||||
} UnkManagerHelperStruct;
|
||||
} PACKED unk_07;
|
||||
} Manager6WarpData;
|
||||
|
||||
typedef struct {
|
||||
Manager manager;
|
||||
Manager6WarpData* warpList;
|
||||
} Manager6;
|
||||
|
||||
typedef struct {
|
||||
Manager manager;
|
||||
u16 unk_20;
|
||||
u16 unk_22;
|
||||
u16 unk_24;
|
||||
u16 unk_26;
|
||||
u8 unk_28[0x0D];
|
||||
u8 unk_35;
|
||||
u16 unk_36;
|
||||
u8 unk_38;
|
||||
u8 unk_39;
|
||||
u8 unk_3a;
|
||||
u8 unk_3b;
|
||||
u16 unk_3c;
|
||||
u16 unk_3e;
|
||||
} ManagerA;
|
||||
|
||||
typedef struct {
|
||||
Manager manager;
|
||||
u8 unk_20;
|
||||
u8 unk_21[0x14];
|
||||
u8 unk_35;
|
||||
u8 unk_36[0x4];
|
||||
u16 unk_3a;
|
||||
u16 unk_3c;
|
||||
u16 unk_3e;
|
||||
} ManagerB;
|
||||
|
||||
typedef struct {
|
||||
Manager manager;
|
||||
Entity* enemies[8];
|
||||
} ManagerBHelper;
|
||||
|
||||
typedef struct {
|
||||
Manager manager;
|
||||
u8 unk_20[0x18];
|
||||
s16 unk_38;
|
||||
s16 unk_3a;
|
||||
u16 unk_3c;
|
||||
u16 unk_3e;
|
||||
} ManagerE;
|
||||
|
||||
typedef struct {
|
||||
u16 unk_00;
|
||||
|
|
|
|||
|
|
@ -57,7 +57,9 @@ typedef struct {
|
|||
/*0x8c*/ u32 field_0x8c;
|
||||
/*0x90*/ union SplitWord field_0x90;
|
||||
/*0x94*/ u32 field_0x94[5];
|
||||
/*0xa8*/ u8 field_0xa8[3];
|
||||
/*0xa8*/ u8 field_0xa8;
|
||||
/*0xa9*/ u8 field_0xa9;
|
||||
/*0xaa*/ u8 field_0xaa;
|
||||
/*0xab*/ u8 field_0xab;
|
||||
/*0xac*/ u32 field_0xac;
|
||||
} PlayerState;
|
||||
|
|
@ -108,4 +110,4 @@ extern s32 ModHealth(s32);
|
|||
extern void ModRupees(s32);
|
||||
#endif
|
||||
|
||||
// clang-format on
|
||||
// clang-format on
|
||||
|
|
|
|||
|
|
@ -474,7 +474,7 @@ SECTIONS {
|
|||
asm/manager1.o(.text);
|
||||
src/manager/manager2.o(.text);
|
||||
asm/manager2.o(.text);
|
||||
asm/manager3.o(.text);
|
||||
src/manager/manager3.o(.text);
|
||||
src/manager/manager4.o(.text);
|
||||
asm/manager5.o(.text);
|
||||
src/manager/manager6.o(.text);
|
||||
|
|
@ -482,7 +482,7 @@ SECTIONS {
|
|||
asm/manager8.o(.text);
|
||||
asm/manager9.o(.text);
|
||||
src/manager/managerA.o(.text);
|
||||
asm/managerB.o(.text);
|
||||
src/manager/managerB.o(.text);
|
||||
asm/managerC.o(.text);
|
||||
asm/managerD.o(.text);
|
||||
src/manager/managerE.o(.text);
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ void sub_0804AAD4(void)
|
|||
_DmaZero((void *)&gUnk_02018EB0, 0x28);
|
||||
gUnk_02018EB0.unk = 0;
|
||||
EraseAllEntities();
|
||||
CreateObject(0x3d, gArea.filler3[5], 0);
|
||||
CreateObject(0x3d, gArea.field_0x17, 0);
|
||||
gArea.filler[8]++;
|
||||
}
|
||||
|
||||
|
|
@ -73,4 +73,4 @@ void sub_0804AB24(void)
|
|||
void sub_0804AB54(void)
|
||||
{
|
||||
gUnk_080D412C[gArea.filler[8]]();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ Entity* sub_08077C94(ItemBehavior*, u32);
|
|||
void* sub_08077C54(UnkItemStruct* unk);
|
||||
Entity* CreatePlayerBomb(ItemBehavior*, u32);
|
||||
extern Entity* sub_0805E744();
|
||||
extern void AppendEntityToList(Entity*, u32);
|
||||
|
||||
extern struct_0811BE48 gUnk_0811BE48[];
|
||||
|
||||
|
|
@ -137,4 +136,4 @@ Entity * sub_08077CF8(u32 subtype, u32 form, u32 parameter, u32 unk)
|
|||
NAKED
|
||||
void sub_08077D38(ItemBehavior *beh, u32 arg1) {
|
||||
asm(".include \"asm/non_matching/sub_08077D38.inc\"");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -155,6 +155,6 @@ void sub_08076D94(ItemBehavior *beh, u32 arg1)
|
|||
|
||||
void GustJar(ItemBehavior *beh, u32 arg1)
|
||||
{
|
||||
gPlayerState.field_0xa8[0] = 3;
|
||||
gPlayerState.field_0xa8 = 3;
|
||||
gUnk_0811BDF4[beh->stateID](beh, arg1);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,102 @@
|
|||
#include "global.h"
|
||||
#include "manager.h"
|
||||
#include "flags.h"
|
||||
#include "area.h"
|
||||
#include "room.h"
|
||||
#include "player.h"
|
||||
#include "functions.h"
|
||||
|
||||
typedef struct {
|
||||
Manager manager;
|
||||
u32 unk_20;
|
||||
u32 unk_24;
|
||||
u8 unk_28[0xC];
|
||||
u8 unk_34;
|
||||
u8 unk_35;
|
||||
u16 unk_36;
|
||||
u16 unk_38;
|
||||
u16 unk_3a;
|
||||
u16 unk_3c;
|
||||
u16 unk_3e;
|
||||
} Manager3;
|
||||
|
||||
extern s8 gUnk_08107C6C[];
|
||||
extern u32 sub_0806FBFC(u32, u32, u32, u32);
|
||||
extern u32 sub_08057810(void);
|
||||
extern u32 sub_080002C0(u16, u16, u8);
|
||||
extern void sub_080577AC(u32, u32, u32);
|
||||
|
||||
void sub_080576C0(Manager3* this) {
|
||||
s8 tmp;
|
||||
if (this->manager.action == 0) {
|
||||
this->manager.action = 1;
|
||||
this->unk_20 = this->unk_38 + gRoomControls.roomOriginX - 0x20;
|
||||
this->unk_24 = this->unk_3a + gRoomControls.roomOriginY - 0x20;
|
||||
return;
|
||||
}
|
||||
if (sub_0806FBFC(this->unk_20, this->unk_24, 0x40, 0x40)) {
|
||||
gArea.field_0x12 = this->unk_20 + 0x20;
|
||||
gArea.field_0x14 = this->unk_24 + 0x20 + gUnk_08107C6C[this->manager.unk_0a];
|
||||
gArea.field_0x16 = this->unk_34;
|
||||
gArea.field_0x17 = this->manager.unk_0a;
|
||||
if (!CheckGlobalFlag(EZERO_1ST)) {
|
||||
gArea.field_0x18 = 1;
|
||||
gArea.field_0x17 = 5;
|
||||
} else {
|
||||
if ((gPlayerState.flags.all & 0x20) && gPlayerState.jumpStatus == 0) {
|
||||
gArea.field_0x18 = 2;
|
||||
} else {
|
||||
if (sub_08057810()) {
|
||||
gArea.field_0x18 = 3;
|
||||
}
|
||||
}
|
||||
if (sub_080002C0(this->unk_38, this->unk_3a, this->manager.unk_0e) == 0x3d) {
|
||||
sub_080577AC(this->unk_38 + gRoomControls.roomOriginX, this->unk_3a + gRoomControls.roomOriginY, this->manager.unk_0e);
|
||||
if (!this->manager.unk_0f) {
|
||||
this->manager.unk_0f = 1;
|
||||
PlaySFX(0x152);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
this->manager.unk_0f = 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void sub_080577AC(u32 baseX, u32 baseY, u32 layer) {
|
||||
u32 r;
|
||||
int offsetX, offsetY;
|
||||
Entity* spark;
|
||||
r = Random();
|
||||
if ((r & 0x7) != 0) return;
|
||||
spark = CreateObject(0xF, 0x26, 0);
|
||||
if (!spark) return;
|
||||
offsetX = (r >> 0x8) & 0xF;
|
||||
offsetY = ((r >> 0x10) & 0xF);
|
||||
if (offsetY > 0x4) {
|
||||
offsetY = -offsetY;
|
||||
}
|
||||
if ((r >> 0x18) & 0x1) {
|
||||
offsetX = -offsetX;
|
||||
}
|
||||
spark->x.HALF.HI = baseX + offsetX;
|
||||
spark->y.HALF.HI = baseY + offsetY;
|
||||
spark->collisionLayer = layer;
|
||||
UpdateSpriteForCollisionLayer(spark);
|
||||
}
|
||||
|
||||
u32 sub_08057810(void) {
|
||||
if ((gPlayerState.flags.all & 0x80)
|
||||
&& !gPlayerState.field_0xaa
|
||||
&& (gArea.field_0x17 != 0x6)
|
||||
&& (gPlayerState.heldObject == 0)) {
|
||||
switch (gPlayerState.field_0xa8) {
|
||||
case 0:
|
||||
case 1:
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
extern void (*gUnk_08107C70[])(Manager*);
|
||||
|
||||
void sub_08057854(Manager* this) {
|
||||
gUnk_08107C70[this->unk_0c](this);
|
||||
gUnk_08107C70[this->action](this);
|
||||
}
|
||||
|
||||
extern void sub_080805F8(void);
|
||||
|
|
@ -47,7 +47,7 @@ void sub_0805786C(Manager* this) {
|
|||
tmp++;
|
||||
}
|
||||
}
|
||||
this->unk_0c = 1;
|
||||
this->action = 1;
|
||||
}
|
||||
|
||||
extern u32 sub_0805795C(Manager*, DiggingCaveEntrance*);
|
||||
|
|
|
|||
|
|
@ -8,25 +8,25 @@ extern u32 CheckPlayerInRegion(u16, u16, u8, u8);
|
|||
extern void DoExitTransition(void*);
|
||||
extern void DeleteManager(Entity*);
|
||||
|
||||
void sub_08057CB4(Entity * this) {
|
||||
void sub_08057CB4(Manager6 * this) {
|
||||
u32 tmp;
|
||||
UnkManagerHelperStruct* i;
|
||||
if (this->action == 0){
|
||||
this->action = 1;
|
||||
this->field_0x20 = (s32) GetCurrentRoomProperty(this->entityType.form);
|
||||
if (this->field_0x20 == 0) {
|
||||
DeleteManager(this);
|
||||
Manager6WarpData* i;
|
||||
if (this->manager.action == 0){
|
||||
this->manager.action = 1;
|
||||
this->warpList = GetCurrentRoomProperty(this->manager.unk_0a);
|
||||
if (!this->warpList) {
|
||||
DeleteManager((Entity*) this);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (this->actionDelay == 0 || gPlayerState.field_0x10[2] == 0x1e) {
|
||||
for (i = ((UnkManagerHelperStruct*) this->field_0x20);i->field_0x00 != 0xFFFF; i++) {
|
||||
tmp = (i->field_0x07.all & 0x3);
|
||||
if (this->manager.unk_0e == 0 || gPlayerState.field_0x10[2] == 0x1e) {
|
||||
for (i = this->warpList; i->posX != 0xFFFF; i++) {
|
||||
tmp = (i->unk_07.all & 0x3);
|
||||
if (((tmp & (gPlayerEntity.collisionLayer)) != 0) &&
|
||||
(((gPlayerState.flags.all & 0x80) != 0) || ((i->field_0x07.b.unk2) != 0)) &&
|
||||
(CheckPlayerInRegion(i->field_0x00,i->field_0x02,i->field_0x04,i->field_0x05) != 0) &&
|
||||
(((gPlayerState.flags.all & 0x80) != 0) || ((i->unk_07.b.unk2) != 0)) &&
|
||||
(CheckPlayerInRegion(i->posX,i->posY,i->width,i->height) != 0) &&
|
||||
(gPlayerEntity.height.HALF.HI == 0)) {
|
||||
DoExitTransition(GetCurrentRoomProperty(i->field_0x06));
|
||||
DoExitTransition(GetCurrentRoomProperty(i->unk_06));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,36 +9,36 @@
|
|||
extern void (*gUnk_081081F4[])(Manager*);
|
||||
|
||||
void sub_08058380(Manager* this) {
|
||||
gUnk_081081F4[this->unk_0c](this);
|
||||
gUnk_081081F4[this->action](this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
extern void sub_0805E3A0(Manager*, u32);
|
||||
|
||||
void sub_08058398(Manager* this) {
|
||||
void sub_08058398(ManagerA* this) {
|
||||
|
||||
if (CheckFlags(this->unk_3c) != 0) {
|
||||
DeleteThisEntity();
|
||||
}
|
||||
this->unk_24 = this->unk_3a.HALF.LO<<3;
|
||||
this->unk_26 = this->unk_3a.HALF.HI<<3;
|
||||
this->unk_20 = this->unk_24 + (this->unk_38.HALF.LO<<4);
|
||||
this->unk_22 = this->unk_26 + (this->unk_38.HALF.HI<<4);
|
||||
sub_0805E3A0(this, 0x06);
|
||||
this->unk_24 = this->unk_3a<<3;
|
||||
this->unk_26 = this->unk_3b<<3;
|
||||
this->unk_20 = this->unk_24 + (this->unk_38<<4);
|
||||
this->unk_22 = this->unk_26 + (this->unk_39<<4);
|
||||
sub_0805E3A0(&this->manager, 0x06);
|
||||
if (this->unk_3e == 0) {
|
||||
this->unk_0c = 2;
|
||||
this->manager.action = 2;
|
||||
} else {
|
||||
this->unk_0c = 1;
|
||||
this->manager.action = 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void sub_08058408(Manager*);
|
||||
void sub_08058408(ManagerA*);
|
||||
|
||||
void sub_080583EC(Manager* this) {
|
||||
void sub_080583EC(ManagerA* this) {
|
||||
if (CheckFlags(this->unk_3e) != 0) {
|
||||
this->unk_0c = 2;
|
||||
this->manager.action = 2;
|
||||
sub_08058408(this);
|
||||
}
|
||||
}
|
||||
|
|
@ -50,15 +50,15 @@ extern void sub_08078AA8(u32, u32);
|
|||
extern void sub_080186C0(u16);
|
||||
extern void sub_08078B48(void);
|
||||
|
||||
u32 sub_0805848C(Manager*);
|
||||
void sub_080585DC(Manager*);
|
||||
u32 sub_0805848C(ManagerA*);
|
||||
void sub_080585DC(ManagerA*);
|
||||
|
||||
void sub_08058408(Manager* this){
|
||||
void sub_08058408(ManagerA* this){
|
||||
u32 tmp2;
|
||||
tmp2 = (gPlayerState.flags.all & 0x08);
|
||||
if (tmp2 != 0) return;
|
||||
if (!CheckPlayerInRegion(this->unk_20, this->unk_22, this->unk_24, this->unk_26)) return;
|
||||
switch (this->unk_0a) {
|
||||
switch (this->manager.unk_0a) {
|
||||
case 1:
|
||||
return;
|
||||
case 2:
|
||||
|
|
@ -71,21 +71,21 @@ void sub_08058408(Manager* this){
|
|||
sub_08078A90(3);
|
||||
sub_08078B48();
|
||||
sub_0805E544();
|
||||
this->unk_0c = 3;
|
||||
this->unk_0d = 0;
|
||||
this->unk_0e = 0x1e;
|
||||
this->manager.action = 3;
|
||||
this->manager.unk_0d = 0;
|
||||
this->manager.unk_0e = 0x1e;
|
||||
return;
|
||||
case 3:
|
||||
this->unk_0c = 4;
|
||||
this->unk_0d = tmp2;
|
||||
this->manager.action = 4;
|
||||
this->manager.unk_0d = tmp2;
|
||||
sub_080186C0(this->unk_36);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
u32 sub_0805848C(Manager* this) {
|
||||
switch (gPlayerState.field_0xa8[0]-5) {
|
||||
u32 sub_0805848C(ManagerA* this) {
|
||||
switch (gPlayerState.field_0xa8-5) {
|
||||
case 0:
|
||||
case 2:
|
||||
case 3:
|
||||
|
|
@ -119,8 +119,8 @@ u32 sub_0805848C(Manager* this) {
|
|||
|
||||
extern void UnfreezeTime(void);
|
||||
|
||||
void sub_08058514(Manager* this) {
|
||||
switch (this->unk_0d) {
|
||||
void sub_08058514(ManagerA* this) {
|
||||
switch (this->manager.unk_0d) {
|
||||
case 1:
|
||||
if ((gPlayerState.flags.all & 0x1235) != 0)
|
||||
return;
|
||||
|
|
@ -128,13 +128,13 @@ void sub_08058514(Manager* this) {
|
|||
return;
|
||||
gPlayerState.jumpStatus = 0;
|
||||
sub_08078AA8(this->unk_36, this->unk_35);
|
||||
this->unk_0d++;
|
||||
this->unk_0e = 0x1E;
|
||||
this->manager.unk_0d++;
|
||||
this->manager.unk_0e = 0x1E;
|
||||
return;
|
||||
case 0:
|
||||
case 2:
|
||||
if (((--this->unk_0e)<<0x18) == 0) {
|
||||
this->unk_0d++;
|
||||
if (((--this->manager.unk_0e)<<0x18) == 0) {
|
||||
this->manager.unk_0d++;
|
||||
}
|
||||
return;
|
||||
case 3:
|
||||
|
|
@ -152,7 +152,7 @@ void sub_08058514(Manager* this) {
|
|||
|
||||
extern void sub_0801855C(void);
|
||||
|
||||
void sub_080585B0(Manager* this) {
|
||||
void sub_080585B0(ManagerA* this) {
|
||||
if (gArea.filler4[0] != 0xFF) {
|
||||
DeleteThisEntity();
|
||||
}
|
||||
|
|
@ -161,7 +161,7 @@ void sub_080585B0(Manager* this) {
|
|||
DeleteThisEntity();
|
||||
}
|
||||
}
|
||||
void sub_080585DC(Manager* this) {
|
||||
void sub_080585DC(ManagerA* this) {
|
||||
if (CheckFlags(this->unk_3c)) {
|
||||
DeleteThisEntity();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,160 @@
|
|||
#include "global.h"
|
||||
#include "manager.h"
|
||||
#include "flags.h"
|
||||
#include "entity.h"
|
||||
#include "room.h"
|
||||
#include "area.h"
|
||||
#include "functions.h"
|
||||
|
||||
extern void (*(gUnk_08108208[]))(Manager*);
|
||||
|
||||
void sub_080585F0(Manager* this) {
|
||||
gUnk_08108208[this->unk_0a](this);
|
||||
}
|
||||
|
||||
extern void (*(gUnk_08108210[]))(Manager*);
|
||||
|
||||
void sub_08058608(Manager* this) {
|
||||
gUnk_08108210[this->action](this);
|
||||
}
|
||||
|
||||
void sub_080586EC(Manager*);
|
||||
|
||||
void sub_08058620(ManagerB* this) {
|
||||
if (!CheckFlags(this->unk_3e)) {
|
||||
this->manager.action = 1;
|
||||
if (!this->unk_3c) {
|
||||
sub_080586EC(&this->manager);
|
||||
}
|
||||
sub_0805E3A0(this, 3);
|
||||
} else {
|
||||
DeleteThisEntity();
|
||||
}
|
||||
}
|
||||
extern void sub_080186C0(u32);
|
||||
|
||||
void sub_08058650(ManagerB* this) {
|
||||
int tmp;
|
||||
if (CheckFlags(this->unk_3c)) {
|
||||
sub_080586EC(&this->manager);
|
||||
if (!this->unk_35) {
|
||||
tmp = gRoomVars.field_0x9 ? gRoomVars.field_0x9 : 0x33;
|
||||
this->unk_20 = gArea.musicIndex;
|
||||
gArea.musicIndex = tmp;
|
||||
PlaySFX(tmp);
|
||||
}
|
||||
sub_080186C0(0xB0F);
|
||||
}
|
||||
}
|
||||
|
||||
extern void sub_0801855C(void);
|
||||
|
||||
void sub_080586A8(ManagerB* this) {
|
||||
if (this->manager.unk_0e) return;
|
||||
SetFlag(this->unk_3e);
|
||||
if (this->unk_3c) {
|
||||
if (!this->unk_35) {
|
||||
gArea.musicIndex = this->unk_20;
|
||||
PlaySFX(gArea.musicIndex);
|
||||
sub_0801855C();
|
||||
}
|
||||
}
|
||||
DeleteThisEntity();
|
||||
}
|
||||
|
||||
ManagerBHelper* sub_08058760(Manager*);
|
||||
void sub_08058798(ManagerBHelper*, Entity*, u32);
|
||||
|
||||
extern EntityData* GetCurrentRoomProperty(u8);
|
||||
extern Entity* LoadRoomEntity(EntityData*);
|
||||
|
||||
void sub_080586EC(Manager* this) {
|
||||
ManagerBHelper* tmp;
|
||||
EntityData* prop;
|
||||
Entity* ent;
|
||||
u32 counter;
|
||||
this->action = 2;
|
||||
this->unk_0e = 0;
|
||||
counter = 0;
|
||||
tmp = sub_08058760(this);
|
||||
if (!tmp) DeleteThisEntity();
|
||||
prop = (EntityData*) GetCurrentRoomProperty(this->unk_0b);
|
||||
if (prop) {
|
||||
while (*((u8*)prop) != 0xFF) {
|
||||
ent = LoadRoomEntity(prop++);
|
||||
if (ent && (ent->entityType.type == 3)) {
|
||||
ent->field_0x6c.HALF.HI |= 0x40;
|
||||
sub_08058798(tmp, ent, counter++);
|
||||
}
|
||||
if (counter >= 7) {
|
||||
counter = 0;
|
||||
tmp = sub_08058760(this);
|
||||
if (!tmp) return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ManagerBHelper* sub_08058760(Manager* this) {
|
||||
ManagerBHelper* extra;
|
||||
extra = (ManagerBHelper*) GetEmptyManager();
|
||||
if (extra) {
|
||||
extra->manager.type = 9;
|
||||
extra->manager.subtype = 0xB;
|
||||
extra->manager.unk_0a = 1;
|
||||
extra->manager.parent = this;
|
||||
this->unk_0e++;
|
||||
_DmaZero(&extra->enemies, 0x20);
|
||||
AppendEntityToList(extra, 8);
|
||||
}
|
||||
return extra;
|
||||
}
|
||||
|
||||
void sub_08058798(ManagerBHelper* this, Entity* value, u32 index) {
|
||||
this->enemies[index]=value;
|
||||
this->manager.unk_0e++;
|
||||
}
|
||||
|
||||
void sub_080587AC(ManagerBHelper* this) {
|
||||
u8 i, tmp;
|
||||
Entity* current;
|
||||
if (this->manager.action == 0) {
|
||||
this->manager.action = 1;
|
||||
sub_0805E3A0(this,3);
|
||||
}
|
||||
tmp = 0;
|
||||
for (i = 0; i < 8; i++) {
|
||||
if ((current = this->enemies[i])) {
|
||||
if (!current->next) {
|
||||
this->enemies[i] = 0;
|
||||
} else {
|
||||
tmp = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!tmp) {
|
||||
if (((ManagerB*) this->manager.parent)->manager.unk_0e) {
|
||||
((ManagerB*) this->manager.parent)->manager.unk_0e--;
|
||||
}
|
||||
DeleteThisEntity();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
extern Manager gUnk_03003DB0;
|
||||
|
||||
void sub_08058800(Entity* this, Entity* unk1) {
|
||||
ManagerBHelper* current;
|
||||
Manager* end = &gUnk_03003DB0;
|
||||
u32 i;
|
||||
for (current = (ManagerBHelper*) end->next; (Manager*)current != end; current=(ManagerBHelper*)current->manager.next) {
|
||||
if (current->manager.type != 0x9 || current->manager.subtype != 0xB) continue;
|
||||
for (i = 0; i < 8; i++) {
|
||||
if (this == current->enemies[i]) {
|
||||
current->enemies[i] = unk1;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -12,28 +12,28 @@ extern void sub_08078A90(u32);
|
|||
extern void sub_08078B48(void);
|
||||
extern void PlaySFX(u32);
|
||||
|
||||
void sub_08058E60(Manager* this) {
|
||||
if (!this->unk_0c) {
|
||||
this->unk_0c = 1;
|
||||
void sub_08058E60(ManagerE* this) {
|
||||
if (!this->manager.action) {
|
||||
this->manager.action = 1;
|
||||
if (CheckFlags(this->unk_3e)) {
|
||||
DeleteManager(this);
|
||||
DeleteManager(&this->manager);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (!CheckFlags(this->unk_3e))
|
||||
return;
|
||||
if (this->unk_0b != 0) {
|
||||
this->unk_0b = 0;
|
||||
if (this->manager.unk_0b != 0) {
|
||||
this->manager.unk_0b = 0;
|
||||
sub_08078A90(0xff);
|
||||
sub_08078B48();
|
||||
}
|
||||
if (this->unk_3a.SHWORD == 0){
|
||||
if (this->unk_38.SHWORD != 0) {
|
||||
PlaySFX(this->unk_38.SHWORD);
|
||||
if (this->unk_3a == 0){
|
||||
if (this->unk_38 != 0) {
|
||||
PlaySFX(this->unk_38);
|
||||
}
|
||||
LoadRoomEntityList(GetCurrentRoomProperty(this->unk_0a));
|
||||
LoadRoomEntityList(GetCurrentRoomProperty(this->manager.unk_0a));
|
||||
DeleteThisEntity();
|
||||
} else {
|
||||
this->unk_3a.SHWORD -= 1;
|
||||
this->unk_3a -= 1;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
#include "npc.h"
|
||||
#include "player.h"
|
||||
|
||||
extern void sub_0805E3A0(Entity*, u32);
|
||||
extern u32 sub_0801E99C(Entity*);
|
||||
extern void sub_08078784(Entity*, u32);
|
||||
extern void sub_0807DD50(Entity*);
|
||||
|
|
@ -84,4 +83,4 @@ void sub_0805FF18(Entity *this)
|
|||
if (UpdateFuseInteraction(this)) {
|
||||
this->action = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,13 +92,13 @@ void sub_08069660(Entity *this)
|
|||
|
||||
void sub_08069684(void)
|
||||
{
|
||||
Entity *mgr;
|
||||
Manager *mgr;
|
||||
|
||||
if (FindEntityInListBySubtype(9, 0x31, 8) == NULL) {
|
||||
mgr = GetEmptyManager();
|
||||
if (mgr != NULL) {
|
||||
mgr->entityType.type = 9;
|
||||
mgr->entityType.subtype = 0x31;
|
||||
mgr->type = 9;
|
||||
mgr->subtype = 0x31;
|
||||
AppendEntityToList(mgr, 8);
|
||||
}
|
||||
}
|
||||
|
|
@ -140,4 +140,4 @@ u32 sub_080696BC(Entity* this)
|
|||
uVar1 = 4;
|
||||
}
|
||||
return gUnk_08111BA0[uVar1 * 3 + iVar3];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ extern void sub_0806ED78(Entity*);
|
|||
extern void sub_08068780(Entity*);
|
||||
extern void sub_08078778(Entity*);
|
||||
extern u32 Random(void);
|
||||
extern void sub_0805E3A0(Entity*, u32);
|
||||
extern void sub_0807DD50(Entity*);
|
||||
extern void sub_0806F118(Entity*);
|
||||
extern void sub_0807DDAC(Entity*, u32);
|
||||
|
|
@ -170,4 +169,4 @@ void Melari_Fusion(Entity* this) {
|
|||
}
|
||||
|
||||
void nullsub_502(Entity* this) {
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ extern s32 sub_0806ED9C(Entity*, u32, u32);
|
|||
extern void sub_0806EE20(Entity*);
|
||||
extern void sub_0806ED78(Entity*);
|
||||
extern u32 sub_080040A8(Entity*);
|
||||
extern void sub_0805E3A0(Entity*, u32);
|
||||
extern u32 sub_0801E99C(Entity*);
|
||||
extern void sub_0807DD50(Entity*);
|
||||
extern void sub_0806F118(Entity*);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ extern void sub_0807DDAC(Entity*, u32);
|
|||
extern void sub_0807DDE4(Entity*);
|
||||
extern void sub_0806ED78(Entity*);
|
||||
extern void PlaySFX(u32);
|
||||
extern void sub_0805E3A0(Entity*, u32);
|
||||
extern void sub_0806A8C8(Entity*);
|
||||
extern void sub_0807DD94(Entity*, u32);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
#include "flags.h"
|
||||
|
||||
extern void PrependEntityToList(Entity*, u32);
|
||||
extern void sub_0805E3A0(Entity*, u32);
|
||||
extern void sub_0807DD50(Entity*);
|
||||
extern void sub_0807DD94(Entity*, u32);
|
||||
extern Entity* FindEntityBySubtype(u32, u32);
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ void sub_08070698(Entity *this)
|
|||
if (gPlayerState.swimState != 0) {
|
||||
gPlayerState.swimState = 1;
|
||||
sub_08079938();
|
||||
gPlayerState.field_0xa8[0] = 7;
|
||||
gPlayerState.field_0xa8 = 7;
|
||||
sub_0807ACCC(this);
|
||||
ent = FindEntityInListByForm(0x6, 0xf, 0x6, 0xb, 0x0);
|
||||
if (ent != NULL) {
|
||||
|
|
@ -59,4 +59,4 @@ void sub_08070698(Entity *this)
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue