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

Merge pull request #272 from Ibot02/gyorg 

Gyorg
This commit is contained in:
notyourav 2022-01-09 23:46:09 -08:00 committed by GitHub
parent 3684f8ba88 4fc5a7c3e4
commit e0194734ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 2247 additions and 4846 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

455
asm/enemy/gyorgChild.s
View File

@ -1,455 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start GyorgChild
GyorgChild: @ 0x08048640
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, _0804867C @ =gRoomTransition
adds r0, #0x39
ldrb r2, [r0]
cmp r2, #0
bne _08048664
ldrb r1, [r5, #0x10]
movs r0, #0x7f
ands r0, r1
strb r0, [r5, #0x10]
adds r0, r5, #0
adds r0, #0x45
strb r2, [r0]
adds r1, r5, #0
adds r1, #0x38
movs r0, #2
strb r0, [r1]
_08048664:
ldr r4, _08048680 @ =gUnk_080D1E6C
adds r0, r5, #0
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
adds r0, r5, #0
bl _call_via_r1
pop {r4, r5, pc}
.align 2, 0
_0804867C: .4byte gRoomTransition
_08048680: .4byte gUnk_080D1E6C
thumb_func_start sub_08048684
sub_08048684: @ 0x08048684
push {lr}
ldr r2, _08048698 @ =gUnk_080D1E84
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_08048698: .4byte gUnk_080D1E84
thumb_func_start sub_0804869C
sub_0804869C: @ 0x0804869C
push {lr}
ldr r1, _080486A8 @ =gUnk_080D1E6C
bl sub_0804AA30
pop {pc}
.align 2, 0
_080486A8: .4byte gUnk_080D1E6C
thumb_func_start sub_080486AC
sub_080486AC: @ 0x080486AC
push {r4, lr}
adds r4, r0, #0
bl sub_0806F520
cmp r0, #0
beq _080486C8
ldr r0, _080486CC @ =gUnk_080D1E94
ldrb r1, [r4, #0xd]
lsls r1, r1, #2
adds r1, r1, r0
ldr r1, [r1]
adds r0, r4, #0
bl _call_via_r1
_080486C8:
pop {r4, pc}
.align 2, 0
_080486CC: .4byte gUnk_080D1E94
thumb_func_start sub_080486D0
sub_080486D0: @ 0x080486D0
movs r1, #2
strb r1, [r0, #0xd]
bx lr
.align 2, 0
thumb_func_start sub_080486D8
sub_080486D8: @ 0x080486D8
push {lr}
bl sub_0806F4E8
pop {pc}
thumb_func_start sub_080486E0
sub_080486E0: @ 0x080486E0
push {r4, lr}
adds r4, r0, #0
bl sub_0806F3E4
cmp r0, #0
beq _080486F2
adds r0, r4, #0
bl sub_0804A7D4
_080486F2:
pop {r4, pc}
thumb_func_start sub_080486F4
sub_080486F4: @ 0x080486F4
push {r4, r5, lr}
adds r4, r0, #0
movs r5, #1
strb r5, [r4, #0x1c]
ldrb r0, [r4, #0x1b]
movs r1, #0xc0
orrs r0, r1
strb r0, [r4, #0x1b]
ldrb r0, [r4, #0x19]
orrs r0, r1
strb r0, [r4, #0x19]
adds r2, r4, #0
adds r2, #0x29
ldrb r0, [r2]
movs r1, #7
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4, #0x15]
lsrs r0, r0, #2
strb r0, [r4, #0x14]
ldrb r0, [r4, #0xa]
cmp r0, #0
bne _0804876C
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl InitializeAnimation
strb r5, [r4, #0xc]
ldrb r0, [r4, #0x10]
movs r1, #0x80
orrs r0, r1
strb r0, [r4, #0x10]
bl Random
movs r1, #0xb
bl __modsi3
ldrb r1, [r4, #0x15]
adds r1, r1, r0
subs r1, #5
movs r2, #0x1f
ands r1, r2
strb r1, [r4, #0x15]
lsls r0, r0, #1
ldr r2, _08048768 @ =gUnk_080D1EA0
adds r1, r0, r2
ldrb r1, [r1]
strb r1, [r4, #0xe]
adds r0, #1
adds r0, r0, r2
ldrb r0, [r0]
adds r1, r4, #0
adds r1, #0x7b
strb r0, [r1]
movs r0, #0x80
lsls r0, r0, #2
strh r0, [r4, #0x24]
b _0804877A
.align 2, 0
_08048768: .4byte gUnk_080D1EA0
_0804876C:
movs r0, #2
strb r0, [r4, #0xc]
strb r5, [r4, #0xe]
ldrb r1, [r4, #0x18]
subs r0, #6
ands r0, r1
strb r0, [r4, #0x18]
_0804877A:
pop {r4, r5, pc}
thumb_func_start sub_0804877C
sub_0804877C: @ 0x0804877C
push {r4, lr}
adds r4, r0, #0
bl LinearMoveUpdate
ldrb r0, [r4, #0xe]
cmp r0, #0
beq _080487AA
subs r0, #1
strb r0, [r4, #0xe]
movs r1, #0xff
ands r0, r1
movs r1, #0xf
ands r0, r1
cmp r0, #0
bne _080487AA
adds r0, r4, #0
adds r0, #0x7b
ldrb r0, [r0]
ldrb r1, [r4, #0x15]
adds r0, r0, r1
movs r1, #0x1f
ands r0, r1
strb r0, [r4, #0x15]
_080487AA:
ldrb r0, [r4, #0x14]
lsrs r0, r0, #1
cmp r0, #1
beq _080487D4
cmp r0, #1
bgt _080487BC
cmp r0, #0
beq _080487C2
b _08048804
_080487BC:
cmp r0, #2
beq _080487EC
b _08048804
_080487C2:
movs r2, #0x32
ldrsh r1, [r4, r2]
ldr r0, _080487D0 @ =gRoomControls
movs r2, #0xc
ldrsh r0, [r0, r2]
b _0804880E
.align 2, 0
_080487D0: .4byte gRoomControls
_080487D4:
movs r0, #0x2e
ldrsh r1, [r4, r0]
ldr r0, _080487E8 @ =gRoomControls
movs r2, #0xa
ldrsh r0, [r0, r2]
movs r2, #0x84
lsls r2, r2, #1
adds r0, r0, r2
b _080487F8
.align 2, 0
_080487E8: .4byte gRoomControls
_080487EC:
movs r0, #0x32
ldrsh r1, [r4, r0]
ldr r0, _08048800 @ =gRoomControls
movs r2, #0xc
ldrsh r0, [r0, r2]
adds r0, #0xb8
_080487F8:
cmp r1, r0
blt _08048824
b _08048814
.align 2, 0
_08048800: .4byte gRoomControls
_08048804:
movs r0, #0x2e
ldrsh r1, [r4, r0]
ldr r0, _08048828 @ =gRoomControls
movs r2, #0xa
ldrsh r0, [r0, r2]
_0804880E:
subs r0, #0x18
cmp r1, r0
bgt _08048824
_08048814:
movs r0, #2
strb r0, [r4, #0xc]
movs r0, #0x5a
strb r0, [r4, #0xe]
ldrb r1, [r4, #0x18]
subs r0, #0x5e
ands r0, r1
strb r0, [r4, #0x18]
_08048824:
pop {r4, pc}
.align 2, 0
_08048828: .4byte gRoomControls
thumb_func_start sub_0804882C
sub_0804882C: @ 0x0804882C
push {r4, lr}
adds r4, r0, #0
ldrb r0, [r4, #0xe]
subs r0, #1
strb r0, [r4, #0xe]
lsls r0, r0, #0x18
cmp r0, #0
bne _080488FA
movs r0, #3
strb r0, [r4, #0xc]
ldrb r0, [r4, #0x10]
movs r1, #0x80
orrs r0, r1
strb r0, [r4, #0x10]
bl Random
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x18]
adds r2, r4, #0
adds r2, #0x29
ldrb r1, [r2]
movs r0, #8
rsbs r0, r0, #0
ands r0, r1
movs r1, #4
orrs r0, r1
strb r0, [r2]
adds r0, r4, #0
adds r0, #0x78
ldrh r0, [r0]
strh r0, [r4, #0x24]
adds r1, r4, #0
adds r1, #0x38
movs r0, #2
strb r0, [r1]
adds r0, r4, #0
bl UpdateSpriteForCollisionLayer
adds r0, r4, #0
adds r0, #0x7a
ldrb r0, [r0]
strb r0, [r4, #0x15]
lsls r0, r0, #0x18
lsrs r0, r0, #0x1a
strb r0, [r4, #0x14]
ldrb r1, [r4, #0x14]
adds r0, r4, #0
bl InitializeAnimation
ldrb r0, [r4, #0x14]
lsrs r0, r0, #1
cmp r0, #1
beq _080488D0
cmp r0, #1
bgt _080488AA
cmp r0, #0
beq _080488AE
b _080488D0
_080488AA:
cmp r0, #2
bne _080488D0
_080488AE:
ldr r1, _080488C8 @ =gPlayerEntity
adds r0, r4, #0
adds r0, #0x74
ldrh r0, [r0]
ldrh r1, [r1, #0x2e]
adds r0, r0, r1
strh r0, [r4, #0x2e]
ldr r1, _080488CC @ =gRoomControls
adds r0, r4, #0
adds r0, #0x76
ldrh r0, [r0]
ldrh r1, [r1, #0xc]
b _080488E8
.align 2, 0
_080488C8: .4byte gPlayerEntity
_080488CC: .4byte gRoomControls
_080488D0:
ldr r1, _080488FC @ =gRoomControls
adds r0, r4, #0
adds r0, #0x74
ldrh r0, [r0]
ldrh r1, [r1, #0xa]
adds r0, r0, r1
strh r0, [r4, #0x2e]
ldr r1, _08048900 @ =gPlayerEntity
adds r0, r4, #0
adds r0, #0x76
ldrh r0, [r0]
ldrh r1, [r1, #0x32]
_080488E8:
adds r0, r0, r1
strh r0, [r4, #0x32]
ldrb r0, [r4, #0xb]
cmp r0, #0
bne _080488FA
movs r0, #0xcc
lsls r0, r0, #1
bl SoundReq
_080488FA:
pop {r4, pc}
.align 2, 0
_080488FC: .4byte gRoomControls
_08048900: .4byte gPlayerEntity
thumb_func_start sub_08048904
sub_08048904: @ 0x08048904
push {r4, lr}
adds r4, r0, #0
bl LinearMoveUpdate
adds r0, r4, #0
bl GetNextFrame
ldrb r0, [r4, #0x14]
lsrs r0, r0, #1
cmp r0, #1
beq _0804893C
cmp r0, #1
bgt _08048924
cmp r0, #0
beq _0804892A
b _0804896C
_08048924:
cmp r0, #2
beq _08048954
b _0804896C
_0804892A:
movs r0, #0x32
ldrsh r1, [r4, r0]
ldr r0, _08048938 @ =gRoomControls
movs r2, #0xc
ldrsh r0, [r0, r2]
b _08048976
.align 2, 0
_08048938: .4byte gRoomControls
_0804893C:
movs r0, #0x2e
ldrsh r1, [r4, r0]
ldr r0, _08048950 @ =gRoomControls
movs r2, #0xa
ldrsh r0, [r0, r2]
movs r2, #0x8c
lsls r2, r2, #1
adds r0, r0, r2
b _08048960
.align 2, 0
_08048950: .4byte gRoomControls
_08048954:
movs r0, #0x32
ldrsh r1, [r4, r0]
ldr r0, _08048968 @ =gRoomControls
movs r2, #0xc
ldrsh r0, [r0, r2]
adds r0, #0xc8
_08048960:
cmp r1, r0
blt _08048980
b _0804897C
.align 2, 0
_08048968: .4byte gRoomControls
_0804896C:
movs r0, #0x2e
ldrsh r1, [r4, r0]
ldr r0, _08048984 @ =gRoomControls
movs r2, #0xa
ldrsh r0, [r0, r2]
_08048976:
subs r0, #0x28
cmp r1, r0
bgt _08048980
_0804897C:
bl DeleteThisEntity
_08048980:
pop {r4, pc}
.align 2, 0
_08048984: .4byte gRoomControls

1093
asm/enemy/gyorgFemale.s
View File

File diff suppressed because it is too large Load Diff

590
asm/enemy/gyorgFemaleEye.s
View File

@ -1,590 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start GyorgFemaleEye
GyorgFemaleEye: @ 0x08048988
push {r4, r5, lr}
adds r5, r0, #0
ldr r0, [r5, #0x50]
ldr r0, [r0, #4]
cmp r0, #0
bne _08048998
bl DeleteThisEntity
_08048998:
ldr r4, _080489B0 @ =gUnk_080D1F64
adds r0, r5, #0
bl GetNextFunction
lsls r0, r0, #2
adds r0, r0, r4
ldr r1, [r0]
adds r0, r5, #0
bl _call_via_r1
pop {r4, r5, pc}
.align 2, 0
_080489B0: .4byte gUnk_080D1F64
thumb_func_start sub_080489B4
sub_080489B4: @ 0x080489B4
push {lr}
ldr r2, _080489C8 @ =gUnk_080D1F7C
ldrb r1, [r0, #0xc]
lsls r1, r1, #2
adds r1, r1, r2
ldr r1, [r1]
bl _call_via_r1
pop {pc}
.align 2, 0
_080489C8: .4byte gUnk_080D1F7C
thumb_func_start sub_080489CC
sub_080489CC: @ 0x080489CC
.ifdef EU
push {r4, r5, r6, lr}
adds r5, r0, #0
movs r0, #0x45
adds r0, r0, r5
mov ip, r0
ldrb r0, [r0]
cmp r0, #0xff
beq _080487F4
ldr r3, [r5, #0x50]
adds r2, r3, #0
adds r2, #0x7c
movs r0, #1
ldrb r1, [r5, #0xa]
lsls r0, r1
ldrb r1, [r2]
orrs r0, r1
strb r0, [r2]
ldr r4, [r3, #0x64]
ldrb r0, [r5, #0xa]
lsls r0, r0, #2
adds r1, r4, #0
adds r1, #0x18
adds r1, r1, r0
ldr r0, [r5, #0x4c]
str r0, [r1]
ldr r2, _08048804 @ =gPlayerEntity
movs r6, #0x2e
ldrsh r0, [r2, r6]
movs r6, #0x2e
ldrsh r1, [r5, r6]
adds r0, r0, r1
lsrs r1, r0, #0x1f
adds r0, r0, r1
asrs r0, r0, #1
strh r0, [r4, #0x38]
ldr r4, [r3, #0x64]
movs r1, #0x32
ldrsh r0, [r2, r1]
movs r2, #0x32
ldrsh r1, [r5, r2]
adds r0, r0, r1
lsrs r1, r0, #0x1f
adds r0, r0, r1
asrs r0, r0, #1
strh r0, [r4, #0x3a]
ldr r2, [r3, #0x64]
adds r3, r5, #0
adds r3, #0x3e
ldrb r0, [r3]
movs r1, #0x10
eors r0, r1
strb r0, [r3]
adds r2, #0x3c
strb r0, [r2]
_080487F4:
movs r0, #0xff
mov r6, ip
strb r0, [r6]
ldr r1, _08048808 @ =gUnk_080D1F64
adds r0, r5, #0
bl sub_0804AA30
pop {r4, r5, r6, pc}
.align 2, 0
_08048804: .4byte gPlayerEntity
_08048808: .4byte gUnk_080D1F64
.else
push {r4, r5, r6, lr}
mov ip, r0
adds r0, #0x45
ldrb r0, [r0]
cmp r0, #0xff
bne _080489DA
b _08048AD8
_080489DA:
mov r0, ip
ldr r4, [r0, #0x50]
adds r0, r4, #0
adds r0, #0x78
ldrb r0, [r0]
mov r2, ip
ldrb r1, [r2, #0xa]
asrs r0, r1
movs r3, #1
ands r0, r3
cmp r0, #0
beq _08048AD8
adds r2, r4, #0
adds r2, #0x7c
adds r0, r3, #0
lsls r0, r1
ldrb r1, [r2]
orrs r0, r1
strb r0, [r2]
mov r0, ip
adds r0, #0x41
ldrb r1, [r0]
movs r0, #0x7f
ands r0, r1
subs r0, #4
cmp r0, #0x16
bhi _08048AD0
lsls r0, r0, #2
ldr r1, _08048A1C @ =_08048A20
adds r0, r0, r1
ldr r0, [r0]
mov pc, r0
.align 2, 0
_08048A1C: .4byte _08048A20
_08048A20: @ jump table
.4byte _08048A7C @ case 0
.4byte _08048A7C @ case 1
.4byte _08048A7C @ case 2
.4byte _08048AD0 @ case 3
.4byte _08048A7C @ case 4
.4byte _08048A7C @ case 5
.4byte _08048A7C @ case 6
.4byte _08048A7C @ case 7
.4byte _08048A7C @ case 8
.4byte _08048A7C @ case 9
.4byte _08048AD0 @ case 10
.4byte _08048AD0 @ case 11
.4byte _08048A7C @ case 12
.4byte _08048A7C @ case 13
.4byte _08048A7C @ case 14
.4byte _08048AD0 @ case 15
.4byte _08048AD0 @ case 16
.4byte _08048AD0 @ case 17
.4byte _08048AD0 @ case 18
.4byte _08048AD0 @ case 19
.4byte _08048A7C @ case 20
.4byte _08048A7C @ case 21
.4byte _08048A7C @ case 22
_08048A7C:
ldr r3, [r4, #0x64]
mov r5, ip
ldrb r0, [r5, #0xa]
lsls r0, r0, #2
adds r1, r3, #0
adds r1, #0x18
adds r1, r1, r0
ldr r0, [r5, #0x4c]
str r0, [r1]
ldr r2, _08048ACC @ =gPlayerEntity
movs r6, #0x2e
ldrsh r0, [r2, r6]
movs r6, #0x2e
ldrsh r1, [r5, r6]
adds r0, r0, r1
lsrs r1, r0, #0x1f
adds r0, r0, r1
asrs r0, r0, #1
strh r0, [r3, #0x38]
ldr r3, [r4, #0x64]
movs r1, #0x32
ldrsh r0, [r2, r1]
movs r2, #0x32
ldrsh r1, [r5, r2]
adds r0, r0, r1
lsrs r1, r0, #0x1f
adds r0, r0, r1
asrs r0, r0, #1
strh r0, [r3, #0x3a]
ldr r2, [r4, #0x64]
mov r3, ip
adds r3, #0x3e
ldrb r0, [r3]
movs r1, #0x10
eors r0, r1
strb r0, [r3]
adds r2, #0x3c
strb r0, [r2]
b _08048AD8
.align 2, 0
_08048ACC: .4byte gPlayerEntity
_08048AD0:
ldr r0, [r4, #0x64]
adds r0, #0x3c
movs r1, #0xff
strb r1, [r0]
_08048AD8:
mov r1, ip
adds r1, #0x45
movs r0, #0xff
strb r0, [r1]
ldr r1, _08048AEC @ =gUnk_080D1F64
mov r0, ip
bl sub_0804AA30
pop {r4, r5, r6, pc}
.align 2, 0
_08048AEC: .4byte gUnk_080D1F64
.endif
thumb_func_start sub_08048AF0
sub_08048AF0: @ 0x08048AF0
push {lr}
movs r1, #1
strb r1, [r0, #0xc]
movs r1, #0xff
strb r1, [r0, #0x14]
ldrb r3, [r0, #0x1b]
movs r2, #0x3f
adds r1, r2, #0
ands r1, r3
movs r3, #0x80
orrs r1, r3
strb r1, [r0, #0x1b]
ldrb r1, [r0, #0x19]
ands r2, r1
orrs r2, r3
strb r2, [r0, #0x19]
adds r3, r0, #0
adds r3, #0x29
ldrb r1, [r3]
movs r2, #7
orrs r1, r2
strb r1, [r3]
adds r2, r0, #0
adds r2, #0x38
movs r1, #2
strb r1, [r2]
bl sub_08048D20
pop {pc}
.align 2, 0
thumb_func_start sub_08048B2C
sub_08048B2C: @ 0x08048B2C
push {r4, r5, lr}
adds r4, r0, #0
bl sub_08048D20
ldr r5, [r4, #0x50]
adds r0, r5, #0
bl sub_08048D70
cmp r0, #0
beq _08048B62
ldrb r0, [r4, #0x18]
lsls r0, r0, #0x1e
cmp r0, #0
bne _08048B52
adds r0, r4, #0
movs r1, #2
movs r2, #0x40
bl CreateFx
_08048B52:
ldrb r0, [r4, #0x18]
movs r1, #4
rsbs r1, r1, #0
ands r1, r0
movs r0, #1
orrs r1, r0
strb r1, [r4, #0x18]
b _08048B6C
_08048B62:
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
strb r0, [r4, #0x18]
_08048B6C:
adds r0, r5, #0
adds r0, #0x78
ldrb r0, [r0]
ldrb r1, [r4, #0xa]
asrs r0, r1
movs r1, #1
ands r0, r1
cmp r0, #0
beq _08048B82
movs r0, #2
strb r0, [r4, #0xc]
_08048B82:
pop {r4, r5, pc}
thumb_func_start sub_08048B84
sub_08048B84: @ 0x08048B84
push {r4, lr}
adds r4, r0, #0
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _08048BAE
movs r0, #3
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x10]
movs r0, #0x80
orrs r0, r1
strb r0, [r4, #0x10]
adds r1, r4, #0
adds r1, #0x3f
movs r0, #0x1e
strb r0, [r1]
_08048BAE:
pop {r4, pc}
thumb_func_start sub_08048BB0
sub_08048BB0: @ 0x08048BB0
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r2, [r4, #0x50]
adds r0, r2, #0
adds r0, #0x78
ldrb r3, [r0]
ldrb r1, [r4, #0xa]
adds r0, r3, #0
asrs r0, r1
movs r6, #1
ands r0, r6
cmp r0, #0
bne _08048C34
adds r0, r2, #0
adds r0, #0x45
ldrb r0, [r0]
cmp r0, #0
beq _08048BFC
movs r0, #4
strb r0, [r4, #0xc]
ldrb r1, [r4, #0x10]
movs r0, #0x7f
ands r0, r1
strb r0, [r4, #0x10]
ldr r1, _08048BF8 @ =gUnk_080D2030
ldrb r0, [r4, #0x14]
lsls r0, r0, #3
ldrb r2, [r4, #0xa]
adds r0, r0, r2
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r4, #0
bl InitializeAnimation
b _08048CEA
.align 2, 0
_08048BF8: .4byte gUnk_080D2030
_08048BFC:
strb r6, [r4, #0xc]
ldrb r1, [r4, #0x10]
movs r0, #0x7f
ands r0, r1
strb r0, [r4, #0x10]
ldrb r1, [r4, #0x18]
movs r0, #4
rsbs r0, r0, #0
ands r0, r1
strb r0, [r4, #0x18]
ldr r1, _08048C30 @ =gUnk_080D2010
ldrb r0, [r4, #0x14]
lsls r0, r0, #3
ldrb r2, [r4, #0xa]
adds r0, r0, r2
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r4, #0
bl InitializeAnimation
adds r0, r4, #0
movs r1, #2
movs r2, #0x40
bl CreateFx
b _08048CEA
.align 2, 0
_08048C30: .4byte gUnk_080D2010
_08048C34:
adds r5, r2, #0
adds r5, #0x80
ldrb r0, [r5]
asrs r0, r1
ands r0, r6
cmp r0, #0
beq _08048CBC
adds r0, r4, #0
adds r0, #0x58
ldrb r0, [r0]
cmp r0, #0x13
bhi _08048C6C
adds r1, r4, #0
adds r1, #0x3d
movs r0, #0xf4
strb r0, [r1]
adds r1, #2
movs r0, #0x89
strb r0, [r1]
ldrb r1, [r2, #0x14]
lsrs r1, r1, #6
adds r1, #0x14
adds r0, r4, #0
bl InitializeAnimation
ldr r0, _08048CB4 @ =0x00000119
bl SoundReq
_08048C6C:
adds r0, r4, #0
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _08048CEA
adds r1, r4, #0
adds r1, #0x3f
movs r0, #0x1e
strb r0, [r1]
ldr r1, _08048CB8 @ =gUnk_080D2010
ldrb r0, [r4, #0x14]
lsls r0, r0, #3
ldrb r2, [r4, #0xa]
adds r0, r0, r2
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r4, #0
bl InitializeAnimation
adds r0, r4, #0
movs r1, #7
bl UpdateAnimationVariableFrames
adds r1, r6, #0
ldrb r4, [r4, #0xa]
lsls r1, r4
ldrb r0, [r5]
bics r0, r1
strb r0, [r5]
b _08048CEA
.align 2, 0
_08048CB4: .4byte 0x00000119
_08048CB8: .4byte gUnk_080D2010
_08048CBC:
cmp r3, #0xff
bne _08048CEA
adds r0, r4, #0
adds r0, #0x58
ldrb r0, [r0]
subs r0, #0x10
cmp r0, #3
bls _08048CE4
ldrb r1, [r4, #0x14]
adds r1, #0x10
adds r0, r4, #0
bl InitializeAnimation
bl Random
movs r1, #0x1c
ands r1, r0
adds r0, r4, #0
bl UpdateAnimationVariableFrames
_08048CE4:
adds r0, r4, #0
bl GetNextFrame
_08048CEA:
pop {r4, r5, r6, pc}
thumb_func_start sub_08048CEC
sub_08048CEC: @ 0x08048CEC
push {r4, lr}
adds r4, r0, #0
bl GetNextFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _08048D1A
movs r0, #1
strb r0, [r4, #0xc]
ldr r1, _08048D1C @ =gUnk_080D2010
ldrb r0, [r4, #0x14]
lsls r0, r0, #3
ldrb r2, [r4, #0xa]
adds r0, r0, r2
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r4, #0
bl InitializeAnimation
_08048D1A:
pop {r4, pc}
.align 2, 0
_08048D1C: .4byte gUnk_080D2010
thumb_func_start sub_08048D20
sub_08048D20: @ 0x08048D20
push {r4, r5, lr}
adds r4, r0, #0
ldr r0, [r4, #0x50]
ldrb r0, [r0, #0x14]
lsrs r0, r0, #6
ldrb r1, [r4, #0x14]
cmp r0, r1
beq _08048D60
strb r0, [r4, #0x14]
ldrb r1, [r4, #0xa]
lsls r3, r0, #3
adds r1, r1, r3
lsls r1, r1, #2
ldr r0, _08048D64 @ =gUnk_080D1F90
adds r1, r1, r0
ldr r2, _08048D68 @ =gRoomControls
ldrh r0, [r2, #6]
ldrh r5, [r1]
adds r0, r0, r5
strh r0, [r4, #0x2e]
ldrh r0, [r2, #8]
ldrh r1, [r1, #2]
adds r0, r0, r1
strh r0, [r4, #0x32]
ldr r1, _08048D6C @ =gUnk_080D2010
ldrb r0, [r4, #0xa]
adds r0, r0, r3
adds r0, r0, r1
ldrb r1, [r0]
adds r0, r4, #0
bl InitializeAnimation
_08048D60:
pop {r4, r5, pc}
.align 2, 0
_08048D64: .4byte gUnk_080D1F90
_08048D68: .4byte gRoomControls
_08048D6C: .4byte gUnk_080D2010
thumb_func_start sub_08048D70
sub_08048D70: @ 0x08048D70
push {lr}
adds r1, r0, #0
adds r0, #0x45
ldrb r0, [r0]
cmp r0, #0
bne _08048D8E
ldr r1, [r1, #0x64]
ldr r0, [r1, #8]
cmp r0, #0
bne _08048D86
ldr r0, [r1, #0xc]
_08048D86:
adds r0, #0x45
ldrb r0, [r0]
cmp r0, #0
bne _08048D92
_08048D8E:
movs r0, #1
b _08048D94
_08048D92:
movs r0, #0
_08048D94:
pop {pc}
.align 2, 0

115
asm/enemy/gyorgFemaleMouth.s
View File

@ -1,115 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start GyorgFemaleMouth
GyorgFemaleMouth: @ 0x08048F8C
push {r4, r5, r6, lr}
adds r4, r0, #0
ldr r0, [r4, #0x50]
ldr r0, [r0, #4]
cmp r0, #0
bne _08048F9C
bl DeleteThisEntity
_08048F9C:
ldrb r0, [r4, #0xc]
cmp r0, #0
bne _08048FD4
movs r0, #1
strb r0, [r4, #0xc]
ldrb r2, [r4, #0x1b]
movs r1, #0x3f
adds r0, r1, #0
ands r0, r2
movs r2, #0x80
orrs r0, r2
strb r0, [r4, #0x1b]
ldrb r0, [r4, #0x19]
ands r1, r0
orrs r1, r2
strb r1, [r4, #0x19]
adds r2, r4, #0
adds r2, #0x29
ldrb r0, [r2]
movs r1, #7
orrs r0, r1
strb r0, [r2]
adds r1, r4, #0
adds r1, #0x38
movs r0, #2
strb r0, [r1]
movs r0, #0xff
strb r0, [r4, #0x14]
_08048FD4:
ldr r0, [r4, #0x50]
ldrb r0, [r0, #0x14]
lsrs r0, r0, #5
lsls r6, r0, #0x18
lsrs r5, r6, #0x18
ldrb r0, [r4, #0x14]
cmp r5, r0
beq _08049018
strb r5, [r4, #0x14]
ldr r3, _08049010 @ =gUnk_080D28CC
lsls r1, r5, #1
adds r1, r1, r3
ldr r2, _08049014 @ =gRoomControls
ldrh r0, [r2, #6]
ldrh r1, [r1]
adds r0, r0, r1
strh r0, [r4, #0x2e]
adds r1, r5, #1
lsls r1, r1, #1
adds r1, r1, r3
ldrh r0, [r2, #8]
ldrh r1, [r1]
adds r0, r0, r1
strh r0, [r4, #0x32]
lsrs r1, r6, #0x19
adds r0, r4, #0
bl InitializeAnimation
b _0804901E
.align 2, 0
_08049010: .4byte gUnk_080D28CC
_08049014: .4byte gRoomControls
_08049018:
adds r0, r4, #0
bl GetNextFrame
_0804901E:
movs r0, #2
ands r0, r5
cmp r0, #0
beq _08049038
ldr r0, _08049034 @ =gPlayerEntity
movs r2, #0x32
ldrsh r1, [r4, r2]
movs r2, #0x32
ldrsh r0, [r0, r2]
b _08049042
.align 2, 0
_08049034: .4byte gPlayerEntity
_08049038:
ldr r0, _08049054 @ =gPlayerEntity
movs r2, #0x2e
ldrsh r1, [r4, r2]
movs r2, #0x2e
ldrsh r0, [r0, r2]
_08049042:
cmp r1, r0
bge _08049048
adds r5, #1
_08049048:
ldr r0, _08049058 @ =gUnk_080D28AC
lsls r1, r5, #2
adds r1, r1, r0
ldr r0, [r1]
str r0, [r4, #0x48]
pop {r4, r5, r6, pc}
.align 2, 0
_08049054: .4byte gPlayerEntity
_08049058: .4byte gUnk_080D28AC

84
asm/non_matching/gyorg_female/sub_08046518.inc Normal file
View File

@ -0,0 +1,84 @@
push {r4, r5, r6, r7, lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5, r6, r7}
sub sp, #0x8
ldr r1, _data0_0
ldr r2, _data0_0+0x4
add r0, r1, r2
ldr r3, _data0_0+0x8
add r2, r1, r3
ldr r7, _data0_0+0xc
add r7, r1, r7
str r7, [sp, #0x4]
ldr r3, _data0_0+0x10
add r6, r1, r3
mov r1, #0x10
_code0_0:
mov r5, #0x10
mov r7, #0x80
add r7, r0
mov r10, r7
mov r3, r2
add r3, #0x80
str r3, [sp]
ldr r7, [sp, #0x4]
add r7, #0x40
mov r8, r7
mov r3, #0x40
add r3, r6
mov r9, r3
sub r1, #0x1
mov r12, r1
mov r3, r0
add r3, #0x20
mov r4, r2
add r4, #0x20
_code0_1:
ldrh r0, [r3]
strh r0, [r4]
ldrh r0, [r3]
lsl r0, #0x1
ldr r7, _data0_0
add r0, r7
ldrh r1, [r0]
ldr r0, [sp, #0x4]
add r2, r0, r5
ldr r7, _data0_0+0x14
add r0, r1, r7
ldrb r0, [r0]
strb r0, [r2]
add r2, r6, r5
ldr r0, _data0_0+0x18
add r1, r0
ldrb r0, [r1]
strb r0, [r2]
sub r3, #0x2
sub r4, #0x2
sub r5, #0x1
cmp r5, #0x0
bne _code0_1
mov r0, r10
ldr r2, [sp]
mov r1, r8
str r1, [sp, #0x4]
mov r6, r9
mov r1, r12
cmp r1, #0x0
bne _code0_0
add sp, #0x8
pop {r3, r4, r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4, r5, r6, r7, pc}
.align 2, 0
_data0_0:
.4byte gMetatileTypesTop
.4byte 0xffffbcb0
.4byte 0xffffecb0
.4byte 0x6658
.4byte 0xffffd658
.4byte gUnk_080B37A0
.4byte gUnk_080B3E80

1466
asm/object/gyorgBossObject.s
View File

File diff suppressed because it is too large Load Diff

241
assets/assets.json
View File

@ -28602,177 +28602,6 @@
"start": 858702, "start": 858702,
"size": 22 "size": 22
}, },
{
"path": "gyorgFemale/gUnk_080D1A84.bin",
"start": 858756,
"size": 16
},
{
"path": "gyorgFemale/gUnk_080D1A94_JP.bin",
"variants": [
"JP"
],
"starts": {
"JP": 858164
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1A94_1_DEMO_JP.bin",
"variants": [
"DEMO_JP"
],
"starts": {
"DEMO_JP": 856792
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1A94_2_EU.bin",
"variants": [
"EU"
],
"starts": {
"EU": 856512
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1A94_3_USA-DEMO_USA.bin",
"variants": [
"USA",
"DEMO_USA"
],
"start": 858772,
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1AAC_JP.bin",
"variants": [
"JP"
],
"starts": {
"JP": 858188
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1AAC_1_DEMO_JP.bin",
"variants": [
"DEMO_JP"
],
"starts": {
"DEMO_JP": 856816
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1AAC_2_EU.bin",
"variants": [
"EU"
],
"starts": {
"EU": 856536
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1AAC_3_USA-DEMO_USA.bin",
"variants": [
"USA",
"DEMO_USA"
],
"start": 858796,
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1AC4_JP.bin",
"variants": [
"JP"
],
"starts": {
"JP": 858212
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1AC4_1_DEMO_JP.bin",
"variants": [
"DEMO_JP"
],
"starts": {
"DEMO_JP": 856840
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1AC4_2_EU.bin",
"variants": [
"EU"
],
"starts": {
"EU": 856560
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1AC4_3_USA-DEMO_USA.bin",
"variants": [
"USA",
"DEMO_USA"
],
"start": 858820,
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1ADC_JP.bin",
"variants": [
"JP"
],
"starts": {
"JP": 858236
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1ADC_1_DEMO_JP.bin",
"variants": [
"DEMO_JP"
],
"starts": {
"DEMO_JP": 856864
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1ADC_2_EU.bin",
"variants": [
"EU"
],
"starts": {
"EU": 856584
},
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1ADC_3_USA-DEMO_USA.bin",
"variants": [
"USA",
"DEMO_USA"
],
"start": 858844,
"size": 24
},
{
"path": "gyorgFemale/gUnk_080D1AF4.bin",
"start": 858868,
"size": 4
},
{
"path": "gyorgFemale/gUnk_080D1AF8.bin",
"start": 858872,
"size": 4
},
{ {
"path": "animations/gSpriteAnimations_GyorgMale_0.bin", "path": "animations/gSpriteAnimations_GyorgMale_0.bin",
"start": 859248, "start": 859248,
@ -28959,11 +28788,6 @@
"size": 6, "size": 6,
"type": "animation" "type": "animation"
}, },
{
"path": "gyorgChild/gUnk_080D1EA0.bin",
"start": 859808,
"size": 22
},
{ {
"path": "animations/gSpriteAnimations_GyorgFemaleEye_0.bin", "path": "animations/gSpriteAnimations_GyorgFemaleEye_0.bin",
"start": 860240, "start": 860240,
@ -29108,21 +28932,6 @@
"size": 16, "size": 16,
"type": "animation" "type": "animation"
}, },
{
"path": "gyorgFemaleEye/gUnk_080D1F90.bin",
"start": 860048,
"size": 128
},
{
"path": "gyorgFemaleEye/gUnk_080D2010.bin",
"start": 860176,
"size": 32
},
{
"path": "gyorgFemaleEye/gUnk_080D2030.bin",
"start": 860208,
"size": 32
},
{ {
"path": "animations/gSpriteAnimations_Enemy62_0.bin", "path": "animations/gSpriteAnimations_Enemy62_0.bin",
"start": 861032, "start": 861032,
@ -29541,51 +29350,6 @@
"size": 17, "size": 17,
"type": "animation" "type": "animation"
}, },
{
"path": "gyorgFemaleMouth/gUnk_080D28CC.bin",
"start": 862412,
"size": 16
},
{
"path": "gyorgFemaleMouth/gUnk_080D28DC.bin",
"start": 862428,
"size": 8
},
{
"path": "gyorgFemaleMouth/gUnk_080D28E4.bin",
"start": 862436,
"size": 8
},
{
"path": "gyorgFemaleMouth/gUnk_080D28EC.bin",
"start": 862444,
"size": 8
},
{
"path": "gyorgFemaleMouth/gUnk_080D28F4.bin",
"start": 862452,
"size": 8
},
{
"path": "gyorgFemaleMouth/gUnk_080D28FC.bin",
"start": 862460,
"size": 8
},
{
"path": "gyorgFemaleMouth/gUnk_080D2904.bin",
"start": 862468,
"size": 8
},
{
"path": "gyorgFemaleMouth/gUnk_080D290C.bin",
"start": 862476,
"size": 8
},
{
"path": "gyorgFemaleMouth/gUnk_080D2914.bin",
"start": 862484,
"size": 8
},
{ {
"path": "enemy64/gUnk_080D29B8.bin", "path": "enemy64/gUnk_080D29B8.bin",
"start": 862648, "start": 862648,
@ -47121,11 +46885,6 @@
"start": 1200092, "start": 1200092,
"size": 20 "size": 20
}, },
{
"path": "gyorgBossObject/gUnk_08124EF8.bin",
"start": 1199864,
"size": 16
},
{ {
"path": "windcrest/gUnk_08125010.bin", "path": "windcrest/gUnk_08125010.bin",
"start": 1200144, "start": 1200144,

29
data/const/enemy/gyorgChild.s
View File

@ -1,29 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1E6C:: @ 080D1E6C
.4byte sub_08048684
.4byte sub_0804869C
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte sub_080486AC
gUnk_080D1E84:: @ 080D1E84
.4byte sub_080486F4
.4byte sub_0804877C
.4byte sub_0804882C
.4byte sub_08048904
gUnk_080D1E94:: @ 080D1E94
.4byte sub_080486D0
.4byte sub_080486D8
.4byte sub_080486E0
gUnk_080D1EA0:: @ 080D1EA0
.incbin "gyorgChild/gUnk_080D1EA0.bin"

95
data/const/enemy/gyorgFemale.s
View File

@ -1,95 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1A64:: @ 080D1A64
.4byte sub_0804614C
.4byte sub_0804625C
.4byte sub_0804632C
.4byte sub_080463E4
gUnk_080D1A74:: @ 080D1A74
.4byte gUnk_080D1A94
.4byte gUnk_080D1AAC
.4byte gUnk_080D1AC4
.4byte gUnk_080D1ADC
gUnk_080D1A84:: @ 080D1A84
.incbin "gyorgFemale/gUnk_080D1A84.bin"
gUnk_080D1A94:: @ 080D1A94
.ifdef JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1A94_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1A94_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "gyorgFemale/gUnk_080D1A94_2_EU.bin"
.else
.incbin "gyorgFemale/gUnk_080D1A94_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_080D1AAC:: @ 080D1AAC
.ifdef JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1AAC_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1AAC_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "gyorgFemale/gUnk_080D1AAC_2_EU.bin"
.else
.incbin "gyorgFemale/gUnk_080D1AAC_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_080D1AC4:: @ 080D1AC4
.ifdef JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1AC4_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1AC4_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "gyorgFemale/gUnk_080D1AC4_2_EU.bin"
.else
.incbin "gyorgFemale/gUnk_080D1AC4_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_080D1ADC:: @ 080D1ADC
.ifdef JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1ADC_JP.bin"
.else
.ifdef DEMO_JP
@ TODO only small differences
.incbin "gyorgFemale/gUnk_080D1ADC_1_DEMO_JP.bin"
.else
.ifdef EU
.incbin "gyorgFemale/gUnk_080D1ADC_2_EU.bin"
.else
.incbin "gyorgFemale/gUnk_080D1ADC_3_USA-DEMO_USA.bin"
.endif
.endif
.endif
gUnk_080D1AF4:: @ 080D1AF4
.incbin "gyorgFemale/gUnk_080D1AF4.bin"
gUnk_080D1AF8:: @ 080D1AF8
.incbin "gyorgFemale/gUnk_080D1AF8.bin"

29
data/const/enemy/gyorgFemaleEye.s
View File

@ -1,29 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D1F64:: @ 080D1F64
.4byte sub_080489B4
.4byte sub_080489CC
.4byte sub_08001324
.4byte sub_0804A7D4
.4byte sub_08001242
.4byte sub_080489B4
gUnk_080D1F7C:: @ 080D1F7C
.4byte sub_08048AF0
.4byte sub_08048B2C
.4byte sub_08048B84
.4byte sub_08048BB0
.4byte sub_08048CEC
gUnk_080D1F90:: @ 080D1F90
.incbin "gyorgFemaleEye/gUnk_080D1F90.bin"
gUnk_080D2010:: @ 080D2010
.incbin "gyorgFemaleEye/gUnk_080D2010.bin"
gUnk_080D2030:: @ 080D2030
.incbin "gyorgFemaleEye/gUnk_080D2030.bin"

42
data/const/enemy/gyorgFemaleMouth.s
View File

@ -1,42 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080D28AC:: @ 080D28AC
.4byte gUnk_080D28DC
.4byte gUnk_080D28E4
.4byte gUnk_080D28EC
.4byte gUnk_080D28F4
.4byte gUnk_080D28FC
.4byte gUnk_080D2904
.4byte gUnk_080D290C
.4byte gUnk_080D2914
gUnk_080D28CC:: @ 080D28CC
.incbin "gyorgFemaleMouth/gUnk_080D28CC.bin"
gUnk_080D28DC:: @ 080D28DC
.incbin "gyorgFemaleMouth/gUnk_080D28DC.bin"
gUnk_080D28E4:: @ 080D28E4
.incbin "gyorgFemaleMouth/gUnk_080D28E4.bin"
gUnk_080D28EC:: @ 080D28EC
.incbin "gyorgFemaleMouth/gUnk_080D28EC.bin"
gUnk_080D28F4:: @ 080D28F4
.incbin "gyorgFemaleMouth/gUnk_080D28F4.bin"
gUnk_080D28FC:: @ 080D28FC
.incbin "gyorgFemaleMouth/gUnk_080D28FC.bin"
gUnk_080D2904:: @ 080D2904
.incbin "gyorgFemaleMouth/gUnk_080D2904.bin"
gUnk_080D290C:: @ 080D290C
.incbin "gyorgFemaleMouth/gUnk_080D290C.bin"
gUnk_080D2914:: @ 080D2914
.incbin "gyorgFemaleMouth/gUnk_080D2914.bin"

20
data/const/object/gyorgBossObject.s
View File

@ -1,20 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124ED0:: @ 08124ED0
.4byte sub_080A1704
.4byte sub_080A184C
.4byte sub_080A189C
.4byte sub_080A190C
.4byte sub_080A1990
.4byte sub_080A19FC
.4byte sub_080A1A80
.4byte sub_080A1AE8
.4byte sub_080A1B4C
.4byte sub_080A1C04
gUnk_08124EF8:: @ 08124EF8
.incbin "gyorgBossObject/gUnk_08124EF8.bin"

10
include/enemy.h
View File

@ -223,14 +223,14 @@ void FireballGuy(Entity*);
void MiniFireballGuy(Entity*); void MiniFireballGuy(Entity*);
void VaatiTransfiguredEye(Entity*); void VaatiTransfiguredEye(Entity*);
void BusinessScrubPrologue(Entity*); void BusinessScrubPrologue(Entity*);
void GyorgFemale(Entity*); void GyorgFemale();
void GyorgMale(Entity*); void GyorgMale();
void Curtain(Entity*); void Curtain(Entity*);
void VaatiWrathEye(Entity*); void VaatiWrathEye(Entity*);
void GyorgChild(Entity*); void GyorgChild();
void GyorgFemaleEye(Entity*); void GyorgFemaleEye();
void Enemy62(Entity*); void Enemy62(Entity*);
void GyorgFemaleMouth(Entity*); void GyorgFemaleMouth();
void Enemy64(Entity*); void Enemy64(Entity*);
void TreeItem(Entity*); void TreeItem(Entity*);
void Enemy66(Entity*); void Enemy66(Entity*);

93
include/enemy/gyorg.h Normal file
View File

@ -0,0 +1,93 @@
#ifndef ENEMY_GYORG_H
#define ENEMY_GYORG_H
#include "enemy.h"
typedef struct {
Entity base;
u8 unk_68[0x8];
u16 unk_70;
u8 unk_72[0x6];
u8 unk_78;
u8 unk_79;
u16 unk_7a;
u8 unk_7c;
u8 unk_7d;
u8 unk_7e[1];
u8 unk_7f;
u8 unk_80;
u8 unk_81[1];
u8 unk_82;
u8 unk_83[5];
} GyorgFemaleEntity;
typedef struct {
Entity base;
u8 unk_68[0x20];
} GyorgFemaleEyeEntity;
typedef struct {
Entity base;
u8 filler[0x20];
} GyorgFemaleMouthEntity;
typedef struct {
Entity base;
u8 unk_68[0x8];
u16 unk_70;
u16 unk_72;
u16 unk_74;
u16 unk_76;
u16 unk_78;
u16 unk_7a;
u8 unk_7c;
u8 unk_7d;
u16 unk_7e;
u16 unk_80;
u16 unk_82;
u16 unk_84;
u16 unk_86;
} GyorgMaleEntity;
typedef struct {
Entity base;
u8 unk_68[0xC];
u16 unk_74;
u16 unk_76;
u16 unk_78;
u8 unk_7a;
u8 unk_7b;
u8 unk_7c[0xC];
} GyorgChildEntity;
typedef struct {
Entity base;
u8 unk_68[4];
u16 unk_6c;
u16 unk_6e;
u16 unk_70;
u16 unk_72;
u8 unk_74;
u8 unk_75;
u16 unk_76;
u16 unk_78;
u8 unk_7a;
u8 unk_7b;
u16 unk_7c;
u8 unk_7e[0xa];
} GyorgBossObjectEntity;
typedef struct {
GyorgBossObjectEntity* boss;
GyorgFemaleEntity* female;
GyorgMaleEntity* male1;
GyorgMaleEntity* male2;
GyorgFemaleMouthEntity* unk_10;
GenericEntity* unk_14;
void* unk_18[0x8];
u16 unk_38;
u16 unk_3a;
u8 unk_3c;
} GyorgHeap;
#endif

20
include/entity.h
View File

@ -195,7 +195,7 @@ typedef struct Entity_ {
/*0x60*/ u16 spriteVramOffset; /*0x60*/ u16 spriteVramOffset;
/*0x62*/ u8 spriteOffsetX; /*0x62*/ u8 spriteOffsetX;
/*0x63*/ s8 spriteOffsetY; /*0x63*/ s8 spriteOffsetY;
/*0x64*/ u32* myHeap; /**< Heap data allocated with #zMalloc. */ /*0x64*/ void* myHeap; /**< Heap data allocated with #zMalloc. */
#ifndef NENT_DEPRECATED #ifndef NENT_DEPRECATED
/*0x68*/ union SplitHWord field_0x68; /*0x68*/ union SplitHWord field_0x68;
/*0x6a*/ union SplitHWord field_0x6a; /*0x6a*/ union SplitHWord field_0x6a;
@ -214,6 +214,24 @@ typedef struct Entity_ {
#endif #endif
} Entity; } Entity;
typedef struct {
/*0x00*/ Entity base;
/*0x68*/ union SplitHWord field_0x68;
/*0x6a*/ union SplitHWord field_0x6a;
/*0x6c*/ union SplitHWord field_0x6c;
/*0x6e*/ union SplitHWord field_0x6e;
/*0x70*/ union SplitWord field_0x70;
/*0x74*/ union SplitHWord field_0x74;
/*0x76*/ union SplitHWord field_0x76;
/*0x78*/ union SplitHWord field_0x78;
/*0x7a*/ union SplitHWord field_0x7a;
/*0x7c*/ union SplitWord field_0x7c;
/*0x80*/ union SplitHWord field_0x80;
/*0x82*/ union SplitHWord field_0x82;
/*0x84*/ union SplitHWord cutsceneBeh;
/*0x86*/ union SplitHWord field_0x86;
} GenericEntity;
/** /**
* Entity linked list structure. * Entity linked list structure.
*/ */

5
include/functions.h
View File

@ -26,7 +26,7 @@ extern void sub_0806D02C(Entity*);
extern void sub_0806FD3C(Entity*); extern void sub_0806FD3C(Entity*);
extern void sub_0805ED14(u32*); extern void sub_0805ED14(u32*);
extern void sub_080A7C18(u32, u32, u32); extern void sub_080A7C18(u32, u32, u32);
extern void sub_0804AA30(Entity*, EntityActionArray); extern void sub_0804AA30(Entity*, void (*const[])());
extern void sub_0804A720(Entity*); extern void sub_0804A720(Entity*);
extern u32 sub_080AEFE0(Entity*); extern u32 sub_080AEFE0(Entity*);
extern u32 sub_08049FA0(Entity*); extern u32 sub_08049FA0(Entity*);
@ -49,7 +49,7 @@ extern void sub_080575C8(u32);
extern void sub_08057688(void); extern void sub_08057688(void);
extern void sub_080580B0(u32); extern void sub_080580B0(u32);
extern void sub_080751E8(u32, u32, void*); extern void sub_080751E8(u32, u32, void*);
extern void sub_0808091C(ScreenTransitionData*, u32); extern void sub_0808091C(const ScreenTransitionData*, u32);
extern void sub_0805BC4C(void); extern void sub_0805BC4C(void);
extern void sub_0807BB68(u32*, u32, u32); extern void sub_0807BB68(u32*, u32, u32);
extern void sub_08054570(void); extern void sub_08054570(void);
@ -96,7 +96,6 @@ extern u32 sub_0805F8F8(u32);
extern u32 sub_0805F7A0(u32); extern u32 sub_0805F7A0(u32);
extern u32* sub_0805F25C(u32); extern u32* sub_0805F25C(u32);
u32 sub_0806FCB8(Entity*, u32, u32, u32); u32 sub_0806FCB8(Entity*, u32, u32, u32);
extern void sub_080A1D70(Entity*, u32);
extern void sub_0806F62C(Entity*, u32, u32); extern void sub_0806F62C(Entity*, u32, u32);
extern void sub_080A1ED0(u32, u32, u32); extern void sub_080A1ED0(u32, u32, u32);
extern u32 sub_0806F5B0(u32); extern u32 sub_0806F5B0(u32);

2
include/room.h
View File

@ -215,6 +215,6 @@ void LoadRoomEntityList(EntityData* listPtr);
void sub_0804B3C4(void*); void sub_0804B3C4(void*);
void sub_0804B0B0(u32 arg0, u32 arg1); void sub_0804B0B0(u32 arg0, u32 arg1);
void DoExitTransition(ScreenTransitionData* data); void DoExitTransition(const ScreenTransitionData* data);
#endif #endif

20
linker.ld
View File

@ -414,14 +414,14 @@ SECTIONS {
src/enemy/miniFireballGuy.o(.text); src/enemy/miniFireballGuy.o(.text);
src/enemy/vaatiTransfiguredEye.o(.text); src/enemy/vaatiTransfiguredEye.o(.text);
asm/enemy/businessScrubPrologue.o(.text); asm/enemy/businessScrubPrologue.o(.text);
asm/enemy/gyorgFemale.o(.text); src/enemy/gyorgFemale.o(.text);
src/enemy/gyorgMale.o(.text); src/enemy/gyorgMale.o(.text);
src/enemy/curtain.o(.text); src/enemy/curtain.o(.text);
src/enemy/vaatiWrathEye.o(.text); src/enemy/vaatiWrathEye.o(.text);
asm/enemy/gyorgChild.o(.text); src/enemy/gyorgChild.o(.text);
asm/enemy/gyorgFemaleEye.o(.text); src/enemy/gyorgFemaleEye.o(.text);
asm/enemy/enemy62.o(.text); asm/enemy/enemy62.o(.text);
asm/enemy/gyorgFemaleMouth.o(.text); src/enemy/gyorgFemaleMouth.o(.text);
asm/enemy/enemy64.o(.text); asm/enemy/enemy64.o(.text);
src/enemy/treeItem.o(.text); src/enemy/treeItem.o(.text);
asm/enemy/enemy66.o(.text); asm/enemy/enemy66.o(.text);
@ -836,7 +836,7 @@ SECTIONS {
src/object/well.o(.text); src/object/well.o(.text);
asm/object/windTribeTeleporter.o(.text); asm/object/windTribeTeleporter.o(.text);
asm/object/objectB9.o(.text); asm/object/objectB9.o(.text);
asm/object/gyorgBossObject.o(.text); src/object/gyorgBossObject.o(.text);
src/object/windcrest.o(.text); src/object/windcrest.o(.text);
asm/object/litArea.o(.text); asm/object/litArea.o(.text);
asm/object/objectBD.o(.text); asm/object/objectBD.o(.text);
@ -1098,20 +1098,20 @@ SECTIONS {
src/enemy/vaatiTransfiguredEye.o(.rodata); src/enemy/vaatiTransfiguredEye.o(.rodata);
data/animations/enemy/vaatiTransfiguredEye.o(.rodata); data/animations/enemy/vaatiTransfiguredEye.o(.rodata);
data/const/enemy/businessScrubPrologue.o(.rodata); data/const/enemy/businessScrubPrologue.o(.rodata);
data/const/enemy/gyorgFemale.o(.rodata); src/enemy/gyorgFemale.o(.rodata);
src/enemy/gyorgMale.o(.rodata); src/enemy/gyorgMale.o(.rodata);
data/animations/enemy/gyorgMale.o(.rodata); data/animations/enemy/gyorgMale.o(.rodata);
src/enemy/curtain.o(.rodata); src/enemy/curtain.o(.rodata);
data/animations/enemy/curtain.o(.rodata); data/animations/enemy/curtain.o(.rodata);
src/enemy/vaatiWrathEye.o(.rodata); src/enemy/vaatiWrathEye.o(.rodata);
data/animations/enemy/vaatiWrathEye.o(.rodata); data/animations/enemy/vaatiWrathEye.o(.rodata);
data/const/enemy/gyorgChild.o(.rodata); src/enemy/gyorgChild.o(.rodata);
data/animations/enemy/gyorgChild.o(.rodata); data/animations/enemy/gyorgChild.o(.rodata);
data/const/enemy/gyorgFemaleEye.o(.rodata); src/enemy/gyorgFemaleEye.o(.rodata);
data/animations/enemy/gyorgFemaleEye.o(.rodata); data/animations/enemy/gyorgFemaleEye.o(.rodata);
data/const/enemy/enemy62.o(.rodata); data/const/enemy/enemy62.o(.rodata);
data/animations/enemy/enemy62.o(.rodata); data/animations/enemy/enemy62.o(.rodata);
data/const/enemy/gyorgFemaleMouth.o(.rodata); src/enemy/gyorgFemaleMouth.o(.rodata);
data/animations/enemy/gyorgFemaleMouth.o(.rodata); data/animations/enemy/gyorgFemaleMouth.o(.rodata);
data/const/enemy/enemy64.o(.rodata); data/const/enemy/enemy64.o(.rodata);
src/enemy/treeItem.o(.rodata); src/enemy/treeItem.o(.rodata);
@ -1584,7 +1584,7 @@ SECTIONS {
data/const/object/well.o(.rodata); data/const/object/well.o(.rodata);
data/const/object/windTribeTeleporter.o(.rodata); data/const/object/windTribeTeleporter.o(.rodata);
data/const/object/objectB9.o(.rodata); data/const/object/objectB9.o(.rodata);
data/const/object/gyorgBossObject.o(.rodata); src/object/gyorgBossObject.o(.rodata);
data/animations/object/gyorgBossObject.o(.rodata); data/animations/object/gyorgBossObject.o(.rodata);
data/const/object/windcrest.o(.rodata); data/const/object/windcrest.o(.rodata);
data/const/object/objectBD.o(.rodata); data/const/object/objectBD.o(.rodata);

200
src/enemy/gyorgChild.c Normal file
View File

@ -0,0 +1,200 @@
#define NENT_DEPRECATED
#include "global.h"
#include "room.h"
#include "asm.h"
#include "functions.h"
#include "enemy/gyorg.h"
void sub_08048684(GyorgChildEntity*);
void sub_0804869C(GyorgChildEntity*);
void sub_080486AC(GyorgChildEntity*);
void (*const gUnk_080D1E6C[])(GyorgChildEntity*) = {
sub_08048684,
sub_0804869C,
(void (*)(GyorgChildEntity*))sub_08001324,
(void (*)(GyorgChildEntity*))sub_0804A7D4,
(void (*)(GyorgChildEntity*))sub_08001242,
sub_080486AC,
};
void GyorgChild(Entity* this) {
if (gRoomTransition.field_0x39 == 0) {
this->flags &= ~0x80;
this->health = 0;
this->collisionLayer = 2;
}
gUnk_080D1E6C[GetNextFunction(this)]((GyorgChildEntity*)this);
}
void sub_080486F4(GyorgChildEntity*);
void sub_0804877C(GyorgChildEntity*);
void sub_0804882C(GyorgChildEntity*);
void sub_08048904(GyorgChildEntity*);
void sub_08048684(GyorgChildEntity* this) {
static void (*const gUnk_080D1E84[])(GyorgChildEntity*) = {
sub_080486F4,
sub_0804877C,
sub_0804882C,
sub_08048904,
};
gUnk_080D1E84[super->action](this);
}
void sub_0804869C(GyorgChildEntity* this) {
sub_0804AA30(super, gUnk_080D1E6C);
}
void sub_080486D0(GyorgChildEntity*);
void sub_080486D8(GyorgChildEntity*);
void sub_080486E0(GyorgChildEntity*);
void sub_080486AC(GyorgChildEntity* this) {
static void (*const gUnk_080D1E94[])(GyorgChildEntity*) = {
sub_080486D0,
sub_080486D8,
sub_080486E0,
};
if (sub_0806F520()) {
gUnk_080D1E94[super->subAction](this);
}
}
void sub_080486D0(GyorgChildEntity* this) {
super->subAction = 2;
}
void sub_080486D8(GyorgChildEntity* this) {
sub_0806F4E8(super);
}
void sub_080486E0(GyorgChildEntity* this) {
if (sub_0806F3E4(super)) {
sub_0804A7D4(super);
}
}
void sub_080486F4(GyorgChildEntity* this) {
static const s8 gUnk_080D1EA0[] = {
0x50, 0x1, 0x40, 0x1, 0x30, 0x1, 0x20, 0x1, 0x10, 0x1, 0,
0, 0x10, -0x1, 0x20, -0x1, 0x30, -0x1, 0x40, -0x1, 0x50, -0x1,
};
super->field_0x1c = 1;
super->spriteOrientation.flipY = 3;
super->spriteRendering.b3 = 3;
super->spritePriority.b0 = 7;
super->animationState = super->direction >> 2;
if (super->type == 0) {
s32 r;
InitializeAnimation(super, super->animationState);
super->action = 1;
super->flags |= 0x80;
r = (signed)Random() % 0xB;
super->direction += r;
super->direction -= 5;
super->direction &= 0x1F;
r *= 2;
super->actionDelay = gUnk_080D1EA0[r];
this->unk_7b = gUnk_080D1EA0[r + 1];
super->speed = 0x200;
} else {
super->action = 2;
super->actionDelay = 1;
super->spriteSettings.draw = 0;
}
}
void sub_0804877C(GyorgChildEntity* this) {
LinearMoveUpdate(super);
if (super->actionDelay != 0) {
if ((--super->actionDelay & 0xF) == 0) {
super->direction += this->unk_7b;
super->direction &= 0x1F;
}
}
switch (super->animationState >> 1) {
case 0:
if (super->y.HALF.HI > gRoomControls.scroll_y - 0x18) {
return;
}
break;
case 1:
if (super->x.HALF.HI < gRoomControls.scroll_x + 0x108) {
return;
}
break;
case 2:
if (super->y.HALF.HI < gRoomControls.scroll_y + 0xb8) {
return;
}
break;
default:
if (super->x.HALF.HI > gRoomControls.scroll_x - 0x18) {
return;
}
break;
}
super->action = 2;
super->actionDelay = 90;
super->spriteSettings.draw = 0;
}
void sub_0804882C(GyorgChildEntity* this) {
if (--super->actionDelay == 0) {
super->action = 3;
super->flags |= 0x80;
Random();
super->spriteSettings.draw = 1;
super->spritePriority.b0 = 4;
super->speed = this->unk_78;
super->collisionLayer = 2;
UpdateSpriteForCollisionLayer(super);
super->direction = this->unk_7a;
super->animationState = super->direction >> 2;
InitializeAnimation(super, super->animationState);
switch (super->animationState >> 1) {
case 0:
case 2:
super->x.HALF.HI = gPlayerEntity.x.HALF.HI + this->unk_74;
super->y.HALF.HI = gRoomControls.scroll_y + this->unk_76;
break;
case 1:
default:
super->x.HALF.HI = gRoomControls.scroll_x + this->unk_74;
super->y.HALF.HI = gPlayerEntity.y.HALF.HI + this->unk_76;
break;
}
if (super->type2 == 0) {
SoundReq(SFX_198);
}
}
}
void sub_08048904(GyorgChildEntity* this) {
LinearMoveUpdate(super);
GetNextFrame(super);
switch (super->animationState >> 1) {
case 0:
if (super->y.HALF.HI > gRoomControls.scroll_y - 0x28) {
return;
}
break;
case 1:
if (super->x.HALF.HI < gRoomControls.scroll_x + 0x118) {
return;
}
break;
case 2:
if (super->y.HALF.HI < gRoomControls.scroll_y + 0xc8) {
return;
}
break;
default:
if (super->x.HALF.HI > gRoomControls.scroll_x - 0x28) {
return;
}
break;
}
DeleteThisEntity();
}

458
src/enemy/gyorgFemale.c Normal file
View File

@ -0,0 +1,458 @@
#define NENT_DEPRECATED
#include "global.h"
#include "entity.h"
#include "enemy.h"
#include "sound.h"
#include "asm.h"
#include "functions.h"
#include "enemy/gyorg.h"
extern u8 gEntCount;
extern u8 gMapDataTopSpecial[];
extern u16 gUnk_02019EE0[];
extern void sub_080197D4(const void*);
extern u32 sub_08000E62(u32);
extern void RegisterTransitionManager(void*, void (*)(), void (*)());
void sub_08046498();
void sub_0804660C(GyorgFemaleEntity*, u32);
void sub_080464C0(GyorgFemaleEntity*);
void sub_08046634(GyorgFemaleEntity*, u32);
void sub_080465C8(void);
void sub_080466A8(GyorgFemaleEntity*);
void sub_08046668(GyorgFemaleEntity*);
void sub_08046518(void);
void sub_080467DC(GyorgFemaleEntity*);
extern u8 gUpdateVisibleTiles;
extern u8 gUnk_080B3E80[];
extern u8 gUnk_080B37A0[];
extern u16 gMetatileTypesTop[];
extern const u8 gUnk_080D1A94[];
extern const u8 gUnk_080D1AAC[];
extern const u8 gUnk_080D1AC4[];
extern const u8 gUnk_080D1ADC[];
void sub_0804614C(GyorgFemaleEntity*);
void sub_0804625C(GyorgFemaleEntity*);
void sub_0804632C(GyorgFemaleEntity*);
void sub_080463E4(GyorgFemaleEntity*);
void GyorgFemale(Entity* this) {
static void (*const gUnk_080D1A64[])(GyorgFemaleEntity*) = {
sub_0804614C,
sub_0804625C,
sub_0804632C,
sub_080463E4,
};
gUnk_080D1A64[this->action]((GyorgFemaleEntity*)this);
}
void sub_0804614C(GyorgFemaleEntity* this) {
Entity* tmp;
if (gEntCount > 0x3d)
return;
tmp = CreateProjectile(0x22);
tmp->type = 0;
tmp->parent = super;
((GyorgHeap*)super->myHeap)->unk_14 = (GenericEntity*)tmp;
tmp = CreateEnemy(GYORG_FEMALE_MOUTH, 0);
tmp->parent = super;
((GyorgHeap*)super->myHeap)->unk_10 = (GyorgFemaleMouthEntity*)tmp;
tmp = CreateEnemy(GYORG_FEMALE_EYE, 0);
tmp->parent = super;
tmp = CreateEnemy(GYORG_FEMALE_EYE, 1);
tmp->parent = super;
tmp = CreateEnemy(GYORG_FEMALE_EYE, 2);
tmp->parent = super;
tmp = CreateEnemy(GYORG_FEMALE_EYE, 3);
tmp->parent = super;
tmp = CreateEnemy(GYORG_FEMALE_EYE, 4);
tmp->parent = super;
tmp = CreateEnemy(GYORG_FEMALE_EYE, 5);
tmp->parent = super;
tmp = CreateEnemy(GYORG_FEMALE_EYE, 6);
tmp->parent = super;
tmp = CreateEnemy(GYORG_FEMALE_EYE, 7);
tmp->parent = super;
super->action = 1;
super->spriteOrientation.flipY = 2;
super->spriteRendering.b3 = 2;
super->collisionLayer = 2;
this->unk_78 = 0;
this->unk_79 = 0;
this->unk_70 = 0x3C;
MemClear(&gUnk_02019EE0, 0x8000);
MemClear(&gMapDataTopSpecial, 0x8000);
sub_0804660C(this, 0);
sub_080464C0(this);
gPlayerEntity.collisionLayer = 2;
UpdateSpriteForCollisionLayer(&gPlayerEntity);
#ifndef EU
RegisterTransitionManager(this, sub_08046498, 0);
#else
RegisterTransitionManager(this, sub_080464C0, 0);
#endif
}
void sub_0804625C(GyorgFemaleEntity* this) {
if (this->unk_79 & 0x80) {
this->unk_79 &= ~0x80;
this->unk_79 |= 0x40;
sub_0804660C(this, (this->unk_79 & 3) << 6);
} else {
if (this->unk_79 & 0x40) {
this->unk_79 &= ~0x40;
sub_080464C0(this);
}
}
sub_080465C8();
if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x38) {
super->action = 2;
super->actionDelay = 0;
this->unk_7a = 0;
this->unk_7c = 0;
this->unk_7d = 0;
this->unk_70 = 0x3c;
this->unk_80 = 0;
return;
}
if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x40) {
super->action = 3;
this->unk_70 = 0x3c;
super->actionDelay = 0;
this->unk_7a = 0;
this->unk_7c = 0;
this->unk_7d = 0;
this->unk_80 = 0;
return;
}
if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x100) {
if (--this->unk_70 == 0) {
this->unk_70 = 0x168;
sub_08046634(this, 1);
}
}
}
void sub_0804632C(GyorgFemaleEntity* this) {
sub_080465C8();
sub_080466A8(this);
if (++this->unk_7a > 0x59f) {
this->unk_7a = 0;
this->unk_7c = 0;
this->unk_7d = 0;
this->unk_80 = 0;
} else {
if (this->unk_7a == 0x78) {
sub_08046668(this);
} else {
if (this->unk_7a == 0x528) {
this->unk_78 = 0;
#ifndef EU
this->unk_7d = 0;
this->unk_7f = 0;
#endif
}
}
}
if (((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x80 && --this->unk_70 == 0) {
this->unk_70 = 0x168;
sub_08046634(this, 0);
}
if ((((GyorgHeap*)super->myHeap)->boss->unk_6c & 0x38) == 0) {
super->action = 1;
this->unk_70 = 0x3c;
#ifndef EU
this->unk_78 = 0;
#endif
this->unk_80 = 0;
}
}
void sub_080463E4(GyorgFemaleEntity* this) {
sub_080465C8();
if (--this->unk_70 == 0) {
this->unk_70 = 0x168;
sub_08046634(this, 1);
}
sub_080466A8(this);
if (++this->unk_7a > 0x59f) {
this->unk_7a = 0;
this->unk_7c = 0;
this->unk_7d = 0;
this->unk_80 = 0;
} else {
if (this->unk_7a == 0x78) {
sub_08046668(this);
} else {
if (this->unk_7a == 0x528) {
this->unk_78 = 0;
#ifndef EU
this->unk_7d = 0;
this->unk_7f = 0;
#endif
}
}
}
if (super->health == 0) {
super->action = 1;
#ifdef EU
this->unk_78 = 0;
#endif
this->unk_70 = 0x3c;
#ifndef EU
this->unk_78 = 0;
#endif
this->unk_80 = 0;
SoundReq(SFX_BOSS_DIE);
}
}
#ifndef EU
void sub_08046498(GyorgFemaleEntity* this) {
MemClear(&gUnk_02019EE0, 0x8000);
MemClear(&gMapDataTopSpecial, 0x8000);
sub_080464C0(this);
}
#endif
void sub_080464C0(GyorgFemaleEntity* this) {
static const void* const gUnk_080D1A74[] = {
gUnk_080D1A94,
gUnk_080D1AAC,
gUnk_080D1AC4,
gUnk_080D1ADC,
};
s32 i;
u8* src;
u8* dst;
sub_080197D4(gUnk_080D1A74[super->animationState >> 6]);
sub_08046518();
for (i = 0x20, src = ((u8*)&gUnk_02019EE0), dst = ((u8*)&gUnk_02019EE0) + 0x3260; i != 0; i--) {
MemCopy(src, dst, 0x40);
dst += 0x100;
src += 0x40;
}
MemClear(&gUnk_02019EE0, 0x800);
gUpdateVisibleTiles = 1;
}
NONMATCH("asm/non_matching/gyorg_female/sub_08046518.inc", void sub_08046518(void)) {
u32 r5;
u16* stack1;
u8* stack2;
u8* r6;
u32 i;
u16* sl;
sl = &gMetatileTypesTop[0xFFFFBCB0];
stack1 = &gMetatileTypesTop[0xFFFFECB0];
stack2 = (u8*)&gMetatileTypesTop[0x00006658];
r6 = (u8*)&gMetatileTypesTop[0xFFFFD658];
for (i = 0; i < 0x10; i++) {
sl += 0x40;
stack1 += 0x40;
for (r5 = 0; r5 < 0x10; r5++) {
stack1[r5] = sl[r5];
stack2[r5] = gUnk_080B37A0[gMetatileTypesTop[sl[r5]]];
r6[r5] = gUnk_080B3E80[gMetatileTypesTop[sl[r5]]];
}
stack2 = stack2 + 0x40;
r6 = r6 + 0x40;
}
}
END_NONMATCH
void sub_080465C8(void) {
s32 x, y;
x = (gPlayerEntity.x.HALF.HI - gRoomControls.origin_x) >> 3;
y = (gPlayerEntity.y.HALF.HI - gRoomControls.origin_y) >> 3;
if (gUnk_02019EE0[(y << 7) + x]) {
gPlayerState.field_0x14 = 1;
}
}
void sub_0804660C(GyorgFemaleEntity* this, u32 unk1) {
static const u16 gUnk_080D1A84[] = {
0x200, 0x258, 0x1B8, 0x210, 0x200, 0x1C8, 0x248, 0x210,
};
const u16* p;
super->animationState = unk1;
p = &gUnk_080D1A84[unk1 >> 5];
super->x.HALF.HI = p[0] + gRoomControls.origin_x;
super->y.HALF.HI = p[1] + gRoomControls.origin_y;
}
// todo: correct type
const u8 gUnk_080D1A94[] = {
#if defined(JP) || defined(DEMO_JP)
0x7C,
#elif defined(EU)
0x50,
#else
0x08,
#endif
0x41, 0x22, 0x80, 0xE0, 0x9E, 0x01, 0x02, 0x00, 0x08, 0x00, 0x80,
#if defined(JP) || defined(DEMO_JP)
0x2C, 0xD3,
#elif defined(EU)
0x00, 0xD3,
#else
0xB8, 0xD2,
#endif
0x22, 0x00, 0x54, 0xB6, 0x00, 0x02, 0x80, 0x1F, 0x00, 0x80,
};
const u8 gUnk_080D1AAC[] = {
#if defined(JP) || defined(DEMO_JP)
0xFC,
#elif defined(EU)
0xD0,
#else
0x88,
#endif
0x3D, 0x22, 0x80, 0xE0, 0x9E, 0x01, 0x02, 0x00, 0x08, 0x00, 0x80,
#if defined(JP) || defined(DEMO_JP)
0xF8,
#elif defined(EU)
0xCC,
#else
0x84,
#endif
0xD6, 0x22, 0x00, 0x54, 0xB6, 0x00, 0x02, 0x80, 0x1F, 0x00, 0x80,
};
const u8 gUnk_080D1AC4[] = {
#if defined(JP) || defined(DEMO_JP)
0xE4,
#elif defined(EU)
0xB8,
#else
0x70,
#endif
0x36, 0x22, 0x80, 0xE0, 0x9E, 0x01, 0x02, 0x00, 0x08, 0x00, 0x80,
#if defined(JP) || defined(DEMO_JP)
0xC0,
#elif defined(EU)
0x94,
#else
0x4C,
#endif
0xDA, 0x22, 0x00, 0x54, 0xB6, 0x00, 0x02, 0x80, 0x1F, 0x00, 0x80,
};
const u8 gUnk_080D1ADC[] = {
#if defined(JP) || defined(DEMO_JP)
0x78,
#elif defined(EU)
0x4C,
#else
0x04,
#endif
0x3A, 0x22, 0x80, 0xE0, 0x9E, 0x01, 0x02, 0x00, 0x08, 0x00, 0x80,
#if defined(JP) || defined(DEMO_JP)
0x88,
#elif defined(EU)
0x5C,
#else
0x14,
#endif
0xDE, 0x22, 0x00, 0x54, 0xB6, 0x00, 0x02, 0x80, 0x1F, 0x00, 0x80,
};
void sub_08046634(GyorgFemaleEntity* this, u32 unk1) {
static const u8 gUnk_080D1AF4[] = { 2, 3, 6, 7 };
u32 tmp;
if (unk1 == 0) {
tmp = gUnk_080D1AF4[Random() & 3];
} else {
tmp = Random() & 7;
}
sub_080A1ED0(tmp, 0, super->animationState >> 3);
}
void sub_08046668(GyorgFemaleEntity* this) {
static const u8 gUnk_080D1AF8[] = { 0x16, 0x92, 0x94, 0x86 };
if (super->health == 0) {
return;
}
#ifndef EU
if (this->unk_78 == 0xFF) {
return;
}
#endif
this->unk_78 = gUnk_080D1AF8[Random() & 3];
this->unk_7f = 0;
this->unk_82 = 0;
sub_080467DC(this);
}
void sub_080466A8(GyorgFemaleEntity* this) {
if (this->unk_7c != 0) {
this->unk_7d |= this->unk_7c;
if (super->actionDelay == 0 && this->unk_78 != 0xFF) {
#ifndef EU
super->actionDelay = 4;
#else
super->actionDelay = 3;
#endif
}
if (sub_08000E62(this->unk_7d) > 2) {
super->actionDelay = 0;
this->unk_7d = 0;
this->unk_78 = 0xFF;
SoundReq(SFX_BOSS_HIT);
if (super->health != 0) {
InitScreenShake(8, 0);
if (++this->unk_82 <= 0xC) {
super->health--;
}
if (super->health == 0) {
this->unk_78 = 0;
this->unk_7a = 0x528;
} else {
if (this->unk_7f == 0) {
this->unk_7f = 1;
this->unk_7a = 0x438;
}
}
}
sub_080467DC(this);
}
}
if (super->actionDelay != 0 && this->unk_78 != 0xFF && --super->actionDelay == 0) {
Entity* tmp;
this->unk_80 |= this->unk_7d;
this->unk_7d = 0;
sub_080467DC(this);
#ifndef EU
if (((GyorgHeap*)super->myHeap)->unk_3c != 0xFF) {
#endif
tmp = &gPlayerEntity;
tmp->knockbackDirection = ((GyorgHeap*)super->myHeap)->unk_3c;
tmp->iframes = 0xF4;
tmp->knockbackDuration = 0xA;
tmp = CreateFx(super, 0x2C, 0);
if (tmp) {
tmp->x.HALF.HI = ((GyorgHeap*)super->myHeap)->unk_38;
tmp->y.HALF.HI = ((GyorgHeap*)super->myHeap)->unk_3a;
tmp->collisionLayer = 1;
UpdateSpriteForCollisionLayer(tmp);
}
#ifndef EU
}
#endif
}
this->unk_7c = 0;
}
void sub_080467DC(GyorgFemaleEntity* this) {
u32 i;
for (i = 0; i < 8; i++) {
(*((GyorgHeap**)(&super->myHeap)))->unk_18[i] = 0;
}
}

208
src/enemy/gyorgFemaleEye.c Normal file
View File

@ -0,0 +1,208 @@
#define NENT_DEPRECATED
#include "global.h"
#include "entity.h"
#include "enemy.h"
#include "player.h"
#include "functions.h"
#include "enemy/gyorg.h"
void sub_080489B4(GyorgFemaleEyeEntity*);
void sub_080489CC(GyorgFemaleEyeEntity*);
void sub_08048AF0(GyorgFemaleEyeEntity*);
void sub_08048B2C(GyorgFemaleEyeEntity*);
void sub_08048B84(GyorgFemaleEyeEntity*);
void sub_08048BB0(GyorgFemaleEyeEntity*);
void sub_08048CEC(GyorgFemaleEyeEntity*);
void sub_08048D20(GyorgFemaleEyeEntity*);
u32 sub_08048D70(GyorgFemaleEntity*);
void (*const gUnk_080D1F64[])(GyorgFemaleEyeEntity*) = {
sub_080489B4,
sub_080489CC,
(void (*)(GyorgFemaleEyeEntity*))sub_08001324,
(void (*)(GyorgFemaleEyeEntity*))sub_0804A7D4,
(void (*)(GyorgFemaleEyeEntity*))sub_08001242,
sub_080489B4,
};
void GyorgFemaleEye(Entity* this) {
if (this->parent->next == NULL) {
DeleteThisEntity();
}
gUnk_080D1F64[GetNextFunction(this)]((GyorgFemaleEyeEntity*)this);
}
void sub_080489B4(GyorgFemaleEyeEntity* this) {
static void (*const gUnk_080D1F7C[])(GyorgFemaleEyeEntity*) = {
sub_08048AF0, sub_08048B2C, sub_08048B84, sub_08048BB0, sub_08048CEC,
};
gUnk_080D1F7C[super->action](this);
}
typedef struct {
u16 x, y;
} xy;
const xy gUnk_080D1F90[] = {
{ 0x1e8, 0x1d8 }, { 0x1f8, 0x1d8 }, { 0x208, 0x1d8 }, { 0x218, 0x1d8 }, { 0x1e8, 0x1e8 }, { 0x1f8, 0x1e8 },
{ 0x208, 0x1e8 }, { 0x218, 0x1e8 }, { 0x238, 0x1f8 }, { 0x238, 0x208 }, { 0x238, 0x218 }, { 0x238, 0x228 },
{ 0x228, 0x1f8 }, { 0x228, 0x208 }, { 0x228, 0x218 }, { 0x228, 0x228 }, { 0x218, 0x248 }, { 0x208, 0x248 },
{ 0x1f8, 0x248 }, { 0x1e8, 0x248 }, { 0x218, 0x238 }, { 0x208, 0x238 }, { 0x1f8, 0x238 }, { 0x1e8, 0x238 },
{ 0x1c8, 0x228 }, { 0x1c8, 0x218 }, { 0x1c8, 0x208 }, { 0x1c8, 0x1f8 }, { 0x1d8, 0x228 }, { 0x1d8, 0x218 },
{ 0x1d8, 0x208 }, { 0x1d8, 0x1f8 },
};
const u8 gUnk_080D2010[] = {
0, 0, 1, 1, 0, 0, 1, 1, 4, 4, 5, 5, 4, 4, 5, 5, 9, 9, 8, 8, 9, 9, 8, 8, 13, 13, 12, 12, 13, 13, 12, 12,
};
const u8 gUnk_080D2030[] = {
2, 2, 3, 3, 2, 2, 3, 3, 6, 6, 7, 7, 6, 6, 7, 7, 11, 11, 10, 10, 11, 11, 10, 10, 15, 15, 14, 14, 15, 15, 14, 14,
};
void sub_080489CC(GyorgFemaleEyeEntity* this) {
GyorgFemaleEntity* parent;
if (super->health != 0xFF) {
parent = (GyorgFemaleEntity*)super->parent;
#ifndef EU
if ((parent->unk_78 >> super->type) & 1) {
#endif
parent->unk_7c |= (1 << super->type);
#ifndef EU
switch (super->bitfield & 0x7F) {
case 4 ... 6:
case 8 ... 13:
case 16 ... 18:
case 24 ... 26:
#endif
(*(((GyorgHeap**)&parent->base.myHeap)))->unk_18[super->type] = super->field_0x4c;
(*(((GyorgHeap**)&parent->base.myHeap)))->unk_38 = (gPlayerEntity.x.HALF.HI + super->x.HALF.HI) / 2;
(*(((GyorgHeap**)&parent->base.myHeap)))->unk_3a = (gPlayerEntity.y.HALF.HI + super->y.HALF.HI) / 2;
(*(((GyorgHeap**)&parent->base.myHeap)))->unk_3c = (super->knockbackDirection ^= 0x10);
#ifndef EU
break;
default:
((GyorgHeap*)parent->base.myHeap)->unk_3c = 0xFF;
break;
}
}
#endif
}
super->health = 0xFF;
sub_0804AA30(super, (void (*const*)(Entity*))gUnk_080D1F64);
}
void sub_08048AF0(GyorgFemaleEyeEntity* this) {
super->action = 1;
super->animationState = 0xFF;
super->spriteOrientation.flipY = 2;
super->spriteRendering.b3 = 2;
super->spritePriority.b0 = 7;
super->collisionLayer = 2;
sub_08048D20(this);
}
void sub_08048B2C(GyorgFemaleEyeEntity* this) {
GyorgFemaleEntity* parent;
sub_08048D20(this);
parent = (GyorgFemaleEntity*)super->parent;
if (sub_08048D70(parent)) {
if (!super->spriteSettings.draw) {
CreateFx(super, 2, 0x40);
}
super->spriteSettings.draw = 1;
} else {
super->spriteSettings.draw = 0;
}
if ((parent->unk_78 >> super->type) & 1) {
super->action = 2;
}
}
void sub_08048B84(GyorgFemaleEyeEntity* this) {
GetNextFrame(super);
if (super->frame & 0x80) {
super->action = 3;
super->flags |= 0x80;
super->hitType = 0x1E;
}
}
void sub_08048BB0(GyorgFemaleEyeEntity* this) {
GyorgFemaleEntity* parent = (GyorgFemaleEntity*)super->parent;
if (!((parent->unk_78 >> super->type) & 1)) {
if (parent->base.health != 0) {
super->action = 4;
super->flags &= ~0x80;
InitializeAnimation(super, gUnk_080D2030[(super->animationState << 3) + super->type]);
} else {
super->action = 1;
super->flags &= ~0x80;
super->spriteSettings.draw = 0;
InitializeAnimation(super, gUnk_080D2010[(super->animationState << 3) + super->type]);
CreateFx(super, 2, 0x40);
}
} else {
if ((parent->unk_80 >> super->type) & 1) {
if (super->animIndex <= 0x13) {
super->iframes = 0xF4;
super->hitType = 0x89;
InitializeAnimation(super, (parent->base.animationState >> 6) + 0x14);
SoundReq(0x119);
}
GetNextFrame(super);
if (super->frame & 0x80) {
super->hitType = 0x1E;
InitializeAnimation(super, gUnk_080D2010[(super->animationState << 3) + super->type]);
UpdateAnimationVariableFrames(super, 7);
parent->unk_80 &= ~(1 << super->type);
}
} else {
if (parent->unk_78 == 0xFF) {
u32 tmp = super->animIndex;
if (tmp < 0x10 || tmp > 0x13) {
InitializeAnimation(super, super->animationState + 0x10);
UpdateAnimationVariableFrames(super, Random() & 0x1C);
}
GetNextFrame(super);
}
}
}
}
void sub_08048CEC(GyorgFemaleEyeEntity* this) {
GetNextFrame(super);
if (super->frame & 0x80) {
super->action = 1;
InitializeAnimation(super, gUnk_080D2010[(super->animationState << 3) + super->type]);
}
}
void sub_08048D20(GyorgFemaleEyeEntity* this) {
GyorgFemaleEntity* parent = (GyorgFemaleEntity*)super->parent;
const xy* tmp;
u32 tmp2 = (parent->base.animationState >> 6);
if (tmp2 != super->animationState) {
super->animationState = tmp2;
tmp = &gUnk_080D1F90[super->type + (tmp2 << 3)];
super->x.HALF.HI = tmp->x + gRoomControls.origin_x;
super->y.HALF.HI = tmp->y + gRoomControls.origin_y;
InitializeAnimation(super, gUnk_080D2010[super->type + (tmp2 << 3)]);
}
}
u32 sub_08048D70(GyorgFemaleEntity* parent) {
GyorgMaleEntity* tmp;
if (parent->base.health != 0) {
return 1;
}
tmp = ((GyorgHeap*)parent->base.myHeap)->male1;
if (!tmp) {
tmp = ((GyorgHeap*)parent->base.myHeap)->male2;
}
if (tmp->base.health != 0) {
return 0;
}
return 1;
}

66
src/enemy/gyorgFemaleMouth.c Normal file
View File

@ -0,0 +1,66 @@
#define NENT_DEPRECATED
#include "global.h"
#include "player.h"
#include "room.h"
#include "enemy/gyorg.h"
extern const Hitbox gUnk_080D28DC;
extern const Hitbox gUnk_080D28E4;
extern const Hitbox gUnk_080D28EC;
extern const Hitbox gUnk_080D28F4;
extern const Hitbox gUnk_080D28FC;
extern const Hitbox gUnk_080D2904;
extern const Hitbox gUnk_080D290C;
extern const Hitbox gUnk_080D2914;
const Hitbox* const gUnk_080D28AC[] = {
&gUnk_080D28DC, &gUnk_080D28E4, &gUnk_080D28EC, &gUnk_080D28F4,
&gUnk_080D28FC, &gUnk_080D2904, &gUnk_080D290C, &gUnk_080D2914,
};
const u16 gUnk_080D28CC[] = {
0x200, 0x1C8, 0x248, 0x210, 0x200, 0x258, 0x1b8, 0x210,
};
const Hitbox gUnk_080D28DC = { 0xE0, 0xF4, { 0, 0, 0, 0 }, 0x8, 0xA };
const Hitbox gUnk_080D28E4 = { 0x20, 0xF4, { 0, 0, 0, 0 }, 0x8, 0xA };
const Hitbox gUnk_080D28EC = { 0x0C, 0xE0, { 0, 0, 0, 0 }, 0xA, 0x8 };
const Hitbox gUnk_080D28F4 = { 0x0C, 0x20, { 0, 0, 0, 0 }, 0xA, 0x8 };
const Hitbox gUnk_080D28FC = { 0xE0, 0x0C, { 0, 0, 0, 0 }, 0x8, 0xA };
const Hitbox gUnk_080D2904 = { 0x20, 0x0C, { 0, 0, 0, 0 }, 0x8, 0xA };
const Hitbox gUnk_080D290C = { 0xF4, 0xE0, { 0, 0, 0, 0 }, 0xA, 0x8 };
const Hitbox gUnk_080D2914 = { 0xF4, 0x20, { 0, 0, 0, 0 }, 0xA, 0x8 };
void GyorgFemaleMouth(Entity* this) {
u32 tmp;
if (this->parent->next == NULL) {
DeleteThisEntity();
}
if (this->action == 0) {
this->action = 1;
this->spriteOrientation.flipY = 2;
this->spriteRendering.b3 = 2;
this->spritePriority.b0 = 7;
this->collisionLayer = 2;
this->animationState = 0xFF;
}
tmp = this->parent->animationState >> 5;
if (tmp != this->animationState) {
this->animationState = tmp;
this->x.HALF.HI = gUnk_080D28CC[tmp] + gRoomControls.origin_x;
this->y.HALF.HI = gUnk_080D28CC[tmp + 1] + gRoomControls.origin_y;
InitializeAnimation(this, tmp >> 1);
} else {
GetNextFrame(this);
}
if (tmp & 2) {
if (this->y.HALF.HI < gPlayerEntity.y.HALF.HI) {
tmp++;
}
} else {
if (this->x.HALF.HI < gPlayerEntity.x.HALF.HI) {
tmp++;
}
}
this->hitbox = (Hitbox*)gUnk_080D28AC[tmp]; // discarding const qualifier with cast
}

1297
src/enemy/gyorgMale.c
View File

File diff suppressed because it is too large Load Diff

443
src/object/gyorgBossObject.c Normal file
View File

@ -0,0 +1,443 @@
#define NENT_DEPRECATED
#include "global.h"
#include "entity.h"
#include "object.h"
#include "area.h"
#include "room.h"
#include "screen.h"
#include "functions.h"
#include "enemy/gyorg.h"
extern const ScreenTransitionData gUnk_0813ABD0;
extern u32 sub_08079F8C(void);
extern s16* const gUnk_08124FF0[];
extern void sub_080A1DCC(GyorgBossObjectEntity*);
extern void sub_080A1C9C(GyorgBossObjectEntity*);
void sub_080A1E54(GyorgBossObjectEntity*);
void sub_080A1D8C(GyorgBossObjectEntity*, s32);
void sub_080A1FF0(GyorgBossObjectEntity*);
u32 sub_080A20B8(GyorgBossObjectEntity*, GyorgMaleEntity*);
void sub_080A1D70(GyorgBossObjectEntity*, u32);
void sub_080A1704(GyorgBossObjectEntity*);
void sub_080A184C(GyorgBossObjectEntity*);
void sub_080A189C(GyorgBossObjectEntity*);
void sub_080A190C(GyorgBossObjectEntity*);
void sub_080A1990(GyorgBossObjectEntity*);
void sub_080A19FC(GyorgBossObjectEntity*);
void sub_080A1A80(GyorgBossObjectEntity*);
void sub_080A1AE8(GyorgBossObjectEntity*);
void sub_080A1B4C(GyorgBossObjectEntity*);
void sub_080A1C04(GyorgBossObjectEntity*);
void GyorgBossObject(Entity* this) {
static void (*const gUnk_08124ED0[])(GyorgBossObjectEntity*) = {
sub_080A1704, sub_080A184C, sub_080A189C, sub_080A190C, sub_080A1990,
sub_080A19FC, sub_080A1A80, sub_080A1AE8, sub_080A1B4C, sub_080A1C04,
};
gUnk_08124ED0[this->action]((GyorgBossObjectEntity*)this);
sub_080A1DCC((GyorgBossObjectEntity*)this);
sub_080A1C9C((GyorgBossObjectEntity*)this);
}
void sub_080A1704(GyorgBossObjectEntity* this) {
GyorgHeap* heap;
Entity* tmp;
if (CheckFlags(0x7B)) {
DeleteThisEntity();
}
if (gEntCount > 0x45)
return;
heap = zMalloc(sizeof(GyorgHeap));
if (!heap)
return;
super->action = 1;
super->myHeap = heap;
this->unk_6e = 0x258;
this->unk_6c = 0;
heap->boss = this;
tmp = CreateEnemy(GYORG_FEMALE, 0);
tmp->myHeap = heap;
heap->female = (GyorgFemaleEntity*)tmp;
tmp = CreateEnemy(GYORG_MALE, 0);
tmp->x.HALF.HI = gRoomControls.origin_x + 0x200;
#ifdef EU
tmp->y.HALF.HI = gRoomControls.origin_y + 0x380;
#else
tmp->y.HALF.HI = gRoomControls.origin_y + 0x330;
#endif
tmp->myHeap = heap;
heap->male1 = (GyorgMaleEntity*)tmp;
tmp = CreateEnemy(GYORG_MALE, 1);
tmp->x.HALF.HI = gRoomControls.origin_x + 0x260;
#ifdef EU
tmp->y.HALF.HI = gRoomControls.origin_y + 0x360;
#else
tmp->y.HALF.HI = gRoomControls.origin_y + 0x310;
#endif
tmp->myHeap = heap;
heap->male2 = (GyorgMaleEntity*)tmp;
gScreen.bg3.control = 0x1E07;
gScreen.lcd.displayControl |= 0x800;
this->unk_70 = 0;
this->unk_72 = 0;
this->unk_74 = 0;
this->unk_7a = 0;
this->unk_76 = 0xc0;
this->unk_78 = 0xc0;
gRoomTransition.field_0x39 = 1;
gPlayerState.flags |= 0x20000;
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
#ifndef EU
SoundReq(0x80100000);
gArea.bgm = gArea.queued_bgm;
#endif
}
void sub_080A184C(GyorgBossObjectEntity* this) {
if (--this->unk_6e == 0) {
super->action = 2;
this->unk_6c = 8;
((GyorgHeap*)super->myHeap)->female->base.health = 8;
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
}
void sub_080A189C(GyorgBossObjectEntity* this) {
if (((GyorgHeap*)super->myHeap)->female->base.health == 0) {
super->action = 3;
super->actionDelay = 0x23;
this->unk_6c = 1;
this->unk_78 = 0x400;
this->unk_7b = 1;
((GyorgHeap*)super->myHeap)->male1->base.health = 0xC;
SoundReq(0x128);
InitScreenShake(0x96, 1);
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
}
void sub_080A190C(GyorgBossObjectEntity* this) {
sub_080A1FF0(this);
if (((GyorgHeap*)super->myHeap)->male1->base.health == 0) {
if (sub_080A20B8(this, ((GyorgHeap*)super->myHeap)->male1)) {
super->action = 4;
this->unk_6c = 0x10;
this->unk_78 = 0xC0;
sub_080A1D70(this, ((GyorgHeap*)super->myHeap)->female->base.animationState);
((GyorgHeap*)super->myHeap)->female->base.health = 0x18;
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
} else {
gPlayerState.startPosX = ((GyorgHeap*)super->myHeap)->male1->base.x.HALF.HI;
gPlayerState.startPosY = ((GyorgHeap*)super->myHeap)->male1->base.y.HALF.HI;
}
}
void sub_080A1990(GyorgBossObjectEntity* this) {
if (((GyorgHeap*)super->myHeap)->female->base.health == 0) {
((GyorgHeap*)super->myHeap)->male1->base.health = 0xC;
super->action = 5;
super->actionDelay = 0x23;
this->unk_6c = 2;
this->unk_78 = 0x400;
this->unk_7b = 1;
SoundReq(0x128);
InitScreenShake(0x96, 1);
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
}
void sub_080A19FC(GyorgBossObjectEntity* this) {
sub_080A1FF0(this);
if (((GyorgHeap*)super->myHeap)->male2->base.health == 0) {
if (sub_080A20B8(this, ((GyorgHeap*)super->myHeap)->male2)) {
super->action = 6;
this->unk_6c = 0x20;
this->unk_78 = 0xc0;
sub_080A1D70(this, ((GyorgHeap*)super->myHeap)->female->base.animationState);
((GyorgHeap*)super->myHeap)->female->base.health = 0x18;
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
} else {
gPlayerState.startPosX = ((GyorgHeap*)super->myHeap)->male2->base.x.HALF.HI;
gPlayerState.startPosY = ((GyorgHeap*)super->myHeap)->male2->base.y.HALF.HI;
}
}
void sub_080A1A80(GyorgBossObjectEntity* this) {
if (((GyorgHeap*)super->myHeap)->female->base.health == 0) {
((GyorgHeap*)super->myHeap)->male2->base.health = 0xC;
super->action = 7;
super->actionDelay = 0x23;
this->unk_6c = 0x104;
this->unk_78 = 0x400;
SoundReq(SFX_BOSS_DIE);
InitScreenShake(0x96, 1);
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
}
void sub_080A1AE8(GyorgBossObjectEntity* this) {
sub_080A1FF0(this);
if (((GyorgHeap*)super->myHeap)->male2->base.health == 0) {
if (sub_080A20B8(this, ((GyorgHeap*)super->myHeap)->male2)) {
super->action = 8;
this->unk_6c = 0x40;
this->unk_78 = 0xC0;
((GyorgHeap*)super->myHeap)->female->base.health = 0xC;
}
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
}
void sub_080A1B4C(GyorgBossObjectEntity* this) {
if (((GyorgHeap*)super->myHeap)->female->base.health == 0) {
if (this->unk_6c != 0) {
InitScreenShake(0x2d, 1);
SoundReq(SFX_BOSS_DIE);
this->unk_78 = 0x600;
}
this->unk_6c = 0;
gRoomTransition.field_0x39 = 0;
if (sub_08079F8C() && gPlayerEntity.z.HALF.HI == 0) {
super->action = 9;
super->actionDelay = 0;
super->field_0xf = 0xF0;
this->unk_6e = 0x1a4;
super->direction = 0;
super->speed = 0x60;
gPlayerState.flags &= ~0x20000;
CopyPosition(&gPlayerEntity, super);
gRoomControls.camera_target = super;
SetPlayerControl(2);
}
}
gPlayerState.startPosX = gRoomControls.origin_x + 0x200;
gPlayerState.startPosY = gRoomControls.origin_y + 0x210;
}
void sub_080A1C04(GyorgBossObjectEntity* this) {
if (this->unk_6e == 0) {
LinearMoveUpdate(super);
sub_080A1E54(this);
if (--super->field_0xf == 0) {
SetFlag(0x7B);
sub_0808091C(&gUnk_0813ABD0, 8);
return;
}
if (super->field_0xf == 0x3C) {
SetFade(7, 4);
}
return;
}
if (--this->unk_6e < 0xb4) {
sub_080A1E54(this);
return;
}
switch (this->unk_6e) {
case 0xb4:
SoundReq(SFX_BOSS_DIE);
InitScreenShake(0x2d0, 2);
break;
case 0x12C:
SoundReq(SFX_BOSS_DIE);
InitScreenShake(0x4b, 1);
break;
}
}
void sub_080A1C9C(GyorgBossObjectEntity* this) {
if (this->unk_7a) {
if (this->unk_74 != this->unk_75) {
this->unk_78 = 0;
sub_080A1D8C(this, 0xC);
if (this->unk_76 == 0) {
this->unk_74 = this->unk_75;
this->unk_78 = this->unk_7c;
}
} else {
sub_080A1D8C(this, 0xC);
if (this->unk_78 == this->unk_76) {
this->unk_7a = 0;
}
}
} else {
sub_080A1D8C(this, 8);
}
this->unk_70 += gSineTable[this->unk_74] * this->unk_76 / 0x100;
this->unk_72 -= gSineTable[this->unk_74 + 0x40] * this->unk_76 / 0x100;
gScreen.bg3.xOffset = this->unk_70 >> 0x8;
gScreen.bg3.yOffset = this->unk_72 >> 0x8;
}
void sub_080A1D70(GyorgBossObjectEntity* this, u32 unk1) {
this->unk_75 = unk1;
this->unk_7a = 1;
this->unk_7c = this->unk_78;
}
void sub_080A1D8C(GyorgBossObjectEntity* this, s32 unk1) {
if (this->unk_78 != this->unk_76) {
if (this->unk_78 > this->unk_76) {
if (unk1 < this->unk_78 - this->unk_76) {
this->unk_76 += unk1;
} else {
this->unk_76 = this->unk_78;
}
} else {
if (unk1 < this->unk_76 - this->unk_78) {
this->unk_76 -= unk1;
} else {
this->unk_76 = this->unk_78;
}
}
}
}
void sub_080A1DCC(GyorgBossObjectEntity* this) {
GenericEntity* tmp;
if ((tmp = (GenericEntity*)((GyorgHeap*)super->myHeap)->male1) != NULL ||
(tmp = (GenericEntity*)((GyorgHeap*)super->myHeap)->male2) != NULL) {
if (tmp->field_0x7c.BYTES.byte0 && tmp->base.spriteRendering.b3 == 2) {
((GyorgHeap*)super->myHeap)->unk_10->base.flags &= ~0x80;
tmp = ((GyorgHeap*)super->myHeap)->unk_14;
tmp->base.flags &= ~0x80;
tmp = (GenericEntity*)tmp->base.child;
tmp->base.flags &= ~0x80;
tmp = (GenericEntity*)tmp->base.child;
tmp->base.flags &= ~0x80;
tmp = (GenericEntity*)tmp->base.child;
tmp->base.flags &= ~0x80;
return;
}
}
((GyorgHeap*)super->myHeap)->unk_10->base.flags |= 0x80;
tmp = ((GyorgHeap*)super->myHeap)->unk_14;
tmp->base.flags |= 0x80;
tmp = (GenericEntity*)tmp->base.child;
tmp->base.flags |= 0x80;
tmp = (GenericEntity*)tmp->base.child;
tmp->base.flags |= 0x80;
tmp = (GenericEntity*)tmp->base.child;
tmp->base.flags |= 0x80;
}
void sub_080A1E54(GyorgBossObjectEntity* this) {
Entity* fx;
if ((++super->actionDelay & 0x1F) == 0) {
fx = CreateFx(super, 0x51, 0);
if (fx) {
u32 r = Random();
fx->x.HALF.HI = gRoomControls.origin_x + 0x200 + (r & 0xf0) - 0x78;
fx->y.HALF.HI = gRoomControls.origin_y + 0x210 + ((r >> 8) & 0x70) - 0x38;
fx->spritePriority.b0 = 5;
fx->collisionLayer = 2;
UpdateSpriteForCollisionLayer(fx);
}
}
}
void sub_080A1ED0(u32 unk0, u32 unk1, u32 unk2) {
static const u16 gUnk_08124EF8[] = { 0x200, 0x1C0, 0x250, 0x210, 0x200, 0x260, 0x1B0, 0x210 };
u32 i = 0;
s16* p;
u32 x, y;
x = gUnk_08124EF8[unk2 * 2] + gRoomControls.origin_x;
y = gUnk_08124EF8[unk2 * 2 + 1] + gRoomControls.origin_y;
p = gUnk_08124FF0[unk0];
while (*p != 1) {
GyorgChildEntity* tmp = (GyorgChildEntity*)CreateEnemy(GYORG_CHILD, unk1);
if (tmp) {
tmp->base.type2 = i++;
tmp->base.x.HALF.HI = x;
tmp->base.y.HALF.HI = y;
tmp->base.direction = DirectionFromAnimationState(unk2);
tmp->unk_7a = DirectionTurnAround(DirectionFromAnimationState(unk2));
tmp->unk_78 = p[2];
switch (unk2) {
case 0:
tmp->unk_74 = p[0];
tmp->unk_76 = -p[1];
break;
case 1:
tmp->unk_74 = p[1] + 0xF0;
tmp->unk_76 = p[0];
break;
case 2:
tmp->unk_74 = p[0];
tmp->unk_76 = p[1] + 0xA0;
break;
case 3:
tmp->unk_74 = -p[1];
tmp->unk_76 = p[0];
break;
}
}
p += 3;
}
if (unk1 == 0) {
Entity* tmp;
tmp = CreateObject(SPECIAL_FX, 2, 0);
if (tmp) {
tmp->x.HALF.HI = x;
tmp->y.HALF.HI = y;
tmp->spriteOrientation.flipY = 3;
tmp->spriteRendering.b3 = 3;
tmp->collisionLayer = 1;
}
}
}
void sub_080A1FF0(GyorgBossObjectEntity* this) {
if (super->actionDelay != 0) {
super->actionDelay--;
if (super->actionDelay <= 0x20 && (super->actionDelay & 0xF) == 0) {
Entity* fx;
fx = CreateFx(super, 0x51, 0);
if (fx) {
u32 r = Random();
fx->x.HALF.HI = gRoomControls.origin_x + 0x200 + (r & 0x78) - 0x3C;
fx->y.HALF.HI = gRoomControls.origin_y + 0x210 + (r & 0x78) - 0x3C;
fx->spritePriority.b0 = 6;
fx->collisionLayer = 1;
UpdateSpriteForCollisionLayer(fx);
}
}
}
if (this->unk_7b) {
if (sub_0806FCB8(&gPlayerEntity, gRoomControls.origin_x + 0x200, gRoomControls.origin_y + 0x210, 0x100)) {
if (super->actionDelay == 0) {
super->actionDelay = 0x78;
} else {
if (super->actionDelay == 0x23) {
InitScreenShake(0x1e, 0);
}
}
} else {
this->unk_7b = 0;
}
}
}
u32 sub_080A20B8(GyorgBossObjectEntity* this, GyorgMaleEntity* other) {
if (other == NULL) {
return 1;
}
if (sub_08079F8C() && gPlayerEntity.z.HALF.HI == 0) {
return other->unk_7c == 0 && gPlayerState.field_0x14 != 0;
}
return 0;
}

2
src/object/objectAF.c
View File

@ -47,7 +47,7 @@ void sub_080A0624(Entity* this) {
void sub_080A0640(Entity* this) { void sub_080A0640(Entity* this) {
if (this->type == 0) { if (this->type == 0) {
PositionRelative(*(Entity**)(this->parent->myHeap + 0x4), this, 0, 0x80000); PositionRelative(*(((Entity**)this->parent->myHeap) + 4), this, 0, 0x80000);
} else { } else {
CopyPosition(this->parent, this); CopyPosition(this->parent, this);
} }

8
src/projectile/v3TennisBallProjectile.c
View File

@ -77,25 +77,25 @@ void V3TennisBallProjectile_Action2(Entity* this) {
bool32 sub_080ACB40(Entity* this) { bool32 sub_080ACB40(Entity* this) {
Entity* r1_grandparent = this->parent->parent; Entity* r1_grandparent = this->parent->parent;
Entity* child = this->child; Entity* child = this->child;
Entity* tmp = ((Entity*)(r1_grandparent->myHeap[7]))->child; Entity* tmp = ((Entity**)(r1_grandparent->myHeap))[7]->child;
if (tmp != this && child == tmp->child) { if (tmp != this && child == tmp->child) {
return 0; return 0;
} }
tmp = ((Entity*)(r1_grandparent->myHeap[8]))->child; tmp = ((Entity**)(r1_grandparent->myHeap))[8]->child;
if (tmp != this && child == tmp->child) { if (tmp != this && child == tmp->child) {
return 0; return 0;
} }
tmp = ((Entity*)(r1_grandparent->myHeap[9]))->child; tmp = ((Entity**)(r1_grandparent->myHeap))[9]->child;
if (tmp != this && child == tmp->child) { if (tmp != this && child == tmp->child) {
return 0; return 0;
} }
tmp = ((Entity*)(r1_grandparent->myHeap[10]))->child; tmp = ((Entity**)(r1_grandparent->myHeap))[10]->child;
if (tmp != this && child == tmp->child) { if (tmp != this && child == tmp->child) {
return 0; return 0;

2
src/scroll.c
View File

@ -30,7 +30,7 @@ void sub_08080910(void) {
gRoomTransition.type = TRANSITION_CUT; gRoomTransition.type = TRANSITION_CUT;
} }
void sub_0808091C(ScreenTransitionData* param_1, u32 param_2) { void sub_0808091C(const ScreenTransitionData* param_1, u32 param_2) {
DoExitTransition(param_1); DoExitTransition(param_1);
gRoomTransition.type = param_2; gRoomTransition.type = param_2;
} }