diff --git a/asm/gyorgBossObject.s b/asm/gyorgBossObject.s deleted file mode 100644 index 673ad56f..00000000 --- a/asm/gyorgBossObject.s +++ /dev/null @@ -1,986 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - - thumb_func_start sub_080A1990 -sub_080A1990: @ 0x080A1990 - push {lr} - adds r2, r0, #0 - ldr r1, [r2, #0x64] - ldr r0, [r1, #4] - adds r0, #0x45 - ldrb r0, [r0] - cmp r0, #0 - bne _080A19D6 - ldr r0, [r1, #8] - adds r0, #0x45 - movs r1, #0xc - strb r1, [r0] - movs r0, #5 - strb r0, [r2, #0xc] - movs r0, #0x23 - strb r0, [r2, #0xe] - adds r1, r2, #0 - adds r1, #0x6c - movs r0, #2 - strh r0, [r1] - adds r1, #0xc - movs r0, #0x80 - lsls r0, r0, #3 - strh r0, [r1] - adds r1, #3 - movs r0, #1 - strb r0, [r1] - movs r0, #0x94 - lsls r0, r0, #1 - bl SoundReq - movs r0, #0x96 - movs r1, #1 - bl sub_08080964 -_080A19D6: - ldr r2, _080A19F4 @ =gPlayerState - ldr r1, _080A19F8 @ =gRoomControls - movs r3, #0x80 - lsls r3, r3, #2 - adds r0, r3, #0 - ldrh r3, [r1, #6] - adds r0, r0, r3 - strh r0, [r2, #0x16] - movs r3, #0x84 - lsls r3, r3, #2 - adds r0, r3, #0 - ldrh r1, [r1, #8] - adds r0, r0, r1 - strh r0, [r2, #0x18] - pop {pc} - .align 2, 0 -_080A19F4: .4byte gPlayerState -_080A19F8: .4byte gRoomControls - - thumb_func_start sub_080A19FC -sub_080A19FC: @ 0x080A19FC - push {r4, lr} - adds r4, r0, #0 - bl sub_080A1FF0 - ldr r3, [r4, #0x64] - ldr r2, [r3, #0xc] - adds r0, r2, #0 - adds r0, #0x45 - ldrb r0, [r0] - cmp r0, #0 - bne _080A1A6C - adds r0, r4, #0 - adds r1, r2, #0 - bl sub_080A20B8 - cmp r0, #0 - beq _080A1A46 - movs r0, #6 - strb r0, [r4, #0xc] - adds r1, r4, #0 - adds r1, #0x6c - movs r0, #0x20 - strh r0, [r1] - adds r1, #0xc - movs r0, #0xc0 - strh r0, [r1] - ldr r0, [r4, #0x64] - ldr r0, [r0, #4] - ldrb r1, [r0, #0x14] - adds r0, r4, #0 - bl sub_080A1D70 - ldr r0, [r4, #0x64] - ldr r0, [r0, #4] - adds r0, #0x45 - movs r1, #0x18 - strb r1, [r0] -_080A1A46: - ldr r2, _080A1A64 @ =gPlayerState - ldr r1, _080A1A68 @ =gRoomControls - movs r3, #0x80 - lsls r3, r3, #2 - adds r0, r3, #0 - ldrh r3, [r1, #6] - adds r0, r0, r3 - strh r0, [r2, #0x16] - movs r3, #0x84 - lsls r3, r3, #2 - adds r0, r3, #0 - ldrh r1, [r1, #8] - adds r0, r0, r1 - strh r0, [r2, #0x18] - b _080A1A78 - .align 2, 0 -_080A1A64: .4byte gPlayerState -_080A1A68: .4byte gRoomControls -_080A1A6C: - ldr r1, _080A1A7C @ =gPlayerState - ldrh r0, [r2, #0x2e] - strh r0, [r1, #0x16] - ldr r0, [r3, #0xc] - ldrh r0, [r0, #0x32] - strh r0, [r1, #0x18] -_080A1A78: - pop {r4, pc} - .align 2, 0 -_080A1A7C: .4byte gPlayerState - - thumb_func_start sub_080A1A80 -sub_080A1A80: @ 0x080A1A80 - push {lr} - adds r2, r0, #0 - ldr r1, [r2, #0x64] - ldr r0, [r1, #4] - adds r0, #0x45 - ldrb r0, [r0] - cmp r0, #0 - bne _080A1AC0 - ldr r0, [r1, #0xc] - adds r0, #0x45 - movs r1, #0xc - strb r1, [r0] - movs r0, #7 - strb r0, [r2, #0xc] - movs r0, #0x23 - strb r0, [r2, #0xe] - adds r1, r2, #0 - adds r1, #0x6c - adds r0, #0xe1 - strh r0, [r1] - adds r1, #0xc - movs r0, #0x80 - lsls r0, r0, #3 - strh r0, [r1] - movs r0, #0x94 - lsls r0, r0, #1 - bl SoundReq - movs r0, #0x96 - movs r1, #1 - bl sub_08080964 -_080A1AC0: - ldr r2, _080A1AE0 @ =gPlayerState - ldr r1, _080A1AE4 @ =gRoomControls - movs r3, #0x80 - lsls r3, r3, #2 - adds r0, r3, #0 - ldrh r3, [r1, #6] - adds r0, r0, r3 - strh r0, [r2, #0x16] - movs r3, #0x84 - lsls r3, r3, #2 - adds r0, r3, #0 - ldrh r1, [r1, #8] - adds r0, r0, r1 - strh r0, [r2, #0x18] - pop {pc} - .align 2, 0 -_080A1AE0: .4byte gPlayerState -_080A1AE4: .4byte gRoomControls - - thumb_func_start sub_080A1AE8 -sub_080A1AE8: @ 0x080A1AE8 - push {r4, lr} - adds r4, r0, #0 - bl sub_080A1FF0 - ldr r0, [r4, #0x64] - ldr r1, [r0, #0xc] - adds r0, r1, #0 - adds r0, #0x45 - ldrb r0, [r0] - cmp r0, #0 - bne _080A1B24 - adds r0, r4, #0 - bl sub_080A20B8 - cmp r0, #0 - beq _080A1B24 - movs r0, #8 - strb r0, [r4, #0xc] - adds r1, r4, #0 - adds r1, #0x6c - movs r0, #0x40 - strh r0, [r1] - adds r1, #0xc - movs r0, #0xc0 - strh r0, [r1] - ldr r0, [r4, #0x64] - ldr r0, [r0, #4] - adds r0, #0x45 - movs r1, #0xc - strb r1, [r0] -_080A1B24: - ldr r2, _080A1B44 @ =gPlayerState - ldr r1, _080A1B48 @ =gRoomControls - movs r3, #0x80 - lsls r3, r3, #2 - adds r0, r3, #0 - ldrh r3, [r1, #6] - adds r0, r0, r3 - strh r0, [r2, #0x16] - movs r3, #0x84 - lsls r3, r3, #2 - adds r0, r3, #0 - ldrh r1, [r1, #8] - adds r0, r0, r1 - strh r0, [r2, #0x18] - pop {r4, pc} - .align 2, 0 -_080A1B44: .4byte gPlayerState -_080A1B48: .4byte gRoomControls - - thumb_func_start sub_080A1B4C -sub_080A1B4C: @ 0x080A1B4C - push {r4, r5, r6, r7, lr} - adds r4, r0, #0 - ldr r0, [r4, #0x64] - ldr r0, [r0, #4] - adds r0, #0x45 - ldrb r7, [r0] - cmp r7, #0 - bne _080A1BD0 - adds r5, r4, #0 - adds r5, #0x6c - ldrh r0, [r5] - cmp r0, #0 - beq _080A1B80 - movs r0, #0x2d - movs r1, #1 - bl sub_08080964 - movs r0, #0x94 - lsls r0, r0, #1 - bl SoundReq - adds r1, r4, #0 - adds r1, #0x78 - movs r0, #0xc0 - lsls r0, r0, #3 - strh r0, [r1] -_080A1B80: - movs r6, #0 - strh r7, [r5] - ldr r0, _080A1BF0 @ =gScreenTransition - adds r0, #0x39 - strb r6, [r0] - bl sub_08079F8C - cmp r0, #0 - beq _080A1BD0 - ldr r3, _080A1BF4 @ =gPlayerEntity - movs r1, #0x36 - ldrsh r0, [r3, r1] - cmp r0, #0 - bne _080A1BD0 - movs r0, #9 - strb r0, [r4, #0xc] - strb r6, [r4, #0xe] - movs r0, #0xf0 - strb r0, [r4, #0xf] - adds r1, r4, #0 - adds r1, #0x6e - adds r0, #0xb4 - strh r0, [r1] - strb r6, [r4, #0x15] - movs r0, #0x60 - strh r0, [r4, #0x24] - ldr r2, _080A1BF8 @ =gPlayerState - ldr r0, [r2, #0x30] - ldr r1, _080A1BFC @ =0xFFFDFFFF - ands r0, r1 - str r0, [r2, #0x30] - adds r0, r3, #0 - adds r1, r4, #0 - bl CopyPosition - ldr r0, _080A1C00 @ =gRoomControls - str r4, [r0, #0x30] - movs r0, #2 - bl SetPlayerControl -_080A1BD0: - ldr r2, _080A1BF8 @ =gPlayerState - ldr r1, _080A1C00 @ =gRoomControls - movs r3, #0x80 - lsls r3, r3, #2 - adds r0, r3, #0 - ldrh r3, [r1, #6] - adds r0, r0, r3 - strh r0, [r2, #0x16] - movs r3, #0x84 - lsls r3, r3, #2 - adds r0, r3, #0 - ldrh r1, [r1, #8] - adds r0, r0, r1 - strh r0, [r2, #0x18] - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A1BF0: .4byte gScreenTransition -_080A1BF4: .4byte gPlayerEntity -_080A1BF8: .4byte gPlayerState -_080A1BFC: .4byte 0xFFFDFFFF -_080A1C00: .4byte gRoomControls - - thumb_func_start sub_080A1C04 -sub_080A1C04: @ 0x080A1C04 - push {r4, lr} - adds r4, r0, #0 - adds r1, r4, #0 - adds r1, #0x6e - ldrh r0, [r1] - cmp r0, #0 - bne _080A1C52 - adds r0, r4, #0 - bl sub_0806F69C - adds r0, r4, #0 - bl sub_080A1E54 - ldrb r0, [r4, #0xf] - subs r1, r0, #1 - strb r1, [r4, #0xf] - lsls r0, r1, #0x18 - cmp r0, #0 - bne _080A1C40 - movs r0, #0x7b - bl SetFlag - ldr r0, _080A1C3C @ =gUnk_0813ABD0 - movs r1, #8 - bl sub_0808091C - b _080A1C9A - .align 2, 0 -_080A1C3C: .4byte gUnk_0813ABD0 -_080A1C40: - lsls r0, r1, #0x18 - lsrs r0, r0, #0x18 - cmp r0, #0x3c - bne _080A1C9A - movs r0, #7 - movs r1, #4 - bl DoFade - b _080A1C9A -_080A1C52: - subs r0, #1 - strh r0, [r1] - lsls r0, r0, #0x10 - lsrs r0, r0, #0x10 - cmp r0, #0xb3 - bhi _080A1C66 - adds r0, r4, #0 - bl sub_080A1E54 - b _080A1C9A -_080A1C66: - ldrh r1, [r1] - cmp r1, #0xb4 - beq _080A1C76 - movs r0, #0x96 - lsls r0, r0, #1 - cmp r1, r0 - beq _080A1C8A - b _080A1C9A -_080A1C76: - movs r0, #0x94 - lsls r0, r0, #1 - bl SoundReq - movs r0, #0xb4 - lsls r0, r0, #2 - movs r1, #2 - bl sub_08080964 - b _080A1C9A -_080A1C8A: - movs r0, #0x94 - lsls r0, r0, #1 - bl SoundReq - movs r0, #0x4b - movs r1, #1 - bl sub_08080964 -_080A1C9A: - pop {r4, pc} - - thumb_func_start sub_080A1C9C -sub_080A1C9C: @ 0x080A1C9C - push {r4, r5, r6, r7, lr} - adds r4, r0, #0 - adds r5, r4, #0 - adds r5, #0x7a - ldrb r0, [r5] - cmp r0, #0 - beq _080A1D04 - adds r0, r4, #0 - adds r0, #0x74 - adds r7, r4, #0 - adds r7, #0x75 - ldrb r1, [r0] - adds r6, r0, #0 - ldrb r0, [r7] - cmp r1, r0 - beq _080A1CE4 - subs r5, #2 - movs r0, #0 - strh r0, [r5] - adds r0, r4, #0 - movs r1, #0xc - bl sub_080A1D8C - adds r0, r4, #0 - adds r0, #0x76 - ldrh r1, [r0] - adds r2, r0, #0 - cmp r1, #0 - bne _080A1D14 - ldrb r0, [r7] - strb r0, [r6] - adds r0, r4, #0 - adds r0, #0x7c - ldrh r0, [r0] - strh r0, [r5] - b _080A1D14 -_080A1CE4: - adds r0, r4, #0 - movs r1, #0xc - bl sub_080A1D8C - adds r0, r4, #0 - adds r0, #0x78 - adds r1, r4, #0 - adds r1, #0x76 - ldrh r0, [r0] - adds r2, r1, #0 - ldrh r1, [r2] - cmp r0, r1 - bne _080A1D14 - movs r0, #0 - strb r0, [r5] - b _080A1D14 -_080A1D04: - adds r0, r4, #0 - movs r1, #8 - bl sub_080A1D8C - adds r6, r4, #0 - adds r6, #0x74 - adds r2, r4, #0 - adds r2, #0x76 -_080A1D14: - adds r3, r4, #0 - adds r3, #0x70 - ldr r5, _080A1D68 @ =gSineTable - ldrb r0, [r6] - lsls r0, r0, #1 - adds r0, r0, r5 - movs r7, #0 - ldrsh r1, [r0, r7] - ldrh r0, [r2] - muls r0, r1, r0 - cmp r0, #0 - bge _080A1D2E - adds r0, #0xff -_080A1D2E: - asrs r0, r0, #8 - ldrh r1, [r3] - adds r0, r0, r1 - strh r0, [r3] - adds r4, #0x72 - ldrb r0, [r6] - adds r0, #0x40 - lsls r0, r0, #1 - adds r0, r0, r5 - movs r5, #0 - ldrsh r1, [r0, r5] - ldrh r0, [r2] - muls r0, r1, r0 - cmp r0, #0 - bge _080A1D4E - adds r0, #0xff -_080A1D4E: - asrs r0, r0, #8 - ldrh r1, [r4] - subs r1, r1, r0 - strh r1, [r4] - ldr r2, _080A1D6C @ =gScreen - ldrh r0, [r3] - lsrs r0, r0, #8 - strh r0, [r2, #0x2e] - lsls r1, r1, #0x10 - lsrs r1, r1, #0x18 - strh r1, [r2, #0x30] - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A1D68: .4byte gSineTable -_080A1D6C: .4byte gScreen - - thumb_func_start sub_080A1D70 -sub_080A1D70: @ 0x080A1D70 - adds r2, r0, #0 - adds r0, #0x75 - strb r1, [r0] - adds r1, r2, #0 - adds r1, #0x7a - movs r0, #1 - strb r0, [r1] - adds r0, r2, #0 - adds r0, #0x78 - ldrh r1, [r0] - adds r0, #4 - strh r1, [r0] - bx lr - .align 2, 0 - - thumb_func_start sub_080A1D8C -sub_080A1D8C: @ 0x080A1D8C - push {r4, lr} - adds r4, r1, #0 - adds r3, r0, #0 - adds r3, #0x78 - adds r2, r0, #0 - adds r2, #0x76 - ldrh r1, [r3] - ldrh r0, [r2] - cmp r1, r0 - beq _080A1DC8 - cmp r1, r0 - bls _080A1DB6 - adds r3, r0, #0 - subs r0, r1, r3 - cmp r4, r0 - bge _080A1DB2 - adds r0, r3, r4 - strh r0, [r2] - b _080A1DC8 -_080A1DB2: - strh r1, [r2] - b _080A1DC8 -_080A1DB6: - ldrh r1, [r2] - ldrh r3, [r3] - subs r0, r1, r3 - cmp r4, r0 - bge _080A1DC6 - subs r0, r1, r4 - strh r0, [r2] - b _080A1DC8 -_080A1DC6: - strh r3, [r2] -_080A1DC8: - pop {r4, pc} - .align 2, 0 - - thumb_func_start sub_080A1DCC -sub_080A1DCC: @ 0x080A1DCC - push {r4, lr} - adds r4, r0, #0 - ldr r1, [r4, #0x64] - ldr r3, [r1, #8] - cmp r3, #0 - bne _080A1DDE - ldr r3, [r1, #0xc] - cmp r3, #0 - beq _080A1E24 -_080A1DDE: - adds r0, r3, #0 - adds r0, #0x7c - ldrb r0, [r0] - cmp r0, #0 - beq _080A1E24 - ldrb r0, [r3, #0x19] - lsrs r0, r0, #6 - cmp r0, #2 - bne _080A1E24 - ldr r3, [r1, #0x10] - ldrb r2, [r3, #0x10] - movs r1, #0x7f - adds r0, r1, #0 - ands r0, r2 - strb r0, [r3, #0x10] - ldr r0, [r4, #0x64] - ldr r3, [r0, #0x14] - ldrb r2, [r3, #0x10] - adds r0, r1, #0 - ands r0, r2 - strb r0, [r3, #0x10] - ldr r3, [r3, #0x54] - ldrb r2, [r3, #0x10] - adds r0, r1, #0 - ands r0, r2 - strb r0, [r3, #0x10] - ldr r3, [r3, #0x54] - ldrb r2, [r3, #0x10] - adds r0, r1, #0 - ands r0, r2 - strb r0, [r3, #0x10] - ldr r3, [r3, #0x54] - ldrb r0, [r3, #0x10] - ands r1, r0 - b _080A1E50 -_080A1E24: - ldr r0, [r4, #0x64] - ldr r2, [r0, #0x10] - ldrb r0, [r2, #0x10] - movs r1, #0x80 - orrs r0, r1 - strb r0, [r2, #0x10] - ldr r0, [r4, #0x64] - ldr r3, [r0, #0x14] - ldrb r0, [r3, #0x10] - orrs r0, r1 - strb r0, [r3, #0x10] - ldr r3, [r3, #0x54] - ldrb r0, [r3, #0x10] - orrs r0, r1 - strb r0, [r3, #0x10] - ldr r3, [r3, #0x54] - ldrb r0, [r3, #0x10] - orrs r0, r1 - strb r0, [r3, #0x10] - ldr r3, [r3, #0x54] - ldrb r0, [r3, #0x10] - orrs r1, r0 -_080A1E50: - strb r1, [r3, #0x10] - pop {r4, pc} - - thumb_func_start sub_080A1E54 -sub_080A1E54: @ 0x080A1E54 - push {r4, r5, lr} - adds r2, r0, #0 - ldrb r0, [r2, #0xe] - adds r0, #1 - strb r0, [r2, #0xe] - movs r1, #0xff - ands r0, r1 - movs r1, #0x1f - ands r0, r1 - cmp r0, #0 - bne _080A1ECA - adds r0, r2, #0 - movs r1, #0x51 - movs r2, #0 - bl CreateFx - adds r4, r0, #0 - cmp r4, #0 - beq _080A1ECA - bl Random - ldr r3, _080A1ECC @ =gRoomControls - movs r1, #0xf0 - adds r2, r0, #0 - ands r2, r1 - movs r5, #0x80 - lsls r5, r5, #2 - adds r1, r5, #0 - adds r2, r2, r1 - ldrh r1, [r3, #6] - adds r1, r1, r2 - subs r1, #0x78 - strh r1, [r4, #0x2e] - lsrs r0, r0, #8 - movs r1, #0x70 - ands r0, r1 - movs r1, #0x84 - lsls r1, r1, #2 - adds r0, r0, r1 - ldrh r3, [r3, #8] - adds r0, r0, r3 - subs r0, #0x38 - strh r0, [r4, #0x32] - adds r2, r4, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #5 - orrs r0, r1 - strb r0, [r2] - adds r1, r4, #0 - adds r1, #0x38 - movs r0, #2 - strb r0, [r1] - adds r0, r4, #0 - bl UpdateSpriteForCollisionLayer -_080A1ECA: - pop {r4, r5, pc} - .align 2, 0 -_080A1ECC: .4byte gRoomControls - - thumb_func_start sub_080A1ED0 -sub_080A1ED0: @ 0x080A1ED0 - push {r4, r5, r6, r7, lr} - mov r7, sl - mov r6, sb - mov r5, r8 - push {r5, r6, r7} - sub sp, #4 - mov sb, r1 - adds r5, r2, #0 - movs r1, #0 - str r1, [sp] - ldr r4, _080A1F60 @ =gUnk_08124EF8 - lsls r1, r5, #2 - adds r1, r1, r4 - ldrh r2, [r1] - ldr r3, _080A1F64 @ =gRoomControls - ldrh r1, [r3, #6] - adds r2, r2, r1 - mov sl, r2 - lsls r1, r5, #1 - adds r1, #1 - lsls r1, r1, #1 - adds r1, r1, r4 - ldrh r2, [r1] - ldrh r1, [r3, #8] - adds r2, r2, r1 - mov r8, r2 - ldr r1, _080A1F68 @ =gUnk_08124FF0 - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r4, [r0] - movs r1, #0 - ldrsh r0, [r4, r1] - cmp r0, #1 - beq _080A1FB0 - lsls r7, r5, #3 - movs r0, #0x10 - adds r6, r7, #0 - eors r6, r0 -_080A1F1C: - movs r0, #0x60 - mov r1, sb - bl CreateEnemy - adds r2, r0, #0 - cmp r2, #0 - beq _080A1FA6 - mov r0, sp - ldrb r0, [r0] - strb r0, [r2, #0xb] - ldr r1, [sp] - adds r1, #1 - str r1, [sp] - mov r0, sl - strh r0, [r2, #0x2e] - mov r1, r8 - strh r1, [r2, #0x32] - strb r7, [r2, #0x15] - adds r0, r2, #0 - adds r0, #0x7a - strb r6, [r0] - ldrh r1, [r4, #4] - subs r0, #2 - strh r1, [r0] - cmp r5, #1 - beq _080A1F7A - cmp r5, #1 - blo _080A1F6C - cmp r5, #2 - beq _080A1F80 - cmp r5, #3 - beq _080A1F94 - b _080A1FA6 - .align 2, 0 -_080A1F60: .4byte gUnk_08124EF8 -_080A1F64: .4byte gRoomControls -_080A1F68: .4byte gUnk_08124FF0 -_080A1F6C: - ldrh r1, [r4] - adds r0, r2, #0 - adds r0, #0x74 - strh r1, [r0] - ldrh r0, [r4, #2] - rsbs r0, r0, #0 - b _080A1F8C -_080A1F7A: - ldrh r0, [r4, #2] - adds r0, #0xf0 - b _080A1F98 -_080A1F80: - ldrh r1, [r4] - adds r0, r2, #0 - adds r0, #0x74 - strh r1, [r0] - ldrh r0, [r4, #2] - adds r0, #0xa0 -_080A1F8C: - adds r1, r2, #0 - adds r1, #0x76 - strh r0, [r1] - b _080A1FA6 -_080A1F94: - ldrh r0, [r4, #2] - rsbs r0, r0, #0 -_080A1F98: - adds r1, r2, #0 - adds r1, #0x74 - strh r0, [r1] - ldrh r1, [r4] - adds r0, r2, #0 - adds r0, #0x76 - strh r1, [r0] -_080A1FA6: - adds r4, #6 - movs r1, #0 - ldrsh r0, [r4, r1] - cmp r0, #1 - bne _080A1F1C -_080A1FB0: - mov r0, sb - cmp r0, #0 - bne _080A1FE4 - movs r0, #0xf - movs r1, #2 - movs r2, #0 - bl CreateObject - adds r2, r0, #0 - cmp r2, #0 - beq _080A1FE4 - mov r1, sl - strh r1, [r2, #0x2e] - mov r0, r8 - strh r0, [r2, #0x32] - ldrb r0, [r2, #0x1b] - movs r1, #0xc0 - orrs r0, r1 - strb r0, [r2, #0x1b] - ldrb r0, [r2, #0x19] - orrs r0, r1 - strb r0, [r2, #0x19] - adds r1, r2, #0 - adds r1, #0x38 - movs r0, #1 - strb r0, [r1] -_080A1FE4: - add sp, #4 - pop {r3, r4, r5} - mov r8, r3 - mov sb, r4 - mov sl, r5 - pop {r4, r5, r6, r7, pc} - - thumb_func_start sub_080A1FF0 -sub_080A1FF0: @ 0x080A1FF0 - push {r4, r5, lr} - adds r5, r0, #0 - ldrb r0, [r5, #0xe] - cmp r0, #0 - beq _080A2066 - subs r1, r0, #1 - strb r1, [r5, #0xe] - lsls r0, r1, #0x18 - lsrs r0, r0, #0x18 - cmp r0, #0x20 - bhi _080A2066 - movs r0, #0xf - ands r1, r0 - cmp r1, #0 - bne _080A2066 - adds r0, r5, #0 - movs r1, #0x51 - movs r2, #0 - bl CreateFx - adds r4, r0, #0 - cmp r4, #0 - beq _080A2066 - bl Random - ldr r3, _080A209C @ =gRoomControls - movs r1, #0x78 - ands r0, r1 - movs r1, #0x80 - lsls r1, r1, #2 - adds r2, r1, #0 - adds r2, r0, r2 - ldrh r1, [r3, #6] - adds r1, r1, r2 - subs r1, #0x3c - strh r1, [r4, #0x2e] - movs r1, #0x84 - lsls r1, r1, #2 - adds r0, r0, r1 - ldrh r3, [r3, #8] - adds r0, r0, r3 - subs r0, #0x3c - strh r0, [r4, #0x32] - adds r2, r4, #0 - adds r2, #0x29 - ldrb r1, [r2] - movs r0, #8 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #6 - orrs r0, r1 - strb r0, [r2] - adds r1, r4, #0 - adds r1, #0x38 - movs r0, #1 - strb r0, [r1] - adds r0, r4, #0 - bl UpdateSpriteForCollisionLayer -_080A2066: - adds r4, r5, #0 - adds r4, #0x7b - ldrb r0, [r4] - cmp r0, #0 - beq _080A20B4 - ldr r0, _080A20A0 @ =gPlayerEntity - ldr r2, _080A209C @ =gRoomControls - ldrh r1, [r2, #6] - movs r3, #0x80 - lsls r3, r3, #2 - adds r1, r1, r3 - ldrh r2, [r2, #8] - adds r3, #0x10 - adds r2, r2, r3 - movs r3, #0x80 - lsls r3, r3, #1 - bl sub_0806FCB8 - cmp r0, #0 - beq _080A20B2 - ldrb r0, [r5, #0xe] - cmp r0, #0 - bne _080A20A4 - movs r0, #0x78 - strb r0, [r5, #0xe] - b _080A20B4 - .align 2, 0 -_080A209C: .4byte gRoomControls -_080A20A0: .4byte gPlayerEntity -_080A20A4: - cmp r0, #0x23 - bne _080A20B4 - movs r0, #0x1e - movs r1, #0 - bl sub_08080964 - b _080A20B4 -_080A20B2: - strb r0, [r4] -_080A20B4: - pop {r4, r5, pc} - .align 2, 0 - - thumb_func_start sub_080A20B8 -sub_080A20B8: @ 0x080A20B8 - push {r4, lr} - adds r4, r1, #0 - cmp r4, #0 - bne _080A20C4 - movs r0, #1 - b _080A20FA -_080A20C4: - bl sub_08079F8C - cmp r0, #0 - beq _080A20F8 - ldr r0, _080A20F0 @ =gPlayerEntity - movs r1, #0x36 - ldrsh r0, [r0, r1] - cmp r0, #0 - bne _080A20F8 - movs r1, #0 - adds r0, r4, #0 - adds r0, #0x7c - ldrb r0, [r0] - cmp r0, #0 - bne _080A20EC - ldr r0, _080A20F4 @ =gPlayerState - ldrb r1, [r0, #0x14] - rsbs r0, r1, #0 - orrs r0, r1 - lsrs r1, r0, #0x1f -_080A20EC: - adds r0, r1, #0 - b _080A20FA - .align 2, 0 -_080A20F0: .4byte gPlayerEntity -_080A20F4: .4byte gPlayerState -_080A20F8: - movs r0, #0 -_080A20FA: - pop {r4, pc} diff --git a/include/enemy/gyorg.h b/include/enemy/gyorg.h index 58b68fbe..bcd6286c 100644 --- a/include/enemy/gyorg.h +++ b/include/enemy/gyorg.h @@ -21,6 +21,21 @@ typedef struct { u8 unk_83[5]; } GyorgFemaleEntity; +typedef struct { + Entity base; + u8 filler[0x20]; +} GyorgFemaleMouthEntity; + +typedef struct { + Entity base; + u8 unk_68[0xC]; + u16 unk_74; + u16 unk_76; + u16 unk_78; + u8 unk_7a; + u8 unk_7b[0xD]; +} GyorgChildEntity; + typedef struct { Entity base; u8 unk_68[4]; @@ -29,21 +44,22 @@ typedef struct { u16 unk_70; u16 unk_72; u8 unk_74; - // u8 unk_75[1]; + u8 unk_75; u16 unk_76; u16 unk_78; u8 unk_7a; u8 unk_7b; - u8 unk_7c[0xc]; + u16 unk_7c; + u8 unk_7e[0xa]; } GyorgBossObjectEntity; typedef struct { GyorgBossObjectEntity* boss; GyorgFemaleEntity* female; - Entity* male1; - Entity* male2; - void* unk_10; - void* unk_14; + GenericEntity* male1; + GenericEntity* male2; + GyorgFemaleMouthEntity* unk_10; + GenericEntity* unk_14; void* unk_18[0x8]; u16 unk_38; u16 unk_3a; diff --git a/include/functions.h b/include/functions.h index d7494909..99d3d476 100644 --- a/include/functions.h +++ b/include/functions.h @@ -41,7 +41,7 @@ extern void FlushSprites(void); extern Entity* CreateProjectile(u32); extern void RegisterPlayerHitbox(); extern s32 GetItemPrice(); -extern void DoExitTransition(ScreenTransitionData*); +extern void DoExitTransition(const ScreenTransitionData*); extern void CreateDustAt(s32, s32, u32); extern void PutItemOnSlot(u32 itemID); extern Entity* CreateSpeechBubbleQuestionMark(Entity*, s32, s32); @@ -81,7 +81,7 @@ extern void sub_080575C8(u32); extern void sub_08057688(void); extern void sub_080580B0(u32); 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_0807BB68(u32*, u32, u32); extern void sub_08054570(void); diff --git a/linker.ld b/linker.ld index d7095703..a4921b91 100644 --- a/linker.ld +++ b/linker.ld @@ -888,7 +888,6 @@ SECTIONS { asm/windTribeTeleporter.o(.text); asm/objectB9.o(.text); src/object/gyorgBossObject.o(.text); - asm/gyorgBossObject.o(.text); src/object/windcrest.o(.text); asm/litArea.o(.text); asm/objectBD.o(.text); diff --git a/src/code_0808091C.c b/src/code_0808091C.c index ab3ceb11..a5ba1bdf 100644 --- a/src/code_0808091C.c +++ b/src/code_0808091C.c @@ -31,7 +31,7 @@ void sub_08080910(void) { gScreenTransition.transitionType = TRANSITION_CUT; } -void sub_0808091C(ScreenTransitionData* param_1, u32 param_2) { +void sub_0808091C(const ScreenTransitionData* param_1, u32 param_2) { DoExitTransition(param_1); gScreenTransition.transitionType = param_2; } diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c index aded2572..508098bb 100644 --- a/src/enemy/gyorgFemale.c +++ b/src/enemy/gyorgFemale.c @@ -49,10 +49,10 @@ void sub_0804614C(GyorgFemaleEntity* this) { tmp = CreateProjectile(0x22); tmp->type = 0; tmp->parent = super; - ((GyorgFemaleHeap*)super->myHeap)->unk_14 = tmp; + ((GyorgFemaleHeap*)super->myHeap)->unk_14 = (GenericEntity*)tmp; tmp = CreateEnemy(GYORG_FEMALE_MOUTH, 0); tmp->parent = super; - ((GyorgFemaleHeap*)super->myHeap)->unk_10 = tmp; + ((GyorgFemaleHeap*)super->myHeap)->unk_10 = (GyorgFemaleMouthEntity*)tmp; tmp = CreateEnemy(GYORG_FEMALE_EYE, 0); tmp->parent = super; tmp = CreateEnemy(GYORG_FEMALE_EYE, 1); diff --git a/src/enemy/gyorgFemaleEye.c b/src/enemy/gyorgFemaleEye.c index ca6b1d05..69482c7a 100644 --- a/src/enemy/gyorgFemaleEye.c +++ b/src/enemy/gyorgFemaleEye.c @@ -172,7 +172,7 @@ void sub_08048D20(GyorgFemaleEyeEntity* this) { } u32 sub_08048D70(GyorgFemaleEntity* parent) { - Entity* tmp; + GenericEntity* tmp; if (parent->base.health != 0) { return 1; } @@ -180,7 +180,7 @@ u32 sub_08048D70(GyorgFemaleEntity* parent) { if (!tmp) { tmp = ((GyorgFemaleHeap*)parent->base.myHeap)->male2; } - if (tmp->health != 0) { + if (tmp->base.health != 0) { return 0; } return 1; diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c index 8a5dd737..13e8f18a 100644 --- a/src/enemy/vaatiArm.c +++ b/src/enemy/vaatiArm.c @@ -2,8 +2,6 @@ #include "object.h" #include "functions.h" -extern void DoExitTransition(ScreenTransitionData*); - typedef struct VaatiArm_HeapStruct1 { union SplitHWord unk00; u16 unk02; diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c index 2efae6f5..07bd1540 100644 --- a/src/enemy/vaatiProjectile.c +++ b/src/enemy/vaatiProjectile.c @@ -2,7 +2,6 @@ #include "functions.h" extern bool32 PlayerInRange(Entity*, u32, u32); -extern void DoExitTransition(ScreenTransitionData*); extern u32 sub_080002E0(u32, u32); extern Entity* gUnk_020000B0; extern const ScreenTransitionData gUnk_0813AB94; diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c index 9c4a2fe5..9f68eab8 100644 --- a/src/object/gyorgBossObject.c +++ b/src/object/gyorgBossObject.c @@ -5,13 +5,23 @@ #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 const u16 gUnk_08124EF8[]; +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*, Entity*); +u32 sub_080A20B8(GyorgBossObjectEntity*, GenericEntity*); void sub_080A1D70(GyorgBossObjectEntity*, u32); extern void (*const gUnk_08124ED0[])(GyorgBossObjectEntity*); @@ -49,7 +59,7 @@ void sub_080A1704(GyorgBossObjectEntity* this) { tmp->y.HALF.HI = gRoomControls.roomOriginY + 0x330; #endif tmp->myHeap = heap; - heap->male1 = tmp; + heap->male1 = (GenericEntity*)tmp; tmp = CreateEnemy(GYORG_MALE, 1); tmp->x.HALF.HI = gRoomControls.roomOriginX + 0x260; #ifdef EU @@ -58,7 +68,7 @@ void sub_080A1704(GyorgBossObjectEntity* this) { tmp->y.HALF.HI = gRoomControls.roomOriginY + 0x310; #endif tmp->myHeap = heap; - heap->male2 = tmp; + heap->male2 = (GenericEntity*)tmp; gScreen.bg3.control = 0x1E07; gScreen.lcd.displayControl |= 0x800; this->unk_70 = 0; @@ -94,7 +104,7 @@ void sub_080A189C(GyorgBossObjectEntity* this) { this->unk_6c = 1; this->unk_78 = 0x400; this->unk_7b = 1; - ((GyorgFemaleHeap*)super->myHeap)->male1->health = 0xC; + ((GyorgFemaleHeap*)super->myHeap)->male1->base.health = 0xC; SoundReq(0x128); sub_08080964(0x96, 1); } @@ -104,7 +114,7 @@ void sub_080A189C(GyorgBossObjectEntity* this) { void sub_080A190C(GyorgBossObjectEntity* this) { sub_080A1FF0(this); - if (((GyorgFemaleHeap*)super->myHeap)->male1->health == 0) { + if (((GyorgFemaleHeap*)super->myHeap)->male1->base.health == 0) { if (sub_080A20B8(this, ((GyorgFemaleHeap*)super->myHeap)->male1)) { super->action = 4; this->unk_6c = 0x10; @@ -115,7 +125,306 @@ void sub_080A190C(GyorgBossObjectEntity* this) { gPlayerState.startPosX = gRoomControls.roomOriginX + 0x200; gPlayerState.startPosY = gRoomControls.roomOriginY + 0x210; } else { - gPlayerState.startPosX = ((GyorgFemaleHeap*)super->myHeap)->male1->x.HALF.HI; - gPlayerState.startPosY = ((GyorgFemaleHeap*)super->myHeap)->male1->y.HALF.HI; + gPlayerState.startPosX = ((GyorgFemaleHeap*)super->myHeap)->male1->base.x.HALF.HI; + gPlayerState.startPosY = ((GyorgFemaleHeap*)super->myHeap)->male1->base.y.HALF.HI; } } + +void sub_080A1990(GyorgBossObjectEntity* this, u32 unk1) { + if (((GyorgFemaleHeap*)super->myHeap)->female->base.health == 0) { + ((GyorgFemaleHeap*)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); + sub_08080964(0x96, 1); + } + gPlayerState.startPosX = gRoomControls.roomOriginX + 0x200; + gPlayerState.startPosY = gRoomControls.roomOriginY + 0x210; +} + +void sub_080A19FC(GyorgBossObjectEntity* this) { + sub_080A1FF0(this); + if (((GyorgFemaleHeap*)super->myHeap)->male2->base.health == 0) { + if (sub_080A20B8(this, ((GyorgFemaleHeap*)super->myHeap)->male2)) { + super->action = 6; + this->unk_6c = 0x20; + this->unk_78 = 0xc0; + sub_080A1D70(this, ((GyorgFemaleHeap*)super->myHeap)->female->base.animationState); + ((GyorgFemaleHeap*)super->myHeap)->female->base.health = 0x18; + } + gPlayerState.startPosX = gRoomControls.roomOriginX + 0x200; + gPlayerState.startPosY = gRoomControls.roomOriginY + 0x210; + } else { + gPlayerState.startPosX = ((GyorgFemaleHeap*)super->myHeap)->male2->base.x.HALF.HI; + gPlayerState.startPosY = ((GyorgFemaleHeap*)super->myHeap)->male2->base.y.HALF.HI; + } +} + +void sub_080A1A80(GyorgBossObjectEntity* this) { + if (((GyorgFemaleHeap*)super->myHeap)->female->base.health == 0) { + ((GyorgFemaleHeap*)super->myHeap)->male2->base.health = 0xC; + super->action = 7; + super->actionDelay = 0x23; + this->unk_6c = 0x104; + this->unk_78 = 0x400; + SoundReq(SFX_BOSS_DIE); + sub_08080964(0x96, 1); + } + gPlayerState.startPosX = gRoomControls.roomOriginX + 0x200; + gPlayerState.startPosY = gRoomControls.roomOriginY + 0x210; +} + +void sub_080A1AE8(GyorgBossObjectEntity* this) { + sub_080A1FF0(this); + if (((GyorgFemaleHeap*)super->myHeap)->male2->base.health == 0) { + if (sub_080A20B8(this, ((GyorgFemaleHeap*)super->myHeap)->male2)) { + super->action = 8; + this->unk_6c = 0x40; + this->unk_78 = 0xC0; + ((GyorgFemaleHeap*)super->myHeap)->female->base.health = 0xC; + } + } + gPlayerState.startPosX = gRoomControls.roomOriginX + 0x200; + gPlayerState.startPosY = gRoomControls.roomOriginY + 0x210; +} + +void sub_080A1B4C(GyorgBossObjectEntity* this) { + if (((GyorgFemaleHeap*)super->myHeap)->female->base.health == 0) { + if (this->unk_6c != 0) { + sub_08080964(0x2d, 1); + SoundReq(SFX_BOSS_DIE); + this->unk_78 = 0x600; + } + this->unk_6c = 0; + gScreenTransition.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.cameraTarget = super; + SetPlayerControl(2); + } + } + gPlayerState.startPosX = gRoomControls.roomOriginX + 0x200; + gPlayerState.startPosY = gRoomControls.roomOriginY + 0x210; +} + +void sub_080A1C04(GyorgBossObjectEntity* this) { + if (this->unk_6e == 0) { + sub_0806F69C(super); + sub_080A1E54(this); + if (--super->field_0xf == 0) { + SetFlag(0x7B); + sub_0808091C(&gUnk_0813ABD0, 8); + return; + } + if (super->field_0xf == 0x3C) { + DoFade(7, 4); + } + return; + } + if (--this->unk_6e < 0xb4) { + sub_080A1E54(this); + return; + } + switch (this->unk_6e) { + case 0xb4: + SoundReq(SFX_BOSS_DIE); + sub_08080964(0x2d0, 2); + break; + case 0x12C: + SoundReq(SFX_BOSS_DIE); + sub_08080964(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 = ((GyorgFemaleHeap*)super->myHeap)->male1) != NULL || + (tmp = ((GyorgFemaleHeap*)super->myHeap)->male2) != NULL) { + if (tmp->field_0x7c.BYTES.byte0 && tmp->base.spriteRendering.b3 == 2) { + ((GyorgFemaleHeap*)super->myHeap)->unk_10->base.flags &= ~0x80; + tmp = ((GyorgFemaleHeap*)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; + } + } + ((GyorgFemaleHeap*)super->myHeap)->unk_10->base.flags |= 0x80; + tmp = ((GyorgFemaleHeap*)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.roomOriginX + 0x200 + (r & 0xf0) - 0x78; + fx->y.HALF.HI = gRoomControls.roomOriginY + 0x210 + ((r >> 8) & 0x70) - 0x38; + fx->spritePriority.b0 = 5; + fx->collisionLayer = 2; + UpdateSpriteForCollisionLayer(fx); + } + } +} + +void sub_080A1ED0(u32 unk0, u32 unk1, u32 unk2) { + u32 i = 0; + s16* p; + u32 x, y; + x = gUnk_08124EF8[unk2 * 2] + gRoomControls.roomOriginX; + y = gUnk_08124EF8[unk2 * 2 + 1] + gRoomControls.roomOriginY; + 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.roomOriginX + 0x200 + (r & 0x78) - 0x3C; + fx->y.HALF.HI = gRoomControls.roomOriginY + 0x210 + (r & 0x78) - 0x3C; + fx->spritePriority.b0 = 6; + fx->collisionLayer = 1; + UpdateSpriteForCollisionLayer(fx); + } + } + } + if (this->unk_7b) { + if (sub_0806FCB8(&gPlayerEntity, gRoomControls.roomOriginX + 0x200, gRoomControls.roomOriginY + 0x210, 0x100)) { + if (super->actionDelay == 0) { + super->actionDelay = 0x78; + } else { + if (super->actionDelay == 0x23) { + sub_08080964(0x1e, 0); + } + } + } else { + this->unk_7b = 0; + } + } +} + +u32 sub_080A20B8(GyorgBossObjectEntity* this, GenericEntity* other) { + if (other == NULL) { + return 1; + } + if (sub_08079F8C() && gPlayerEntity.z.HALF.HI == 0) { + return other->field_0x7c.BYTES.byte0 == 0 && gPlayerState.field_0x14 != 0; + } + return 0; +}