From 8ad65efb7c228d934e515209fdff5515a30aade1 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Sun, 16 Jan 2022 23:28:59 +0100 Subject: [PATCH 1/7] decomp kinstone menu --- asm/non_matching/subtask/sub_080A3C6C.inc | 172 +++ asm/non_matching/subtask/sub_080A414C.inc | 112 ++ asm/non_matching/subtask/sub_080A4494.inc | 34 + asm/subtask.s | 1294 --------------------- include/enemy.h | 1 + include/kinstone.h | 2 +- include/menu.h | 28 +- include/screen.h | 4 +- src/debug.c | 12 +- src/fileselect.c | 18 +- src/game.c | 8 +- src/object/fileScreenObjects.c | 14 +- src/subtask.c | 568 ++++++++- src/subtask2.c | 2 +- 14 files changed, 939 insertions(+), 1330 deletions(-) create mode 100644 asm/non_matching/subtask/sub_080A3C6C.inc create mode 100644 asm/non_matching/subtask/sub_080A414C.inc create mode 100644 asm/non_matching/subtask/sub_080A4494.inc diff --git a/asm/non_matching/subtask/sub_080A3C6C.inc b/asm/non_matching/subtask/sub_080A3C6C.inc new file mode 100644 index 00000000..d55c1997 --- /dev/null +++ b/asm/non_matching/subtask/sub_080A3C6C.inc @@ -0,0 +1,172 @@ + .syntax unified + push {r4, r5, lr} + ldr r0, _080A3C9C @ =gFadeControl + ldrb r0, [r0] + cmp r0, #0 + beq _080A3C78 + b _080A3DA8 +_080A3C78: + ldr r5, _080A3CA0 @ =gMenu + movs r0, #2 + strb r0, [r5, #1] + adds r0, r5, #0 + adds r0, #0x28 + ldrb r0, [r0] + lsls r2, r0, #0x10 + ldr r0, [r5, #0x10] + subs r4, r2, r0 + adds r1, r4, #0 + cmp r4, #0 + bge _080A3C92 + rsbs r1, r4, #0 +_080A3C92: + ldr r0, _080A3CA4 @ =0x00001FFD + cmp r1, r0 + bhi _080A3CA8 + str r2, [r5, #0x10] + b _080A3CDE + .align 2, 0 +_080A3C9C: .4byte gFadeControl +_080A3CA0: .4byte gMenu +_080A3CA4: .4byte 0x00001FFD +_080A3CA8: + movs r0, #1 + strb r0, [r5, #1] + adds r0, r4, #0 + bl sub_08000E44 + adds r2, r0, #0 + adds r0, r4, #0 + cmp r0, #0 + bge _080A3CBE + ldr r1, _080A3D18 @ =0x0001FFFF + adds r0, r0, r1 +_080A3CBE: + asrs r4, r0, #0x11 + cmp r4, #0 + bge _080A3CC6 + rsbs r4, r4, #0 +_080A3CC6: + cmp r4, #5 + ble _080A3CCC + movs r4, #5 +_080A3CCC: + ldr r0, _080A3D1C @ =gUnk_081280EE + adds r0, r4, r0 + ldrb r1, [r0] + ldr r0, _080A3D20 @ =0x00000666 + muls r0, r2, r0 + muls r1, r0, r1 + ldr r0, [r5, #0x10] + adds r0, r0, r1 + str r0, [r5, #0x10] +_080A3CDE: + adds r3, r5, #0 + adds r3, #0x29 + ldrb r2, [r3] + ldr r0, [r5, #0x10] + adds r1, r0, #0 + cmp r0, #0 + bge _080A3CF0 + ldr r4, _080A3D24 @ =0x0000FFFF + adds r1, r0, r4 +_080A3CF0: + asrs r1, r1, #0x10 + cmp r2, r1 + beq _080A3CFE + strb r1, [r3] + movs r0, #0x69 + bl SoundReq +_080A3CFE: + ldr r2, _080A3D28 @ =gInput + ldrh r1, [r2, #2] + ldr r0, _080A3D2C @ =0x0000020A + ands r0, r1 + cmp r0, #0 + beq _080A3D30 + movs r0, #2 + bl sub_080A7114 + movs r0, #0x6c + bl SoundReq + b _080A3DA8 + .align 2, 0 +_080A3D18: .4byte 0x0001FFFF +_080A3D1C: .4byte gUnk_081280EE +_080A3D20: .4byte 0x00000666 +_080A3D24: .4byte 0x0000FFFF +_080A3D28: .4byte gInput +_080A3D2C: .4byte 0x0000020A +_080A3D30: + adds r0, r5, #0 + adds r0, #0x28 + ldrb r4, [r0] + ldrh r1, [r2, #4] + adds r5, r0, #0 + cmp r1, #0x20 + beq _080A3D56 + cmp r1, #0x20 + bgt _080A3D4C + cmp r1, #1 + beq _080A3D5E + cmp r1, #0x10 + beq _080A3D5A + b _080A3D8A +_080A3D4C: + cmp r1, #0x40 + beq _080A3D56 + cmp r1, #0x80 + beq _080A3D5A + b _080A3D8A +_080A3D56: + subs r4, #1 + b _080A3D8A +_080A3D5A: + adds r4, #1 + b _080A3D8A +_080A3D5E: + ldr r2, _080A3DAC @ =gMenu + ldrb r0, [r2, #1] + cmp r0, #2 + bne _080A3D8A + ldr r0, [r2, #0x10] + cmp r0, #0 + bge _080A3D70 + ldr r1, _080A3DB0 @ =0x0000FFFF + adds r0, r0, r1 +_080A3D70: + asrs r4, r0, #0x10 + ldr r0, _080A3DB4 @ =gSave + movs r1, #0x8c + lsls r1, r1, #1 + adds r0, r0, r1 + adds r0, r4, r0 + ldrb r1, [r0] + adds r0, r2, #0 + adds r0, #0x2a + strb r1, [r0] + movs r0, #3 + bl sub_080A7114 +_080A3D8A: + bl sub_080A3B48 + cmp r0, r4 + bgt _080A3D94 + subs r4, r0, #1 +_080A3D94: + cmp r0, #1 + bgt _080A3D9A + movs r4, #0 +_080A3D9A: + cmp r4, #0 + bge _080A3DA0 + movs r4, #0 +_080A3DA0: + ldrb r0, [r5] + cmp r0, r4 + beq _080A3DA8 + strb r4, [r5] +_080A3DA8: + pop {r4, r5, pc} + .align 2, 0 +_080A3DAC: .4byte gMenu +_080A3DB0: .4byte 0x0000FFFF +_080A3DB4: .4byte gSave + .syntax divided diff --git a/asm/non_matching/subtask/sub_080A414C.inc b/asm/non_matching/subtask/sub_080A414C.inc new file mode 100644 index 00000000..56c64cc5 --- /dev/null +++ b/asm/non_matching/subtask/sub_080A414C.inc @@ -0,0 +1,112 @@ + .syntax unified + push {r4, r5, r6, r7, lr} + mov r7, sb + mov r6, r8 + push {r6, r7} + ldr r4, _080A4210 @ =gOamCmd + movs r0, #0 + strh r0, [r4, #4] + strh r0, [r4, #6] + ldr r0, _080A4214 @ =gMenu + ldrh r0, [r0, #0x10] + ldr r1, _080A4218 @ =0x00000B21 + bl __divsi3 + lsls r0, r0, #0x10 + lsrs r0, r0, #0x10 + movs r5, #3 + rsbs r5, r5, #0 + movs r1, #0xff + mov r8, r1 + adds r7, r4, #0 + ldr r6, _080A421C @ =gSineTable + rsbs r0, r0, #0 + adds r4, r0, #0 + subs r4, #0x45 + ldr r2, _080A4220 @ =gUnk_02002B6B + mov sb, r2 +_080A4180: + adds r2, r4, #0 + mov r3, r8 + ands r2, r3 + lsls r0, r2, #1 + adds r0, r0, r6 + movs r3, #0 + ldrsh r1, [r0, r3] + lsls r0, r1, #4 + adds r0, r0, r1 + lsls r0, r0, #2 + cmp r0, #0 + bge _080A419A + adds r0, #0xff +_080A419A: + asrs r0, r0, #8 + adds r0, #0x4f + strh r0, [r7, #2] + adds r0, r2, #0 + adds r0, #0x40 + mov r1, r8 + ands r0, r1 + lsls r0, r0, #1 + adds r0, r0, r6 + movs r2, #0 + ldrsh r1, [r0, r2] + lsls r0, r1, #5 + adds r0, r0, r1 + lsls r0, r0, #1 + cmp r0, #0 + bge _080A41BC + adds r0, #0xff +_080A41BC: + asrs r0, r0, #8 + subs r0, #0x10 + strh r0, [r7] + ldr r2, _080A4214 @ =gMenu + ldr r0, [r2, #0x10] + cmp r0, #0 + bge _080A41CE + ldr r3, _080A4224 @ =0x0000FFFF + adds r0, r0, r3 +_080A41CE: + asrs r0, r0, #0x10 + adds r3, r0, r5 + cmp r3, #0 + blt _080A4200 + mov r1, sb + adds r0, r3, r1 + ldrb r1, [r0] + ldr r0, _080A4228 @ =gSave + cmp r5, #0 + bne _080A41EE + ldrb r2, [r2, #1] + cmp r2, #4 + bgt _080A41EE + cmp r2, #3 + blt _080A41EE + subs r1, #1 +_080A41EE: + cmp r1, #0 + ble _080A4200 + movs r2, #0x8c + lsls r2, r2, #1 + adds r0, r0, r2 + adds r0, r3, r0 + ldrb r0, [r0] + bl sub_080A42E0 +_080A4200: + adds r4, #0x17 + adds r5, #1 + cmp r5, #3 + ble _080A4180 + pop {r3, r4} + mov r8, r3 + mov sb, r4 + pop {r4, r5, r6, r7, pc} + .align 2, 0 +_080A4210: .4byte gOamCmd +_080A4214: .4byte gMenu +_080A4218: .4byte 0x00000B21 +_080A421C: .4byte gSineTable +_080A4220: .4byte gUnk_02002B6B +_080A4224: .4byte 0x0000FFFF +_080A4228: .4byte gSave + .syntax divided diff --git a/asm/non_matching/subtask/sub_080A4494.inc b/asm/non_matching/subtask/sub_080A4494.inc new file mode 100644 index 00000000..ddb6aaa1 --- /dev/null +++ b/asm/non_matching/subtask/sub_080A4494.inc @@ -0,0 +1,34 @@ + .syntax unified + push {r4, r5, lr} + bl sub_0805F2C8 + adds r4, r0, #0 + cmp r4, #0 + beq _080A44D0 + ldr r0, _080A44D4 @ =gTextGfxBuffer + str r0, [r4, #8] + movs r1, #0 + strb r1, [r4, #2] + movs r0, #5 + strb r0, [r4, #3] + strb r1, [r4, #1] + ldr r1, _080A44D8 @ =gUnk_02002AC0 + adds r0, r4, #0 + movs r2, #0x80 + bl sub_080A44E0 + ldr r0, _080A44DC @ =gFuseInfo + ldr r0, [r0, #0xc] + bl sub_08002632 + adds r0, r4, #0 + movs r2, #0xa0 + bl sub_080A44E0 + adds r5, r0, #0 + adds r0, r4, #0 + bl sub_0805F300 +_080A44D0: + adds r0, r5, #0 + pop {r4, r5, pc} + .align 2, 0 +_080A44D4: .4byte gTextGfxBuffer +_080A44D8: .4byte gUnk_02002AC0 +_080A44DC: .4byte gFuseInfo + .syntax divided diff --git a/asm/subtask.s b/asm/subtask.s index a643ad7b..738946ec 100644 --- a/asm/subtask.s +++ b/asm/subtask.s @@ -6,1300 +6,6 @@ .text - thumb_func_start sub_080A3C6C -sub_080A3C6C: @ 0x080A3C6C - push {r4, r5, lr} - ldr r0, _080A3C9C @ =gFadeControl - ldrb r0, [r0] - cmp r0, #0 - beq _080A3C78 - b _080A3DA8 -_080A3C78: - ldr r5, _080A3CA0 @ =gMenu - movs r0, #2 - strb r0, [r5, #1] - adds r0, r5, #0 - adds r0, #0x28 - ldrb r0, [r0] - lsls r2, r0, #0x10 - ldr r0, [r5, #0x10] - subs r4, r2, r0 - adds r1, r4, #0 - cmp r4, #0 - bge _080A3C92 - rsbs r1, r4, #0 -_080A3C92: - ldr r0, _080A3CA4 @ =0x00001FFD - cmp r1, r0 - bhi _080A3CA8 - str r2, [r5, #0x10] - b _080A3CDE - .align 2, 0 -_080A3C9C: .4byte gFadeControl -_080A3CA0: .4byte gMenu -_080A3CA4: .4byte 0x00001FFD -_080A3CA8: - movs r0, #1 - strb r0, [r5, #1] - adds r0, r4, #0 - bl sub_08000E44 - adds r2, r0, #0 - adds r0, r4, #0 - cmp r0, #0 - bge _080A3CBE - ldr r1, _080A3D18 @ =0x0001FFFF - adds r0, r0, r1 -_080A3CBE: - asrs r4, r0, #0x11 - cmp r4, #0 - bge _080A3CC6 - rsbs r4, r4, #0 -_080A3CC6: - cmp r4, #5 - ble _080A3CCC - movs r4, #5 -_080A3CCC: - ldr r0, _080A3D1C @ =gUnk_081280EE - adds r0, r4, r0 - ldrb r1, [r0] - ldr r0, _080A3D20 @ =0x00000666 - muls r0, r2, r0 - muls r1, r0, r1 - ldr r0, [r5, #0x10] - adds r0, r0, r1 - str r0, [r5, #0x10] -_080A3CDE: - adds r3, r5, #0 - adds r3, #0x29 - ldrb r2, [r3] - ldr r0, [r5, #0x10] - adds r1, r0, #0 - cmp r0, #0 - bge _080A3CF0 - ldr r4, _080A3D24 @ =0x0000FFFF - adds r1, r0, r4 -_080A3CF0: - asrs r1, r1, #0x10 - cmp r2, r1 - beq _080A3CFE - strb r1, [r3] - movs r0, #0x69 - bl SoundReq -_080A3CFE: - ldr r2, _080A3D28 @ =gInput - ldrh r1, [r2, #2] - ldr r0, _080A3D2C @ =0x0000020A - ands r0, r1 - cmp r0, #0 - beq _080A3D30 - movs r0, #2 - bl sub_080A7114 - movs r0, #0x6c - bl SoundReq - b _080A3DA8 - .align 2, 0 -_080A3D18: .4byte 0x0001FFFF -_080A3D1C: .4byte gUnk_081280EE -_080A3D20: .4byte 0x00000666 -_080A3D24: .4byte 0x0000FFFF -_080A3D28: .4byte gInput -_080A3D2C: .4byte 0x0000020A -_080A3D30: - adds r0, r5, #0 - adds r0, #0x28 - ldrb r4, [r0] - ldrh r1, [r2, #4] - adds r5, r0, #0 - cmp r1, #0x20 - beq _080A3D56 - cmp r1, #0x20 - bgt _080A3D4C - cmp r1, #1 - beq _080A3D5E - cmp r1, #0x10 - beq _080A3D5A - b _080A3D8A -_080A3D4C: - cmp r1, #0x40 - beq _080A3D56 - cmp r1, #0x80 - beq _080A3D5A - b _080A3D8A -_080A3D56: - subs r4, #1 - b _080A3D8A -_080A3D5A: - adds r4, #1 - b _080A3D8A -_080A3D5E: - ldr r2, _080A3DAC @ =gMenu - ldrb r0, [r2, #1] - cmp r0, #2 - bne _080A3D8A - ldr r0, [r2, #0x10] - cmp r0, #0 - bge _080A3D70 - ldr r1, _080A3DB0 @ =0x0000FFFF - adds r0, r0, r1 -_080A3D70: - asrs r4, r0, #0x10 - ldr r0, _080A3DB4 @ =gSave - movs r1, #0x8c - lsls r1, r1, #1 - adds r0, r0, r1 - adds r0, r4, r0 - ldrb r1, [r0] - adds r0, r2, #0 - adds r0, #0x2a - strb r1, [r0] - movs r0, #3 - bl sub_080A7114 -_080A3D8A: - bl sub_080A3B48 - cmp r0, r4 - bgt _080A3D94 - subs r4, r0, #1 -_080A3D94: - cmp r0, #1 - bgt _080A3D9A - movs r4, #0 -_080A3D9A: - cmp r4, #0 - bge _080A3DA0 - movs r4, #0 -_080A3DA0: - ldrb r0, [r5] - cmp r0, r4 - beq _080A3DA8 - strb r4, [r5] -_080A3DA8: - pop {r4, r5, pc} - .align 2, 0 -_080A3DAC: .4byte gMenu -_080A3DB0: .4byte 0x0000FFFF -_080A3DB4: .4byte gSave - - thumb_func_start sub_080A3DB8 -sub_080A3DB8: @ 0x080A3DB8 - push {lr} - ldr r0, _080A3DDC @ =gMenu - ldrb r1, [r0, #1] - cmp r1, #6 - bne _080A3DEE - ldr r0, _080A3DE0 @ =gFuseInfo - strb r1, [r0] - ldrb r0, [r0, #3] - lsls r0, r0, #3 - ldr r1, _080A3DE4 @ =gUnk_080C9CBC - adds r1, r0, r1 - ldrb r0, [r1, #3] - cmp r0, #0 - beq _080A3DE8 - ldrb r1, [r1, #4] - bl MenuFadeIn - b _080A3DF8 - .align 2, 0 -_080A3DDC: .4byte gMenu -_080A3DE0: .4byte gFuseInfo -_080A3DE4: .4byte gUnk_080C9CBC -_080A3DE8: - bl Subtask_Exit - b _080A3DF8 -_080A3DEE: - ldr r1, _080A3DFC @ =gFuseInfo - movs r0, #5 - strb r0, [r1] - bl Subtask_Exit -_080A3DF8: - pop {pc} - .align 2, 0 -_080A3DFC: .4byte gFuseInfo - - thumb_func_start sub_080A3E00 -sub_080A3E00: @ 0x080A3E00 - push {lr} - ldr r1, _080A3E18 @ =gMenu - movs r0, #3 - strb r0, [r1, #1] - ldr r2, _080A3E1C @ =gUnk_081280F4 - ldrb r0, [r1, #6] - lsls r0, r0, #2 - adds r0, r0, r2 - ldr r0, [r0] - bl _call_via_r0 - pop {pc} - .align 2, 0 -_080A3E18: .4byte gMenu -_080A3E1C: .4byte gUnk_081280F4 - - thumb_func_start sub_080A3E20 -sub_080A3E20: @ 0x080A3E20 - push {lr} - ldr r2, _080A3E44 @ =gMenu - movs r0, #0 - strh r0, [r2, #0x18] - adds r1, r2, #0 - adds r1, #0x2c - ldrb r0, [r1] - adds r0, #2 - strb r0, [r1] - lsls r0, r0, #0x18 - asrs r0, r0, #0x18 - cmp r0, #0x45 - ble _080A3E42 - movs r0, #0x46 - strb r0, [r1] - movs r0, #1 - strb r0, [r2, #6] -_080A3E42: - pop {pc} - .align 2, 0 -_080A3E44: .4byte gMenu - - thumb_func_start sub_080A3E48 -sub_080A3E48: @ 0x080A3E48 - push {r4, lr} - ldr r2, _080A3E78 @ =gUnk_080C9CBC - ldr r3, _080A3E7C @ =gMenu - adds r0, r3, #0 - adds r0, #0x2a - ldrb r0, [r0] - lsls r0, r0, #3 - adds r0, r0, r2 - ldrb r1, [r0, #5] - ldr r0, _080A3E80 @ =gFuseInfo - ldrb r0, [r0, #3] - lsls r0, r0, #3 - adds r0, r0, r2 - ldrb r0, [r0, #5] - cmp r1, r0 - beq _080A3E84 - movs r0, #0x8c - lsls r0, r0, #1 - bl SoundReq - movs r0, #4 - bl sub_080A7114 - b _080A3EC8 - .align 2, 0 -_080A3E78: .4byte gUnk_080C9CBC -_080A3E7C: .4byte gMenu -_080A3E80: .4byte gFuseInfo -_080A3E84: - movs r2, #0 - movs r0, #2 - strb r0, [r3, #6] - movs r0, #0x14 - strh r0, [r3, #8] - ldr r3, _080A3ECC @ =gScreen - ldrh r0, [r3] - movs r4, #0x80 - lsls r4, r4, #6 - adds r1, r4, #0 - orrs r0, r1 - strh r0, [r3] - adds r1, r3, #0 - adds r1, #0x58 - ldr r0, _080A3ED0 @ =0x00006887 - strh r0, [r1] - adds r1, #4 - ldr r0, _080A3ED4 @ =0x0000405F - strh r0, [r1] - adds r1, #4 - movs r0, #0x3f - strh r0, [r1] - adds r1, #2 - movs r0, #0x1f - strh r0, [r1] - adds r1, #4 - ldr r0, _080A3ED8 @ =0x00003F90 - strh r0, [r1] - adds r0, r3, #0 - adds r0, #0x6a - strh r2, [r0] - movs r0, #0xfa - bl SoundReq -_080A3EC8: - pop {r4, pc} - .align 2, 0 -_080A3ECC: .4byte gScreen -_080A3ED0: .4byte 0x00006887 -_080A3ED4: .4byte 0x0000405F -_080A3ED8: .4byte 0x00003F90 - - thumb_func_start sub_080A3EDC -sub_080A3EDC: @ 0x080A3EDC - push {lr} - ldr r2, _080A3F08 @ =gScreen - adds r1, r2, #0 - adds r1, #0x6a - ldrh r0, [r1] - adds r0, #1 - strh r0, [r1] - lsls r0, r0, #0x10 - lsrs r0, r0, #0x10 - cmp r0, #0xe - bls _080A3F04 - movs r0, #0 - strh r0, [r1] - ldrh r1, [r2] - ldr r0, _080A3F0C @ =0x0000DFFF - ands r0, r1 - strh r0, [r2] - movs r0, #5 - bl sub_080A7114 -_080A3F04: - pop {pc} - .align 2, 0 -_080A3F08: .4byte gScreen -_080A3F0C: .4byte 0x0000DFFF - - thumb_func_start sub_080A3F10 -sub_080A3F10: @ 0x080A3F10 - push {r4, lr} - ldr r2, _080A3F48 @ =gMenu - movs r0, #4 - strb r0, [r2, #1] - adds r3, r2, #0 - adds r3, #0x2c - ldrb r1, [r3] - subs r1, #3 - strb r1, [r3] - movs r4, #0x80 - lsls r4, r4, #1 - adds r0, r4, #0 - ldrh r4, [r2, #0x18] - adds r0, r0, r4 - strh r0, [r2, #0x18] - lsls r1, r1, #0x18 - cmp r1, #0 - bge _080A3F46 - movs r0, #0 - strh r0, [r2, #0x18] - strb r0, [r3] - movs r0, #1 - bl sub_080A7114 - movs r0, #0x6d - bl SoundReq -_080A3F46: - pop {r4, pc} - .align 2, 0 -_080A3F48: .4byte gMenu - - thumb_func_start sub_080A3F4C -sub_080A3F4C: @ 0x080A3F4C - push {lr} - ldr r1, _080A3F60 @ =gUnk_08128100 - ldr r0, _080A3F64 @ =gMenu - ldrb r0, [r0, #6] - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r0, [r0] - bl _call_via_r0 - pop {pc} - .align 2, 0 -_080A3F60: .4byte gUnk_08128100 -_080A3F64: .4byte gMenu - - thumb_func_start sub_080A3F68 -sub_080A3F68: @ 0x080A3F68 - push {r4, r5, lr} - ldr r5, _080A3FB4 @ =gMenu - movs r0, #5 - strb r0, [r5, #1] - ldr r4, _080A3FB8 @ =gUnk_02002C81 - ldr r0, _080A3FBC @ =gFuseInfo - ldrb r1, [r0, #3] - adds r0, r4, #0 - bl WriteBit - ldr r0, _080A3FC0 @ =0xFFFFFED6 - adds r1, r4, r0 - ldrb r0, [r1] - adds r0, #1 - strb r0, [r1] - lsls r0, r0, #0x18 - lsrs r0, r0, #0x18 - cmp r0, #0x63 - bls _080A3F96 - ldr r0, _080A3FC4 @ =0xFFFFFED5 - adds r1, r4, r0 - movs r0, #1 - strb r0, [r1] -_080A3F96: - bl sub_080A4468 - movs r0, #0xcd - bl SoundReq - ldr r0, _080A3FC8 @ =0x00000702 - movs r1, #0xe - bl MessageAtHeight - movs r0, #1 - strb r0, [r5, #6] - movs r0, #0x78 - strh r0, [r5, #8] - pop {r4, r5, pc} - .align 2, 0 -_080A3FB4: .4byte gMenu -_080A3FB8: .4byte gUnk_02002C81 -_080A3FBC: .4byte gFuseInfo -_080A3FC0: .4byte 0xFFFFFED6 -_080A3FC4: .4byte 0xFFFFFED5 -_080A3FC8: .4byte 0x00000702 - - thumb_func_start sub_080A3FCC -sub_080A3FCC: @ 0x080A3FCC - push {lr} - ldr r0, _080A3FE8 @ =gMessage - ldrb r1, [r0] - movs r0, #0x7f - ands r0, r1 - cmp r0, #0 - bne _080A3FE6 - ldr r0, _080A3FEC @ =gMenu - movs r1, #2 - strb r1, [r0, #6] - ldr r0, _080A3FF0 @ =0x00000147 - bl SoundReq -_080A3FE6: - pop {pc} - .align 2, 0 -_080A3FE8: .4byte gMessage -_080A3FEC: .4byte gMenu -_080A3FF0: .4byte 0x00000147 - - thumb_func_start sub_080A3FF4 -sub_080A3FF4: @ 0x080A3FF4 - push {lr} - ldr r2, _080A4014 @ =gMenu - ldrh r0, [r2, #8] - subs r0, #1 - strh r0, [r2, #8] - lsls r0, r0, #0x10 - cmp r0, #0 - beq _080A4018 - ldrh r0, [r2, #0x1a] - ldrh r3, [r2, #0x18] - adds r1, r0, r3 - strh r1, [r2, #0x18] - adds r0, #0x20 - strh r0, [r2, #0x1a] - b _080A4036 - .align 2, 0 -_080A4014: .4byte gMenu -_080A4018: - movs r0, #6 - strb r0, [r2, #1] - movs r0, #3 - strb r0, [r2, #6] - movs r0, #0x4f - strh r0, [r2, #8] - movs r0, #0xb3 - movs r1, #1 - movs r2, #0 - bl CreateObject - movs r0, #0xe5 - lsls r0, r0, #1 - bl SoundReq -_080A4036: - pop {pc} - - thumb_func_start sub_080A4038 -sub_080A4038: @ 0x080A4038 - push {lr} - ldr r1, _080A4050 @ =gMenu - ldrh r0, [r1, #8] - subs r0, #1 - strh r0, [r1, #8] - lsls r0, r0, #0x10 - cmp r0, #0 - bge _080A404E - movs r0, #2 - bl sub_080A7114 -_080A404E: - pop {pc} - .align 2, 0 -_080A4050: .4byte gMenu - - thumb_func_start sub_080A4054 -sub_080A4054: @ 0x080A4054 - push {lr} - bl sub_080A422C - bl sub_080A414C - bl sub_080A4080 - movs r2, #0 - ldr r0, _080A407C @ =gUnk_02019EE0 - adds r1, r0, #1 -_080A4068: - ldrb r0, [r1] - cmp r0, #0 - beq _080A4072 - subs r0, #1 - strb r0, [r1] -_080A4072: - adds r1, #4 - adds r2, #1 - cmp r2, #0xf - bls _080A4068 - pop {pc} - .align 2, 0 -_080A407C: .4byte gUnk_02019EE0 - - thumb_func_start sub_080A4080 -sub_080A4080: @ 0x080A4080 -.ifdef EU - push {r4, r5, r6, r7, lr} - ldr r4, _080A394C @ =gOamCmd - movs r0, #0 - strh r0, [r4, #4] - strh r0, [r4, #6] - ldr r5, _080A3950 @ =gChooseFileState - adds r0, r5, #0 - adds r0, #0x2f - movs r1, #0 - ldrsb r1, [r0, r1] - movs r0, #0x10 - subs r0, r0, r1 - strh r0, [r4, #2] - movs r0, #0x40 - strh r0, [r4] - movs r0, #0x80 - lsls r0, r0, #3 - strh r0, [r4, #8] - movs r0, #0xfd - lsls r0, r0, #1 - movs r1, #0 - bl DrawDirect - movs r0, #0x94 - strh r0, [r4, #2] - movs r0, #0x50 - strh r0, [r4] - movs r0, #0x90 - lsls r0, r0, #3 - strh r0, [r4, #8] - ldr r7, _080A3954 @ =0x000001F9 - adds r0, r7, #0 - movs r1, #0 - bl DrawDirect - movs r0, #0xb8 - strh r0, [r4] - movs r0, #0x94 - lsls r0, r0, #3 - strh r0, [r4, #8] - adds r0, r7, #0 - movs r1, #1 - bl DrawDirect - ldr r0, _080A3958 @ =gMain - ldrh r0, [r0, #0xc] - lsrs r0, r0, #2 - movs r1, #0xe - ands r0, r1 - ldr r1, _080A395C @ =gUnk_08128110 - adds r6, r0, r1 - ldrb r1, [r6] - movs r0, #0xa - subs r0, r0, r1 - strh r0, [r4] - movs r0, #0x9c - lsls r0, r0, #3 - strh r0, [r4, #8] - bl sub_080A3B48 - subs r0, #1 - cmp r0, #0 - ble _080A3948 - ldr r1, [r5, #0x10] - cmp r1, #0 - bge _080A3920 - ldr r2, _080A3960 @ =0x0000FFFF - adds r1, r1, r2 -_080A3920: - asrs r5, r1, #0x10 - cmp r5, r0 - beq _080A3934 - ldrb r0, [r6, #1] - adds r0, #0x77 - strh r0, [r4, #2] - adds r0, r7, #0 - movs r1, #3 - bl DrawDirect -_080A3934: - cmp r5, #0 - beq _080A3948 - ldrb r1, [r6, #1] - movs r0, #0x27 - subs r0, r0, r1 - strh r0, [r4, #2] - adds r0, r7, #0 - movs r1, #2 - bl DrawDirect -_080A3948: - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A394C: .4byte gOamCmd -_080A3950: .4byte gChooseFileState -_080A3954: .4byte 0x000001F9 -_080A3958: .4byte gMain -_080A395C: .4byte gUnk_08128110 -_080A3960: .4byte 0x0000FFFF -.else - push {r4, r5, r6, r7, lr} - ldr r4, _080A4134 @ =gOamCmd - movs r0, #0 - strh r0, [r4, #4] - strh r0, [r4, #6] - ldr r5, _080A4138 @ =gMenu - adds r0, r5, #0 - adds r0, #0x2f - movs r1, #0 - ldrsb r1, [r0, r1] - movs r0, #0x10 - subs r0, r0, r1 - strh r0, [r4, #2] - movs r0, #0x40 - strh r0, [r4] - movs r0, #0x80 - lsls r0, r0, #3 - strh r0, [r4, #8] - ldr r0, _080A413C @ =0x000001FB - movs r1, #0 - bl DrawDirect - movs r0, #0x94 - strh r0, [r4, #2] - movs r0, #0x50 - strh r0, [r4] - movs r0, #0x90 - lsls r0, r0, #3 - strh r0, [r4, #8] - movs r7, #0xfd - lsls r7, r7, #1 - adds r0, r7, #0 - movs r1, #0 - bl DrawDirect - movs r0, #0xb8 - strh r0, [r4] - movs r0, #0x94 - lsls r0, r0, #3 - strh r0, [r4, #8] - adds r0, r7, #0 - movs r1, #1 - bl DrawDirect - ldr r0, _080A4140 @ =gMain - ldrh r0, [r0, #0xc] - lsrs r0, r0, #2 - movs r1, #0xe - ands r0, r1 - ldr r1, _080A4144 @ =gUnk_08128110 - adds r6, r0, r1 - ldrb r1, [r6] - movs r0, #0xa - subs r0, r0, r1 - strh r0, [r4] - movs r0, #0x9c - lsls r0, r0, #3 - strh r0, [r4, #8] - bl sub_080A3B48 - subs r0, #1 - cmp r0, #0 - ble _080A4130 - ldr r1, [r5, #0x10] - cmp r1, #0 - bge _080A4108 - ldr r2, _080A4148 @ =0x0000FFFF - adds r1, r1, r2 -_080A4108: - asrs r5, r1, #0x10 - cmp r5, r0 - beq _080A411C - ldrb r0, [r6, #1] - adds r0, #0x77 - strh r0, [r4, #2] - adds r0, r7, #0 - movs r1, #3 - bl DrawDirect -_080A411C: - cmp r5, #0 - beq _080A4130 - ldrb r1, [r6, #1] - movs r0, #0x27 - subs r0, r0, r1 - strh r0, [r4, #2] - adds r0, r7, #0 - movs r1, #2 - bl DrawDirect -_080A4130: - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A4134: .4byte gOamCmd -_080A4138: .4byte gMenu -_080A413C: .4byte 0x000001FB -_080A4140: .4byte gMain -_080A4144: .4byte gUnk_08128110 -_080A4148: .4byte 0x0000FFFF -.endif - - thumb_func_start sub_080A414C -sub_080A414C: @ 0x080A414C - push {r4, r5, r6, r7, lr} - mov r7, sb - mov r6, r8 - push {r6, r7} - ldr r4, _080A4210 @ =gOamCmd - movs r0, #0 - strh r0, [r4, #4] - strh r0, [r4, #6] - ldr r0, _080A4214 @ =gMenu - ldrh r0, [r0, #0x10] - ldr r1, _080A4218 @ =0x00000B21 - bl __divsi3 - lsls r0, r0, #0x10 - lsrs r0, r0, #0x10 - movs r5, #3 - rsbs r5, r5, #0 - movs r1, #0xff - mov r8, r1 - adds r7, r4, #0 - ldr r6, _080A421C @ =gSineTable - rsbs r0, r0, #0 - adds r4, r0, #0 - subs r4, #0x45 - ldr r2, _080A4220 @ =gUnk_02002B6B - mov sb, r2 -_080A4180: - adds r2, r4, #0 - mov r3, r8 - ands r2, r3 - lsls r0, r2, #1 - adds r0, r0, r6 - movs r3, #0 - ldrsh r1, [r0, r3] - lsls r0, r1, #4 - adds r0, r0, r1 - lsls r0, r0, #2 - cmp r0, #0 - bge _080A419A - adds r0, #0xff -_080A419A: - asrs r0, r0, #8 - adds r0, #0x4f - strh r0, [r7, #2] - adds r0, r2, #0 - adds r0, #0x40 - mov r1, r8 - ands r0, r1 - lsls r0, r0, #1 - adds r0, r0, r6 - movs r2, #0 - ldrsh r1, [r0, r2] - lsls r0, r1, #5 - adds r0, r0, r1 - lsls r0, r0, #1 - cmp r0, #0 - bge _080A41BC - adds r0, #0xff -_080A41BC: - asrs r0, r0, #8 - subs r0, #0x10 - strh r0, [r7] - ldr r2, _080A4214 @ =gMenu - ldr r0, [r2, #0x10] - cmp r0, #0 - bge _080A41CE - ldr r3, _080A4224 @ =0x0000FFFF - adds r0, r0, r3 -_080A41CE: - asrs r0, r0, #0x10 - adds r3, r0, r5 - cmp r3, #0 - blt _080A4200 - mov r1, sb - adds r0, r3, r1 - ldrb r1, [r0] - ldr r0, _080A4228 @ =gSave - cmp r5, #0 - bne _080A41EE - ldrb r2, [r2, #1] - cmp r2, #4 - bgt _080A41EE - cmp r2, #3 - blt _080A41EE - subs r1, #1 -_080A41EE: - cmp r1, #0 - ble _080A4200 - movs r2, #0x8c - lsls r2, r2, #1 - adds r0, r0, r2 - adds r0, r3, r0 - ldrb r0, [r0] - bl sub_080A42E0 -_080A4200: - adds r4, #0x17 - adds r5, #1 - cmp r5, #3 - ble _080A4180 - pop {r3, r4} - mov r8, r3 - mov sb, r4 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A4210: .4byte gOamCmd -_080A4214: .4byte gMenu -_080A4218: .4byte 0x00000B21 -_080A421C: .4byte gSineTable -_080A4220: .4byte gUnk_02002B6B -_080A4224: .4byte 0x0000FFFF -_080A4228: .4byte gSave - - thumb_func_start sub_080A422C -sub_080A422C: @ 0x080A422C - push {r4, r5, lr} - ldr r5, _080A42A4 @ =gMenu - ldrh r0, [r5, #0x18] - lsrs r0, r0, #8 - movs r1, #0x1b - bl __modsi3 - lsls r0, r0, #0x10 - lsrs r0, r0, #0x10 - ldr r1, _080A42A8 @ =gUnk_08128120 - adds r0, r0, r1 - movs r1, #0 - ldrsb r1, [r0, r1] - lsls r1, r1, #4 - movs r4, #0x80 - lsls r4, r4, #1 - movs r0, #0 - adds r2, r4, #0 - movs r3, #0 - bl sub_0805ECEC - ldr r1, _080A42AC @ =gOamCmd - movs r0, #0 - strh r4, [r1, #4] - strh r0, [r1, #6] - movs r0, #0x4f - strh r0, [r1, #2] - adds r0, r5, #0 - adds r0, #0x2a - ldrb r2, [r0] - adds r4, #0x80 - ldrb r0, [r5, #1] - cmp r0, #5 - beq _080A42B6 - cmp r0, #5 - bgt _080A42B0 - cmp r0, #3 - blt _080A42C4 - adds r4, r5, #0 - adds r4, #0x2c - movs r0, #0 - ldrsb r0, [r4, r0] - adds r0, #0x32 - strh r0, [r1] - adds r0, r2, #0 - movs r1, #0 - bl sub_080A42E0 - movs r1, #0 - ldrsb r1, [r4, r1] - lsls r0, r1, #3 - adds r0, r0, r1 - lsls r0, r0, #1 - movs r1, #0x46 - bl __divsi3 - movs r1, #0x8a - subs r4, r1, r0 - b _080A42C6 - .align 2, 0 -_080A42A4: .4byte gMenu -_080A42A8: .4byte gUnk_08128120 -_080A42AC: .4byte gOamCmd -_080A42B0: - cmp r0, #6 - beq _080A42C6 - b _080A42C4 -_080A42B6: - movs r0, #0x78 - strh r0, [r1] - adds r0, r2, #0 - movs r1, #0xff - bl sub_080A42E0 - b _080A42C6 -_080A42C4: - movs r4, #0x8a -_080A42C6: - ldr r0, _080A42D8 @ =gOamCmd - strh r4, [r0] - ldr r0, _080A42DC @ =gFuseInfo - ldrb r0, [r0, #3] - movs r1, #0 - bl sub_080A42E0 - pop {r4, r5, pc} - .align 2, 0 -_080A42D8: .4byte gOamCmd -_080A42DC: .4byte gFuseInfo - - thumb_func_start sub_080A42E0 -sub_080A42E0: @ 0x080A42E0 - push {r4, r5, r6, r7, lr} - adds r4, r1, #0 - lsls r0, r0, #3 - ldr r1, _080A42F4 @ =gUnk_080C9CBC - adds r7, r0, r1 - cmp r4, #0xff - bne _080A42F8 - ldrb r0, [r7, #2] - b _080A42FA - .align 2, 0 -_080A42F4: .4byte gUnk_080C9CBC -_080A42F8: - ldrb r0, [r7, #1] -_080A42FA: - bl sub_080A43A8 - adds r6, r0, #0 - cmp r4, #0 - beq _080A4372 - cmp r4, #0xff - beq _080A4372 - lsls r1, r6, #2 - ldr r0, _080A4348 @ =gUnk_02019EE0 - adds r1, r1, r0 - lsls r5, r6, #1 - ldrb r0, [r1, #2] - cmp r4, r0 - beq _080A4324 - strb r4, [r1, #2] - movs r1, #0xb8 - lsls r1, r1, #2 - adds r0, r5, r1 - adds r1, r4, #0 - bl sub_0801C2F0 -_080A4324: - ldr r1, _080A434C @ =gOamCmd - ldr r2, _080A4350 @ =0x00003AE0 - adds r0, r5, r2 - strh r0, [r1, #8] - movs r0, #0 - ldrsh r4, [r1, r0] - movs r2, #2 - ldrsh r5, [r1, r2] - ldr r0, _080A4354 @ =gMenu - ldrb r0, [r0, #1] - cmp r0, #0 - bne _080A4358 - ldrh r0, [r1] - adds r0, #0x10 - strh r0, [r1] - ldrh r0, [r1, #2] - adds r0, #9 - b _080A4362 - .align 2, 0 -_080A4348: .4byte gUnk_02019EE0 -_080A434C: .4byte gOamCmd -_080A4350: .4byte 0x00003AE0 -_080A4354: .4byte gMenu -_080A4358: - ldrh r0, [r1] - adds r0, #8 - strh r0, [r1] - ldrh r0, [r1, #2] - adds r0, #0xa -_080A4362: - strh r0, [r1, #2] - movs r0, #0 - movs r1, #5 - bl DrawDirect - ldr r0, _080A4394 @ =gOamCmd - strh r4, [r0] - strh r5, [r0, #2] -_080A4372: - ldrb r1, [r7] - lsls r1, r1, #0xc - movs r0, #0x80 - lsls r0, r0, #4 - orrs r1, r0 - lsls r0, r6, #4 - movs r2, #0xc0 - lsls r2, r2, #2 - adds r0, r0, r2 - orrs r1, r0 - ldr r0, _080A4394 @ =gOamCmd - strh r1, [r0, #8] - movs r0, #0 - movs r1, #3 - bl DrawDirect - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A4394: .4byte gOamCmd - - thumb_func_start sub_080A4398 -sub_080A4398: @ 0x080A4398 - push {lr} - ldr r0, _080A43A4 @ =gUnk_02019EE0 - movs r1, #0x40 - bl MemClear - pop {pc} - .align 2, 0 -_080A43A4: .4byte gUnk_02019EE0 - - thumb_func_start sub_080A43A8 -sub_080A43A8: @ 0x080A43A8 - push {r4, r5, lr} - adds r5, r0, #0 - bl sub_080A43DC - adds r4, r0, #0 - cmp r4, #0xf - bls _080A43C8 - movs r0, #0xf - ands r4, r0 - lsls r1, r4, #4 - movs r0, #0xc0 - lsls r0, r0, #2 - adds r1, r1, r0 - adds r0, r5, #0 - bl sub_080A4418 -_080A43C8: - lsls r0, r4, #2 - ldr r1, _080A43D8 @ =gUnk_02019EE0 - adds r0, r0, r1 - strb r5, [r0] - movs r1, #2 - strb r1, [r0, #1] - adds r0, r4, #0 - pop {r4, r5, pc} - .align 2, 0 -_080A43D8: .4byte gUnk_02019EE0 - - thumb_func_start sub_080A43DC -sub_080A43DC: @ 0x080A43DC - push {lr} - movs r1, #0 - ldr r2, _080A43EC @ =gUnk_02019EE0 -_080A43E2: - ldrb r3, [r2] - cmp r0, r3 - bne _080A43F0 - adds r0, r1, #0 - b _080A4416 - .align 2, 0 -_080A43EC: .4byte gUnk_02019EE0 -_080A43F0: - adds r2, #4 - adds r1, #1 - cmp r1, #0xf - bls _080A43E2 - movs r1, #0 - ldr r2, _080A4408 @ =gUnk_02019EE0 -_080A43FC: - ldrb r0, [r2, #1] - cmp r0, #0 - bne _080A440C - adds r0, r1, #0 - adds r0, #0x10 - b _080A4416 - .align 2, 0 -_080A4408: .4byte gUnk_02019EE0 -_080A440C: - adds r2, #4 - adds r1, #1 - cmp r1, #0xf - bls _080A43FC - movs r0, #0 -_080A4416: - pop {pc} - - thumb_func_start sub_080A4418 -sub_080A4418: @ 0x080A4418 - push {lr} - lsls r1, r1, #5 - ldr r2, _080A4444 @ =0x06010000 - adds r3, r1, r2 - ldr r1, _080A4448 @ =gUnk_080CA06C - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r1, [r0] - movs r2, #0x80 - lsls r2, r2, #0x18 - ands r2, r1 - mvns r0, r2 - ands r0, r1 - ldr r1, _080A444C @ =gGlobalGfxAndPalettes - adds r1, r0, r1 - cmp r2, #0 - beq _080A4450 - adds r0, r1, #0 - adds r1, r3, #0 - bl LZ77UnCompVram - b _080A445C - .align 2, 0 -_080A4444: .4byte 0x06010000 -_080A4448: .4byte gUnk_080CA06C -_080A444C: .4byte gGlobalGfxAndPalettes -_080A4450: - ldr r0, _080A4460 @ =0x040000D4 - str r1, [r0] - str r3, [r0, #4] - ldr r1, _080A4464 @ =0x84000080 - str r1, [r0, #8] - ldr r0, [r0, #8] -_080A445C: - pop {pc} - .align 2, 0 -_080A4460: .4byte 0x040000D4 -_080A4464: .4byte 0x84000080 - - thumb_func_start sub_080A4468 -sub_080A4468: @ 0x080A4468 - push {lr} - ldr r0, _080A4488 @ =gUnk_03003DF0 - movs r1, #0 - strb r1, [r0, #2] - ldr r0, [r0, #4] - strb r1, [r0, #3] - ldr r0, _080A448C @ =gFuseInfo - ldrb r0, [r0, #3] - bl sub_0801E6C8 - ldr r0, _080A4490 @ =gMenu - adds r0, #0x2a - ldrb r0, [r0] - bl sub_0801E798 - pop {pc} - .align 2, 0 -_080A4488: .4byte gUnk_03003DF0 -_080A448C: .4byte gFuseInfo -_080A4490: .4byte gMenu - - thumb_func_start sub_080A4494 -sub_080A4494: @ 0x080A4494 - push {r4, r5, lr} - bl sub_0805F2C8 - adds r4, r0, #0 - cmp r4, #0 - beq _080A44D0 - ldr r0, _080A44D4 @ =gTextGfxBuffer - str r0, [r4, #8] - movs r1, #0 - strb r1, [r4, #2] - movs r0, #5 - strb r0, [r4, #3] - strb r1, [r4, #1] - ldr r1, _080A44D8 @ =gUnk_02002AC0 - adds r0, r4, #0 - movs r2, #0x80 - bl sub_080A44E0 - ldr r0, _080A44DC @ =gFuseInfo - ldr r0, [r0, #0xc] - bl sub_08002632 - adds r0, r4, #0 - movs r2, #0xa0 - bl sub_080A44E0 - adds r5, r0, #0 - adds r0, r4, #0 - bl sub_0805F300 -_080A44D0: - adds r0, r5, #0 - pop {r4, r5, pc} - .align 2, 0 -_080A44D4: .4byte gTextGfxBuffer -_080A44D8: .4byte gUnk_02002AC0 -_080A44DC: .4byte gFuseInfo - - thumb_func_start sub_080A44E0 -sub_080A44E0: @ 0x080A44E0 - push {r4, r5, r6, lr} - mov r6, r8 - push {r6} - adds r4, r0, #0 - adds r6, r1, #0 - adds r5, r2, #0 - movs r0, #0 - strh r0, [r4, #6] - movs r0, #0x60 - strh r0, [r4, #4] - movs r0, #0xc0 - lsls r0, r0, #2 - mov r8, r0 - ldr r0, [r4, #8] - mov r1, r8 - bl MemClear - adds r0, r6, #0 - adds r1, r4, #0 - bl sub_0805F76C - adds r6, r0, #0 - ldr r0, [r4, #8] - lsls r5, r5, #5 - ldr r1, _080A4524 @ =0x06010000 - adds r5, r5, r1 - adds r1, r5, #0 - mov r2, r8 - bl MemCopy - adds r0, r6, #0 - pop {r3} - mov r8, r3 - pop {r4, r5, r6, pc} - .align 2, 0 -_080A4524: .4byte 0x06010000 - - thumb_func_start sub_080A4528 -sub_080A4528: @ 0x080A4528 - push {r4, lr} - ldr r0, _080A4540 @ =gFuseInfo - ldr r2, [r0, #0xc] - ldrb r0, [r2, #8] - cmp r0, #7 - bne _080A4544 - ldrb r0, [r2, #9] - ldrb r1, [r2, #0xa] - ldrb r2, [r2, #0xb] - bl CreateNPC - b _080A4550 - .align 2, 0 -_080A4540: .4byte gFuseInfo -_080A4544: - cmp r0, #3 - bne _080A45A2 - ldrb r0, [r2, #9] - ldrb r1, [r2, #0xa] - bl CreateEnemy -_080A4550: - adds r4, r0, #0 - cmp r4, #0 - beq _080A45A2 - ldrb r0, [r4, #8] - cmp r0, #7 - bne _080A456A - adds r0, r4, #0 - bl NPCInit - ldrb r0, [r4, #9] - strb r0, [r4, #0xf] - movs r0, #0x56 - b _080A4576 -_080A456A: - adds r0, r4, #0 - bl EnemyInit - ldrb r0, [r4, #9] - strb r0, [r4, #0xf] - movs r0, #0x66 -_080A4576: - strb r0, [r4, #9] - movs r2, #0 - movs r0, #0xcc - strh r0, [r4, #0x2e] - movs r0, #0x60 - strh r0, [r4, #0x32] - adds r3, r4, #0 - adds r3, #0x29 - ldrb r1, [r3] - subs r0, #0x99 - ands r0, r1 - movs r1, #0x10 - orrs r0, r1 - strb r0, [r3] - ldrb r1, [r4, #0x18] - movs r0, #4 - rsbs r0, r0, #0 - ands r0, r1 - movs r1, #1 - orrs r0, r1 - strb r0, [r4, #0x18] - str r2, [r4, #0x48] -_080A45A2: - pop {r4, pc} - thumb_func_start Subtask_FigurineMenu Subtask_FigurineMenu: @ 0x080A45A4 .ifdef DEMO_USA diff --git a/include/enemy.h b/include/enemy.h index 1b7d1a07..49d40b28 100644 --- a/include/enemy.h +++ b/include/enemy.h @@ -12,6 +12,7 @@ #include "entity.h" #include "projectile.h" +bool32 EnemyInit(Entity* this); extern u32 GetNextFunction(Entity*); extern void EnemyFunctionHandler(Entity*, EntityActionArray); extern void sub_08001324(Entity*); diff --git a/include/kinstone.h b/include/kinstone.h index 28b799dd..5d8e3ec8 100644 --- a/include/kinstone.h +++ b/include/kinstone.h @@ -7,7 +7,7 @@ extern void sub_08018C58(u32); typedef struct { u8 unk[4]; - u32 unk2; + u8* unk2; u32 unk4; } Unk_struct; extern Unk_struct gUnk_03003DF0[]; diff --git a/include/menu.h b/include/menu.h index e4c09e84..22902ca5 100644 --- a/include/menu.h +++ b/include/menu.h @@ -44,9 +44,14 @@ typedef struct { /*0x08*/ u16 transitionTimer; /*0x0a*/ u16 field_0xa; /*0x0c*/ u8* field_0xc; - /*0x10*/ u8 focusCoords[2]; - /*0x12*/ u8 field_0x12; - /*0x13*/ u8 unk13; + /*0x10*/ // u8 focusCoords[2]; + union { + s32 i; + u16 h[2]; + u8 a[4]; + } unk10; + /*0x12*/ // u8 field_0x12; + /*0x13*/ // u8 unk13; /*0x14*/ u8 unk14; /*0x15*/ u8 unk15; /*0x16*/ u8 unk16; @@ -54,9 +59,22 @@ typedef struct { /* */ // directly in the code. This happens when you take the address off the field with '&`. /* */ // Perhaps they had a macro to cast this to different sized arrays. /*0x17*/ u8 selectMtx; - /*0x18*/ u8 filler18[0x12]; + /*0x18*/ u16 unk18; + /*0x1a*/ union SplitHWord unk1a; + /*0x1c*/ u8 unk1c; + /*0x1s*/ u8 unk1d; + /*0x1e*/ u8 unk1e; + /*0x1f*/ s8 unk1f; + /*0x20*/ u8 unk20; + /*0x21*/ u8 unk21; + /*0x22*/ u8 filler22[6]; + /*0x28*/ u8 unk28; + /*0x29*/ u8 unk29; /*0x2a*/ u8 unk2a; - /*0x2c*/ int field_0x2c; + /*0x2b*/ u8 unk2b; + /*0x2c*/ s8 unk2c; + /*0x2d*/ u8 unk2d; + /*0x2e*/ union SplitHWord unk2e; } Menu; static_assert(sizeof(Menu) == 0x30); diff --git a/include/screen.h b/include/screen.h index a5b05623..fe17b183 100644 --- a/include/screen.h +++ b/include/screen.h @@ -68,8 +68,8 @@ typedef struct { } Screen; typedef struct { - u16 x; - u16 y; + s16 x; + s16 y; u16 _4; u16 _6; u16 _8; diff --git a/src/debug.c b/src/debug.c index 19b3ae04..f07417d6 100644 --- a/src/debug.c +++ b/src/debug.c @@ -48,14 +48,14 @@ void sub_0805FA98(void) { switch (gInput.newKeys) { case DPAD_UP: - gMenu.focusCoords[1] -= 1; + gMenu.unk10.a[1] -= 1; break; case DPAD_DOWN: - gMenu.focusCoords[1] += 1; + gMenu.unk10.a[1] += 1; break; case L_BUTTON: - gMenu.focusCoords[0] ^= 1; - if (gMenu.focusCoords[0] == 0) { + gMenu.unk10.a[0] ^= 1; + if (gMenu.unk10.a[0] == 0) { gScreen.bg0.control = BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(3); gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(3) | BGCNT_PRIORITY(3); } else { @@ -82,7 +82,7 @@ void sub_0805FA98(void) { iVar1 = 0; break; } - switch (gMenu.focusCoords[1]) { + switch (gMenu.unk10.a[1]) { case 0: gMenu.unk14 = (gMenu.unk14 + iVar1 + 0x50) % 0x50; break; @@ -94,7 +94,7 @@ void sub_0805FA98(void) { break; } } - gMenu.focusCoords[1] = (gMenu.focusCoords[1] + 3) % 3; + gMenu.unk10.a[1] = (gMenu.unk10.a[1] + 3) % 3; gScreen.bg3.updated = 1; } diff --git a/src/fileselect.c b/src/fileselect.c index f2e1cb39..539c974b 100644 --- a/src/fileselect.c +++ b/src/fileselect.c @@ -875,11 +875,11 @@ NONMATCH("asm/non_matching/fileScreen/sub_080610B8.inc", void sub_080610B8(void) END_NONMATCH void sub_08051358(void) { - gMenu.field_0x12 = gSaveHeader->language == 0 ? 4 : 3; + gMenu.unk10.a[2] = gSaveHeader->language == 0 ? 4 : 3; - if (gMenu.focusCoords[0] != 0x0b || gMenu.focusCoords[1] != 0x5) { - gMenu.focusCoords[1] = 0x5; - gMenu.focusCoords[0] = 0xb; + if (gMenu.unk10.a[0] != 0x0b || gMenu.unk10.a[1] != 0x5) { + gMenu.unk10.a[1] = 0x5; + gMenu.unk10.a[0] = 0xb; SoundReq(SFX_TEXTBOX_NEXT); } } @@ -940,7 +940,7 @@ void sub_08051480(u32 c) { u32 idx; result = sub_080514BC(c); - idx = gMenu.unk13; + idx = gMenu.unk10.a[3]; if (result == RESULT_INVALID) { return; @@ -955,7 +955,7 @@ void sub_08051480(u32 c) { idx = FILENAME_LENGTH - 1; } - gMenu.unk13 = idx + 1; + gMenu.unk10.a[3] = idx + 1; gSave.name[idx] = c; sub_08051574(SFX_6B); } @@ -976,7 +976,7 @@ u32 sub_080514BC(u32 a1) { return 1; } - idx = gMenu.unk13; + idx = gMenu.unk10.a[3]; if (idx == 0) return 0; @@ -1119,7 +1119,7 @@ NONMATCH("asm/non_matching/fileScreen/sub_08051738.inc", void sub_08051738(void) } uVar3++; gMenu.unk16 = uVar3; - gMenu.unk13 = 4; + gMenu.unk10.a[3] = 4; gMenu.unk14 = uVar3; } END_NONMATCH @@ -1128,7 +1128,7 @@ s32 sub_080517B4(s32 a1) { u32 i = gUnk_02019EE0.unk7; if (a1 != 0) { for (i = i + a1; i < 5; i += a1) { - if ((&gMenu.focusCoords[0])[i] != 0 && (&gMenu.focusCoords[0])[i] != 4) + if (gMenu.unk10.a[i] != 0 && gMenu.unk10.a[i] != 4) return i; } diff --git a/src/game.c b/src/game.c index b2aefb17..2bb7b65d 100644 --- a/src/game.c +++ b/src/game.c @@ -652,7 +652,7 @@ static void GameOver_Init(void) { if (gFadeControl.active) return; sub_08052010(); - gMenu.focusCoords[0] = 80; + gMenu.unk10.a[0] = 80; gMenu.transitionTimer = 60; gSave.stats.health = 24; gMain.field_0x5 = 60; @@ -667,8 +667,8 @@ static void GameOver_FadeIn(void) { return; if (gMain.field_0x5 == 0) { - if (gMenu.focusCoords[0] >= 38) { - gMenu.focusCoords[0]--; + if (gMenu.unk10.a[0] >= 38) { + gMenu.unk10.a[0]--; } else { gMenu.transitionTimer--; if (gMenu.transitionTimer == 0) { @@ -839,7 +839,7 @@ static void DrawGameOverText(void) { gOamCmd._4 = 0; gOamCmd._6 = 0; gOamCmd._8 = 0x8600; - gOamCmd.y = gMenu.focusCoords[0]; + gOamCmd.y = gMenu.unk10.a[0]; for (i = 0; i < 8; ++i) { gOamCmd.x = sOffsets[i]; #ifdef EU diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index 004f98d5..a59f8172 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -219,7 +219,7 @@ void sub_0808EABC(Entity* this) { } break; case 5: - switch (gMenu.focusCoords[this->type]) { + switch (gMenu.unk10.a[this->type]) { case 0: var0 = 42; var1 = 40; @@ -228,7 +228,7 @@ void sub_0808EABC(Entity* this) { case 2: var0 = 20; var1 = 144; - var1 -= (gMenu.unk16 - gMenu.focusCoords[this->type]) * 32; + var1 -= (gMenu.unk16 - gMenu.unk10.a[this->type]) * 32; break; } break; @@ -371,9 +371,9 @@ void sub_0808ECBC(Entity* this) { void sub_0808ED64(Entity* this) { int y = 255; - if (gUnk_02032EC0.lastState == 1 && gMenu.focusCoords[1] != 5) { - this->x.HALF.HI = gMenu.focusCoords[0] * 16 + 28; - y = gMenu.focusCoords[1] * 16 + 58; + if (gUnk_02032EC0.lastState == 1 && gMenu.unk10.a[1] != 5) { + this->x.HALF.HI = gMenu.unk10.a[0] * 16 + 28; + y = gMenu.unk10.a[1] * 16 + 58; } this->y.HALF.HI = y; } @@ -384,7 +384,7 @@ void sub_0808ED98(Entity* this) { this->field_0x68.HWORD = 27; y = -10; } else { - u32 var0 = gMenu.unk13; + u32 var0 = gMenu.unk10.a[3]; if (var0 > 5) { var0 = 5; } @@ -416,7 +416,7 @@ void sub_0808EE00(Entity* this) { } this->field_0x6a.HWORD = var2; - this->palette.b.b0 = gMenu.focusCoords[1] == 5 && var1 == gMenu.field_0x12 ? 11 : 9; + this->palette.b.b0 = gMenu.unk10.a[1] == 5 && var1 == gMenu.unk10.a[2] ? 11 : 9; gUnk_02019EE0.isTransitioning |= sub_0808EF6C(this); } diff --git a/src/subtask.c b/src/subtask.c index f73b719f..ea93d9b9 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -1,11 +1,93 @@ #include "global.h" -#include "functions.h" #include "menu.h" #include "screen.h" #include "common.h" #include "subtask.h" +#include "sound.h" +#include "save.h" +#include "kinstone.h" +#include "game.h" +#include "message.h" +#include "object.h" +#include "main.h" +#include "npc.h" +#include "enemy.h" +#include "functions.h" + +extern const u32 gUnk_080CA06C[]; +extern const u8 gGlobalGfxAndPalettes[]; +typedef struct { + u8 filler0[0x1]; + u8 unk1; + u8 charColor; + u8 bgColor; + u16 unk4; + u16 unk6; + u8* unk8; +} struct_02036540; + +u32 sub_08000E44(u32); +s32 sub_080A3B48(void); +void sub_080A4468(void); +void sub_080A422C(void); +void sub_080A414C(void); +void sub_080A4080(void); +void sub_080A42E0(u32, u32); +void sub_0805ECEC(u32, u32, u32, u32); +u32 sub_080A43A8(u32); +void sub_0801C2F0(u32, u32); +u32 sub_080A4418(u32, u32); +u32 sub_080A43DC(u32); +void sub_0801E6C8(u32); +void sub_0801E798(u32); +u32 sub_080A44E0(struct_02036540*, u8*, u32); +struct_02036540* sub_0805F2C8(void); +void sub_0805F300(struct_02036540*); +u32 sub_0805F76C(u8*, struct_02036540*); extern void (*const gUnk_081280C4[])(void); +extern const u8 gUnk_081280EE[]; + +typedef struct { + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + u8 unk4; + u8 unk5; + u8 unk6; + u8 unk7; +} struct_080C9CBC; + +extern const struct_080C9CBC gUnk_080C9CBC[]; +extern void (*const gUnk_081280F4[])(void); + +extern u8 gUnk_02002C81[]; +typedef struct { + u8 unk_00[1]; + u8 unk_01; + u8 unk_02[2]; +} struct_02019EE0; + +extern struct_02019EE0 gUnk_02019EE0[]; +extern s8 gUnk_08128120[]; + +typedef struct { + void* sourceAddress; + void* destinationAddress; + union { + u32 word; + struct { + u16 low; + u16 high; + } half; + } control; +} DMARegisters; + +#define DMA3 ((volatile DMARegisters*)REG_ADDR_DMA3SAD) + +extern u8 gTextGfxBuffer[]; +extern u8 gUnk_02002AC0[]; void Subtask_KinstoneMenu(void) { #if !(defined(DEMO_USA) || defined(DEMO_JP)) @@ -60,3 +142,487 @@ void sub_080A3BD0(void) { sub_080A7114(1); SetFade(6, 8); } + +NONMATCH("asm/non_matching/subtask/sub_080A3C6C.inc", void sub_080A3C6C(void)) { + s32 tmp1, tmp2, tmp3, tmp4, tmp5; + u8* ptr; + if (gFadeControl.active) { + return; + } + gMenu.column_idx = 2; + tmp2 = gMenu.unk28 * 0x10000; + tmp1 = tmp2 - gMenu.unk10.i; + tmp5 = tmp1; + if (tmp1 < 0) { + tmp5 = -tmp1; + } + if (tmp5 <= 0x1ffdu) { + gMenu.unk10.i = tmp2; + } else { + gMenu.column_idx = 1; + tmp2 = sub_08000E44(tmp1); + tmp1 /= 0x20000; + if (tmp1 < 0) { + tmp1 = -tmp1; + } + if (tmp1 > 5) { + tmp1 = 5; + } + gMenu.unk10.i += gUnk_081280EE[tmp1] * 0x666 * tmp2; + } + if (gMenu.unk29 != gMenu.unk10.i / 0x10000) { + gMenu.unk29 = gMenu.unk10.i / 0x10000; + SoundReq(SFX_TEXTBOX_CHOICE); + } + if ((gInput.newKeys & 0x20a) != 0) { + sub_080A7114(2); + SoundReq(SFX_MENU_CANCEL); + return; + } + tmp3 = gMenu.unk28; + switch (gInput.unk4) { + case 0x20: + case 0x40: + tmp3 -= 1; + break; + case 0x10: + case 0x80: + tmp3 += 1; + break; + case 1: + if (gMenu.column_idx == 2) { + tmp3 = gMenu.unk10.i / 0x10000; + gMenu.unk2a = gSave.unk118[tmp3]; + sub_080A7114(3); + } + break; + } + tmp4 = sub_080A3B48(); + if (tmp4 <= tmp3) { + tmp3 = tmp4 - 1; + } + if (tmp4 < 2) { + tmp3 = 0; + } + if (tmp3 < 0) { + tmp3 = 0; + } + if (gMenu.unk28 != tmp3) { + gMenu.unk28 = tmp3; + } +} +END_NONMATCH + +void sub_080A3DB8(void) { + const struct_080C9CBC* ptr; + if (gMenu.column_idx == 6) { + gFuseInfo._0 = 6; + ptr = &gUnk_080C9CBC[gFuseInfo._3]; + if (ptr->unk3 != 0) { + MenuFadeIn(ptr->unk3, ptr->unk4); + } else { + Subtask_Exit(); + } + } else { + gFuseInfo._0 = 5; + Subtask_Exit(); + } +} + +void sub_080A3E00(void) { + gMenu.column_idx = 3; + gUnk_081280F4[gMenu.overlayType](); +} + +void sub_080A3E20(void) { + gMenu.unk18 = 0; + gMenu.unk2c += 2; + if (0x45 < gMenu.unk2c) { + gMenu.unk2c = 0x46; + gMenu.overlayType = 1; + } +} + +void sub_080A3E48(void) { + u32 temp = gUnk_080C9CBC[gMenu.unk2a].unk5; + if (temp != gUnk_080C9CBC[gFuseInfo._3].unk5) { + SoundReq(SFX_ITEM_SHIELD_BOUNCE); + sub_080A7114(4); + } else { + gMenu.overlayType = 2; + gMenu.transitionTimer = 0x14; + gScreen.lcd.displayControl |= 0x2000; + gScreen.controls.window0HorizontalDimensions = 0x6887; + gScreen.controls.window0VerticalDimensions = 0x405f; + gScreen.controls.windowInsideControl = 0x3f; + gScreen.controls.windowOutsideControl = 0x1f; + gScreen.controls.layerFXControl = 0x3f90; + gScreen.controls.layerBrightness = 0; + SoundReq(SFX_FA); + } +} + +void sub_080A3EDC(void) { + if (++gScreen.controls.layerBrightness > 14) { + gScreen.controls.layerBrightness = 0; + gScreen.lcd.displayControl &= 0xdfff; + sub_080A7114(5); + } +} + +void sub_080A3F10(void) { + gMenu.column_idx = 4; + gMenu.unk2c -= 3; + gMenu.unk18 += 0x100; + if (gMenu.unk2c < 0) { + gMenu.unk18 = 0; + gMenu.unk2c = 0; + sub_080A7114(1); + SoundReq(SFX_MENU_ERROR); + } +} + +void sub_080A3F4C(void) { + extern void (*const gUnk_08128100[])(void); + gUnk_08128100[gMenu.overlayType](); +} + +void sub_080A3F68(void) { + gMenu.column_idx = 5; + WriteBit((u32*)gUnk_02002C81, gFuseInfo._3); + if (99 < ++gUnk_02002C81[-298]) { + gUnk_02002C81[-299] = 1; + } + sub_080A4468(); + SoundReq(SFX_TASK_COMPLETE); + MessageAtHeight(0x702, 0xe); + gMenu.overlayType = 1; + gMenu.transitionTimer = 0x78; +} + +void sub_080A3FCC(void) { + if ((gMessage.doTextBox & 0x7f) == 0) { + gMenu.overlayType = 2; + SoundReq(SFX_147); + } +} + +void sub_080A3FF4(void) { + gMenu.transitionTimer -= 1; + if (gMenu.transitionTimer != 0) { + gMenu.unk18 += gMenu.unk1a.HWORD; + gMenu.unk1a.HWORD += 0x20; + } else { + gMenu.column_idx = 6; + gMenu.overlayType = 3; + gMenu.transitionTimer = 0x4f; + CreateObject(OBJECT_B3, 1, 0); + SoundReq(SFX_1CA); + } +} + +void sub_080A4038(void) { + // TODO figure out why in some place s16 is needed and u16 in others + if (--(s16)gMenu.transitionTimer < 0) { + sub_080A7114(2); + } +} + +void sub_080A4054(void) { + u32 uVar2; + sub_080A422C(); + sub_080A414C(); + sub_080A4080(); + for (uVar2 = 0; uVar2 < 0x10; uVar2++) { + if (gUnk_02019EE0[uVar2].unk_01 != 0) { + gUnk_02019EE0[uVar2].unk_01 -= 1; + } + } +} + +extern u8 gUnk_08128110[]; +void sub_080A4080(void) { + u32 uVar1; + s32 iVar2; + s32 iVar3; + u8* temp; + + u32 t; + + gOamCmd._4 = 0; + gOamCmd._6 = 0; + gOamCmd.y = 0x10 - (s8)gMenu.unk2e.HALF.HI; + gOamCmd.x = 0x40; + gOamCmd._8 = 0x400; +#ifdef EU + DrawDirect(0x1fa, 0); +#else + DrawDirect(0x1fb, 0); +#endif + gOamCmd.y = 0x94; + gOamCmd.x = 0x50; + gOamCmd._8 = 0x480; +#ifdef EU + t = 0x1f9; +#else + t = 0x1fa; +#endif + DrawDirect(t, 0); + gOamCmd.x = 0xb8; + gOamCmd._8 = 0x4a0; + DrawDirect(t, 1); + uVar1 = gMain.ticks.HWORD >> 2 & 0xe; + temp = &gUnk_08128110[uVar1]; + gOamCmd.x = 10 - temp[0]; + gOamCmd._8 = 0x4e0; + iVar2 = sub_080A3B48() - 1; + if (0 < iVar2) { + iVar3 = gMenu.unk10.i; + if (iVar3 < 0) { + iVar3 = gMenu.unk10.i + 0xffff; + } + if (iVar3 >> 0x10 != iVar2) { + gOamCmd.y = temp[1] + 0x77; + DrawDirect(t, 3); + } + if (iVar3 >> 0x10 != 0) { + gOamCmd.y = 0x27 - temp[1]; + DrawDirect(t, 2); + } + } +} + +NONMATCH("asm/non_matching/subtask/sub_080A414C.inc", void sub_080A414C(void)) { + s32 uVar1; + s32 iVar2; + s32 uVar3; + + s32 i; + + gOamCmd._4 = 0; + gOamCmd._6 = 0; + uVar1 = gMenu.unk10.h[0] / 0xb21; + for (i = -3, uVar1 = -uVar1 - 0x45; i < 4; uVar1 += 0x17, i++) { + gOamCmd.y = ((gSineTable[uVar1 & 0xff] * 0x44) / 0x100) + 0x4f; + gOamCmd.x = ((gSineTable[(uVar1 + 0x40) & 0xff] * 0x42) / 0x100) - 0x10; + iVar2 = gMenu.unk10.i / 0x10000 + i; + if (iVar2 >= 0) { + uVar3 = gSave.unk12B[iVar2]; + if (i == 0) { + switch (gMenu.column_idx) { + case 3: + case 4: + uVar3 -= 1; + break; + default: + break; + } + } + if (0 < uVar3) { + sub_080A42E0(gSave.unk118[iVar2], uVar3); + } + } + } +} +END_NONMATCH + +void sub_080A422C(void) { + s32 uVar2; + s32 t, t2; + u16 t3; + + uVar2 = gMenu.unk18 / 256; + uVar2 %= 27; + t3 = uVar2; + sub_0805ECEC(0, gUnk_08128120[t3] << 4, 0x100, 0); + gOamCmd._4 = 0x100; + gOamCmd._6 = 0; + gOamCmd.y = 0x4f; + t = gMenu.unk2a; + t2 = 0x180; + switch (gMenu.column_idx) { + case 5: + gOamCmd.x = 0x78; + sub_080A42E0(t, 0xff); + break; + case 3: + case 4: + gOamCmd.x = gMenu.unk2c + 0x32; + sub_080A42E0(t, 0); + t2 = 0x8a - (gMenu.unk2c * 0x12 / 0x46); + break; + case 6: + break; + default: + t2 = 0x8a; + break; + } + + gOamCmd.x = t2; + sub_080A42E0(gFuseInfo._3, 0); +} + +void sub_080A42E0(u32 param_1, u32 param_2) { + u8 uVar1; + s32 sVar2; + s32 sVar3; + s32 iVar4; + + const struct_080C9CBC* ptr = &gUnk_080C9CBC[param_1]; + + if (param_2 == 0xff) { + uVar1 = ptr->unk2; + } else { + uVar1 = ptr->unk1; + } + iVar4 = sub_080A43A8(uVar1); + if ((param_2 != 0) && (param_2 != 0xff)) { + int index = iVar4 * 4; + if (param_2 != gUnk_02019EE0[iVar4].unk_02[0]) { + gUnk_02019EE0[iVar4].unk_02[0] = param_2; + sub_0801C2F0(iVar4 * 2 + 0x2e0, param_2); + } + gOamCmd._8 = (s16)(iVar4 * 2) + 0x3ae0; + sVar2 = gOamCmd.x; + sVar3 = gOamCmd.y; + if (gMenu.column_idx == 0) { + gOamCmd.x += 0x10; + gOamCmd.y += 9; + } else { + gOamCmd.x += 8; + gOamCmd.y += 10; + } + DrawDirect(0, 5); + gOamCmd.x = sVar2; + gOamCmd.y = sVar3; + } + { + int t; + t = ptr->unk0; + t <<= 0xc; + t |= 0x800; + t |= (iVar4 << 4) + 0x300; + gOamCmd._8 = t; + } + DrawDirect(0, 3); +} + +void sub_080A4398(void) { + MemClear(&gUnk_02019EE0, 0x40); +} + +u32 sub_080A43A8(u32 param_1) { + u32 uVar1; + + uVar1 = sub_080A43DC(param_1); + if (0xf < uVar1) { + uVar1 &= 0xf; + sub_080A4418(param_1, uVar1 * 0x10 + 0x300); + } + { int index = uVar1 * 4; } + gUnk_02019EE0[uVar1].unk_00[0] = param_1; + gUnk_02019EE0[uVar1].unk_01 = 2; + return uVar1; +} + +u32 sub_080A43DC(u32 unk1) { + u32 i; + for (i = 0; i < 16; i++) { + if (unk1 == gUnk_02019EE0[i].unk_00[0]) { + return i; + } + } + for (i = 0; i < 16; i++) { + if (gUnk_02019EE0[i].unk_01 == 0) { + return i + 0x10; + } + } + return 0; +} + +u32 sub_080A4418(u32 param_1, u32 param_2) { + void* src; + u32 t, t2; + void* dest; + + dest = (void*)(param_2 * 0x20 + 0x6010000); + t = gUnk_080CA06C[param_1]; + t2 = t & 0x80000000; + src = (void*)&gGlobalGfxAndPalettes[~t2 & t]; + if (t2) { + LZ77UnCompVram(src, dest); + } else { + DMA3->sourceAddress = src; + DMA3->destinationAddress = dest; + DMA3->control.word = 0x84000080; + return DMA3->control.word; + } +} + +void sub_080A4468(void) { + gUnk_03003DF0[0].unk[2] = 0; + gUnk_03003DF0[0].unk2[3] = 0; + sub_0801E6C8(gFuseInfo._3); + sub_0801E798(gMenu.unk2a); +} + +NONMATCH("asm/non_matching/subtask/sub_080A4494.inc", u32 sub_080A4494(void)) { + struct_02036540* psVar1; + u32 ret; + + psVar1 = sub_0805F2C8(); + if (psVar1 != NULL) { + psVar1->unk8 = gTextGfxBuffer; + psVar1->charColor = 0; + psVar1->bgColor = 5; + psVar1->unk1 = 0; + sub_080A44E0(psVar1, gUnk_02002AC0, 0x80); + sub_08002632(gFuseInfo.ent); + ret = sub_080A44E0(psVar1, gUnk_02002AC0, 0xa0); + sub_0805F300(psVar1); + } + return ret; +} +END_NONMATCH + +u32 sub_080A44E0(struct_02036540* param_1, u8* param_2, u32 param_3) { + u32 uVar1; + u32 size; + + param_1->unk6 = 0; + param_1->unk4 = 0x60; + size = 0x300; + MemClear(param_1->unk8, size); + uVar1 = sub_0805F76C(param_2, param_1); + MemCopy(param_1->unk8, (void*)(param_3 * 0x20 + 0x6010000), size); + return uVar1; +} + +void sub_080A4528(void) { + Entity* entity; + + if (gFuseInfo.ent->kind == NPC) { + entity = CreateNPC(gFuseInfo.ent->id, gFuseInfo.ent->type, gFuseInfo.ent->type2); + } else { + if (gFuseInfo.ent->kind != ENEMY) { + return; + } + entity = CreateEnemy(gFuseInfo.ent->id, gFuseInfo.ent->type); + } + if (entity != NULL) { + if (entity->kind == NPC) { + NPCInit(entity); + entity->field_0xf = entity->id; + entity->id = 0x56; + } else { + EnemyInit(entity); + entity->field_0xf = entity->id; + entity->id = 0x66; + } + entity->x.HALF.HI = 0xcc; + entity->y.HALF.HI = 0x60; + entity->spritePriority.b1 = 2; + entity->spriteSettings.draw = 1; + entity->hitbox = NULL; + } +} diff --git a/src/subtask2.c b/src/subtask2.c index dffcbab0..4218e8c9 100644 --- a/src/subtask2.c +++ b/src/subtask2.c @@ -11,7 +11,7 @@ u32 sub_080A554C(u32 arg0) { if (arg0 != 0) { for (i = 0; i < 17; i++) { - if (arg0 == gMenu.focusCoords[i]) + if (arg0 == gMenu.unk10.a[i]) return i; } } From 4517e77563b783be7672b9b2ec8391a216db2b42 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Mon, 17 Jan 2022 03:11:40 +0100 Subject: [PATCH 2/7] decomp figurine menu --- asm/non_matching/subtask/sub_080A4864.inc | 116 ++ asm/non_matching/subtask/sub_080A4978.inc | 443 +++++++ asm/non_matching/subtask/sub_080A4BA0.inc | 140 +++ asm/subtask.s | 1369 --------------------- include/sound.h | 1 + include/structures.h | 14 +- src/enemy/octorokBoss.c | 6 +- src/game.c | 4 +- src/item/itemOcarina.c | 4 +- src/manager/manager15.c | 2 +- src/manager/manager7.c | 4 +- src/npc/npc23.c | 4 +- src/object/cloud.c | 2 +- src/objectUtils.c | 2 +- src/player.c | 6 +- src/playerItem/playerItemPacciCane.c | 6 +- src/script.c | 6 +- src/subtask.c | 327 +++++ 18 files changed, 1063 insertions(+), 1393 deletions(-) create mode 100644 asm/non_matching/subtask/sub_080A4864.inc create mode 100644 asm/non_matching/subtask/sub_080A4978.inc create mode 100644 asm/non_matching/subtask/sub_080A4BA0.inc diff --git a/asm/non_matching/subtask/sub_080A4864.inc b/asm/non_matching/subtask/sub_080A4864.inc new file mode 100644 index 00000000..22af3aeb --- /dev/null +++ b/asm/non_matching/subtask/sub_080A4864.inc @@ -0,0 +1,116 @@ +.syntax unified + push {r4, r5, r6, lr} + ldr r0, _080A4894 @ =gFadeControl + ldrb r0, [r0] + cmp r0, #0 + bne _080A4926 + ldr r0, _080A4898 @ =gMenu + movs r5, #0x1f + ldrsb r5, [r0, r5] + ldrb r4, [r0, #0x1c] + ldr r0, _080A489C @ =gInput + ldrh r1, [r0, #4] + cmp r1, #0x20 + beq _080A48DC + cmp r1, #0x20 + bgt _080A48A0 + cmp r1, #2 + beq _080A48C0 + cmp r1, #2 + ble _080A48DE + cmp r1, #8 + beq _080A48C0 + cmp r1, #0x10 + beq _080A48D8 + b _080A48DE + .align 2, 0 +_080A4894: .4byte gFadeControl +_080A4898: .4byte gMenu +_080A489C: .4byte gInput +_080A48A0: + cmp r1, #0x80 + beq _080A48D4 + cmp r1, #0x80 + bgt _080A48AE + cmp r1, #0x40 + beq _080A48D0 + b _080A48DE +_080A48AE: + movs r0, #0x80 + lsls r0, r0, #1 + cmp r1, r0 + beq _080A48CC + movs r0, #0x80 + lsls r0, r0, #2 + cmp r1, r0 + beq _080A48C8 + b _080A48DE +_080A48C0: + movs r0, #3 + bl sub_080A7114 + b _080A48DE +_080A48C8: + subs r4, #5 + b _080A48DE +_080A48CC: + adds r4, #5 + b _080A48DE +_080A48D0: + subs r4, #1 + b _080A48DE +_080A48D4: + adds r4, #1 + b _080A48DE +_080A48D8: + adds r5, #8 + b _080A48DE +_080A48DC: + subs r5, #8 +_080A48DE: + ldr r0, _080A4928 @ =gSave + ldrb r0, [r0, #6] + movs r1, #0x88 + cmp r0, #0 + bne _080A48EA + movs r1, #0x82 +_080A48EA: + cmp r4, #0 + bgt _080A48F0 + movs r4, #1 +_080A48F0: + cmp r1, r4 + bge _080A48F6 + adds r4, r1, #0 +_080A48F6: + ldr r6, _080A492C @ =gMenu + ldrb r0, [r6, #0x1c] + cmp r0, r4 + beq _080A490E + strb r4, [r6, #0x1c] + movs r0, #0x69 + bl SoundReq + movs r0, #2 + bl sub_080A7114 + movs r5, #0 +_080A490E: + ldrb r0, [r6, #0x1e] + cmp r5, #0 + bge _080A4916 + movs r5, #0 +_080A4916: + cmp r0, r5 + bge _080A491C + adds r5, r0, #0 +_080A491C: + strb r5, [r6, #0x1f] + ldr r1, _080A4930 @ =gScreen + adds r0, r5, #0 + subs r0, #0x70 + strh r0, [r1, #0x18] +_080A4926: + pop {r4, r5, r6, pc} + .align 2, 0 +_080A4928: .4byte gSave +_080A492C: .4byte gMenu +_080A4930: .4byte gScreen +.syntax divided diff --git a/asm/non_matching/subtask/sub_080A4978.inc b/asm/non_matching/subtask/sub_080A4978.inc new file mode 100644 index 00000000..fd243abf --- /dev/null +++ b/asm/non_matching/subtask/sub_080A4978.inc @@ -0,0 +1,443 @@ +.syntax unified +.ifdef EU + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + ldr r5, _080A432C @ =gOamCmd + movs r0, #0 + strh r0, [r5, #4] + strh r0, [r5, #6] + movs r0, #0x80 + lsls r0, r0, #4 + strh r0, [r5, #8] + movs r0, #0x9c + strh r0, [r5] + movs r0, #0x48 + strh r0, [r5, #2] + ldr r7, _080A4330 @ =0x000001FB + adds r0, r7, #0 + movs r1, #0 + bl DrawDirect + ldr r0, _080A4334 @ =gSave + ldrb r0, [r0, #6] + movs r2, #0x88 + cmp r0, #0 + bne _080A41C2 + movs r2, #0x82 +_080A41C2: + ldr r3, _080A4338 @ =gChooseFileState + ldrb r1, [r3, #1] + movs r0, #2 + ands r0, r1 + cmp r0, #0 + beq _080A4226 + ldrb r4, [r3, #0x1c] + cmp r2, r4 + blt _080A4226 + movs r6, #0xe8 + strh r6, [r5] + movs r0, #0xa0 + lsls r0, r0, #7 + adds r1, r2, #0 + bl __divsi3 + subs r1, r4, #1 + muls r0, r1, r0 + cmp r0, #0 + bge _080A41EC + adds r0, #0xff +_080A41EC: + asrs r0, r0, #8 + adds r0, #0x20 + strh r0, [r5, #2] + adds r0, r7, #0 + movs r1, #1 + bl DrawDirect + ldr r0, _080A433C @ =gMain + ldrh r1, [r0, #0xc] + movs r0, #0x10 + ands r0, r1 + movs r4, #2 + cmp r0, #0 + beq _080A420A + movs r4, #4 +_080A420A: + strh r6, [r5] + movs r0, #0x1a + strh r0, [r5, #2] + adds r0, r7, #0 + adds r1, r4, #0 + bl DrawDirect + strh r6, [r5] + movs r0, #0x76 + strh r0, [r5, #2] + adds r1, r4, #1 + adds r0, r7, #0 + bl DrawDirect +_080A4226: + ldr r0, _080A433C @ =gMain + ldrh r1, [r0, #0xc] + movs r2, #0x10 + adds r0, r2, #0 + ands r0, r1 + cmp r0, #0 + beq _080A427C + ldr r5, _080A4338 @ =gChooseFileState + ldrb r1, [r5, #1] + adds r0, r2, #0 + ands r0, r1 + cmp r0, #0 + beq _080A427C + ldrb r0, [r5, #0x1e] + cmp r0, #0 + beq _080A427C + ldr r4, _080A432C @ =gOamCmd + strh r2, [r4, #2] + movs r0, #0x1f + ldrsb r0, [r5, r0] + cmp r0, #0 + ble _080A4262 + movs r0, #6 + strh r0, [r4] + movs r0, #0x9c + strh r0, [r4, #2] + ldr r0, _080A4330 @ =0x000001FB + movs r1, #6 + bl DrawDirect +_080A4262: + ldrb r1, [r5, #0x1e] + movs r0, #0x1f + ldrsb r0, [r5, r0] + cmp r1, r0 + ble _080A427C + movs r0, #0xea + strh r0, [r4] + movs r0, #0x9c + strh r0, [r4, #2] + ldr r0, _080A4330 @ =0x000001FB + movs r1, #7 + bl DrawDirect +_080A427C: + movs r0, #0x80 + lsls r0, r0, #0x12 + ldrb r0, [r0, #7] + cmp r0, #0 + beq _080A42D0 + ldr r2, _080A4338 @ =gChooseFileState + ldrb r1, [r2, #1] + movs r0, #4 + ands r0, r1 + cmp r0, #0 + beq _080A42D0 + ldr r1, _080A432C @ =gOamCmd + movs r0, #0x10 + strh r0, [r1, #2] + ldrb r4, [r2, #0x1c] + movs r6, #2 + adds r7, r1, #0 + movs r5, #0x6b +_080A42A0: + strh r5, [r7] + adds r0, r4, #0 + movs r1, #0xa + bl __modsi3 + lsls r0, r0, #1 + movs r2, #0x9e + lsls r2, r2, #4 + adds r1, r2, #0 + orrs r0, r1 + strh r0, [r7, #8] + movs r0, #0 + movs r1, #9 + bl DrawDirect + adds r0, r4, #0 + movs r1, #0xa + bl __divsi3 + adds r4, r0, #0 + subs r5, #7 + subs r6, #1 + cmp r6, #0 + bge _080A42A0 +_080A42D0: + ldr r4, _080A4338 @ =gChooseFileState + ldrb r1, [r4, #1] + movs r0, #1 + ands r0, r1 + cmp r0, #0 + beq _080A4352 + ldrb r0, [r4, #0x1c] + bl sub_080A4948 + cmp r0, #0 + beq _080A4352 + ldr r1, _080A432C @ =gOamCmd + movs r0, #0x2c + strh r0, [r1] + movs r0, #0x48 + strh r0, [r1, #2] + movs r0, #0xd4 + lsls r0, r0, #7 + strh r0, [r1, #8] + ldr r0, _080A4340 @ =0x000001F7 + ldrb r1, [r4, #0x1c] + subs r1, #1 + bl DrawDirect + ldrb r1, [r4, #0x1c] + ldrb r0, [r4, #0x1d] + cmp r0, r1 + beq _080A4352 + strb r1, [r4, #0x1d] + ldrb r4, [r4, #0x1c] + lsls r4, r4, #4 + ldr r0, _080A4344 @ =gFigurines + adds r4, r4, r0 + ldr r0, [r4] + movs r1, #0x16 + movs r2, #9 + bl LoadPalettes + ldr r0, [r4, #4] + ldr r2, [r4, #8] + cmp r2, #0 + bge _080A434CEU + ldr r1, _080A4348EU @ =0x06014000 + bl LZ77UnCompVram + b _080A4352 + .align 2, 0 +_080A432C: .4byte gOamCmd +_080A4330: .4byte 0x000001FB +_080A4334: .4byte gSave +_080A4338: .4byte gChooseFileState +_080A433C: .4byte gMain +_080A4340: .4byte 0x000001F7 +_080A4344: .4byte gFigurines +_080A4348EU: .4byte 0x06014000 +_080A434CEU: + ldr r1, _080A4358EU @ =0x06014000 + bl LoadResourceAsync +_080A4352: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7, pc} + .align 2, 0 +_080A4358EU: .4byte 0x06014000 +.else + push {r4, r5, r6, r7, lr} + mov r7, r8 + push {r7} + ldr r5, _080A4B1C @ =gOamCmd + movs r0, #0 + strh r0, [r5, #4] + strh r0, [r5, #6] + movs r0, #0x80 + lsls r0, r0, #4 + strh r0, [r5, #8] + movs r0, #0x9c + strh r0, [r5] + movs r0, #0x48 + strh r0, [r5, #2] + movs r7, #0xfe + lsls r7, r7, #1 + adds r0, r7, #0 + movs r1, #0 + bl DrawDirect + ldr r0, _080A4B20 @ =gSave + ldrb r0, [r0, #6] + movs r2, #0x88 + cmp r0, #0 + bne _080A49AC + movs r2, #0x82 +_080A49AC: + ldr r3, _080A4B24 @ =gMenu + ldrb r1, [r3, #1] + movs r0, #2 + ands r0, r1 + cmp r0, #0 + beq _080A4A10 + ldrb r4, [r3, #0x1c] + cmp r2, r4 + blt _080A4A10 + movs r6, #0xe8 + strh r6, [r5] + movs r0, #0xa0 + lsls r0, r0, #7 + adds r1, r2, #0 + bl __divsi3 + subs r1, r4, #1 + muls r0, r1, r0 + cmp r0, #0 + bge _080A49D6 + adds r0, #0xff +_080A49D6: + asrs r0, r0, #8 + adds r0, #0x20 + strh r0, [r5, #2] + adds r0, r7, #0 + movs r1, #1 + bl DrawDirect + ldr r0, _080A4B28 @ =gMain + ldrh r1, [r0, #0xc] + movs r0, #0x10 + ands r0, r1 + movs r4, #2 + cmp r0, #0 + beq _080A49F4 + movs r4, #4 +_080A49F4: + strh r6, [r5] + movs r0, #0x1a + strh r0, [r5, #2] + adds r0, r7, #0 + adds r1, r4, #0 + bl DrawDirect + strh r6, [r5] + movs r0, #0x76 + strh r0, [r5, #2] + adds r1, r4, #1 + adds r0, r7, #0 + bl DrawDirect +_080A4A10: + ldr r0, _080A4B28 @ =gMain + ldrh r1, [r0, #0xc] + movs r2, #0x10 + adds r0, r2, #0 + ands r0, r1 + cmp r0, #0 + beq _080A4A6A + ldr r5, _080A4B24 @ =gMenu + ldrb r1, [r5, #1] + adds r0, r2, #0 + ands r0, r1 + cmp r0, #0 + beq _080A4A6A + ldrb r0, [r5, #0x1e] + cmp r0, #0 + beq _080A4A6A + ldr r4, _080A4B1C @ =gOamCmd + strh r2, [r4, #2] + movs r0, #0x1f + ldrsb r0, [r5, r0] + cmp r0, #0 + ble _080A4A4E + movs r0, #6 + strh r0, [r4] + movs r0, #0x9c + strh r0, [r4, #2] + movs r0, #0xfe + lsls r0, r0, #1 + movs r1, #6 + bl DrawDirect +_080A4A4E: + ldrb r1, [r5, #0x1e] + movs r0, #0x1f + ldrsb r0, [r5, r0] + cmp r1, r0 + ble _080A4A6A + movs r0, #0xea + strh r0, [r4] + movs r0, #0x9c + strh r0, [r4, #2] + movs r0, #0xfe + lsls r0, r0, #1 + movs r1, #7 + bl DrawDirect +_080A4A6A: + movs r0, #0x80 + lsls r0, r0, #0x12 + ldrb r0, [r0, #7] + cmp r0, #0 + beq _080A4ABE + ldr r2, _080A4B24 @ =gMenu + ldrb r1, [r2, #1] + movs r0, #4 + ands r0, r1 + cmp r0, #0 + beq _080A4ABE + ldr r1, _080A4B1C @ =gOamCmd + movs r0, #0x10 + strh r0, [r1, #2] + ldrb r4, [r2, #0x1c] + movs r6, #2 + adds r7, r1, #0 + movs r5, #0x6b +_080A4A8E: + strh r5, [r7] + adds r0, r4, #0 + movs r1, #0xa + bl __modsi3 + lsls r0, r0, #1 + movs r2, #0x9e + lsls r2, r2, #4 + adds r1, r2, #0 + orrs r0, r1 + strh r0, [r7, #8] + movs r0, #0 + movs r1, #9 + bl DrawDirect + adds r0, r4, #0 + movs r1, #0xa + bl __divsi3 + adds r4, r0, #0 + subs r5, #7 + subs r6, #1 + cmp r6, #0 + bge _080A4A8E +_080A4ABE: + ldr r4, _080A4B24 @ =gMenu + ldrb r1, [r4, #1] + movs r0, #1 + ands r0, r1 + cmp r0, #0 + beq _080A4B3A + ldrb r0, [r4, #0x1c] + bl sub_080A4948 + cmp r0, #0 + beq _080A4B3A + ldr r1, _080A4B1C @ =gOamCmd + movs r0, #0x2c + strh r0, [r1] + movs r0, #0x48 + strh r0, [r1, #2] + movs r0, #0xd4 + lsls r0, r0, #7 + strh r0, [r1, #8] + movs r0, #0xfc + lsls r0, r0, #1 + ldrb r1, [r4, #0x1c] + subs r1, #1 + bl DrawDirect + ldrb r1, [r4, #0x1c] + ldrb r0, [r4, #0x1d] + cmp r0, r1 + beq _080A4B3A + strb r1, [r4, #0x1d] + ldrb r4, [r4, #0x1c] + lsls r4, r4, #4 + ldr r0, _080A4B2C @ =gFigurines + adds r4, r4, r0 + ldr r0, [r4] + movs r1, #0x16 + movs r2, #9 + bl LoadPalettes + ldr r0, [r4, #4] + ldr r2, [r4, #8] + cmp r2, #0 + bge _080A4B34 + ldr r1, _080A4B30 @ =0x06014000 + bl LZ77UnCompVram + b _080A4B3A + .align 2, 0 +_080A4B1C: .4byte gOamCmd +_080A4B20: .4byte gSave +_080A4B24: .4byte gMenu +_080A4B28: .4byte gMain +_080A4B2C: .4byte gFigurines +_080A4B30: .4byte 0x06014000 +_080A4B34: + ldr r1, _080A4B40 @ =0x06014000 + bl LoadResourceAsync +_080A4B3A: + pop {r3} + mov r8, r3 + pop {r4, r5, r6, r7, pc} + .align 2, 0 +_080A4B40: .4byte 0x06014000 +.endif +.syntax divided diff --git a/asm/non_matching/subtask/sub_080A4BA0.inc b/asm/non_matching/subtask/sub_080A4BA0.inc new file mode 100644 index 00000000..1036e8af --- /dev/null +++ b/asm/non_matching/subtask/sub_080A4BA0.inc @@ -0,0 +1,140 @@ +.syntax unified + push {r4, r5, r6, lr} + sub sp, #0x54 + adds r5, r0, #0 + adds r6, r1, #0 + add r0, sp, #0x18 + movs r1, #0x30 + bl MemClear + ldr r0, _080A4C08 @ =gUnk_0812816C + mov r1, sp + movs r2, #0x18 + bl MemCopy + ldr r0, _080A4C0C @ =gUnk_08128184 + add r4, sp, #0x48 + adds r1, r4, #0 + movs r2, #0xc + bl MemCopy + lsls r1, r6, #1 + adds r1, r1, r6 + lsls r2, r1, #9 + ldr r0, [sp, #4] + adds r0, r0, r2 + str r0, [sp, #4] + mov r2, sp + mov r0, sp + lsls r1, r1, #4 + ldrh r0, [r0, #0x10] + adds r1, r1, r0 + strh r1, [r2, #0x10] + lsls r1, r6, #7 + ldr r0, [sp] + adds r0, r0, r1 + str r0, [sp] + cmp r6, #2 + bne _080A4BEE + mov r0, sp + strb r6, [r0, #0x14] +_080A4BEE: + ldr r0, _080A4C10 @ =gSave + ldrb r0, [r0, #6] + movs r1, #0x88 + cmp r0, #0 + bne _080A4BFA + movs r1, #0x82 +_080A4BFA: + cmp r5, #0 + ble _080A4C02 + cmp r1, r5 + bge _080A4C14 +_080A4C02: + movs r5, #1 + rsbs r5, r5, #0 + b _080A4C3E + .align 2, 0 +_080A4C08: .4byte gUnk_0812816C +_080A4C0C: .4byte gUnk_08128184 +_080A4C10: .4byte gSave +_080A4C14: + ldr r1, _080A4C30 @ =gUnk_020227E8 + ldr r2, _080A4C34 @ =0x00303030 + adds r0, r5, #0 + bl sub_08057044 + adds r0, r5, #0 + bl sub_080A4948 + cmp r0, #0 + bne _080A4C38 + movs r0, #0x80 + lsls r0, r0, #8 + b _080A4C3C + .align 2, 0 +_080A4C30: .4byte gUnk_020227E8 +_080A4C34: .4byte 0x00303030 +_080A4C38: + movs r0, #0x80 + lsls r0, r0, #4 +_080A4C3C: + adds r5, r5, r0 +_080A4C3E: + ldr r0, _080A4C94 @ =gMenu + lsls r1, r6, #1 + adds r0, #0x10 + adds r1, r1, r0 + ldrh r0, [r1] + cmp r0, r5 + beq _080A4CB2 + strh r5, [r1] + ldr r0, _080A4C98 @ =0x0000F00B + cmp r6, #2 + bne _080A4C56 + subs r0, #7 +_080A4C56: + ldr r1, [sp] + movs r2, #0x80 + bl MemFill16 + cmp r5, #0 + ble _080A4CAC + ldr r0, _080A4C9C @ =0x00007FFF + cmp r5, r0 + ble _080A4C6A + ldr r5, _080A4CA0 @ =0x00000889 +_080A4C6A: + adds r0, r5, #0 + cmp r5, #0 + bge _080A4C72 + adds r0, #0xff +_080A4C72: + asrs r0, r0, #8 + strb r0, [r4, #8] + strb r5, [r4, #9] + ldr r0, [sp] + adds r0, #0x16 + str r0, [sp] + movs r0, #0x80 + lsls r0, r0, #0x12 + ldrb r0, [r0, #7] + cmp r0, #0 + bne _080A4CA4 + adds r0, r4, #0 + mov r1, sp + bl sub_0805F46C + b _080A4CAC + .align 2, 0 +_080A4C94: .4byte gMenu +_080A4C98: .4byte 0x0000F00B +_080A4C9C: .4byte 0x00007FFF +_080A4CA0: .4byte 0x00000889 +_080A4CA4: + adds r0, r5, #0 + mov r1, sp + bl sub_0805F46C +_080A4CAC: + ldr r1, _080A4CB8 @ =gScreen + movs r0, #1 + strh r0, [r1, #0x32] +_080A4CB2: + add sp, #0x54 + pop {r4, r5, r6, pc} + .align 2, 0 +_080A4CB8: .4byte gScreen +.syntax divided diff --git a/asm/subtask.s b/asm/subtask.s index 738946ec..01cc01e2 100644 --- a/asm/subtask.s +++ b/asm/subtask.s @@ -6,1375 +6,6 @@ .text - thumb_func_start Subtask_FigurineMenu -Subtask_FigurineMenu: @ 0x080A45A4 -.ifdef DEMO_USA - bx lr - .align 2, 0 -.else -.ifdef DEMO_JP - bx lr - .align 2, 0 -.else - push {lr} - bl FlushSprites - ldr r0, _080A45C4 @ =gUnk_02032EC0 - ldrb r0, [r0, #3] - cmp r0, #0xff - bne _080A45D0 - ldr r1, _080A45C8 @ =gUnk_0812815C - ldr r0, _080A45CC @ =gMenu - ldrb r0, [r0, #5] - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r0, [r0] - bl _call_via_r0 - b _080A45E0 - .align 2, 0 -_080A45C4: .4byte gUnk_02032EC0 -_080A45C8: .4byte gUnk_0812815C -_080A45CC: .4byte gMenu -_080A45D0: - ldr r1, _080A4600 @ =gUnk_0812814C - ldr r0, _080A4604 @ =gMenu - ldrb r0, [r0, #5] - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r0, [r0] - bl _call_via_r0 -_080A45E0: - bl UpdateEntities - bl sub_0801C1D4 - bl DrawOAMCmd - bl DrawEntities - bl sub_080A4978 - bl CopyOAM - bl sub_080A4B44 - pop {pc} - .align 2, 0 -_080A4600: .4byte gUnk_0812814C -_080A4604: .4byte gMenu -.endif -.endif - - thumb_func_start sub_080A4608 -sub_080A4608: @ 0x080A4608 - push {r4, lr} - movs r0, #0x80 - bl SetBgmVolume - movs r0, #3 - bl sub_080A4DA8 - ldr r4, _080A46A0 @ =gPaletteBuffer - movs r1, #0xfb - lsls r1, r1, #1 - adds r0, r4, r1 - ldrh r1, [r0] - movs r0, #0 - bl SetColor - movs r0, #0xae - lsls r0, r0, #1 - movs r2, #0xd3 - lsls r2, r2, #1 - adds r1, r4, r2 - ldrh r1, [r1] - bl SetColor - ldr r0, _080A46A4 @ =gBG0Buffer - movs r1, #0x80 - lsls r1, r1, #4 - bl MemClear - ldr r0, _080A46A8 @ =gBG3Buffer - movs r1, #0x80 - lsls r1, r1, #5 - bl MemClear - ldr r2, _080A46AC @ =gScreen - adds r1, r2, #0 - adds r1, #0x58 - movs r0, #0xf0 - strh r0, [r1] - adds r1, #4 - ldr r0, _080A46B0 @ =0x00007898 - strh r0, [r1] - adds r1, #4 - movs r0, #0x1f - strh r0, [r1] - adds r1, #2 - movs r0, #0x1d - strh r0, [r1] - movs r0, #1 - strh r0, [r2, #0x1a] - movs r2, #0xee - ldr r3, _080A46B4 @ =gMenu - movs r1, #0xf - adds r0, r3, #0 - adds r0, #0x1f -_080A4674: - strb r2, [r0] - subs r0, #1 - subs r1, #1 - cmp r1, #0 - bge _080A4674 - ldr r0, _080A46B8 @ =gUnk_02032EC0 - ldrb r1, [r0, #3] - ldr r0, _080A46BC @ =gSave - ldrb r0, [r0, #6] - movs r2, #0x88 - cmp r0, #0 - bne _080A468E - movs r2, #0x82 -_080A468E: - cmp r2, r1 - bge _080A4694 - movs r1, #1 -_080A4694: - strb r1, [r3, #0x1c] - movs r0, #4 - movs r1, #8 - bl SetFade - pop {r4, pc} - .align 2, 0 -_080A46A0: .4byte gPaletteBuffer -_080A46A4: .4byte gBG0Buffer -_080A46A8: .4byte gBG3Buffer -_080A46AC: .4byte gScreen -_080A46B0: .4byte 0x00007898 -_080A46B4: .4byte gMenu -_080A46B8: .4byte gUnk_02032EC0 -_080A46BC: .4byte gSave - - thumb_func_start sub_080A46C0 -sub_080A46C0: @ 0x080A46C0 - push {lr} - movs r0, #0x80 - lsls r0, r0, #1 - bl SetBgmVolume - movs r0, #0x6c - bl SoundReq - movs r0, #2 - bl ClearRoomFlag - bl Subtask_Exit - pop {pc} - - thumb_func_start sub_080A46DC -sub_080A46DC: @ 0x080A46DC - push {lr} - bl sub_080A4608 - movs r0, #1 - bl sub_080A7114 - pop {pc} - .align 2, 0 - - thumb_func_start sub_080A46EC -sub_080A46EC: @ 0x080A46EC - push {lr} - ldr r0, _080A4714 @ =gFadeControl - ldrb r0, [r0] - cmp r0, #0 - bne _080A4710 - ldr r1, _080A4718 @ =gUnk_080FC3E4 - ldr r0, _080A471C @ =gMenu - ldrb r0, [r0, #0x1c] - lsls r0, r0, #3 - adds r0, r0, r1 - ldrb r1, [r0, #7] - movs r0, #0xa2 - movs r2, #0 - bl CreateObject - movs r0, #2 - bl sub_080A7114 -_080A4710: - pop {pc} - .align 2, 0 -_080A4714: .4byte gFadeControl -_080A4718: .4byte gUnk_080FC3E4 -_080A471C: .4byte gMenu - - thumb_func_start sub_080A4720 -sub_080A4720: @ 0x080A4720 - push {r4, lr} - ldr r4, _080A4744 @ =gMenu - ldrb r0, [r4] - cmp r0, #0 - beq _080A47C4 - adds r1, r4, #0 - adds r1, #0x20 - ldrb r0, [r1] - adds r0, #1 - movs r3, #0 - strb r0, [r1] - ldrb r0, [r1] - cmp r0, #0x40 - beq _080A4748 - cmp r0, #0x80 - beq _080A4788 - b _080A475A - .align 2, 0 -_080A4744: .4byte gMenu -_080A4748: - ldr r0, _080A477C @ =gUnk_02002B0E - ldrb r1, [r4, #0x1c] - bl WriteBit - adds r1, r4, #0 - adds r1, #0x21 - strb r0, [r1] - movs r0, #1 - strb r0, [r4, #1] -_080A475A: - ldr r0, _080A4780 @ =gMenu - adds r0, #0x20 - ldrb r0, [r0] - lsrs r1, r0, #2 - cmp r1, #0x10 - bls _080A476A - movs r0, #0x20 - subs r1, r0, r1 -_080A476A: - ldr r0, _080A4784 @ =gScreen - adds r2, r0, #0 - adds r2, #0x6a - strh r1, [r2] - adds r0, #0x66 - movs r1, #0xbf - strh r1, [r0] - b _080A47C4 - .align 2, 0 -_080A477C: .4byte gUnk_02002B0E -_080A4780: .4byte gMenu -_080A4784: .4byte gScreen -_080A4788: - ldr r2, _080A47C8 @ =gScreen - adds r0, r2, #0 - adds r0, #0x6a - strh r3, [r0] - subs r0, #4 - strh r3, [r0] - ldrh r1, [r2] - movs r3, #0x80 - lsls r3, r3, #6 - adds r0, r3, #0 - orrs r0, r1 - strh r0, [r2] - movs r0, #3 - bl sub_080A7114 - ldr r0, _080A47CC @ =gUnk_0812813C - bl sub_080A70AC - movs r0, #0x15 - strb r0, [r4, #1] - adds r0, r4, #0 - adds r0, #0x21 - ldrb r0, [r0] - movs r1, #0x6d - cmp r0, #0 - bne _080A47BE - adds r1, #0x9c -_080A47BE: - adds r0, r1, #0 - bl SoundReq -_080A47C4: - pop {r4, pc} - .align 2, 0 -_080A47C8: .4byte gScreen -_080A47CC: .4byte gUnk_0812813C - - thumb_func_start sub_080A47D0 -sub_080A47D0: @ 0x080A47D0 - push {r4, lr} - ldr r0, _080A47EC @ =gMenu - movs r4, #0x1f - ldrsb r4, [r0, r4] - ldr r0, _080A47F0 @ =gInput - ldrh r0, [r0, #4] - cmp r0, #8 - beq _080A47FE - cmp r0, #8 - bgt _080A47F4 - cmp r0, #2 - beq _080A47FE - b _080A480A - .align 2, 0 -_080A47EC: .4byte gMenu -_080A47F0: .4byte gInput -_080A47F4: - cmp r0, #0x10 - beq _080A4804 - cmp r0, #0x20 - beq _080A4808 - b _080A480A -_080A47FE: - bl sub_080A46C0 - b _080A480A -_080A4804: - adds r4, #8 - b _080A480A -_080A4808: - subs r4, #8 -_080A480A: - ldr r1, _080A4828 @ =gMenu - ldrb r0, [r1, #0x1e] - cmp r4, #0 - bge _080A4814 - movs r4, #0 -_080A4814: - cmp r0, r4 - bge _080A481A - adds r4, r0, #0 -_080A481A: - strb r4, [r1, #0x1f] - ldr r1, _080A482C @ =gScreen - adds r0, r4, #0 - subs r0, #0x70 - strh r0, [r1, #0x18] - pop {r4, pc} - .align 2, 0 -_080A4828: .4byte gMenu -_080A482C: .4byte gScreen - - thumb_func_start sub_080A4830 -sub_080A4830: @ 0x080A4830 - push {lr} - bl sub_080A4608 - ldr r2, _080A4858 @ =gScreen - ldrh r1, [r2] - movs r3, #0x80 - lsls r3, r3, #6 - adds r0, r3, #0 - orrs r0, r1 - strh r0, [r2] - ldr r0, _080A485C @ =gUnk_0812813C - bl sub_080A70AC - ldr r1, _080A4860 @ =gMenu - movs r0, #0xff - strb r0, [r1, #1] - movs r0, #1 - bl sub_080A7114 - pop {pc} - .align 2, 0 -_080A4858: .4byte gScreen -_080A485C: .4byte gUnk_0812813C -_080A4860: .4byte gMenu - - thumb_func_start sub_080A4864 -sub_080A4864: @ 0x080A4864 - push {r4, r5, r6, lr} - ldr r0, _080A4894 @ =gFadeControl - ldrb r0, [r0] - cmp r0, #0 - bne _080A4926 - ldr r0, _080A4898 @ =gMenu - movs r5, #0x1f - ldrsb r5, [r0, r5] - ldrb r4, [r0, #0x1c] - ldr r0, _080A489C @ =gInput - ldrh r1, [r0, #4] - cmp r1, #0x20 - beq _080A48DC - cmp r1, #0x20 - bgt _080A48A0 - cmp r1, #2 - beq _080A48C0 - cmp r1, #2 - ble _080A48DE - cmp r1, #8 - beq _080A48C0 - cmp r1, #0x10 - beq _080A48D8 - b _080A48DE - .align 2, 0 -_080A4894: .4byte gFadeControl -_080A4898: .4byte gMenu -_080A489C: .4byte gInput -_080A48A0: - cmp r1, #0x80 - beq _080A48D4 - cmp r1, #0x80 - bgt _080A48AE - cmp r1, #0x40 - beq _080A48D0 - b _080A48DE -_080A48AE: - movs r0, #0x80 - lsls r0, r0, #1 - cmp r1, r0 - beq _080A48CC - movs r0, #0x80 - lsls r0, r0, #2 - cmp r1, r0 - beq _080A48C8 - b _080A48DE -_080A48C0: - movs r0, #3 - bl sub_080A7114 - b _080A48DE -_080A48C8: - subs r4, #5 - b _080A48DE -_080A48CC: - adds r4, #5 - b _080A48DE -_080A48D0: - subs r4, #1 - b _080A48DE -_080A48D4: - adds r4, #1 - b _080A48DE -_080A48D8: - adds r5, #8 - b _080A48DE -_080A48DC: - subs r5, #8 -_080A48DE: - ldr r0, _080A4928 @ =gSave - ldrb r0, [r0, #6] - movs r1, #0x88 - cmp r0, #0 - bne _080A48EA - movs r1, #0x82 -_080A48EA: - cmp r4, #0 - bgt _080A48F0 - movs r4, #1 -_080A48F0: - cmp r1, r4 - bge _080A48F6 - adds r4, r1, #0 -_080A48F6: - ldr r6, _080A492C @ =gMenu - ldrb r0, [r6, #0x1c] - cmp r0, r4 - beq _080A490E - strb r4, [r6, #0x1c] - movs r0, #0x69 - bl SoundReq - movs r0, #2 - bl sub_080A7114 - movs r5, #0 -_080A490E: - ldrb r0, [r6, #0x1e] - cmp r5, #0 - bge _080A4916 - movs r5, #0 -_080A4916: - cmp r0, r5 - bge _080A491C - adds r5, r0, #0 -_080A491C: - strb r5, [r6, #0x1f] - ldr r1, _080A4930 @ =gScreen - adds r0, r5, #0 - subs r0, #0x70 - strh r0, [r1, #0x18] -_080A4926: - pop {r4, r5, r6, pc} - .align 2, 0 -_080A4928: .4byte gSave -_080A492C: .4byte gMenu -_080A4930: .4byte gScreen - - thumb_func_start sub_080A4934 -sub_080A4934: @ 0x080A4934 - push {lr} - movs r0, #1 - bl sub_080A7114 - pop {pc} - .align 2, 0 - - thumb_func_start sub_080A4940 -sub_080A4940: @ 0x080A4940 - push {lr} - bl sub_080A46C0 - pop {pc} - - thumb_func_start sub_080A4948 -sub_080A4948: @ 0x080A4948 - push {r4, lr} - adds r1, r0, #0 - movs r4, #0 - ldr r3, _080A4974 @ =gSave - ldrb r0, [r3, #6] - movs r2, #0x88 - cmp r0, #0 - bne _080A495A - movs r2, #0x82 -_080A495A: - cmp r1, #0 - bgt _080A4962 - cmp r2, r1 - blt _080A4970 -_080A4962: - adds r0, r3, #0 - adds r0, #0xce - bl ReadBit - cmp r0, #0 - beq _080A4970 - movs r4, #1 -_080A4970: - adds r0, r4, #0 - pop {r4, pc} - .align 2, 0 -_080A4974: .4byte gSave - - thumb_func_start sub_080A4978 -sub_080A4978: @ 0x080A4978 -.ifdef EU - push {r4, r5, r6, r7, lr} - mov r7, r8 - push {r7} - ldr r5, _080A432C @ =gOamCmd - movs r0, #0 - strh r0, [r5, #4] - strh r0, [r5, #6] - movs r0, #0x80 - lsls r0, r0, #4 - strh r0, [r5, #8] - movs r0, #0x9c - strh r0, [r5] - movs r0, #0x48 - strh r0, [r5, #2] - ldr r7, _080A4330 @ =0x000001FB - adds r0, r7, #0 - movs r1, #0 - bl DrawDirect - ldr r0, _080A4334 @ =gSave - ldrb r0, [r0, #6] - movs r2, #0x88 - cmp r0, #0 - bne _080A41C2 - movs r2, #0x82 -_080A41C2: - ldr r3, _080A4338 @ =gChooseFileState - ldrb r1, [r3, #1] - movs r0, #2 - ands r0, r1 - cmp r0, #0 - beq _080A4226 - ldrb r4, [r3, #0x1c] - cmp r2, r4 - blt _080A4226 - movs r6, #0xe8 - strh r6, [r5] - movs r0, #0xa0 - lsls r0, r0, #7 - adds r1, r2, #0 - bl __divsi3 - subs r1, r4, #1 - muls r0, r1, r0 - cmp r0, #0 - bge _080A41EC - adds r0, #0xff -_080A41EC: - asrs r0, r0, #8 - adds r0, #0x20 - strh r0, [r5, #2] - adds r0, r7, #0 - movs r1, #1 - bl DrawDirect - ldr r0, _080A433C @ =gMain - ldrh r1, [r0, #0xc] - movs r0, #0x10 - ands r0, r1 - movs r4, #2 - cmp r0, #0 - beq _080A420A - movs r4, #4 -_080A420A: - strh r6, [r5] - movs r0, #0x1a - strh r0, [r5, #2] - adds r0, r7, #0 - adds r1, r4, #0 - bl DrawDirect - strh r6, [r5] - movs r0, #0x76 - strh r0, [r5, #2] - adds r1, r4, #1 - adds r0, r7, #0 - bl DrawDirect -_080A4226: - ldr r0, _080A433C @ =gMain - ldrh r1, [r0, #0xc] - movs r2, #0x10 - adds r0, r2, #0 - ands r0, r1 - cmp r0, #0 - beq _080A427C - ldr r5, _080A4338 @ =gChooseFileState - ldrb r1, [r5, #1] - adds r0, r2, #0 - ands r0, r1 - cmp r0, #0 - beq _080A427C - ldrb r0, [r5, #0x1e] - cmp r0, #0 - beq _080A427C - ldr r4, _080A432C @ =gOamCmd - strh r2, [r4, #2] - movs r0, #0x1f - ldrsb r0, [r5, r0] - cmp r0, #0 - ble _080A4262 - movs r0, #6 - strh r0, [r4] - movs r0, #0x9c - strh r0, [r4, #2] - ldr r0, _080A4330 @ =0x000001FB - movs r1, #6 - bl DrawDirect -_080A4262: - ldrb r1, [r5, #0x1e] - movs r0, #0x1f - ldrsb r0, [r5, r0] - cmp r1, r0 - ble _080A427C - movs r0, #0xea - strh r0, [r4] - movs r0, #0x9c - strh r0, [r4, #2] - ldr r0, _080A4330 @ =0x000001FB - movs r1, #7 - bl DrawDirect -_080A427C: - movs r0, #0x80 - lsls r0, r0, #0x12 - ldrb r0, [r0, #7] - cmp r0, #0 - beq _080A42D0 - ldr r2, _080A4338 @ =gChooseFileState - ldrb r1, [r2, #1] - movs r0, #4 - ands r0, r1 - cmp r0, #0 - beq _080A42D0 - ldr r1, _080A432C @ =gOamCmd - movs r0, #0x10 - strh r0, [r1, #2] - ldrb r4, [r2, #0x1c] - movs r6, #2 - adds r7, r1, #0 - movs r5, #0x6b -_080A42A0: - strh r5, [r7] - adds r0, r4, #0 - movs r1, #0xa - bl __modsi3 - lsls r0, r0, #1 - movs r2, #0x9e - lsls r2, r2, #4 - adds r1, r2, #0 - orrs r0, r1 - strh r0, [r7, #8] - movs r0, #0 - movs r1, #9 - bl DrawDirect - adds r0, r4, #0 - movs r1, #0xa - bl __divsi3 - adds r4, r0, #0 - subs r5, #7 - subs r6, #1 - cmp r6, #0 - bge _080A42A0 -_080A42D0: - ldr r4, _080A4338 @ =gChooseFileState - ldrb r1, [r4, #1] - movs r0, #1 - ands r0, r1 - cmp r0, #0 - beq _080A4352 - ldrb r0, [r4, #0x1c] - bl sub_080A4948 - cmp r0, #0 - beq _080A4352 - ldr r1, _080A432C @ =gOamCmd - movs r0, #0x2c - strh r0, [r1] - movs r0, #0x48 - strh r0, [r1, #2] - movs r0, #0xd4 - lsls r0, r0, #7 - strh r0, [r1, #8] - ldr r0, _080A4340 @ =0x000001F7 - ldrb r1, [r4, #0x1c] - subs r1, #1 - bl DrawDirect - ldrb r1, [r4, #0x1c] - ldrb r0, [r4, #0x1d] - cmp r0, r1 - beq _080A4352 - strb r1, [r4, #0x1d] - ldrb r4, [r4, #0x1c] - lsls r4, r4, #4 - ldr r0, _080A4344 @ =gFigurines - adds r4, r4, r0 - ldr r0, [r4] - movs r1, #0x16 - movs r2, #9 - bl LoadPalettes - ldr r0, [r4, #4] - ldr r2, [r4, #8] - cmp r2, #0 - bge _080A434CEU - ldr r1, _080A4348EU @ =0x06014000 - bl LZ77UnCompVram - b _080A4352 - .align 2, 0 -_080A432C: .4byte gOamCmd -_080A4330: .4byte 0x000001FB -_080A4334: .4byte gSave -_080A4338: .4byte gChooseFileState -_080A433C: .4byte gMain -_080A4340: .4byte 0x000001F7 -_080A4344: .4byte gFigurines -_080A4348EU: .4byte 0x06014000 -_080A434CEU: - ldr r1, _080A4358EU @ =0x06014000 - bl LoadResourceAsync -_080A4352: - pop {r3} - mov r8, r3 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A4358EU: .4byte 0x06014000 -.else - push {r4, r5, r6, r7, lr} - mov r7, r8 - push {r7} - ldr r5, _080A4B1C @ =gOamCmd - movs r0, #0 - strh r0, [r5, #4] - strh r0, [r5, #6] - movs r0, #0x80 - lsls r0, r0, #4 - strh r0, [r5, #8] - movs r0, #0x9c - strh r0, [r5] - movs r0, #0x48 - strh r0, [r5, #2] - movs r7, #0xfe - lsls r7, r7, #1 - adds r0, r7, #0 - movs r1, #0 - bl DrawDirect - ldr r0, _080A4B20 @ =gSave - ldrb r0, [r0, #6] - movs r2, #0x88 - cmp r0, #0 - bne _080A49AC - movs r2, #0x82 -_080A49AC: - ldr r3, _080A4B24 @ =gMenu - ldrb r1, [r3, #1] - movs r0, #2 - ands r0, r1 - cmp r0, #0 - beq _080A4A10 - ldrb r4, [r3, #0x1c] - cmp r2, r4 - blt _080A4A10 - movs r6, #0xe8 - strh r6, [r5] - movs r0, #0xa0 - lsls r0, r0, #7 - adds r1, r2, #0 - bl __divsi3 - subs r1, r4, #1 - muls r0, r1, r0 - cmp r0, #0 - bge _080A49D6 - adds r0, #0xff -_080A49D6: - asrs r0, r0, #8 - adds r0, #0x20 - strh r0, [r5, #2] - adds r0, r7, #0 - movs r1, #1 - bl DrawDirect - ldr r0, _080A4B28 @ =gMain - ldrh r1, [r0, #0xc] - movs r0, #0x10 - ands r0, r1 - movs r4, #2 - cmp r0, #0 - beq _080A49F4 - movs r4, #4 -_080A49F4: - strh r6, [r5] - movs r0, #0x1a - strh r0, [r5, #2] - adds r0, r7, #0 - adds r1, r4, #0 - bl DrawDirect - strh r6, [r5] - movs r0, #0x76 - strh r0, [r5, #2] - adds r1, r4, #1 - adds r0, r7, #0 - bl DrawDirect -_080A4A10: - ldr r0, _080A4B28 @ =gMain - ldrh r1, [r0, #0xc] - movs r2, #0x10 - adds r0, r2, #0 - ands r0, r1 - cmp r0, #0 - beq _080A4A6A - ldr r5, _080A4B24 @ =gMenu - ldrb r1, [r5, #1] - adds r0, r2, #0 - ands r0, r1 - cmp r0, #0 - beq _080A4A6A - ldrb r0, [r5, #0x1e] - cmp r0, #0 - beq _080A4A6A - ldr r4, _080A4B1C @ =gOamCmd - strh r2, [r4, #2] - movs r0, #0x1f - ldrsb r0, [r5, r0] - cmp r0, #0 - ble _080A4A4E - movs r0, #6 - strh r0, [r4] - movs r0, #0x9c - strh r0, [r4, #2] - movs r0, #0xfe - lsls r0, r0, #1 - movs r1, #6 - bl DrawDirect -_080A4A4E: - ldrb r1, [r5, #0x1e] - movs r0, #0x1f - ldrsb r0, [r5, r0] - cmp r1, r0 - ble _080A4A6A - movs r0, #0xea - strh r0, [r4] - movs r0, #0x9c - strh r0, [r4, #2] - movs r0, #0xfe - lsls r0, r0, #1 - movs r1, #7 - bl DrawDirect -_080A4A6A: - movs r0, #0x80 - lsls r0, r0, #0x12 - ldrb r0, [r0, #7] - cmp r0, #0 - beq _080A4ABE - ldr r2, _080A4B24 @ =gMenu - ldrb r1, [r2, #1] - movs r0, #4 - ands r0, r1 - cmp r0, #0 - beq _080A4ABE - ldr r1, _080A4B1C @ =gOamCmd - movs r0, #0x10 - strh r0, [r1, #2] - ldrb r4, [r2, #0x1c] - movs r6, #2 - adds r7, r1, #0 - movs r5, #0x6b -_080A4A8E: - strh r5, [r7] - adds r0, r4, #0 - movs r1, #0xa - bl __modsi3 - lsls r0, r0, #1 - movs r2, #0x9e - lsls r2, r2, #4 - adds r1, r2, #0 - orrs r0, r1 - strh r0, [r7, #8] - movs r0, #0 - movs r1, #9 - bl DrawDirect - adds r0, r4, #0 - movs r1, #0xa - bl __divsi3 - adds r4, r0, #0 - subs r5, #7 - subs r6, #1 - cmp r6, #0 - bge _080A4A8E -_080A4ABE: - ldr r4, _080A4B24 @ =gMenu - ldrb r1, [r4, #1] - movs r0, #1 - ands r0, r1 - cmp r0, #0 - beq _080A4B3A - ldrb r0, [r4, #0x1c] - bl sub_080A4948 - cmp r0, #0 - beq _080A4B3A - ldr r1, _080A4B1C @ =gOamCmd - movs r0, #0x2c - strh r0, [r1] - movs r0, #0x48 - strh r0, [r1, #2] - movs r0, #0xd4 - lsls r0, r0, #7 - strh r0, [r1, #8] - movs r0, #0xfc - lsls r0, r0, #1 - ldrb r1, [r4, #0x1c] - subs r1, #1 - bl DrawDirect - ldrb r1, [r4, #0x1c] - ldrb r0, [r4, #0x1d] - cmp r0, r1 - beq _080A4B3A - strb r1, [r4, #0x1d] - ldrb r4, [r4, #0x1c] - lsls r4, r4, #4 - ldr r0, _080A4B2C @ =gFigurines - adds r4, r4, r0 - ldr r0, [r4] - movs r1, #0x16 - movs r2, #9 - bl LoadPalettes - ldr r0, [r4, #4] - ldr r2, [r4, #8] - cmp r2, #0 - bge _080A4B34 - ldr r1, _080A4B30 @ =0x06014000 - bl LZ77UnCompVram - b _080A4B3A - .align 2, 0 -_080A4B1C: .4byte gOamCmd -_080A4B20: .4byte gSave -_080A4B24: .4byte gMenu -_080A4B28: .4byte gMain -_080A4B2C: .4byte gFigurines -_080A4B30: .4byte 0x06014000 -_080A4B34: - ldr r1, _080A4B40 @ =0x06014000 - bl LoadResourceAsync -_080A4B3A: - pop {r3} - mov r8, r3 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A4B40: .4byte 0x06014000 -.endif - - thumb_func_start sub_080A4B44 -sub_080A4B44: @ 0x080A4B44 - push {r4, r5, lr} - ldr r5, _080A4B9C @ =gMenu - ldrb r4, [r5, #0x1c] - ldrb r1, [r5, #1] - movs r0, #0x10 - ands r0, r1 - cmp r0, #0 - beq _080A4B5C - adds r0, r4, #0 - bl sub_080A4CBC - strb r0, [r5, #0x1e] -_080A4B5C: - ldrb r1, [r5, #1] - movs r0, #4 - ands r0, r1 - cmp r0, #0 - beq _080A4B6E - adds r0, r4, #0 - movs r1, #2 - bl sub_080A4BA0 -_080A4B6E: - ldrb r1, [r5, #1] - movs r0, #8 - ands r0, r1 - cmp r0, #0 - beq _080A4B98 - subs r0, r4, #2 - movs r1, #0 - bl sub_080A4BA0 - subs r0, r4, #1 - movs r1, #1 - bl sub_080A4BA0 - adds r0, r4, #1 - movs r1, #3 - bl sub_080A4BA0 - adds r0, r4, #2 - movs r1, #4 - bl sub_080A4BA0 -_080A4B98: - pop {r4, r5, pc} - .align 2, 0 -_080A4B9C: .4byte gMenu - - thumb_func_start sub_080A4BA0 -sub_080A4BA0: @ 0x080A4BA0 - push {r4, r5, r6, lr} - sub sp, #0x54 - adds r5, r0, #0 - adds r6, r1, #0 - add r0, sp, #0x18 - movs r1, #0x30 - bl MemClear - ldr r0, _080A4C08 @ =gUnk_0812816C - mov r1, sp - movs r2, #0x18 - bl MemCopy - ldr r0, _080A4C0C @ =gUnk_08128184 - add r4, sp, #0x48 - adds r1, r4, #0 - movs r2, #0xc - bl MemCopy - lsls r1, r6, #1 - adds r1, r1, r6 - lsls r2, r1, #9 - ldr r0, [sp, #4] - adds r0, r0, r2 - str r0, [sp, #4] - mov r2, sp - mov r0, sp - lsls r1, r1, #4 - ldrh r0, [r0, #0x10] - adds r1, r1, r0 - strh r1, [r2, #0x10] - lsls r1, r6, #7 - ldr r0, [sp] - adds r0, r0, r1 - str r0, [sp] - cmp r6, #2 - bne _080A4BEE - mov r0, sp - strb r6, [r0, #0x14] -_080A4BEE: - ldr r0, _080A4C10 @ =gSave - ldrb r0, [r0, #6] - movs r1, #0x88 - cmp r0, #0 - bne _080A4BFA - movs r1, #0x82 -_080A4BFA: - cmp r5, #0 - ble _080A4C02 - cmp r1, r5 - bge _080A4C14 -_080A4C02: - movs r5, #1 - rsbs r5, r5, #0 - b _080A4C3E - .align 2, 0 -_080A4C08: .4byte gUnk_0812816C -_080A4C0C: .4byte gUnk_08128184 -_080A4C10: .4byte gSave -_080A4C14: - ldr r1, _080A4C30 @ =gUnk_020227E8 - ldr r2, _080A4C34 @ =0x00303030 - adds r0, r5, #0 - bl sub_08057044 - adds r0, r5, #0 - bl sub_080A4948 - cmp r0, #0 - bne _080A4C38 - movs r0, #0x80 - lsls r0, r0, #8 - b _080A4C3C - .align 2, 0 -_080A4C30: .4byte gUnk_020227E8 -_080A4C34: .4byte 0x00303030 -_080A4C38: - movs r0, #0x80 - lsls r0, r0, #4 -_080A4C3C: - adds r5, r5, r0 -_080A4C3E: - ldr r0, _080A4C94 @ =gMenu - lsls r1, r6, #1 - adds r0, #0x10 - adds r1, r1, r0 - ldrh r0, [r1] - cmp r0, r5 - beq _080A4CB2 - strh r5, [r1] - ldr r0, _080A4C98 @ =0x0000F00B - cmp r6, #2 - bne _080A4C56 - subs r0, #7 -_080A4C56: - ldr r1, [sp] - movs r2, #0x80 - bl MemFill16 - cmp r5, #0 - ble _080A4CAC - ldr r0, _080A4C9C @ =0x00007FFF - cmp r5, r0 - ble _080A4C6A - ldr r5, _080A4CA0 @ =0x00000889 -_080A4C6A: - adds r0, r5, #0 - cmp r5, #0 - bge _080A4C72 - adds r0, #0xff -_080A4C72: - asrs r0, r0, #8 - strb r0, [r4, #8] - strb r5, [r4, #9] - ldr r0, [sp] - adds r0, #0x16 - str r0, [sp] - movs r0, #0x80 - lsls r0, r0, #0x12 - ldrb r0, [r0, #7] - cmp r0, #0 - bne _080A4CA4 - adds r0, r4, #0 - mov r1, sp - bl sub_0805F46C - b _080A4CAC - .align 2, 0 -_080A4C94: .4byte gMenu -_080A4C98: .4byte 0x0000F00B -_080A4C9C: .4byte 0x00007FFF -_080A4CA0: .4byte 0x00000889 -_080A4CA4: - adds r0, r5, #0 - mov r1, sp - bl sub_0805F46C -_080A4CAC: - ldr r1, _080A4CB8 @ =gScreen - movs r0, #1 - strh r0, [r1, #0x32] -_080A4CB2: - add sp, #0x54 - pop {r4, r5, r6, pc} - .align 2, 0 -_080A4CB8: .4byte gScreen - - thumb_func_start sub_080A4CBC -sub_080A4CBC: @ 0x080A4CBC - push {r4, r5, r6, lr} - adds r6, r0, #0 - ldr r1, _080A4D0C @ =gMenu - ldrb r0, [r1, #0x1a] - cmp r0, r6 - beq _080A4CFE - strb r6, [r1, #0x1a] - ldr r4, _080A4D10 @ =gBG1Buffer - movs r5, #0x80 - lsls r5, r5, #4 - adds r0, r4, #0 - adds r1, r5, #0 - bl MemClear - ldr r1, _080A4D14 @ =0x0600E000 - adds r0, r4, #0 - adds r2, r5, #0 - bl MemCopy - adds r0, r6, #0 - bl sub_080A4948 - cmp r0, #0 - beq _080A4CF8 - movs r1, #0x90 - lsls r1, r1, #4 - adds r0, r6, r1 - ldr r1, _080A4D18 @ =gUnk_08128190 - bl sub_0805F46C -_080A4CF8: - ldr r1, _080A4D1C @ =gScreen - movs r0, #1 - strh r0, [r1, #0x1a] -_080A4CFE: - ldr r0, _080A4D18 @ =gUnk_08128190 - ldr r0, [r0] - movs r2, #0x80 - lsls r2, r2, #1 - adds r1, r0, r2 - movs r2, #0 - b _080A4D28 - .align 2, 0 -_080A4D0C: .4byte gMenu -_080A4D10: .4byte gBG1Buffer -_080A4D14: .4byte 0x0600E000 -_080A4D18: .4byte gUnk_08128190 -_080A4D1C: .4byte gScreen -_080A4D20: - adds r1, #0x40 - adds r2, #1 - cmp r2, #0x13 - bhi _080A4D2E -_080A4D28: - ldrh r0, [r1] - cmp r0, #0 - bne _080A4D20 -_080A4D2E: - lsls r0, r2, #3 - pop {r4, r5, r6, pc} - .align 2, 0 - - thumb_func_start sub_080A4D34 -sub_080A4D34: @ 0x080A4D34 - push {lr} - bl LoadGfxGroups - movs r0, #0xb5 - bl LoadPaletteGroup - ldr r1, _080A4D50 @ =gSave - adds r2, r1, #0 - adds r2, #0xaa - ldrb r0, [r2] - cmp r0, #8 - bhi _080A4D54 - movs r1, #2 - b _080A4D66 - .align 2, 0 -_080A4D50: .4byte gSave -_080A4D54: - adds r0, r1, #0 - adds r0, #0xab - ldrb r0, [r0] - ldrb r1, [r2] - subs r0, r0, r1 - movs r1, #1 - cmp r0, #8 - bgt _080A4D66 - movs r1, #0 -_080A4D66: - adds r0, r1, #0 - adds r0, #0x56 - bl LoadGfxGroup - ldr r1, _080A4D80 @ =gScreen - movs r0, #0 - strh r0, [r1, #0x2e] - strh r0, [r1, #0x30] - ldr r0, _080A4D84 @ =0x00001E0B - strh r0, [r1, #0x2c] - movs r0, #1 - strh r0, [r1, #0x32] - pop {pc} - .align 2, 0 -_080A4D80: .4byte gScreen -_080A4D84: .4byte 0x00001E0B - - thumb_func_start sub_080A4D88 -sub_080A4D88: @ 0x080A4D88 - push {lr} - ldr r0, _080A4DA4 @ =gUnk_020344A0 - movs r1, #8 - bl MemClear - movs r0, #1 - movs r1, #0 - bl MenuFadeIn - movs r0, #0x80 - bl SetBgmVolume - pop {pc} - .align 2, 0 -_080A4DA4: .4byte gUnk_020344A0 - - thumb_func_start sub_080A4DA8 -sub_080A4DA8: @ 0x080A4DA8 - push {r4, lr} - adds r4, r0, #0 - bl sub_080A4D34 - adds r0, r4, #0 - bl sub_080A4DB8 - pop {r4, pc} - - thumb_func_start sub_080A4DB8 -sub_080A4DB8: @ 0x080A4DB8 - push {r4, r5, lr} - adds r5, r0, #0 - bl sub_08056250 - ldr r0, _080A4E58 @ =gBG0Buffer - movs r4, #0x80 - lsls r4, r4, #4 - adds r1, r4, #0 - bl MemClear - ldr r0, _080A4E5C @ =gBG1Buffer - adds r1, r4, #0 - bl MemClear - ldr r0, _080A4E60 @ =gBG2Buffer - adds r1, r4, #0 - bl MemClear - ldr r0, _080A4E64 @ =gUnk_0200AF34 - movs r1, #0xc0 - lsls r1, r1, #2 - bl MemClear - ldr r4, _080A4E68 @ =gMenu - adds r0, r4, #0 - movs r1, #0x30 - bl MemClear - ldr r0, _080A4E6C @ =0x0000FFFF - strh r0, [r4, #0x2e] - ldr r0, _080A4E70 @ =gUnk_02034490 - adds r0, #2 - adds r0, r5, r0 - ldrb r0, [r0] - movs r3, #0 - strb r0, [r4, #3] - ldr r0, _080A4E74 @ =gUnk_08128A38 - lsls r5, r5, #3 - adds r5, r5, r0 - ldrb r0, [r5] - lsls r0, r0, #3 - ldr r1, _080A4E78 @ =gUnk_08128AD8 - adds r4, r0, r1 - ldr r1, _080A4E7C @ =gScreen - ldrh r2, [r4, #2] - movs r5, #0xca - lsls r5, r5, #5 - adds r0, r5, #0 - orrs r0, r2 - strh r0, [r1] - strh r3, [r1, #0xa] - strh r3, [r1, #0xc] - movs r2, #1 - strh r2, [r1, #0xe] - strh r3, [r1, #0x16] - strh r3, [r1, #0x18] - ldrh r0, [r4, #4] - strh r0, [r1, #0x14] - strh r2, [r1, #0x1a] - strh r3, [r1, #0x22] - strh r3, [r1, #0x24] - ldrh r0, [r4, #6] - strh r0, [r1, #0x20] - strh r2, [r1, #0x26] - strh r3, [r1, #0x2e] - strh r3, [r1, #0x30] - ldr r0, _080A4E80 @ =0x00001E0B - strh r0, [r1, #0x2c] - ldrb r0, [r4] - cmp r0, #0 - beq _080A4E4A - bl LoadPaletteGroup -_080A4E4A: - ldrb r0, [r4, #1] - cmp r0, #0 - beq _080A4E54 - bl LoadGfxGroup -_080A4E54: - pop {r4, r5, pc} - .align 2, 0 -_080A4E58: .4byte gBG0Buffer -_080A4E5C: .4byte gBG1Buffer -_080A4E60: .4byte gBG2Buffer -_080A4E64: .4byte gUnk_0200AF34 -_080A4E68: .4byte gMenu -_080A4E6C: .4byte 0x0000FFFF -_080A4E70: .4byte gUnk_02034490 -_080A4E74: .4byte gUnk_08128A38 -_080A4E78: .4byte gUnk_08128AD8 -_080A4E7C: .4byte gScreen -_080A4E80: .4byte 0x00001E0B - - thumb_func_start sub_080A4E84 -sub_080A4E84: @ 0x080A4E84 - ldr r1, _080A4E8C @ =gUnk_02034490 - strb r0, [r1, #0x14] - bx lr - .align 2, 0 -_080A4E8C: .4byte gUnk_02034490 - - thumb_func_start sub_080A4E90 -sub_080A4E90: @ 0x080A4E90 - ldr r1, _080A4E9C @ =gUnk_02034490 - movs r2, #0 - strb r0, [r1, #0x11] - strb r2, [r1, #0x12] - bx lr - .align 2, 0 -_080A4E9C: .4byte gUnk_02034490 - thumb_func_start Subtask_PauseMenu Subtask_PauseMenu: @ 0x080A4EA0 push {r4, lr} diff --git a/include/sound.h b/include/sound.h index 8549510f..898581d3 100644 --- a/include/sound.h +++ b/include/sound.h @@ -6,6 +6,7 @@ #define NUM_BGM 99 void SoundReq(u32 sound); +void SetBgmVolume(u32 volume); extern void EnqueueSFX(u32); void InitSound(void); diff --git a/include/structures.h b/include/structures.h index 16187958..327666d1 100644 --- a/include/structures.h +++ b/include/structures.h @@ -99,7 +99,19 @@ typedef struct { } PriorityHandler; extern PriorityHandler gPriorityHandler; -extern u8 gUnk_02034490[]; +extern struct{ + u8 unk0; + u8 unk1; + u8 unk2[0xf]; + u8 unk11; + u8 unk12; + u8 unk13; + s8 unk14; + u8 unk15; + s8 unk16; + u8 unk17; +} gUnk_02034490; +static_assert(sizeof(gUnk_02034490)==0x18); typedef struct { u8 unk0; diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c index 8514214a..a0112901 100644 --- a/src/enemy/octorokBoss.c +++ b/src/enemy/octorokBoss.c @@ -198,7 +198,7 @@ void OctorokBoss_Hit_SubAction0(Entity* this) { GET_HELPER(this)->fallingStonesTimer = 0; if (GET_BOSS_PHASE(this) == 4) { this->subAction = 4; - gUnk_02034490[0] = 1; + gUnk_02034490.unk0 = 1; sub_08078B48(); SoundReq(SFX_BOSS_DIE); } else { @@ -505,7 +505,7 @@ ASM_FUNC("asm/non_matching/octorokBoss/OctorokBoss_Init.inc", void OctorokBoss_I void OctorokBoss_Intro(Entity* this) { sub_08078B48(); - gUnk_02034490[0] = 1; + gUnk_02034490.unk0 = 1; sub_08036F60(this); OctorokBoss_Intro_SubActions[this->subAction](this); sub_0805EC9C(this, this->field_0x76.HWORD, this->field_0x74.HWORD, GET_ANGLE(this)); @@ -579,7 +579,7 @@ void OctorokBoss_Intro_SubAction5(Entity* this) { this->subAction = 0; gRoomControls.unk5 = gPlayerEntity.animationState; OctorokBoss_SetAttackTimer(this); - gUnk_02034490[0] = 0; + gUnk_02034490.unk0 = 0; SoundReq(BGM_BOSS_THEME); } } else { diff --git a/src/game.c b/src/game.c index 2bb7b65d..ebbb34c9 100644 --- a/src/game.c +++ b/src/game.c @@ -323,7 +323,7 @@ static void GameMain_ChangeRoom(void) { sub_080300C4(); gMain.substate = GAMEMAIN_UPDATE; SetPlayerControl(0); - gUnk_02034490[0] = 0; + gUnk_02034490.unk0 = 0; #if defined(USA) || defined(DEMO_USA) if (gArea.inventoryGfxIdx != 0xff) { sub_0801855C(); @@ -1233,7 +1233,7 @@ static void InitRoomTransition(void) { bool32 CanDispEzloMessage(void) { s32 tmp = PL_STATE_WALK; - if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED || gUnk_02034490[0] || + if (!(gInput.heldKeys & SELECT_BUTTON) || gPlayerState.controlMode != CONTROL_ENABLED || gUnk_02034490.unk0 || gUnk_0200AF00.filler0[1]) return 0; diff --git a/src/item/itemOcarina.c b/src/item/itemOcarina.c index 5913c477..035e7e23 100644 --- a/src/item/itemOcarina.c +++ b/src/item/itemOcarina.c @@ -24,7 +24,7 @@ void OcarinaUse(ItemBehavior* this, u32 arg1) { gPlayerEntity.field_0x7a.HWORD = 2; gPlayerState.flags |= PL_USE_OCARINA; gPlayerState.field_0x27[0] = -1; - gUnk_02034490[0] = 1; + gUnk_02034490.unk0 = 1; gPlayerState.field_0xa = (8 >> arg1) | gPlayerState.field_0xa; gPlayerState.keepFacing = (8 >> arg1) | gPlayerState.keepFacing; ResetPlayerVelocity(); @@ -41,7 +41,7 @@ NONMATCH("asm/non_matching/ocarina/OcarinaUpdate.inc", void OcarinaUpdate(ItemBe gPlayerEntity.flags |= 0x80; gPlayerState.flags &= ~PL_USE_OCARINA; gPlayerState.field_0x27[0] = 0; - gUnk_02034490[0] = 0; + gUnk_02034490.unk0 = 0; CreateBird(); ResetPlayerEventPriority(); sub_08077E78(this, arg1); diff --git a/src/manager/manager15.c b/src/manager/manager15.c index 21cad632..598f7b04 100644 --- a/src/manager/manager15.c +++ b/src/manager/manager15.c @@ -306,7 +306,7 @@ void sub_0805A76C(Manager15* this) { gPlayerEntity.animationState = 4; RequestPriorityDuration((Entity*)this, 600); SetPlayerControl(0xFF); - gUnk_02034490[0] = 1; + gUnk_02034490.unk0 = 1; gRoomControls.camera_target = NULL; sub_08077B20(); } diff --git a/src/manager/manager7.c b/src/manager/manager7.c index 5316a4a3..0560a005 100644 --- a/src/manager/manager7.c +++ b/src/manager/manager7.c @@ -83,7 +83,7 @@ void Manager7_Main(Manager7* this) { tmp2 = &gUnk_081080A4[tmp << 4]; switch (this->manager.unk_0e) { case 0: - gUnk_02034490[0] = 1; + gUnk_02034490.unk0 = 1; LoadResourceAsync(&gGlobalGfxAndPalettes[tmp2[0]], tmp2[1], 0x1000); LoadPaletteGroup(gUnk_081081E4[tmp]); this->manager.unk_0e++; @@ -100,7 +100,7 @@ void Manager7_Main(Manager7* this) { this->manager.unk_0e++; break; case 8: - gUnk_02034490[0] = 0; + gUnk_02034490.unk0 = 0; this->manager.unk_0e++; break; } diff --git a/src/npc/npc23.c b/src/npc/npc23.c index 40712f6f..28000a79 100644 --- a/src/npc/npc23.c +++ b/src/npc/npc23.c @@ -49,7 +49,7 @@ void sub_08066358(Entity* this) { } this->speed = 0x80; this->cutsceneBeh.HWORD = 1; - gUnk_02034490[0] = 1; + gUnk_02034490.unk0 = 1; sub_080788E0(this); } } else { @@ -96,7 +96,7 @@ void sub_0806643C(Entity* this) { void sub_08066474(void) { if (gPlayerEntity.action != 0xf) { - gUnk_02034490[0] = 0; + gUnk_02034490.unk0 = 0; } } diff --git a/src/object/cloud.c b/src/object/cloud.c index 5c4383d8..380ba409 100644 --- a/src/object/cloud.c +++ b/src/object/cloud.c @@ -33,7 +33,7 @@ void sub_0809F514(Entity* this) { this->spriteSettings.draw = 0; this->field_0x68.HALF.LO = 12; gRoomControls.camera_target = this; - gUnk_02034490[0] = 255; + gUnk_02034490.unk0 = 255; sub_0809F7BC(this); } diff --git a/src/objectUtils.c b/src/objectUtils.c index 646b62e5..0b219018 100644 --- a/src/objectUtils.c +++ b/src/objectUtils.c @@ -24,7 +24,7 @@ Entity* sub_080A276C(Entity* parent, u32 type, u32 type2) { PrependEntityToList(e, 6); CopyPosition(&gPlayerEntity, e); gPriorityHandler.sys_priority = 6; - gUnk_02034490[0] = 1; + gUnk_02034490.unk0 = 1; e->field_0x68.HALF.HI = gPlayerEntity.flags; e->field_0x68.HALF.LO = gPlayerEntity.spriteSettings.draw; e->field_0x6a.HALF.LO = gPlayerEntity.iframes; diff --git a/src/player.c b/src/player.c index 6c2772d6..b49d83eb 100644 --- a/src/player.c +++ b/src/player.c @@ -325,7 +325,7 @@ extern Entity* gPlayerClones[]; extern ScriptExecutionContext gPlayerScriptExecutionContext; NONMATCH("asm/non_matching/playerItemPacciCane/CheckPlayerInactive.inc", u32 CheckPlayerInactive(void)) { - if (!((gInput.newKeys & START_BUTTON) == 0 || gFadeControl.active || gUnk_02034490[0] || + if (!((gInput.newKeys & START_BUTTON) == 0 || gFadeControl.active || gUnk_02034490.unk0 || (gMessage.doTextBox & 0x7F) || gSave.stats.health == 0 || !gSave.fillerD0[34] || gPlayerState.controlMode != 0 || gPriorityHandler.priority_timer != 0)) { u32 tmp = gPlayerState.framestate ? gPlayerState.framestate : gPlayerState.framestate_last; @@ -1145,7 +1145,7 @@ static void PortalStandUpdate(Entity* this) { static void PortalActivateInit(Entity* this) { gRoomControls.camera_target = NULL; - gUnk_02034490[0] = 1; + gUnk_02034490.unk0 = 1; this->subAction = 3; this->field_0xf = 0x1e; gPlayerState.animation = 0x738; @@ -1228,7 +1228,7 @@ static void sub_080717F8(Entity* this) { this->x.HALF.HI = gArea.curPortalX + sOffsets[gArea.curPortalExitDirection * 2]; this->y.HALF.HI = gArea.curPortalY + sOffsets[gArea.curPortalExitDirection * 2 + 1]; gArea.unk1A = 0xb4; - gUnk_02034490[0] = 0; + gUnk_02034490.unk0 = 0; this->action = PLAYER_MINISH; this->subAction = 0; gPlayerState.flags = (gPlayerState.flags & ~PL_USE_PORTAL) | PL_MINISH; diff --git a/src/playerItem/playerItemPacciCane.c b/src/playerItem/playerItemPacciCane.c index 3a6f533c..3f797d84 100644 --- a/src/playerItem/playerItemPacciCane.c +++ b/src/playerItem/playerItemPacciCane.c @@ -4,13 +4,12 @@ #include "common.h" #include "message.h" #include "save.h" +#include "structures.h" extern void (*const gUnk_0811B9D8[])(Entity*); void sub_080704FC(Entity*); -extern u8 gUnk_02034490[0x18]; - void PlayerItemPacciCane(Entity* this) { gUnk_0811B9D8[this->action](this); } @@ -25,6 +24,7 @@ void sub_080704D4(Entity* this) { ASM_FUNC("asm/non_matching/playerItemPacciCane/sub_080704FC.inc", void sub_080704FC(Entity* this)) +// TODO This name sounds like this does not belong in this file void ClearMenuSavestate(void) { - MemClear(gUnk_02034490, sizeof(gUnk_02034490)); + MemClear(&gUnk_02034490, sizeof(gUnk_02034490)); } diff --git a/src/script.c b/src/script.c index 02cf220a..b7dab735 100644 --- a/src/script.c +++ b/src/script.c @@ -450,11 +450,11 @@ void sub_0807DF28(void) { void sub_0807DF38(void) { gUnk_0200AF00.filler0[1] = 0xff; - gUnk_02034490[0] = 0xff; + gUnk_02034490.unk0 = 0xff; } void sub_0807DF50(void) { - gUnk_02034490[0] = 0; + gUnk_02034490.unk0 = 0; gUnk_0200AF00.filler0[1] = 0; RecoverUI(0); ResetPlayerAnimationAndAction(); @@ -1158,7 +1158,7 @@ void ScriptCommand_0807E9F0(Entity* entity, ScriptExecutionContext* context) { switch (gFuseInfo._0) { case 2: gPlayerState.controlMode = CONTROL_DISABLED; - gUnk_02034490[0] = tmp; + gUnk_02034490.unk0 = tmp; context->condition = tmp; break; case 1: diff --git a/src/subtask.c b/src/subtask.c index ea93d9b9..7b9375d2 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -13,6 +13,7 @@ #include "npc.h" #include "enemy.h" #include "functions.h" +#include "structures.h" extern const u32 gUnk_080CA06C[]; extern const u8 gGlobalGfxAndPalettes[]; @@ -44,6 +45,14 @@ u32 sub_080A44E0(struct_02036540*, u8*, u32); struct_02036540* sub_0805F2C8(void); void sub_0805F300(struct_02036540*); u32 sub_0805F76C(u8*, struct_02036540*); +void sub_080A4978(void); +void sub_080A4B44(void); +void sub_080A4DA8(u32); +u32 sub_080A4CBC(u32); +void sub_080A4BA0(u32, u32); +void sub_0805F46C(u32, const u16**); +void sub_080A4DB8(u32); +void sub_08056250(void); extern void (*const gUnk_081280C4[])(void); extern const u8 gUnk_081280EE[]; @@ -89,6 +98,30 @@ typedef struct { extern u8 gTextGfxBuffer[]; extern u8 gUnk_02002AC0[]; +extern const struct { + u8 filler[7]; + u8 unk7; +} gUnk_080FC3E4[]; + +extern u32 gUnk_02002B0E; +extern const KeyButtonLayout gUnk_0812813C; +extern const u16* gUnk_08128190; +extern u8 gUnk_020344A0[8]; +typedef struct { + u8 unk0; + u8 unk1; + u16 unk2; + u16 unk4; + u16 unk6; +} struct_08128AD8; +extern const struct_08128AD8 gUnk_08128AD8[]; + +extern const struct { + u8 unk0; + u8 filler[3]; + void (*func)(void); +} gUnk_08128A38[]; + void Subtask_KinstoneMenu(void) { #if !(defined(DEMO_USA) || defined(DEMO_JP)) gRoomTransition.player_status.field_0x24[8] = 2; @@ -626,3 +659,297 @@ void sub_080A4528(void) { entity->hitbox = NULL; } } + +extern void (*const gUnk_0812815C[])(void); +extern void (*const gUnk_0812814C[])(void); + +void Subtask_FigurineMenu(void) { +#ifndef DEMO + FlushSprites(); + if (gUnk_02032EC0.field_0x3 == 0xff) { + gUnk_0812815C[gMenu.menuType](); + } else { + gUnk_0812814C[gMenu.menuType](); + } + UpdateEntities(); + sub_0801C1D4(); + DrawOAMCmd(); + DrawEntities(); + sub_080A4978(); + CopyOAM(); + sub_080A4B44(); +#endif +} + +void sub_080A4608(void) { + s32 iVar2; + + SetBgmVolume(0x80); + sub_080A4DA8(3); + SetColor(0, gPaletteBuffer[0xfb]); + SetColor(0x15c, gPaletteBuffer[0xd3]); + MemClear(&gBG0Buffer, 0x800); + MemClear(&gBG3Buffer, 0x1000); + gScreen.controls.window0HorizontalDimensions = 0xf0; + gScreen.controls.window0VerticalDimensions = 0x7898; + gScreen.controls.windowInsideControl = 0x1f; + gScreen.controls.windowOutsideControl = 0x1d; + gScreen.bg1.updated = 1; + for (iVar2 = 0; iVar2 < 0x10; iVar2++) { + gMenu.unk10.a[iVar2] = 0xee; + } + { + int r0, r1, r2; + + r1 = gUnk_02032EC0.field_0x3; + r0 = gSave.unk6; + r2 = 0x88; + if (r0 == 0) { + r2 = 0x82; + } + if (r2 < r1) { + r1 = 1; + } + gMenu.unk1c = r1; + } + SetFade(4, 8); +} + +void sub_080A46C0(void) { + SetBgmVolume(0x100); + SoundReq(SFX_MENU_CANCEL); + ClearRoomFlag(2); + Subtask_Exit(); +} + +void sub_080A46DC(void) { + sub_080A4608(); + sub_080A7114(1); +} + +void sub_080A46EC(void) { + if (gFadeControl.active == 0) { + CreateObject(0xa2, gUnk_080FC3E4[gMenu.unk1c].unk7, 0); + sub_080A7114(2); + } +} + +void sub_080A4720(void) { + u32 bVar1; + Sound sound; + + if (gMenu.field_0x0 != 0) { + gMenu.unk20 += 1; + switch (gMenu.unk20) { + case 0x40: + gMenu.unk21 = WriteBit(&gUnk_02002B0E, gMenu.unk1c); + gMenu.column_idx = 1; + default: + bVar1 = gMenu.unk20 >> 2; + if (0x10 < bVar1) { + bVar1 = 0x20 - bVar1; + } + gScreen.controls.layerBrightness = bVar1; + gScreen.controls.layerFXControl = 0xbf; + break; + case 0x80: + gScreen.controls.layerBrightness = 0; + gScreen.controls.layerFXControl = 0; + gScreen.lcd.displayControl |= 0x2000; + sub_080A7114(3); + sub_080A70AC((KeyButtonLayout*)&gUnk_0812813C); + gMenu.column_idx = 0x15; + if (gMenu.unk21 == 0) { + sound = SFX_109; + } else { + sound = SFX_MENU_ERROR; + } + SoundReq(sound); + return; + } + } +} + +void sub_080A47D0(void) { + s32 uVar1; + s32 t; + + uVar1 = gMenu.unk1f; + switch (gInput.unk4) { + case 2: + case 8: + sub_080A46C0(); + break; + case 0x10: + uVar1 += 8; + break; + case 0x20: + uVar1 -= 8; + break; + } + t = gMenu.unk1e; + if (uVar1 < 0) { + uVar1 = 0; + } + if (t < uVar1) { + uVar1 = t; + } + gMenu.unk1f = uVar1; + gScreen.bg1.yOffset = uVar1 - 0x70; +} + +void sub_080A4830(void) { + sub_080A4608(); + gScreen.lcd.displayControl |= 0x2000; + sub_080A70AC(&gUnk_0812813C); + gMenu.column_idx = 0xff; + sub_080A7114(1); +} + +ASM_FUNC("asm/non_matching/subtask/sub_080A4864.inc", void sub_080A4864(Entity* this)) + +void sub_080A4934(void) { + sub_080A7114(1); +} + +void sub_080A4940(void) { + sub_080A46C0(); +} + +u32 sub_080A4948(s32 param_1) { + s32 iVar1; + u32 uVar2; + + uVar2 = 0; + iVar1 = gSave.unk6 == 0 ? 0x82 : 0x88; + if ((0 < param_1) || (iVar1 >= param_1)) { + if (ReadBit((u32*)&gSave.stats.filler4[4], param_1)) { + uVar2 = 1; + } + } + return uVar2; +} + +ASM_FUNC("asm/non_matching/subtask/sub_080A4978.inc", void sub_080A4978(void)) + +void sub_080A4B44(void) { + u32 uVar1; + + uVar1 = gMenu.unk1c; + if ((gMenu.column_idx & 0x10) != 0) { + gMenu.unk1e = sub_080A4CBC(uVar1); + } + if ((gMenu.column_idx & 4) != 0) { + sub_080A4BA0(uVar1, 2); + } + if ((gMenu.column_idx & 8) != 0) { + sub_080A4BA0(uVar1 - 2, 0); + sub_080A4BA0(uVar1 - 1, 1); + sub_080A4BA0(uVar1 + 1, 3); + sub_080A4BA0(uVar1 + 2, 4); + } +} + +ASM_FUNC("asm/non_matching/subtask/sub_080A4BA0.inc", void sub_080A4BA0(u32 unk1, u32 unk2)) + +u32 sub_080A4CBC(u32 param_1) { + s32 iVar1; + const u16* psVar2; + u32 uVar3; + + if (gMenu.unk1a.HALF.LO != param_1) { + gMenu.unk1a.HALF.LO = param_1; + MemClear(&gBG1Buffer, 0x800); + MemCopy(&gBG1Buffer, (void*)0x600e000, 0x800); + iVar1 = sub_080A4948(param_1); + if (iVar1 != 0) { + sub_0805F46C(param_1 + 0x900, &gUnk_08128190); + } + gScreen.bg1.updated = 1; + } + psVar2 = gUnk_08128190 + 0x80; + + for (uVar3 = 0; uVar3 < 0x14; uVar3++) { + if (*psVar2 == 0) + break; + psVar2 += 0x20; + } + return uVar3 << 3; +} + +void sub_080A4D34(void) { + s32 iVar1; + + LoadGfxGroups(); + LoadPaletteGroup(0xb5); + if (gSave.stats.health <= 8) { + iVar1 = 2; + } else { + s32 missingHealth = gSave.stats.maxHealth - gSave.stats.health; + if (missingHealth < 9) { + iVar1 = 0; + } else { + iVar1 = 1; + } + } + LoadGfxGroup(iVar1 + 0x56); + gScreen.bg3.xOffset = 0; + gScreen.bg3.yOffset = 0; + gScreen.bg3.control = 0x1e0b; + gScreen.bg3.updated = 1; +} + +void sub_080A4D88(void) { + MemClear(gUnk_020344A0, sizeof(gUnk_020344A0)); + MenuFadeIn(1, 0); + SetBgmVolume(0x80); +} + +void sub_080A4DA8(u32 param_1) { + sub_080A4D34(); + sub_080A4DB8(param_1); +} + +void sub_080A4DB8(u32 param_1) { + const struct_08128AD8* ptr; + + sub_08056250(); + MemClear(&gBG0Buffer, 0x800); + MemClear(&gBG1Buffer, 0x800); + MemClear(&gBG2Buffer, 0x800); + MemClear(gUnk_0200AF00.filler25 + 0xf, 0x300); + MemClear(&gMenu, sizeof(gMenu)); + gMenu.unk2e.HWORD = 0xffff; + gMenu.field_0x3 = gUnk_02034490.unk2[param_1]; + ptr = &gUnk_08128AD8[gUnk_08128A38[param_1].unk0]; + gScreen.lcd.displayControl = ptr->unk2 | 0x1940; + gScreen.bg0.xOffset = 0; + gScreen.bg0.yOffset = 0; + gScreen.bg0.updated = 1; + gScreen.bg1.xOffset = 0; + gScreen.bg1.yOffset = 0; + gScreen.bg1.control = ptr->unk4; + gScreen.bg1.updated = 1; + gScreen.bg2.xOffset = 0; + gScreen.bg2.yOffset = 0; + gScreen.bg2.control = ptr->unk6; + gScreen.bg2.updated = 1; + gScreen.bg3.xOffset = 0; + gScreen.bg3.yOffset = 0; + gScreen.bg3.control = 0x1e0b; + if (ptr->unk0 != 0) { + LoadPaletteGroup(ptr->unk0); + } + if (ptr->unk1 != 0) { + LoadGfxGroup(ptr->unk1); + } +} + +void sub_080A4E84(u8 param_1) { + gUnk_02034490.unk14 = param_1; +} + +void sub_080A4E90(u8 param_1) { + gUnk_02034490.unk11 = param_1; + gUnk_02034490.unk12 = 0; +} From 0e57341980dfc4da49b07aeef78e584003eff893 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Mon, 24 Jan 2022 01:46:08 +0100 Subject: [PATCH 3/7] decomp subtask.c --- asm/non_matching/subtask/sub_080A4494.inc | 34 - asm/non_matching/subtask/sub_080A4864.inc | 116 --- asm/non_matching/subtask/sub_080A4978.inc | 443 -------- asm/subtask.s | 1110 --------------------- include/itemMenuTable.h | 39 + include/room.h | 4 +- linker.ld | 2 - src/itemMenuTable.c | 86 +- src/subtask.c | 681 ++++++++++++- src/subtask2.c | 24 - 10 files changed, 732 insertions(+), 1807 deletions(-) delete mode 100644 asm/non_matching/subtask/sub_080A4494.inc delete mode 100644 asm/non_matching/subtask/sub_080A4864.inc delete mode 100644 asm/non_matching/subtask/sub_080A4978.inc delete mode 100644 asm/subtask.s create mode 100644 include/itemMenuTable.h delete mode 100644 src/subtask2.c diff --git a/asm/non_matching/subtask/sub_080A4494.inc b/asm/non_matching/subtask/sub_080A4494.inc deleted file mode 100644 index ddb6aaa1..00000000 --- a/asm/non_matching/subtask/sub_080A4494.inc +++ /dev/null @@ -1,34 +0,0 @@ - .syntax unified - push {r4, r5, lr} - bl sub_0805F2C8 - adds r4, r0, #0 - cmp r4, #0 - beq _080A44D0 - ldr r0, _080A44D4 @ =gTextGfxBuffer - str r0, [r4, #8] - movs r1, #0 - strb r1, [r4, #2] - movs r0, #5 - strb r0, [r4, #3] - strb r1, [r4, #1] - ldr r1, _080A44D8 @ =gUnk_02002AC0 - adds r0, r4, #0 - movs r2, #0x80 - bl sub_080A44E0 - ldr r0, _080A44DC @ =gFuseInfo - ldr r0, [r0, #0xc] - bl sub_08002632 - adds r0, r4, #0 - movs r2, #0xa0 - bl sub_080A44E0 - adds r5, r0, #0 - adds r0, r4, #0 - bl sub_0805F300 -_080A44D0: - adds r0, r5, #0 - pop {r4, r5, pc} - .align 2, 0 -_080A44D4: .4byte gTextGfxBuffer -_080A44D8: .4byte gUnk_02002AC0 -_080A44DC: .4byte gFuseInfo - .syntax divided diff --git a/asm/non_matching/subtask/sub_080A4864.inc b/asm/non_matching/subtask/sub_080A4864.inc deleted file mode 100644 index 22af3aeb..00000000 --- a/asm/non_matching/subtask/sub_080A4864.inc +++ /dev/null @@ -1,116 +0,0 @@ -.syntax unified - push {r4, r5, r6, lr} - ldr r0, _080A4894 @ =gFadeControl - ldrb r0, [r0] - cmp r0, #0 - bne _080A4926 - ldr r0, _080A4898 @ =gMenu - movs r5, #0x1f - ldrsb r5, [r0, r5] - ldrb r4, [r0, #0x1c] - ldr r0, _080A489C @ =gInput - ldrh r1, [r0, #4] - cmp r1, #0x20 - beq _080A48DC - cmp r1, #0x20 - bgt _080A48A0 - cmp r1, #2 - beq _080A48C0 - cmp r1, #2 - ble _080A48DE - cmp r1, #8 - beq _080A48C0 - cmp r1, #0x10 - beq _080A48D8 - b _080A48DE - .align 2, 0 -_080A4894: .4byte gFadeControl -_080A4898: .4byte gMenu -_080A489C: .4byte gInput -_080A48A0: - cmp r1, #0x80 - beq _080A48D4 - cmp r1, #0x80 - bgt _080A48AE - cmp r1, #0x40 - beq _080A48D0 - b _080A48DE -_080A48AE: - movs r0, #0x80 - lsls r0, r0, #1 - cmp r1, r0 - beq _080A48CC - movs r0, #0x80 - lsls r0, r0, #2 - cmp r1, r0 - beq _080A48C8 - b _080A48DE -_080A48C0: - movs r0, #3 - bl sub_080A7114 - b _080A48DE -_080A48C8: - subs r4, #5 - b _080A48DE -_080A48CC: - adds r4, #5 - b _080A48DE -_080A48D0: - subs r4, #1 - b _080A48DE -_080A48D4: - adds r4, #1 - b _080A48DE -_080A48D8: - adds r5, #8 - b _080A48DE -_080A48DC: - subs r5, #8 -_080A48DE: - ldr r0, _080A4928 @ =gSave - ldrb r0, [r0, #6] - movs r1, #0x88 - cmp r0, #0 - bne _080A48EA - movs r1, #0x82 -_080A48EA: - cmp r4, #0 - bgt _080A48F0 - movs r4, #1 -_080A48F0: - cmp r1, r4 - bge _080A48F6 - adds r4, r1, #0 -_080A48F6: - ldr r6, _080A492C @ =gMenu - ldrb r0, [r6, #0x1c] - cmp r0, r4 - beq _080A490E - strb r4, [r6, #0x1c] - movs r0, #0x69 - bl SoundReq - movs r0, #2 - bl sub_080A7114 - movs r5, #0 -_080A490E: - ldrb r0, [r6, #0x1e] - cmp r5, #0 - bge _080A4916 - movs r5, #0 -_080A4916: - cmp r0, r5 - bge _080A491C - adds r5, r0, #0 -_080A491C: - strb r5, [r6, #0x1f] - ldr r1, _080A4930 @ =gScreen - adds r0, r5, #0 - subs r0, #0x70 - strh r0, [r1, #0x18] -_080A4926: - pop {r4, r5, r6, pc} - .align 2, 0 -_080A4928: .4byte gSave -_080A492C: .4byte gMenu -_080A4930: .4byte gScreen -.syntax divided diff --git a/asm/non_matching/subtask/sub_080A4978.inc b/asm/non_matching/subtask/sub_080A4978.inc deleted file mode 100644 index fd243abf..00000000 --- a/asm/non_matching/subtask/sub_080A4978.inc +++ /dev/null @@ -1,443 +0,0 @@ -.syntax unified -.ifdef EU - push {r4, r5, r6, r7, lr} - mov r7, r8 - push {r7} - ldr r5, _080A432C @ =gOamCmd - movs r0, #0 - strh r0, [r5, #4] - strh r0, [r5, #6] - movs r0, #0x80 - lsls r0, r0, #4 - strh r0, [r5, #8] - movs r0, #0x9c - strh r0, [r5] - movs r0, #0x48 - strh r0, [r5, #2] - ldr r7, _080A4330 @ =0x000001FB - adds r0, r7, #0 - movs r1, #0 - bl DrawDirect - ldr r0, _080A4334 @ =gSave - ldrb r0, [r0, #6] - movs r2, #0x88 - cmp r0, #0 - bne _080A41C2 - movs r2, #0x82 -_080A41C2: - ldr r3, _080A4338 @ =gChooseFileState - ldrb r1, [r3, #1] - movs r0, #2 - ands r0, r1 - cmp r0, #0 - beq _080A4226 - ldrb r4, [r3, #0x1c] - cmp r2, r4 - blt _080A4226 - movs r6, #0xe8 - strh r6, [r5] - movs r0, #0xa0 - lsls r0, r0, #7 - adds r1, r2, #0 - bl __divsi3 - subs r1, r4, #1 - muls r0, r1, r0 - cmp r0, #0 - bge _080A41EC - adds r0, #0xff -_080A41EC: - asrs r0, r0, #8 - adds r0, #0x20 - strh r0, [r5, #2] - adds r0, r7, #0 - movs r1, #1 - bl DrawDirect - ldr r0, _080A433C @ =gMain - ldrh r1, [r0, #0xc] - movs r0, #0x10 - ands r0, r1 - movs r4, #2 - cmp r0, #0 - beq _080A420A - movs r4, #4 -_080A420A: - strh r6, [r5] - movs r0, #0x1a - strh r0, [r5, #2] - adds r0, r7, #0 - adds r1, r4, #0 - bl DrawDirect - strh r6, [r5] - movs r0, #0x76 - strh r0, [r5, #2] - adds r1, r4, #1 - adds r0, r7, #0 - bl DrawDirect -_080A4226: - ldr r0, _080A433C @ =gMain - ldrh r1, [r0, #0xc] - movs r2, #0x10 - adds r0, r2, #0 - ands r0, r1 - cmp r0, #0 - beq _080A427C - ldr r5, _080A4338 @ =gChooseFileState - ldrb r1, [r5, #1] - adds r0, r2, #0 - ands r0, r1 - cmp r0, #0 - beq _080A427C - ldrb r0, [r5, #0x1e] - cmp r0, #0 - beq _080A427C - ldr r4, _080A432C @ =gOamCmd - strh r2, [r4, #2] - movs r0, #0x1f - ldrsb r0, [r5, r0] - cmp r0, #0 - ble _080A4262 - movs r0, #6 - strh r0, [r4] - movs r0, #0x9c - strh r0, [r4, #2] - ldr r0, _080A4330 @ =0x000001FB - movs r1, #6 - bl DrawDirect -_080A4262: - ldrb r1, [r5, #0x1e] - movs r0, #0x1f - ldrsb r0, [r5, r0] - cmp r1, r0 - ble _080A427C - movs r0, #0xea - strh r0, [r4] - movs r0, #0x9c - strh r0, [r4, #2] - ldr r0, _080A4330 @ =0x000001FB - movs r1, #7 - bl DrawDirect -_080A427C: - movs r0, #0x80 - lsls r0, r0, #0x12 - ldrb r0, [r0, #7] - cmp r0, #0 - beq _080A42D0 - ldr r2, _080A4338 @ =gChooseFileState - ldrb r1, [r2, #1] - movs r0, #4 - ands r0, r1 - cmp r0, #0 - beq _080A42D0 - ldr r1, _080A432C @ =gOamCmd - movs r0, #0x10 - strh r0, [r1, #2] - ldrb r4, [r2, #0x1c] - movs r6, #2 - adds r7, r1, #0 - movs r5, #0x6b -_080A42A0: - strh r5, [r7] - adds r0, r4, #0 - movs r1, #0xa - bl __modsi3 - lsls r0, r0, #1 - movs r2, #0x9e - lsls r2, r2, #4 - adds r1, r2, #0 - orrs r0, r1 - strh r0, [r7, #8] - movs r0, #0 - movs r1, #9 - bl DrawDirect - adds r0, r4, #0 - movs r1, #0xa - bl __divsi3 - adds r4, r0, #0 - subs r5, #7 - subs r6, #1 - cmp r6, #0 - bge _080A42A0 -_080A42D0: - ldr r4, _080A4338 @ =gChooseFileState - ldrb r1, [r4, #1] - movs r0, #1 - ands r0, r1 - cmp r0, #0 - beq _080A4352 - ldrb r0, [r4, #0x1c] - bl sub_080A4948 - cmp r0, #0 - beq _080A4352 - ldr r1, _080A432C @ =gOamCmd - movs r0, #0x2c - strh r0, [r1] - movs r0, #0x48 - strh r0, [r1, #2] - movs r0, #0xd4 - lsls r0, r0, #7 - strh r0, [r1, #8] - ldr r0, _080A4340 @ =0x000001F7 - ldrb r1, [r4, #0x1c] - subs r1, #1 - bl DrawDirect - ldrb r1, [r4, #0x1c] - ldrb r0, [r4, #0x1d] - cmp r0, r1 - beq _080A4352 - strb r1, [r4, #0x1d] - ldrb r4, [r4, #0x1c] - lsls r4, r4, #4 - ldr r0, _080A4344 @ =gFigurines - adds r4, r4, r0 - ldr r0, [r4] - movs r1, #0x16 - movs r2, #9 - bl LoadPalettes - ldr r0, [r4, #4] - ldr r2, [r4, #8] - cmp r2, #0 - bge _080A434CEU - ldr r1, _080A4348EU @ =0x06014000 - bl LZ77UnCompVram - b _080A4352 - .align 2, 0 -_080A432C: .4byte gOamCmd -_080A4330: .4byte 0x000001FB -_080A4334: .4byte gSave -_080A4338: .4byte gChooseFileState -_080A433C: .4byte gMain -_080A4340: .4byte 0x000001F7 -_080A4344: .4byte gFigurines -_080A4348EU: .4byte 0x06014000 -_080A434CEU: - ldr r1, _080A4358EU @ =0x06014000 - bl LoadResourceAsync -_080A4352: - pop {r3} - mov r8, r3 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A4358EU: .4byte 0x06014000 -.else - push {r4, r5, r6, r7, lr} - mov r7, r8 - push {r7} - ldr r5, _080A4B1C @ =gOamCmd - movs r0, #0 - strh r0, [r5, #4] - strh r0, [r5, #6] - movs r0, #0x80 - lsls r0, r0, #4 - strh r0, [r5, #8] - movs r0, #0x9c - strh r0, [r5] - movs r0, #0x48 - strh r0, [r5, #2] - movs r7, #0xfe - lsls r7, r7, #1 - adds r0, r7, #0 - movs r1, #0 - bl DrawDirect - ldr r0, _080A4B20 @ =gSave - ldrb r0, [r0, #6] - movs r2, #0x88 - cmp r0, #0 - bne _080A49AC - movs r2, #0x82 -_080A49AC: - ldr r3, _080A4B24 @ =gMenu - ldrb r1, [r3, #1] - movs r0, #2 - ands r0, r1 - cmp r0, #0 - beq _080A4A10 - ldrb r4, [r3, #0x1c] - cmp r2, r4 - blt _080A4A10 - movs r6, #0xe8 - strh r6, [r5] - movs r0, #0xa0 - lsls r0, r0, #7 - adds r1, r2, #0 - bl __divsi3 - subs r1, r4, #1 - muls r0, r1, r0 - cmp r0, #0 - bge _080A49D6 - adds r0, #0xff -_080A49D6: - asrs r0, r0, #8 - adds r0, #0x20 - strh r0, [r5, #2] - adds r0, r7, #0 - movs r1, #1 - bl DrawDirect - ldr r0, _080A4B28 @ =gMain - ldrh r1, [r0, #0xc] - movs r0, #0x10 - ands r0, r1 - movs r4, #2 - cmp r0, #0 - beq _080A49F4 - movs r4, #4 -_080A49F4: - strh r6, [r5] - movs r0, #0x1a - strh r0, [r5, #2] - adds r0, r7, #0 - adds r1, r4, #0 - bl DrawDirect - strh r6, [r5] - movs r0, #0x76 - strh r0, [r5, #2] - adds r1, r4, #1 - adds r0, r7, #0 - bl DrawDirect -_080A4A10: - ldr r0, _080A4B28 @ =gMain - ldrh r1, [r0, #0xc] - movs r2, #0x10 - adds r0, r2, #0 - ands r0, r1 - cmp r0, #0 - beq _080A4A6A - ldr r5, _080A4B24 @ =gMenu - ldrb r1, [r5, #1] - adds r0, r2, #0 - ands r0, r1 - cmp r0, #0 - beq _080A4A6A - ldrb r0, [r5, #0x1e] - cmp r0, #0 - beq _080A4A6A - ldr r4, _080A4B1C @ =gOamCmd - strh r2, [r4, #2] - movs r0, #0x1f - ldrsb r0, [r5, r0] - cmp r0, #0 - ble _080A4A4E - movs r0, #6 - strh r0, [r4] - movs r0, #0x9c - strh r0, [r4, #2] - movs r0, #0xfe - lsls r0, r0, #1 - movs r1, #6 - bl DrawDirect -_080A4A4E: - ldrb r1, [r5, #0x1e] - movs r0, #0x1f - ldrsb r0, [r5, r0] - cmp r1, r0 - ble _080A4A6A - movs r0, #0xea - strh r0, [r4] - movs r0, #0x9c - strh r0, [r4, #2] - movs r0, #0xfe - lsls r0, r0, #1 - movs r1, #7 - bl DrawDirect -_080A4A6A: - movs r0, #0x80 - lsls r0, r0, #0x12 - ldrb r0, [r0, #7] - cmp r0, #0 - beq _080A4ABE - ldr r2, _080A4B24 @ =gMenu - ldrb r1, [r2, #1] - movs r0, #4 - ands r0, r1 - cmp r0, #0 - beq _080A4ABE - ldr r1, _080A4B1C @ =gOamCmd - movs r0, #0x10 - strh r0, [r1, #2] - ldrb r4, [r2, #0x1c] - movs r6, #2 - adds r7, r1, #0 - movs r5, #0x6b -_080A4A8E: - strh r5, [r7] - adds r0, r4, #0 - movs r1, #0xa - bl __modsi3 - lsls r0, r0, #1 - movs r2, #0x9e - lsls r2, r2, #4 - adds r1, r2, #0 - orrs r0, r1 - strh r0, [r7, #8] - movs r0, #0 - movs r1, #9 - bl DrawDirect - adds r0, r4, #0 - movs r1, #0xa - bl __divsi3 - adds r4, r0, #0 - subs r5, #7 - subs r6, #1 - cmp r6, #0 - bge _080A4A8E -_080A4ABE: - ldr r4, _080A4B24 @ =gMenu - ldrb r1, [r4, #1] - movs r0, #1 - ands r0, r1 - cmp r0, #0 - beq _080A4B3A - ldrb r0, [r4, #0x1c] - bl sub_080A4948 - cmp r0, #0 - beq _080A4B3A - ldr r1, _080A4B1C @ =gOamCmd - movs r0, #0x2c - strh r0, [r1] - movs r0, #0x48 - strh r0, [r1, #2] - movs r0, #0xd4 - lsls r0, r0, #7 - strh r0, [r1, #8] - movs r0, #0xfc - lsls r0, r0, #1 - ldrb r1, [r4, #0x1c] - subs r1, #1 - bl DrawDirect - ldrb r1, [r4, #0x1c] - ldrb r0, [r4, #0x1d] - cmp r0, r1 - beq _080A4B3A - strb r1, [r4, #0x1d] - ldrb r4, [r4, #0x1c] - lsls r4, r4, #4 - ldr r0, _080A4B2C @ =gFigurines - adds r4, r4, r0 - ldr r0, [r4] - movs r1, #0x16 - movs r2, #9 - bl LoadPalettes - ldr r0, [r4, #4] - ldr r2, [r4, #8] - cmp r2, #0 - bge _080A4B34 - ldr r1, _080A4B30 @ =0x06014000 - bl LZ77UnCompVram - b _080A4B3A - .align 2, 0 -_080A4B1C: .4byte gOamCmd -_080A4B20: .4byte gSave -_080A4B24: .4byte gMenu -_080A4B28: .4byte gMain -_080A4B2C: .4byte gFigurines -_080A4B30: .4byte 0x06014000 -_080A4B34: - ldr r1, _080A4B40 @ =0x06014000 - bl LoadResourceAsync -_080A4B3A: - pop {r3} - mov r8, r3 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A4B40: .4byte 0x06014000 -.endif -.syntax divided diff --git a/asm/subtask.s b/asm/subtask.s deleted file mode 100644 index 01cc01e2..00000000 --- a/asm/subtask.s +++ /dev/null @@ -1,1110 +0,0 @@ - .include "asm/macros.inc" - - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start Subtask_PauseMenu -Subtask_PauseMenu: @ 0x080A4EA0 - push {r4, lr} - ldr r4, _080A4EB8 @ =gUnk_02034490 - ldrb r0, [r4, #0x11] - cmp r0, #6 - bne _080A4EBC - movs r0, #0x80 - lsls r0, r0, #1 - bl SetBgmVolume - bl Subtask_Exit - b _080A4F14 - .align 2, 0 -_080A4EB8: .4byte gUnk_02034490 -_080A4EBC: - bl FlushSprites - ldr r1, _080A4F18 @ =gUnk_08128B30 - ldrb r0, [r4, #0x11] - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r0, [r0] - bl _call_via_r0 - bl sub_080A5128 - bl sub_0801C1D4 - bl DrawOAMCmd - ldrb r0, [r4, #0x11] - cmp r0, #4 - beq _080A4EF0 - ldr r0, _080A4F1C @ =gUnk_08128A38 - ldrb r1, [r4, #1] - lsls r1, r1, #3 - adds r0, #4 - adds r1, r1, r0 - ldr r0, [r1] - bl _call_via_r0 -_080A4EF0: - bl CopyOAM - movs r3, #0x16 - ldrsb r3, [r4, r3] - movs r1, #0 - cmp r3, #0 - beq _080A4F00 - ldr r1, _080A4F20 @ =0x00000E46 -_080A4F00: - ldr r2, _080A4F24 @ =gScreen - adds r0, r2, #0 - adds r0, #0x66 - strh r1, [r0] - lsls r1, r3, #8 - movs r0, #0x10 - subs r0, r0, r3 - orrs r1, r0 - adds r2, #0x68 - strh r1, [r2] -_080A4F14: - pop {r4, pc} - .align 2, 0 -_080A4F18: .4byte gUnk_08128B30 -_080A4F1C: .4byte gUnk_08128A38 -_080A4F20: .4byte 0x00000E46 -_080A4F24: .4byte gScreen - - thumb_func_start sub_080A4F28 -sub_080A4F28: @ 0x080A4F28 - push {r4, lr} - bl sub_0801E8D4 - bl sub_080A4D34 - movs r1, #4 - ldr r3, _080A4F90 @ =gUnk_02034492 - movs r2, #0 -_080A4F38: - adds r0, r1, r3 - strb r2, [r0] - adds r1, #1 - cmp r1, #0xd - ble _080A4F38 - ldr r1, _080A4F94 @ =gRoomTransition - ldrh r0, [r1, #0x20] - ldrh r1, [r1, #0x22] - bl sub_080A6A80 - ldr r4, _080A4F98 @ =gUnk_02034490 - ldrb r0, [r0, #4] - strb r0, [r4, #6] - bl sub_0801DB94 - strb r0, [r4, #7] - movs r0, #0x10 - bl IsItemEquipped - movs r1, #0xf - cmp r0, #2 - beq _080A4F66 - movs r1, #0x10 -_080A4F66: - strb r1, [r4, #0x15] - ldr r1, _080A4F9C @ =gUnk_08128A38 - ldrb r0, [r4, #1] - lsls r0, r0, #3 - adds r0, r0, r1 - ldrb r0, [r0, #1] - bl sub_080A50A0 - strb r0, [r4, #1] - strb r0, [r4, #0x14] - bl sub_080A4DB8 - movs r0, #4 - movs r1, #0x20 - bl SetFade - movs r0, #1 - bl sub_080A4E90 - pop {r4, pc} - .align 2, 0 -_080A4F90: .4byte gUnk_02034492 -_080A4F94: .4byte gRoomTransition -_080A4F98: .4byte gUnk_02034490 -_080A4F9C: .4byte gUnk_08128A38 - - thumb_func_start sub_080A4FA0 -sub_080A4FA0: @ 0x080A4FA0 - push {lr} - ldr r0, _080A4FB4 @ =gFadeControl - ldrb r0, [r0] - cmp r0, #0 - bne _080A4FB0 - movs r0, #2 - bl sub_080A4E90 -_080A4FB0: - pop {pc} - .align 2, 0 -_080A4FB4: .4byte gFadeControl - - thumb_func_start sub_080A4FB8 -sub_080A4FB8: @ 0x080A4FB8 - push {r4, r5, lr} - bl sub_080A51F4 - cmp r0, #0 - beq _080A5052 - ldr r0, _080A4FE4 @ =gMenu - ldr r1, [r0, #0xc] - adds r2, r0, #0 - cmp r1, #0 - beq _080A5052 - movs r4, #1 - rsbs r4, r4, #0 - ldr r0, _080A4FE8 @ =gInput - ldrh r1, [r0, #2] - cmp r1, #8 - beq _080A4FFE - cmp r1, #8 - bgt _080A4FEC - cmp r1, #2 - beq _080A500A - b _080A500C - .align 2, 0 -_080A4FE4: .4byte gMenu -_080A4FE8: .4byte gInput -_080A4FEC: - movs r0, #0x80 - lsls r0, r0, #1 - cmp r1, r0 - beq _080A5006 - movs r0, #0x80 - lsls r0, r0, #2 - cmp r1, r0 - beq _080A5002 - b _080A500C -_080A4FFE: - movs r4, #0 - b _080A5010 -_080A5002: - movs r4, #1 - b _080A5010 -_080A5006: - movs r4, #2 - b _080A5010 -_080A500A: - movs r4, #3 -_080A500C: - cmp r4, #0 - blt _080A5052 -_080A5010: - ldr r0, [r2, #0xc] - adds r0, r0, r4 - ldrb r5, [r0] - cmp r5, #6 - bgt _080A5024 - cmp r5, #4 - bge _080A5028 - cmp r5, #0 - beq _080A5052 - b _080A5042 -_080A5024: - cmp r5, #0xf - bne _080A5042 -_080A5028: - movs r0, #0x47 - bl GetInventoryValue - cmp r0, #0 - bne _080A5042 - movs r1, #1 - cmp r4, #1 - bne _080A503A - movs r1, #2 -_080A503A: - ldr r0, _080A5078 @ =gMenu - ldr r0, [r0, #0xc] - adds r0, r0, r1 - ldrb r5, [r0] -_080A5042: - ldr r0, _080A507C @ =gUnk_02034490 - movs r4, #0 - strb r5, [r0, #0x14] - movs r0, #0x65 - bl SoundReq - ldr r0, _080A5078 @ =gMenu - str r4, [r0, #0xc] -_080A5052: - ldr r4, _080A507C @ =gUnk_02034490 - movs r0, #0x14 - ldrsb r0, [r4, r0] - bl sub_080A50A0 - adds r5, r0, #0 - ldrb r0, [r4, #1] - cmp r0, r5 - beq _080A5096 - strb r5, [r4, #0x14] - bl sub_080A51D4 - cmp r5, #0xe - bne _080A5080 - movs r0, #6 - bl sub_080A4E90 - b _080A5096 - .align 2, 0 -_080A5078: .4byte gMenu -_080A507C: .4byte gUnk_02034490 -_080A5080: - movs r0, #3 - bl sub_080A4E90 - ldr r0, _080A5098 @ =gBG0Buffer - movs r1, #0x80 - lsls r1, r1, #4 - bl MemClear - ldr r1, _080A509C @ =gScreen - movs r0, #1 - strh r0, [r1, #0xe] -_080A5096: - pop {r4, r5, pc} - .align 2, 0 -_080A5098: .4byte gBG0Buffer -_080A509C: .4byte gScreen - - thumb_func_start sub_080A50A0 -sub_080A50A0: @ 0x080A50A0 - push {lr} - adds r1, r0, #0 - cmp r1, #0xf - bne _080A50B4 - bl AreaHasMap - movs r1, #4 - cmp r0, #0 - beq _080A50B4 - movs r1, #5 -_080A50B4: - adds r0, r1, #0 - pop {pc} - - thumb_func_start sub_080A50B8 -sub_080A50B8: @ 0x080A50B8 - push {r4, lr} - ldr r4, _080A50DC @ =gUnk_02034490 - movs r0, #0x16 - ldrsb r0, [r4, r0] - adds r0, #2 - cmp r0, #0x10 - ble _080A50D8 - ldr r2, _080A50E0 @ =gScreen - ldrh r1, [r2] - ldr r0, _080A50E4 @ =0x0000F8FF - ands r0, r1 - strh r0, [r2] - movs r0, #4 - bl sub_080A4E90 - movs r0, #0x10 -_080A50D8: - strb r0, [r4, #0x16] - pop {r4, pc} - .align 2, 0 -_080A50DC: .4byte gUnk_02034490 -_080A50E0: .4byte gScreen -_080A50E4: .4byte 0x0000F8FF - - thumb_func_start sub_080A50E8 -sub_080A50E8: @ 0x080A50E8 - push {lr} - ldr r1, _080A5104 @ =gUnk_02034490 - movs r0, #0x10 - strb r0, [r1, #0x16] - movs r0, #0x14 - ldrsb r0, [r1, r0] - strb r0, [r1, #1] - bl sub_080A4DB8 - movs r0, #5 - bl sub_080A4E90 - pop {pc} - .align 2, 0 -_080A5104: .4byte gUnk_02034490 - - thumb_func_start sub_080A5108 -sub_080A5108: @ 0x080A5108 - push {r4, lr} - ldr r4, _080A5124 @ =gUnk_02034490 - movs r0, #0x16 - ldrsb r0, [r4, r0] - subs r0, #2 - cmp r0, #0 - bge _080A511E - movs r0, #2 - bl sub_080A4E90 - movs r0, #0 -_080A511E: - strb r0, [r4, #0x16] - pop {r4, pc} - .align 2, 0 -_080A5124: .4byte gUnk_02034490 - - thumb_func_start sub_080A5128 -sub_080A5128: @ 0x080A5128 - push {r4, r5, lr} - sub sp, #0x18 - ldr r0, _080A5140 @ =gUnk_02034490 - ldrb r1, [r0, #1] - adds r2, r0, #0 - cmp r1, #7 - blt _080A515A - cmp r1, #8 - ble _080A5144 - cmp r1, #0xb - bgt _080A515A - b _080A51C6 - .align 2, 0 -_080A5140: .4byte gUnk_02034490 -_080A5144: - movs r0, #0x60 - str r0, [sp] - movs r0, #0x18 - str r0, [sp, #4] - subs r0, #0x28 - str r0, [sp, #8] - movs r1, #0x48 - str r1, [sp, #0xc] - movs r0, #0x80 - lsls r0, r0, #1 - b _080A5182 -_080A515A: - movs r0, #0x40 - str r0, [sp] - movs r0, #0x16 - ldrsb r0, [r2, r0] - lsls r0, r0, #1 - movs r4, #0x10 - subs r0, r4, r0 - str r0, [sp, #4] - movs r0, #0x16 - ldrsb r0, [r2, r0] - movs r1, #3 - bl __divsi3 - lsls r0, r0, #0x18 - asrs r0, r0, #0x18 - subs r4, r4, r0 - str r4, [sp, #8] - movs r1, #0x48 - str r1, [sp, #0xc] - adds r0, #0xe0 -_080A5182: - str r0, [sp, #0x10] - str r1, [sp, #0x14] - ldr r4, _080A51CC @ =gOamCmd - movs r0, #0 - strh r0, [r4, #4] - strh r0, [r4, #6] - movs r0, #0x80 - lsls r0, r0, #3 - strh r0, [r4, #8] - ldr r0, [sp] - strh r0, [r4] - ldr r0, [sp, #4] - strh r0, [r4, #2] -.ifdef EU - movs r5, #0xfd - lsls r5, r5, #0x1 -.else - ldr r5, _080A51D0 @ =0x000001FB -.endif - adds r0, r5, #0 - movs r1, #0 - bl DrawDirect - ldr r0, [sp, #8] - strh r0, [r4] - ldr r0, [sp, #0xc] - strh r0, [r4, #2] - adds r0, r5, #0 - movs r1, #1 - bl DrawDirect - ldr r0, [sp, #0x10] - strh r0, [r4] - ldr r0, [sp, #0x14] - strh r0, [r4, #2] - adds r0, r5, #0 - movs r1, #2 - bl DrawDirect -_080A51C6: - add sp, #0x18 - pop {r4, r5, pc} - .align 2, 0 -_080A51CC: .4byte gOamCmd -.ifndef EU -_080A51D0: .4byte 0x000001FB -.endif - - thumb_func_start sub_080A51D4 -sub_080A51D4: @ 0x080A51D4 - push {lr} - ldr r0, _080A51EC @ =gUnk_02034490 - ldrb r1, [r0, #1] - cmp r1, #0xd - bhi _080A51E8 - adds r0, #2 - adds r0, r1, r0 - ldr r1, _080A51F0 @ =gMenu - ldrb r1, [r1, #3] - strb r1, [r0] -_080A51E8: - pop {pc} - .align 2, 0 -_080A51EC: .4byte gUnk_02034490 -_080A51F0: .4byte gMenu - - thumb_func_start sub_080A51F4 -sub_080A51F4: @ 0x080A51F4 - push {lr} - movs r1, #1 - ldr r0, _080A5210 @ =gFadeControl - ldrb r0, [r0] - cmp r0, #0 - beq _080A5202 - movs r1, #0 -_080A5202: - ldr r0, _080A5214 @ =gUnk_02034490 - ldrb r0, [r0, #0x11] - cmp r0, #2 - beq _080A520C - movs r1, #0 -_080A520C: - adds r0, r1, #0 - pop {pc} - .align 2, 0 -_080A5210: .4byte gFadeControl -_080A5214: .4byte gUnk_02034490 - - thumb_func_start sub_080A5218 -sub_080A5218: @ 0x080A5218 - push {lr} - ldr r1, _080A5230 @ =gUnk_08128B48 - ldr r0, _080A5234 @ =gMenu - ldrb r0, [r0, #5] - lsls r0, r0, #2 - adds r0, r0, r1 - ldr r0, [r0] - bl _call_via_r0 - bl sub_080A5384 - pop {pc} - .align 2, 0 -_080A5230: .4byte gUnk_08128B48 -_080A5234: .4byte gMenu - - thumb_func_start sub_080A5238 -sub_080A5238: @ 0x080A5238 - push {r4, r5, lr} - ldr r4, _080A528C @ =gMenu - movs r0, #0 - str r0, [r4, #0xc] - ldr r0, _080A5290 @ =gUnk_08128B50 - bl sub_080A70AC - movs r5, #1 - adds r4, #0x10 -_080A524A: - adds r0, r5, #0 - bl GetInventoryValue - cmp r0, #1 - bne _080A527E - ldr r1, _080A5294 @ =gUnk_080FD5B4 - lsls r0, r5, #3 - adds r0, r0, r1 - ldrb r1, [r0] - cmp r1, #0x11 - bhi _080A527E - cmp r5, #0x10 - bhi _080A526C - cmp r5, #0xf - blo _080A526C - ldr r0, _080A5298 @ =gUnk_02034490 - ldrb r5, [r0, #0x15] -_080A526C: - adds r0, r1, r4 - strb r5, [r0] - lsls r1, r1, #3 - movs r0, #0xd8 - lsls r0, r0, #2 - adds r1, r1, r0 - adds r0, r5, #0 - bl sub_080A5F48 -_080A527E: - adds r5, #1 - cmp r5, #0x1f - bls _080A524A - movs r0, #1 - bl sub_080A7114 - pop {r4, r5, pc} - .align 2, 0 -_080A528C: .4byte gMenu -_080A5290: .4byte gUnk_08128B50 -_080A5294: .4byte gUnk_080FD5B4 -_080A5298: .4byte gUnk_02034490 - - thumb_func_start sub_080A529C -sub_080A529C: @ 0x080A529C - push {r4, r5, lr} - bl sub_080A51F4 - cmp r0, #0 - beq _080A5380 - ldr r1, _080A52D0 @ =gMenu - ldr r0, _080A52D4 @ =gUnk_08128BF4 - str r0, [r1, #0xc] - ldrb r4, [r1, #3] - lsls r1, r4, #3 - ldr r0, _080A52D8 @ =gItemMenuTable - adds r1, r1, r0 - ldr r0, _080A52DC @ =gInput - ldrh r2, [r0, #2] - adds r3, r0, #0 - cmp r2, #1 - beq _080A52E0 - cmp r2, #2 - beq _080A52EC - ldrh r0, [r3, #4] - cmp r0, #0x20 - beq _080A5330 - cmp r0, #0x20 - bgt _080A531E - b _080A5318 - .align 2, 0 -_080A52D0: .4byte gMenu -_080A52D4: .4byte gUnk_08128BF4 -_080A52D8: .4byte gItemMenuTable -_080A52DC: .4byte gInput -_080A52E0: - cmp r4, #0x10 - bne _080A52EC -.ifdef DEMO_USA - movs r0, #0x6d - bl SoundReq - b _080A5336 -.else -.ifdef DEMO_JP @ TODO same as DEMO_USA - movs r0, #0x6d - bl SoundReq - b _080A5336 -.else - movs r0, #0xb - bl sub_080A4E84 - b _080A530A -.endif -.endif -_080A52EC: - ldr r0, _080A5314 @ =gMenu - adds r0, #0x10 - adds r2, r4, r0 - ldrb r0, [r2] - cmp r0, #0 - beq _080A5336 - ldrh r0, [r3, #2] - movs r1, #1 - eors r0, r1 - rsbs r1, r0, #0 - orrs r1, r0 - lsrs r1, r1, #0x1f - ldrb r0, [r2] - bl ForceEquipItem -_080A530A: - movs r0, #0x6a - bl SoundReq - b _080A5336 - .align 2, 0 -_080A5314: .4byte gMenu -_080A5318: - cmp r0, #0x10 - beq _080A5334 - b _080A5336 -_080A531E: - cmp r0, #0x40 - beq _080A5328 - cmp r0, #0x80 - beq _080A532C - b _080A5336 -_080A5328: - ldrb r4, [r1] - b _080A5336 -_080A532C: - ldrb r4, [r1, #1] - b _080A5336 -_080A5330: - ldrb r4, [r1, #2] - b _080A5336 -_080A5334: - ldrb r4, [r1, #3] -_080A5336: - ldr r5, _080A535C @ =gMenu - ldrb r0, [r5, #3] - cmp r0, r4 - beq _080A5346 - strb r4, [r5, #3] - movs r0, #0x69 - bl SoundReq -_080A5346: - adds r0, r5, #0 - adds r0, #0x10 - adds r0, r4, r0 - ldrb r1, [r0] - cmp r4, #0xc - blo _080A5376 - cmp r4, #0xf - bls _080A5360 - cmp r4, #0x10 - beq _080A5374 - b _080A5376 - .align 2, 0 -_080A535C: .4byte gMenu -_080A5360: - cmp r1, #0 - beq _080A5376 - ldr r0, _080A5370 @ =gSave - adds r0, r0, r1 - adds r0, #0x9a - ldrb r1, [r0] - b _080A5376 - .align 2, 0 -_080A5370: .4byte gSave -_080A5374: - movs r1, #0x73 -_080A5376: - movs r0, #0x80 - lsls r0, r0, #3 - adds r0, r1, r0 - bl sub_080A6F6C -_080A5380: - pop {r4, r5, pc} - .align 2, 0 - - thumb_func_start sub_080A5384 -sub_080A5384: @ 0x080A5384 -.ifdef EU - push {r4, r5, r6, r7, lr} - mov r7, sl - mov r6, sb - mov r5, r8 - push {r5, r6, r7} - ldr r0, _080A4C14EU @ =gOamCmd - movs r2, #0 - movs r1, #0x80 - lsls r1, r1, #3 - strh r1, [r0, #4] - strh r2, [r0, #6] - strh r2, [r0, #8] - movs r5, #0 - ldr r4, _080A4C18 @ =gSave - movs r0, #0xb6 - adds r0, r0, r4 - mov sl, r0 - movs r1, #0xac - adds r1, r1, r4 - mov sb, r1 - movs r2, #0xad - adds r2, r2, r4 - mov r8, r2 - movs r6, #0 -_080A4BC8: - ldr r0, _080A4C1C @ =gChooseFileState - adds r0, #0x10 - adds r2, r5, r0 - ldrb r0, [r2] - cmp r0, #0 - beq _080A4C68 - ldr r0, _080A4C20 @ =gItemMenuTable - adds r1, r6, r0 - ldrb r0, [r1, #6] - ldr r3, _080A4C14EU @ =gOamCmd - strh r0, [r3] - ldrb r0, [r1, #7] - strh r0, [r3, #2] - ldrb r3, [r2] - cmp r3, #0x1f - bhi _080A4BF4 - cmp r3, #0x1c - blo _080A4BF4 - adds r0, r3, #0 - subs r0, #0x1c - add r0, sl - ldrb r3, [r0] -_080A4BF4: - movs r2, #3 - cmp r3, #7 - blo _080A4C42 - cmp r3, #8 - bhi _080A4C28 - ldr r0, _080A4C24 @ =gBombBagSizes - adds r1, r4, #0 - adds r1, #0xae - ldrb r1, [r1] - adds r1, r1, r0 - ldrb r0, [r1] - mov r7, sb - ldrb r7, [r7] - cmp r0, r7 - bhi _080A4C42 - b _080A4C40 - .align 2, 0 -_080A4C14EU: .4byte gOamCmd -_080A4C18: .4byte gSave -_080A4C1C: .4byte gChooseFileState -_080A4C20: .4byte gItemMenuTable -_080A4C24: .4byte gBombBagSizes -_080A4C28: - cmp r3, #0xa - bhi _080A4C42 - ldr r0, _080A4D40 @ =gQuiverSizes - adds r1, r4, #0 - adds r1, #0xaf - ldrb r1, [r1] - adds r1, r1, r0 - ldrb r0, [r1] - mov r1, r8 - ldrb r1, [r1] - cmp r0, r1 - bhi _080A4C42 -_080A4C40: - movs r2, #4 -_080A4C42: - lsls r2, r2, #0xc - movs r7, #0xd8 - lsls r7, r7, #2 - adds r0, r6, r7 - movs r7, #0x80 - lsls r7, r7, #4 - adds r1, r7, #0 - orrs r0, r1 - orrs r2, r0 - ldr r0, _080A4D44 @ =gOamCmd - strh r2, [r0, #8] - ldr r1, _080A4D48 @ =gSpriteAnimations_322 - lsls r0, r3, #2 - adds r0, r0, r1 - ldr r0, [r0] - ldrb r1, [r0] - ldr r0, _080A4D4C @ =0x00000141 - bl DrawDirect -_080A4C68: - adds r6, #8 - adds r5, #1 - cmp r5, #0x10 - bls _080A4BC8 - ldr r0, _080A4D44 @ =gOamCmd - movs r1, #0x80 - lsls r1, r1, #4 - strh r1, [r0, #8] - ldr r1, _080A4D50EU @ =gChooseFileState - ldrb r1, [r1, #3] - mov sb, r0 - cmp r1, #0x10 - bne _080A4C8E - movs r0, #0x80 - lsls r0, r0, #0x12 - ldrb r0, [r0, #7] - cmp r0, #0 - beq _080A4C8E - movs r1, #0x11 -_080A4C8E: - lsls r0, r1, #3 - ldr r1, _080A4D54EU @ =gItemMenuTable - mov r8, r1 - adds r1, r0, r1 - mov r4, sb - ldrb r0, [r1, #6] - strh r0, [r4] - ldrb r0, [r1, #7] - strh r0, [r4, #2] - ldrb r2, [r1, #4] - ldr r0, _080A4D58 @ =gMain - ldrh r1, [r0, #0xc] - movs r0, #0x10 - ands r0, r1 - adds r1, r2, #4 - cmp r0, #0 - beq _080A4CB2EU - adds r1, r2, #3 -_080A4CB2EU: - movs r6, #0xfd - lsls r6, r6, #1 - adds r0, r6, #0 - bl DrawDirect - movs r0, #0x80 - lsls r0, r0, #0x12 - ldrb r0, [r0, #7] - movs r1, #0x11 - cmp r0, #0 - beq _080A4CCA - movs r1, #0x10 -_080A4CCA: - lsls r0, r1, #3 - mov r2, r8 - adds r1, r0, r2 - ldrb r0, [r1, #6] - strh r0, [r4] - ldrb r0, [r1, #7] - strh r0, [r4, #2] - movs r0, #0x80 - lsls r0, r0, #4 - strh r0, [r4, #8] - adds r0, r6, #0 - movs r1, #0x22 - bl DrawDirect - ldr r7, _080A4D5C @ =gSave - adds r0, r7, #0 - adds r0, #0xb4 - ldrb r0, [r0] - bl sub_080A554C - adds r5, r0, #0 - cmp r5, #0x10 - bhi _080A4D0E - lsls r0, r5, #3 - mov r3, r8 - adds r1, r0, r3 - ldrb r0, [r1, #6] - strh r0, [r4] - ldrb r0, [r1, #7] - strh r0, [r4, #2] - adds r0, r6, #0 - movs r1, #3 - bl DrawDirect -_080A4D0E: - adds r0, r7, #0 - adds r0, #0xb5 - ldrb r0, [r0] - bl sub_080A554C - adds r5, r0, #0 - cmp r5, #0x10 - bhi _080A4D36 - lsls r0, r5, #3 - mov r7, r8 - adds r1, r0, r7 - ldrb r0, [r1, #6] - mov r2, sb - strh r0, [r2] - ldrb r0, [r1, #7] - strh r0, [r2, #2] - adds r0, r6, #0 - movs r1, #3 - bl DrawDirect -_080A4D36: - pop {r3, r4, r5} - mov r8, r3 - mov sb, r4 - mov sl, r5 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A4D40: .4byte gQuiverSizes -_080A4D44: .4byte gOamCmd -_080A4D48: .4byte gSpriteAnimations_322 -_080A4D4C: .4byte 0x00000141 -_080A4D50EU: .4byte gChooseFileState -_080A4D54EU: .4byte gItemMenuTable -_080A4D58: .4byte gMain -_080A4D5C: .4byte gSave -.else - push {r4, r5, r6, r7, lr} - mov r7, sl - mov r6, sb - mov r5, r8 - push {r5, r6, r7} - ldr r0, _080A5400 @ =gOamCmd - movs r2, #0 - movs r1, #0x80 - lsls r1, r1, #3 - strh r1, [r0, #4] - strh r2, [r0, #6] - strh r2, [r0, #8] - movs r5, #0 - ldr r4, _080A5404 @ =gSave - movs r0, #0xb6 - adds r0, r0, r4 - mov sl, r0 - movs r1, #0xac - adds r1, r1, r4 - mov sb, r1 - movs r2, #0xad - adds r2, r2, r4 - mov r8, r2 - movs r6, #0 -_080A53B4: - ldr r0, _080A5408 @ =gMenu - adds r0, #0x10 - adds r2, r5, r0 - ldrb r0, [r2] - cmp r0, #0 - beq _080A5456 - ldr r0, _080A540C @ =gItemMenuTable - adds r1, r6, r0 - ldrb r0, [r1, #6] - ldr r3, _080A5400 @ =gOamCmd - strh r0, [r3] - ldrb r0, [r1, #7] - strh r0, [r3, #2] - ldrb r3, [r2] - cmp r3, #0x1f - bhi _080A53E0 - cmp r3, #0x1c - blo _080A53E0 - adds r0, r3, #0 - subs r0, #0x1c - add r0, sl - ldrb r3, [r0] -_080A53E0: - movs r2, #3 - cmp r3, #7 - blo _080A542E - cmp r3, #8 - bhi _080A5414 - ldr r0, _080A5410 @ =gBombBagSizes - adds r1, r4, #0 - adds r1, #0xae - ldrb r1, [r1] - adds r1, r1, r0 - ldrb r0, [r1] - mov r7, sb - ldrb r7, [r7] - cmp r0, r7 - bhi _080A542E - b _080A542C - .align 2, 0 -_080A5400: .4byte gOamCmd -_080A5404: .4byte gSave -_080A5408: .4byte gMenu -_080A540C: .4byte gItemMenuTable -_080A5410: .4byte gBombBagSizes -_080A5414: - cmp r3, #0xa - bhi _080A542E - ldr r0, _080A552C @ =gQuiverSizes - adds r1, r4, #0 - adds r1, #0xaf - ldrb r1, [r1] - adds r1, r1, r0 - ldrb r0, [r1] - mov r1, r8 - ldrb r1, [r1] - cmp r0, r1 - bhi _080A542E -_080A542C: - movs r2, #4 -_080A542E: - lsls r2, r2, #0xc - movs r7, #0xd8 - lsls r7, r7, #2 - adds r0, r6, r7 - movs r7, #0x80 - lsls r7, r7, #4 - adds r1, r7, #0 - orrs r0, r1 - orrs r2, r0 - ldr r0, _080A5530 @ =gOamCmd - strh r2, [r0, #8] - ldr r1, _080A5534 @ =gSpriteAnimations_322 - lsls r0, r3, #2 - adds r0, r0, r1 - ldr r0, [r0] - ldrb r1, [r0] - movs r0, #0xa1 - lsls r0, r0, #1 - bl DrawDirect -_080A5456: - adds r6, #8 - adds r5, #1 - cmp r5, #0x10 - bls _080A53B4 - ldr r0, _080A5530 @ =gOamCmd - movs r1, #0x80 - lsls r1, r1, #4 - strh r1, [r0, #8] - ldr r1, _080A5538 @ =gMenu - ldrb r1, [r1, #3] - mov sb, r0 - cmp r1, #0x10 - bne _080A547C - movs r0, #0x80 - lsls r0, r0, #0x12 - ldrb r0, [r0, #7] - cmp r0, #0 - beq _080A547C - movs r1, #0x11 -_080A547C: - lsls r0, r1, #3 - ldr r1, _080A553C @ =gItemMenuTable - mov r8, r1 - adds r1, r0, r1 - mov r4, sb - ldrb r0, [r1, #6] - strh r0, [r4] - ldrb r0, [r1, #7] - strh r0, [r4, #2] - ldrb r2, [r1, #4] - ldr r0, _080A5540 @ =gMain - ldrh r1, [r0, #0xc] - movs r0, #0x10 - ands r0, r1 - adds r1, r2, #4 - cmp r0, #0 - beq _080A54A0 - adds r1, r2, #3 -_080A54A0: - ldr r6, _080A5544 @ =0x000001FB - adds r0, r6, #0 - bl DrawDirect - movs r0, #0x80 - lsls r0, r0, #0x12 - ldrb r0, [r0, #7] - movs r1, #0x11 - cmp r0, #0 - beq _080A54B6 - movs r1, #0x10 -_080A54B6: - lsls r0, r1, #3 - mov r2, r8 - adds r1, r0, r2 - ldrb r0, [r1, #6] - strh r0, [r4] - ldrb r0, [r1, #7] - strh r0, [r4, #2] - movs r0, #0x80 - lsls r0, r0, #4 - strh r0, [r4, #8] - adds r0, r6, #0 - movs r1, #0x22 - bl DrawDirect - ldr r7, _080A5548 @ =gSave - adds r0, r7, #0 - adds r0, #0xb4 - ldrb r0, [r0] - bl sub_080A554C - adds r5, r0, #0 - cmp r5, #0x10 - bhi _080A54FA - lsls r0, r5, #3 - mov r3, r8 - adds r1, r0, r3 - ldrb r0, [r1, #6] - strh r0, [r4] - ldrb r0, [r1, #7] - strh r0, [r4, #2] - adds r0, r6, #0 - movs r1, #3 - bl DrawDirect -_080A54FA: - adds r0, r7, #0 - adds r0, #0xb5 - ldrb r0, [r0] - bl sub_080A554C - adds r5, r0, #0 - cmp r5, #0x10 - bhi _080A5522 - lsls r0, r5, #3 - mov r7, r8 - adds r1, r0, r7 - ldrb r0, [r1, #6] - mov r2, sb - strh r0, [r2] - ldrb r0, [r1, #7] - strh r0, [r2, #2] - adds r0, r6, #0 - movs r1, #3 - bl DrawDirect -_080A5522: - pop {r3, r4, r5} - mov r8, r3 - mov sb, r4 - mov sl, r5 - pop {r4, r5, r6, r7, pc} - .align 2, 0 -_080A552C: .4byte gQuiverSizes -_080A5530: .4byte gOamCmd -_080A5534: .4byte gSpriteAnimations_322 -_080A5538: .4byte gMenu -_080A553C: .4byte gItemMenuTable -_080A5540: .4byte gMain -_080A5544: .4byte 0x000001FB -_080A5548: .4byte gSave -.endif diff --git a/include/itemMenuTable.h b/include/itemMenuTable.h new file mode 100644 index 00000000..f1d6aaa5 --- /dev/null +++ b/include/itemMenuTable.h @@ -0,0 +1,39 @@ +#ifndef SUBTASK_ITEMMENUTABLE_H +#define SUBTASK_ITEMMENUTABLE_H + +#include "global.h" + +typedef enum { + MENU_SLOT_SWORD, + MENU_SLOT_GUST_JAR, + MENU_SLOT_CANE, + MENU_SLOT_BOOMERANG, + MENU_SLOT_SHIELD, + MENU_SLOT_MOLE_MITTS, + MENU_SLOT_LANTERN, + MENU_SLOT_BOMBS, + MENU_SLOT_PEGASUS_BOOTS, + MENU_SLOT_ROCS_CAPE, + MENU_SLOT_OCARINA, + MENU_SLOT_BOW, + MENU_SLOT_BOTTLE0, + MENU_SLOT_BOTTLE1, + MENU_SLOT_BOTTLE2, + MENU_SLOT_BOTTLE3, + MENU_SLOT_SAVE_BUTTON, +} ItemMenuTableSlot; + +typedef struct { + u8 up; + u8 down; + u8 left; + u8 right; + u8 type; + u8 unk0; + u8 x; + u8 y; +} ItemMenuTableEntry; + +extern const ItemMenuTableEntry gItemMenuTable[]; + +#endif // SUBTASK_ITEMMENUTABLE_H diff --git a/include/room.h b/include/room.h index 0cd7f3c2..3ed662ba 100644 --- a/include/room.h +++ b/include/room.h @@ -124,8 +124,8 @@ typedef struct { /* 0x0e */ s16 dungeon_y; /* 0x10 */ u16 dungeon_map_x; /* 0x12 */ u16 dungeon_map_y; - /* 0x14 */ s16 overworld_map_x; - /* 0x16 */ s16 overworld_map_y; + /* 0x14 */ u16 overworld_map_x; + /* 0x16 */ u16 overworld_map_y; /* 0x18 */ u8 field_0x24[0x8]; } PlayerRoomStatus; static_assert(sizeof(PlayerRoomStatus) == 0x20); diff --git a/linker.ld b/linker.ld index f6a36769..3cbdac30 100644 --- a/linker.ld +++ b/linker.ld @@ -855,8 +855,6 @@ SECTIONS { src/sound.o(.text); asm/staffroll.o(.text); src/subtask.o(.text); - asm/subtask.o(.text); - src/subtask2.o(.text); asm/subtask2.o(.text); /* subtask.c */ src/playerItem/playerItemSword.o(.text); src/playerItemUtils.o(.text); diff --git a/src/itemMenuTable.c b/src/itemMenuTable.c index 04622c7a..13c6e8b1 100644 --- a/src/itemMenuTable.c +++ b/src/itemMenuTable.c @@ -1,53 +1,39 @@ -#include "global.h" - -typedef enum { - SWORD, - GUST_JAR, - CANE, - BOOMERANG, - SHIELD, - MOLE_MITTS, - LANTERN, - BOMBS, - PEGASUS_BOOTS, - ROCS_CAPE, - OCARINA, - BOW, - BOTTLE0, - BOTTLE1, - BOTTLE2, - BOTTLE3, - SAVE_BUTTON, -} ItemMenuTableSlot; - -typedef struct { - u8 up; - u8 down; - u8 left; - u8 right; - u8 type; - u8 unk0; - u8 x; - u8 y; -} ItemMenuTableEntry; +#include "itemMenuTable.h" const ItemMenuTableEntry gItemMenuTable[] = { - [SWORD] = { BOTTLE0, SHIELD, BOOMERANG, GUST_JAR, 0x01, 0x0c, 0x42, 0x33 }, - [GUST_JAR] = { BOTTLE1, MOLE_MITTS, SWORD, CANE, 0x01, 0x10, 0x66, 0x33 }, - [CANE] = { BOTTLE3, LANTERN, GUST_JAR, BOOMERANG, 0x01, 0x14, 0x8a, 0x33 }, - [BOOMERANG] = { SAVE_BUTTON, BOMBS, CANE, SWORD, 0x01, 0x15, 0xae, 0x33 }, - [SHIELD] = { SWORD, PEGASUS_BOOTS, BOMBS, MOLE_MITTS, 0x01, 0x16, 0x42, 0x4b }, - [MOLE_MITTS] = { GUST_JAR, ROCS_CAPE, SHIELD, LANTERN, 0x01, 0x17, 0x66, 0x4b }, - [LANTERN] = { CANE, OCARINA, MOLE_MITTS, BOMBS, 0x01, 0x00, 0x8a, 0x4b }, - [BOMBS] = { BOOMERANG, BOW, LANTERN, SHIELD, 0x01, 0x00, 0xae, 0x4b }, - [PEGASUS_BOOTS] = { SHIELD, BOTTLE0, BOW, ROCS_CAPE, 0x01, 0x00, 0x42, 0x63 }, - [ROCS_CAPE] = { MOLE_MITTS, BOTTLE1, PEGASUS_BOOTS, OCARINA, 0x01, 0x00, 0x66, 0x63 }, - [OCARINA] = { LANTERN, BOTTLE3, ROCS_CAPE, BOW, 0x01, 0x00, 0x8a, 0x63 }, - [BOW] = { BOMBS, SAVE_BUTTON, OCARINA, PEGASUS_BOOTS, 0x01, 0x00, 0xae, 0x63 }, - [BOTTLE0] = { PEGASUS_BOOTS, SWORD, SAVE_BUTTON, BOTTLE1, 0x01, 0x00, 0x42, 0x7b }, - [BOTTLE1] = { ROCS_CAPE, GUST_JAR, BOTTLE0, BOTTLE2, 0x01, 0x00, 0x5a, 0x7b }, - [BOTTLE2] = { ROCS_CAPE, GUST_JAR, BOTTLE1, BOTTLE3, 0x01, 0x00, 0x72, 0x7b }, - [BOTTLE3] = { OCARINA, CANE, BOTTLE2, SAVE_BUTTON, 0x01, 0x00, 0x8a, 0x7b }, - [SAVE_BUTTON] = { BOW, BOOMERANG, BOTTLE3, BOTTLE0, 0x03, 0x00, 0xb5, 0x75 }, - { BOW, BOOMERANG, BOTTLE3, BOTTLE0, 0x05, 0x00, 0xb5, 0x75 }, + [MENU_SLOT_SWORD] = { MENU_SLOT_BOTTLE0, MENU_SLOT_SHIELD, MENU_SLOT_BOOMERANG, MENU_SLOT_GUST_JAR, 0x01, 0x0c, + 0x42, 0x33 }, + [MENU_SLOT_GUST_JAR] = { MENU_SLOT_BOTTLE1, MENU_SLOT_MOLE_MITTS, MENU_SLOT_SWORD, MENU_SLOT_CANE, 0x01, 0x10, 0x66, + 0x33 }, + [MENU_SLOT_CANE] = { MENU_SLOT_BOTTLE3, MENU_SLOT_LANTERN, MENU_SLOT_GUST_JAR, MENU_SLOT_BOOMERANG, 0x01, 0x14, + 0x8a, 0x33 }, + [MENU_SLOT_BOOMERANG] = { MENU_SLOT_SAVE_BUTTON, MENU_SLOT_BOMBS, MENU_SLOT_CANE, MENU_SLOT_SWORD, 0x01, 0x15, 0xae, + 0x33 }, + [MENU_SLOT_SHIELD] = { MENU_SLOT_SWORD, MENU_SLOT_PEGASUS_BOOTS, MENU_SLOT_BOMBS, MENU_SLOT_MOLE_MITTS, 0x01, 0x16, + 0x42, 0x4b }, + [MENU_SLOT_MOLE_MITTS] = { MENU_SLOT_GUST_JAR, MENU_SLOT_ROCS_CAPE, MENU_SLOT_SHIELD, MENU_SLOT_LANTERN, 0x01, 0x17, + 0x66, 0x4b }, + [MENU_SLOT_LANTERN] = { MENU_SLOT_CANE, MENU_SLOT_OCARINA, MENU_SLOT_MOLE_MITTS, MENU_SLOT_BOMBS, 0x01, 0x00, 0x8a, + 0x4b }, + [MENU_SLOT_BOMBS] = { MENU_SLOT_BOOMERANG, MENU_SLOT_BOW, MENU_SLOT_LANTERN, MENU_SLOT_SHIELD, 0x01, 0x00, 0xae, + 0x4b }, + [MENU_SLOT_PEGASUS_BOOTS] = { MENU_SLOT_SHIELD, MENU_SLOT_BOTTLE0, MENU_SLOT_BOW, MENU_SLOT_ROCS_CAPE, 0x01, 0x00, + 0x42, 0x63 }, + [MENU_SLOT_ROCS_CAPE] = { MENU_SLOT_MOLE_MITTS, MENU_SLOT_BOTTLE1, MENU_SLOT_PEGASUS_BOOTS, MENU_SLOT_OCARINA, 0x01, + 0x00, 0x66, 0x63 }, + [MENU_SLOT_OCARINA] = { MENU_SLOT_LANTERN, MENU_SLOT_BOTTLE3, MENU_SLOT_ROCS_CAPE, MENU_SLOT_BOW, 0x01, 0x00, 0x8a, + 0x63 }, + [MENU_SLOT_BOW] = { MENU_SLOT_BOMBS, MENU_SLOT_SAVE_BUTTON, MENU_SLOT_OCARINA, MENU_SLOT_PEGASUS_BOOTS, 0x01, 0x00, + 0xae, 0x63 }, + [MENU_SLOT_BOTTLE0] = { MENU_SLOT_PEGASUS_BOOTS, MENU_SLOT_SWORD, MENU_SLOT_SAVE_BUTTON, MENU_SLOT_BOTTLE1, 0x01, + 0x00, 0x42, 0x7b }, + [MENU_SLOT_BOTTLE1] = { MENU_SLOT_ROCS_CAPE, MENU_SLOT_GUST_JAR, MENU_SLOT_BOTTLE0, MENU_SLOT_BOTTLE2, 0x01, 0x00, + 0x5a, 0x7b }, + [MENU_SLOT_BOTTLE2] = { MENU_SLOT_ROCS_CAPE, MENU_SLOT_GUST_JAR, MENU_SLOT_BOTTLE1, MENU_SLOT_BOTTLE3, 0x01, 0x00, + 0x72, 0x7b }, + [MENU_SLOT_BOTTLE3] = { MENU_SLOT_OCARINA, MENU_SLOT_CANE, MENU_SLOT_BOTTLE2, MENU_SLOT_SAVE_BUTTON, 0x01, 0x00, + 0x8a, 0x7b }, + [MENU_SLOT_SAVE_BUTTON] = { MENU_SLOT_BOW, MENU_SLOT_BOOMERANG, MENU_SLOT_BOTTLE3, MENU_SLOT_BOTTLE0, 0x03, 0x00, + 0xb5, 0x75 }, + { MENU_SLOT_BOW, MENU_SLOT_BOOMERANG, MENU_SLOT_BOTTLE3, MENU_SLOT_BOTTLE0, 0x05, 0x00, 0xb5, 0x75 }, }; diff --git a/src/subtask.c b/src/subtask.c index 7b9375d2..57b28c52 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -12,6 +12,8 @@ #include "main.h" #include "npc.h" #include "enemy.h" +#include "item.h" +#include "itemMenuTable.h" #include "functions.h" #include "structures.h" @@ -53,6 +55,10 @@ void sub_080A4BA0(u32, u32); void sub_0805F46C(u32, const u16**); void sub_080A4DB8(u32); void sub_08056250(void); +void sub_080A5128(void); +u32 sub_080A51F4(void); +void sub_080A51D4(void); +void sub_080A5F48(u32, u32); extern void (*const gUnk_081280C4[])(void); extern const u8 gUnk_081280EE[]; @@ -118,10 +124,14 @@ extern const struct_08128AD8 gUnk_08128AD8[]; extern const struct { u8 unk0; - u8 filler[3]; + u8 unk1; + u8 filler[2]; void (*func)(void); } gUnk_08128A38[]; +extern const KeyButtonLayout gUnk_08128B50; +extern const u8 gUnk_080FD5B4[]; + void Subtask_KinstoneMenu(void) { #if !(defined(DEMO_USA) || defined(DEMO_JP)) gRoomTransition.player_status.field_0x24[8] = 2; @@ -179,32 +189,29 @@ void sub_080A3BD0(void) { NONMATCH("asm/non_matching/subtask/sub_080A3C6C.inc", void sub_080A3C6C(void)) { s32 tmp1, tmp2, tmp3, tmp4, tmp5; u8* ptr; + Menu* menu; if (gFadeControl.active) { return; } - gMenu.column_idx = 2; - tmp2 = gMenu.unk28 * 0x10000; - tmp1 = tmp2 - gMenu.unk10.i; - tmp5 = tmp1; - if (tmp1 < 0) { - tmp5 = -tmp1; - } - if (tmp5 <= 0x1ffdu) { - gMenu.unk10.i = tmp2; + menu = &gMenu; + menu->column_idx = 2; + tmp2 = menu->unk28 * 0x10000; + tmp1 = tmp2 - menu->unk10.i; + if ((tmp1 < 0 ? -tmp1 : tmp1) <= 0x1ffdu) { + menu->unk10.i = tmp2; } else { - gMenu.column_idx = 1; + menu->column_idx = 1; tmp2 = sub_08000E44(tmp1); - tmp1 /= 0x20000; - if (tmp1 < 0) { + tmp1 = tmp1 / 0x20000; + if (tmp1 < 0) tmp1 = -tmp1; - } if (tmp1 > 5) { tmp1 = 5; } - gMenu.unk10.i += gUnk_081280EE[tmp1] * 0x666 * tmp2; + menu->unk10.i += gUnk_081280EE[tmp1] * 0x666 * tmp2; } - if (gMenu.unk29 != gMenu.unk10.i / 0x10000) { - gMenu.unk29 = gMenu.unk10.i / 0x10000; + if (menu->unk29 != menu->unk10.i / 0x10000) { + menu->unk29 = menu->unk10.i / 0x10000; SoundReq(SFX_TEXTBOX_CHOICE); } if ((gInput.newKeys & 0x20a) != 0) { @@ -212,7 +219,7 @@ NONMATCH("asm/non_matching/subtask/sub_080A3C6C.inc", void sub_080A3C6C(void)) { SoundReq(SFX_MENU_CANCEL); return; } - tmp3 = gMenu.unk28; + tmp3 = menu->unk28; switch (gInput.unk4) { case 0x20: case 0x40: @@ -240,8 +247,8 @@ NONMATCH("asm/non_matching/subtask/sub_080A3C6C.inc", void sub_080A3C6C(void)) { if (tmp3 < 0) { tmp3 = 0; } - if (gMenu.unk28 != tmp3) { - gMenu.unk28 = tmp3; + if (menu->unk28 != tmp3) { + menu->unk28 = tmp3; } } END_NONMATCH @@ -599,8 +606,9 @@ void sub_080A4468(void) { sub_0801E798(gMenu.unk2a); } -NONMATCH("asm/non_matching/subtask/sub_080A4494.inc", u32 sub_080A4494(void)) { +u32 sub_080A4494(void) { struct_02036540* psVar1; + u8* r1; u32 ret; psVar1 = sub_0805F2C8(); @@ -610,13 +618,17 @@ NONMATCH("asm/non_matching/subtask/sub_080A4494.inc", u32 sub_080A4494(void)) { psVar1->bgColor = 5; psVar1->unk1 = 0; sub_080A44E0(psVar1, gUnk_02002AC0, 0x80); +#if NON_MATCHING + ret = sub_080A44E0(psVar1, sub_08002632(gFuseInfo.ent) >> 0x20, 0xa0); +#else sub_08002632(gFuseInfo.ent); - ret = sub_080A44E0(psVar1, gUnk_02002AC0, 0xa0); + asm("" : "=r"(r1)); + ret = sub_080A44E0(psVar1, r1, 0xa0); +#endif sub_0805F300(psVar1); } return ret; } -END_NONMATCH u32 sub_080A44E0(struct_02036540* param_1, u8* param_2, u32 param_3) { u32 uVar1; @@ -664,7 +676,7 @@ extern void (*const gUnk_0812815C[])(void); extern void (*const gUnk_0812814C[])(void); void Subtask_FigurineMenu(void) { -#ifndef DEMO +#if !(defined(DEMO_USA) || defined(DEMO_JP)) FlushSprites(); if (gUnk_02032EC0.field_0x3 == 0xff) { gUnk_0812815C[gMenu.menuType](); @@ -806,7 +818,65 @@ void sub_080A4830(void) { sub_080A7114(1); } -ASM_FUNC("asm/non_matching/subtask/sub_080A4864.inc", void sub_080A4864(Entity* this)) +void sub_080A4864(void) { + int r0, r1, r2, r3, r4, r5, r6; + + if (gFadeControl.active) + return; + + r5 = gMenu.unk1f; + r4 = gMenu.unk1c; + r1 = gInput.unk4; + switch (gInput.unk4) { + case 2: + case 8: + sub_080A7114(3); + break; + case 0x200: + r4 -= 5; + break; + case 0x100: + r4 += 5; + break; + case 0x40: + r4--; + break; + case 0x80: + r4++; + break; + case 0x10: + r5 += 8; + break; + case 0x20: + r5 -= 8; + break; + case 1: + break; + } + r1 = (gSave.unk6 == 0) ? 0x82 : 0x88; + if (r4 <= 0) { + r4 = 1; + } + if (r1 < r4) { + r4 = r1; + } + r0 = gMenu.unk1c; + if (r0 != r4) { + gMenu.unk1c = r4; + SoundReq(SFX_TEXTBOX_CHOICE); + sub_080A7114(2); + r5 = 0; + } + r0 = gMenu.unk1e; + if (r5 < 0) { + r5 = 0; + } + if (r0 < r5) { + r5 = r0; + } + gMenu.unk1f = r5; + gScreen.bg1.yOffset = r5 - 0x70; +} void sub_080A4934(void) { sub_080A7114(1); @@ -830,7 +900,102 @@ u32 sub_080A4948(s32 param_1) { return uVar2; } -ASM_FUNC("asm/non_matching/subtask/sub_080A4978.inc", void sub_080A4978(void)) +typedef struct { + u8* pal; + u8* gfx; + int size; + int zero; +} Figurine; + +extern const Figurine gFigurines[]; + +#ifdef EU +#define sub_080A4978_draw_constant 0x1fb +#else +#define sub_080A4978_draw_constant 0x1fc +#endif +void sub_080A4978(void) { + int r0, r2, r4, r6; + + gOamCmd._4 = 0; + gOamCmd._6 = 0; + gOamCmd._8 = 0x800; + gOamCmd.x = 0x9c; + gOamCmd.y = 0x48; + DrawDirect(sub_080A4978_draw_constant, 0); + r2 = (gSave.unk6 == 0) ? 0x82 : 0x88; + if ((gMenu.column_idx & 2) != 0) { + if (r2 >= (gMenu.unk1c)) { + gOamCmd.x = 0xe8; + r0 = (0x5000 / r2) * (gMenu.unk1c - 1); + if (r0 < 0) { + r0 += 0xff; + } + r0 >>= 8; + r0 += 0x20; + gOamCmd.y = r0; + DrawDirect(sub_080A4978_draw_constant, 1); + r0 = gMain.ticks.HWORD & 0x10; + r4 = (r0) ? 4 : 2; + gOamCmd.x = 0xe8; + gOamCmd.y = 0x1a; + DrawDirect(sub_080A4978_draw_constant, r4); + gOamCmd.x = 0xe8; + gOamCmd.y = 0x76; + DrawDirect(sub_080A4978_draw_constant, r4 + 1); + } + } + if (gMain.ticks.HWORD & 0x10) { + if (gMenu.column_idx & 0x10) { + if (gMenu.unk1e) { + gOamCmd.y = 0x10; + if (gMenu.unk1f > 0) { + gOamCmd.x = 6; + gOamCmd.y = 0x9c; + DrawDirect(sub_080A4978_draw_constant, 6); + } + if (gMenu.unk1e > gMenu.unk1f) { + gOamCmd.x = 0xea; + gOamCmd.y = 0x9c; + DrawDirect(sub_080A4978_draw_constant, 7); + } + } + } + } + if (gSaveHeader->language) { + if (gMenu.column_idx & 0x4) { + gOamCmd.y = 0x10; + r4 = gMenu.unk1c; + for (r6 = 2; r6 >= 0; r6--) { + gOamCmd.x = 0x5d + (r6 * 7); + gOamCmd._8 = ((r4 % 10) << 1) | 0x9e0; + DrawDirect(0, 9); + r4 = r4 / 10; + } + } + } + if (gMenu.column_idx & 1) { + if (sub_080A4948(gMenu.unk1c)) { + gOamCmd.x = 0x2c; + gOamCmd.y = 0x48; + gOamCmd._8 = 0xd4 << 7; + DrawDirect(sub_080A4978_draw_constant - 4, gMenu.unk1c - 1); + if (gMenu.unk1d != gMenu.unk1c) { + const Figurine* fig; + u8* gfx; + gMenu.unk1d = gMenu.unk1c; + fig = &gFigurines[gMenu.unk1c]; + LoadPalettes(fig->pal, 0x16, 9); + gfx = fig->gfx; + if (fig->size < 0) { + LZ77UnCompVram(gfx, (void*)0x6014000); + } else { + LoadResourceAsync(gfx, 0x6014000, fig->size); + } + } + } + } +} void sub_080A4B44(void) { u32 uVar1; @@ -953,3 +1118,467 @@ void sub_080A4E90(u8 param_1) { gUnk_02034490.unk11 = param_1; gUnk_02034490.unk12 = 0; } + +void Subtask_PauseMenu(void) { + extern const void (*const gUnk_08128B30[])(void); + + if (gUnk_02034490.unk11 == 6) { + SetBgmVolume(0x100); + Subtask_Exit(); + } else { + FlushSprites(); + gUnk_08128B30[gUnk_02034490.unk11](); + sub_080A5128(); + sub_0801C1D4(); + DrawOAMCmd(); + if (gUnk_02034490.unk11 != 4) { + gUnk_08128A38[gUnk_02034490.unk1].func(); + } + CopyOAM(); + { + u32 t = gUnk_02034490.unk16; + u32 t2 = (t != 0) ? 0xe46 : 0; + gScreen.controls.layerFXControl = t2; + gScreen.controls.alphaBlend = (t << 8) | (0x10 - t); + } + } +} + +typedef struct { + u8 _0; + u8 _1; + u8 _2; + u8 _3; + u8 _4; + u16 _6; +} struct_08127F94; +struct_08127F94* sub_080A6A80(u32, u32); + +extern u8 gUnk_02034492[]; +void sub_0801E8D4(void); +u32 sub_0801DB94(void); +s32 sub_080A50A0(s32); + +void sub_080A4F28(void) { + struct_08127F94* ptr; + int r0, r1; + + sub_0801E8D4(); + sub_080A4D34(); + r1 = 4; + do { + gUnk_02034492[r1] = 0; + r1++; + } while (r1 <= 0xd); + ptr = sub_080A6A80((u16)gRoomTransition.player_status.overworld_map_x, + (u16)gRoomTransition.player_status.overworld_map_y); + gUnk_02034490.unk2[4] = ptr->_4; + gUnk_02034490.unk2[5] = sub_0801DB94(); + if (IsItemEquipped(ITEM_LANTERN_ON) != 2) { + r1 = 0x10; + } else { + r1 = 0xf; + } + gUnk_02034490.unk15 = r1; + r0 = gUnk_08128A38[gUnk_02034490.unk1].unk1; + r0 = sub_080A50A0(r0); + gUnk_02034490.unk1 = r0; + gUnk_02034490.unk14 = r0; + sub_080A4DB8(r0); + SetFade(4, 0x20); + sub_080A4E90(1); +} + +void sub_080A4FA0(void) { + if (gFadeControl.active == 0) { + sub_080A4E90(2); + } +} + +void sub_080A4FB8(void) { + int iVar1; + u32 uVar2; + int iVar4; + s32 bVar5; + + if ((sub_080A51F4() != 0) && (gMenu.field_0xc != NULL)) { + iVar1 = -1; + switch (gInput.newKeys) { + case 8: + iVar1 = 0; + break; + case 0x200: + iVar1 = 1; + break; + case 0x100: + iVar1 = 2; + break; + case 0x2: + iVar1 = 3; + break; + } + if (iVar1 >= 0) { + switch (bVar5 = gMenu.field_0xc[iVar1]) { + case 0: + break; + case 4 ... 6: + case 0xf: + uVar2 = GetInventoryValue(0x47); + if (uVar2 == 0) { + iVar4 = 1; + if (iVar1 == 1) { + iVar4 = 2; + } + bVar5 = gMenu.field_0xc[iVar4]; + } + default: + gUnk_02034490.unk14 = bVar5; + SoundReq(SFX_TEXTBOX_OPEN); + gMenu.field_0xc = NULL; + break; + } + } + } + bVar5 = sub_080A50A0(gUnk_02034490.unk14); + if (gUnk_02034490.unk1 != bVar5) { + gUnk_02034490.unk14 = bVar5; + sub_080A51D4(); + if (bVar5 == 0xe) { + sub_080A4E90(6); + } else { + sub_080A4E90(3); + MemClear(&gBG0Buffer, 0x800); + gScreen.bg0.updated = 1; + } + } +} + +s32 sub_080A50A0(s32 param_1) { + s32 iVar1; + + if (param_1 == 0xf) { + iVar1 = AreaHasMap(); + param_1 = 4; + if (iVar1 != 0) { + param_1 = 5; + } + } + return param_1; +} + +void sub_080A50B8(void) { + s32 iVar1; + + iVar1 = gUnk_02034490.unk16 + 2; + if (0x10 < iVar1) { + gScreen.lcd.displayControl &= 0xf8ff; + sub_080A4E90(4); + iVar1 = 0x10; + } + gUnk_02034490.unk16 = iVar1; +} + +void sub_080A50E8(void) { + u32 t; + gUnk_02034490.unk16 = 0x10; + gUnk_02034490.unk1 = t = gUnk_02034490.unk14; + sub_080A4DB8(t); + sub_080A4E90(5); +} + +void sub_080A5108(void) { + s32 iVar1; + + iVar1 = gUnk_02034490.unk16 - 2; + if (iVar1 < 0) { + sub_080A4E90(2); + iVar1 = 0; + } + gUnk_02034490.unk16 = iVar1; +} + +void sub_080A5128(void) { + int r5, t; + struct { + int x; + int y; + } p[3]; + + switch (gUnk_02034490.unk1) { + case 7: + case 8: + p[0].x = 0x60; + p[0].y = 0x18; + p[1].x = -0x10; + p[1].y = 0x48; + p[2].x = 0x100; + p[2].y = 0x48; + break; + case 9: + case 10: + case 11: + return; + default: + p[0].x = 0x40; + p[0].y = 0x10 - (gUnk_02034490.unk16 << 1); + t = (gUnk_02034490.unk16 / 3); + p[1].x = 0x10 - t; + p[1].y = 0x48; + p[2].x = 0xe0 + t; + p[2].y = 0x48; + break; + } + gOamCmd._4 = 0; + gOamCmd._6 = 0; + gOamCmd._8 = 0x400; + gOamCmd.x = p[0].x; + gOamCmd.y = p[0].y; +#ifdef EU + r5 = 0xfd << 1; +#else + r5 = 0x1fb; +#endif + DrawDirect(r5, 0); + gOamCmd.x = p[1].x; + gOamCmd.y = p[1].y; + DrawDirect(r5, 1); + gOamCmd.x = p[2].x; + gOamCmd.y = p[2].y; + DrawDirect(r5, 2); +} + +void sub_080A51D4(void) { + u32 i = gUnk_02034490.unk1; + if (i < 0xe) { + gUnk_02034490.unk2[i] = gMenu.field_0x3; + } +} + +u32 sub_080A51F4(void) { + u32 retval = 1; + if (gFadeControl.active != 0) + retval = 0; + if (gUnk_02034490.unk11 != 2) + retval = 0; + return retval; +} + +void sub_080A5384(void); +void sub_080A5218(void) { + extern void (*const gUnk_08128B48[])(void); + + gUnk_08128B48[gMenu.menuType](); + sub_080A5384(); +} + +void sub_080A5238(void) { + u32 uVar1; + u32 uVar2; + u32 uVar3; + + gMenu.field_0xc = NULL; + sub_080A70AC((KeyButtonLayout*)&gUnk_08128B50); + for (uVar3 = 1; uVar3 < 0x20; uVar3++) { + uVar1 = GetInventoryValue(uVar3); + if ((uVar1 == 1) && (uVar2 = gUnk_080FD5B4[uVar3 * 8], uVar2 < 0x12)) { + switch (uVar3) { + case 0xf: + case 0x10: + uVar3 = gUnk_02034490.unk15; + break; + default: + break; + } + gMenu.unk10.a[uVar2] = uVar3; + sub_080A5F48(uVar3, uVar2 * 8 + 0x360); + } + } + sub_080A7114(1); +} + +extern const u8 gUnk_08128BF4[]; +void sub_080A6F6C(u32); +void sub_080A529C(void) { + s32 iVar1; + u32 uVar2; + u32 uVar3; + const ItemMenuTableEntry* entry; + + if (sub_080A51F4()) { + gMenu.field_0xc = (u8*)gUnk_08128BF4; + uVar3 = gMenu.field_0x3; + + entry = &gItemMenuTable[uVar3]; + switch (gInput.newKeys) { + case 1: + if (uVar3 == 0x10) { +#if defined(DEMO_USA) || defined(DEMO_JP) + SoundReq(SFX_MENU_ERROR); +#else + sub_080A4E84(0xb); + SoundReq(SFX_TEXTBOX_SELECT); +#endif + break; + } + case 2: + if (gMenu.unk10.a[uVar3] != 0) { + u32 t = !!(gInput.newKeys ^ 1); + ForceEquipItem(gMenu.unk10.a[uVar3], t); + SoundReq(SFX_TEXTBOX_SELECT); + } + break; + default: + switch (gInput.unk4) { + case DPAD_UP: + uVar3 = entry->up; + break; + case DPAD_DOWN: + uVar3 = entry->down; + break; + case DPAD_LEFT: + uVar3 = entry->left; + break; + case DPAD_RIGHT: + uVar3 = entry->right; + break; + } + break; + } + if (gMenu.field_0x3 != uVar3) { + gMenu.field_0x3 = uVar3; + SoundReq(SFX_TEXTBOX_CHOICE); + } + uVar2 = gMenu.unk10.a[uVar3]; + switch (uVar3) { + case 0xc: + case 0xd: + case 0xe: + case 0xf: + if (uVar2 != 0) { + uVar2 = gSave.saved_status.field_0x24[uVar2 - 6]; + } + break; + case 0x10: + uVar2 = 0x73; + break; + default: + break; + } + sub_080A6F6C(uVar2 + 0x400); + } +} + +u32 sub_080A554C(u32); +extern u8* gSpriteAnimations_322[]; +#ifdef EU +#define sub_080A5384_draw_constant0 0x1fa +#define sub_080A5384_draw_constant1 0x141 +#else +#define sub_080A5384_draw_constant0 0x1fb +#define sub_080A5384_draw_constant1 0x142 +#endif +void sub_080A5384(void) { + u32 tmp; + u32 uVar3; + s32 iVar2; + const ItemMenuTableEntry* entry; + + gOamCmd._4 = 0x400; + gOamCmd._6 = 0; + gOamCmd._8 = 0; + for (uVar3 = 0; uVar3 < 0x11; uVar3++) { + u32 item; + if (gMenu.unk10.a[uVar3] != 0) { + entry = &gItemMenuTable[uVar3]; + gOamCmd.x = entry->x; + gOamCmd.y = entry->y; + item = gMenu.unk10.a[uVar3]; + switch (item) { + case 0x1c ... 0x1f: + item = gSave.stats.bottles[item - 0x1c]; + break; + } + iVar2 = 3; + switch (item) { + case 7: + case 8: + if (gBombBagSizes[gSave.stats.bombBagType] <= gSave.stats.bombCount) { + iVar2 = 4; + } + break; + case 9: + case 10: + if (gQuiverSizes[gSave.stats.quiverType] <= gSave.stats.arrowCount) { + iVar2 = 4; + } + break; + } + gOamCmd._8 = 0x800 | iVar2 << 0xc | ((uVar3 * 8) + 0x360); + DrawDirect(sub_080A5384_draw_constant1, *gSpriteAnimations_322[item]); + } + } + gOamCmd._8 = 0x800; + { + u32 uVar3 = gMenu.field_0x3; + if ((uVar3 == 0x10) && (gSaveHeader->language != 0)) { + uVar3 = 0x11; + } + entry = &gItemMenuTable[uVar3]; + } + gOamCmd.x = entry->x; + gOamCmd.y = entry->y; + tmp = entry->type + ((gMain.ticks.HWORD & 0x10) != 0 ? 3 : 4); + DrawDirect(sub_080A5384_draw_constant0, tmp); + { + u32 uVar3; + if (gSaveHeader->language != 0) { + uVar3 = 0x10; + } else { + uVar3 = 0x11; + } + entry = &gItemMenuTable[uVar3]; + } + gOamCmd.x = entry->x; + gOamCmd.y = entry->y; + gOamCmd._8 = 0x800; + DrawDirect(sub_080A5384_draw_constant0, 0x22); + { + uVar3 = sub_080A554C(gSave.stats.itemButtons[0]); + if (uVar3 < 0x11) { + entry = &gItemMenuTable[uVar3]; + gOamCmd.x = entry->x; + gOamCmd.y = entry->y; + DrawDirect(sub_080A5384_draw_constant0, 3); + } + } + { + uVar3 = sub_080A554C(gSave.stats.itemButtons[1]); + if (uVar3 < 0x11) { + entry = &gItemMenuTable[uVar3]; + gOamCmd.x = entry->x; + gOamCmd.y = entry->y; + DrawDirect(sub_080A5384_draw_constant0, 3); + } + } +} + +extern void (*const gUnk_08128BF8[])(void); + +extern u8 gUnk_02000090; + +u32 sub_080A554C(u32 arg0) { + u32 i; + + if (arg0 != 0) { + for (i = 0; i < 17; i++) { + if (arg0 == gMenu.unk10.a[i]) + return i; + } + } + return 17; +} + +void sub_080A5574(void) { + gUnk_08128BF8[gMenu.menuType](); + sub_080A57F4(); +} diff --git a/src/subtask2.c b/src/subtask2.c deleted file mode 100644 index 4218e8c9..00000000 --- a/src/subtask2.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "global.h" -#include "menu.h" -#include "functions.h" - -extern void (*const gUnk_08128BF8[])(void); - -extern u8 gUnk_02000090; - -u32 sub_080A554C(u32 arg0) { - u32 i; - - if (arg0 != 0) { - for (i = 0; i < 17; i++) { - if (arg0 == gMenu.unk10.a[i]) - return i; - } - } - return 17; -} - -void sub_080A5574(void) { - gUnk_08128BF8[gMenu.menuType](); - sub_080A57F4(); -} From 6fd53ccfa06855478a9bbdee8f859e00515fb191 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Mon, 24 Jan 2022 02:16:20 +0100 Subject: [PATCH 4/7] started working on generic menu structs --- include/menu.h | 17 +++- src/debug.c | 26 +++--- src/fileselect.c | 24 +++--- src/game.c | 8 +- src/object/fileScreenObjects.c | 14 ++-- src/subtask.c | 140 ++++++++++++++++----------------- 6 files changed, 119 insertions(+), 110 deletions(-) diff --git a/include/menu.h b/include/menu.h index 22902ca5..1c1ccc37 100644 --- a/include/menu.h +++ b/include/menu.h @@ -44,8 +44,11 @@ typedef struct { /*0x08*/ u16 transitionTimer; /*0x0a*/ u16 field_0xa; /*0x0c*/ u8* field_0xc; - /*0x10*/ // u8 focusCoords[2]; - union { +} Menu; + +typedef struct { + /*0x00*/ Menu base; + /*0x10*/ union { s32 i; u16 h[2]; u8 a[4]; @@ -75,9 +78,15 @@ typedef struct { /*0x2c*/ s8 unk2c; /*0x2d*/ u8 unk2d; /*0x2e*/ union SplitHWord unk2e; -} Menu; -static_assert(sizeof(Menu) == 0x30); +} GenericMenu; +static_assert(sizeof(GenericMenu) == 0x30); + +typedef struct { + Menu base; +} KinstoneMenu; extern Menu gMenu; +#define gGenericMenu (*(GenericMenu*)&gMenu) +#define gKinstoneMenu (*(KinstoneMenu*)&gMenu) #endif diff --git a/src/debug.c b/src/debug.c index f07417d6..eaa65981 100644 --- a/src/debug.c +++ b/src/debug.c @@ -34,8 +34,8 @@ void sub_0805FA04(void) { gScreen.bg3.updated = 1; MessageInitialize(); MemClear((void*)&gUnk_02032EC0, sizeof(UI)); - MemClear((void*)&gMenu, sizeof(Menu)); - gMenu.unk16 = gSaveHeader->language; + MemClear((void*)&gGenericMenu, sizeof(GenericMenu)); + gGenericMenu.unk16 = gSaveHeader->language; LoadGfxGroups(); SetColor(0, 0x1144); gMain.state = 1; @@ -48,14 +48,14 @@ void sub_0805FA98(void) { switch (gInput.newKeys) { case DPAD_UP: - gMenu.unk10.a[1] -= 1; + gGenericMenu.unk10.a[1] -= 1; break; case DPAD_DOWN: - gMenu.unk10.a[1] += 1; + gGenericMenu.unk10.a[1] += 1; break; case L_BUTTON: - gMenu.unk10.a[0] ^= 1; - if (gMenu.unk10.a[0] == 0) { + gGenericMenu.unk10.a[0] ^= 1; + if (gGenericMenu.unk10.a[0] == 0) { gScreen.bg0.control = BGCNT_SCREENBASE(31) | BGCNT_CHARBASE(3); gScreen.bg3.control = BGCNT_SCREENBASE(30) | BGCNT_CHARBASE(3) | BGCNT_PRIORITY(3); } else { @@ -64,8 +64,8 @@ void sub_0805FA98(void) { } break; case R_BUTTON: - gSaveHeader->language = gMenu.unk16; - MessageFromTarget(gMenu.unk14 * 0x100 + gMenu.unk15); + gSaveHeader->language = gGenericMenu.unk16; + MessageFromTarget(gGenericMenu.unk14 * 0x100 + gGenericMenu.unk15); break; case B_BUTTON: MessageInitialize(); @@ -82,19 +82,19 @@ void sub_0805FA98(void) { iVar1 = 0; break; } - switch (gMenu.unk10.a[1]) { + switch (gGenericMenu.unk10.a[1]) { case 0: - gMenu.unk14 = (gMenu.unk14 + iVar1 + 0x50) % 0x50; + gGenericMenu.unk14 = (gGenericMenu.unk14 + iVar1 + 0x50) % 0x50; break; case 1: - gMenu.unk15 += iVar1; + gGenericMenu.unk15 += iVar1; break; case 2: - gMenu.unk16 = (gMenu.unk16 + iVar1 + 7) % 7; + gGenericMenu.unk16 = (gGenericMenu.unk16 + iVar1 + 7) % 7; break; } } - gMenu.unk10.a[1] = (gMenu.unk10.a[1] + 3) % 3; + gGenericMenu.unk10.a[1] = (gGenericMenu.unk10.a[1] + 3) % 3; gScreen.bg3.updated = 1; } diff --git a/src/fileselect.c b/src/fileselect.c index 539c974b..724444f3 100644 --- a/src/fileselect.c +++ b/src/fileselect.c @@ -875,11 +875,11 @@ NONMATCH("asm/non_matching/fileScreen/sub_080610B8.inc", void sub_080610B8(void) END_NONMATCH void sub_08051358(void) { - gMenu.unk10.a[2] = gSaveHeader->language == 0 ? 4 : 3; + gGenericMenu.unk10.a[2] = gSaveHeader->language == 0 ? 4 : 3; - if (gMenu.unk10.a[0] != 0x0b || gMenu.unk10.a[1] != 0x5) { - gMenu.unk10.a[1] = 0x5; - gMenu.unk10.a[0] = 0xb; + if (gGenericMenu.unk10.a[0] != 0x0b || gGenericMenu.unk10.a[1] != 0x5) { + gGenericMenu.unk10.a[1] = 0x5; + gGenericMenu.unk10.a[0] = 0xb; SoundReq(SFX_TEXTBOX_NEXT); } } @@ -940,7 +940,7 @@ void sub_08051480(u32 c) { u32 idx; result = sub_080514BC(c); - idx = gMenu.unk10.a[3]; + idx = gGenericMenu.unk10.a[3]; if (result == RESULT_INVALID) { return; @@ -955,7 +955,7 @@ void sub_08051480(u32 c) { idx = FILENAME_LENGTH - 1; } - gMenu.unk10.a[3] = idx + 1; + gGenericMenu.unk10.a[3] = idx + 1; gSave.name[idx] = c; sub_08051574(SFX_6B); } @@ -976,7 +976,7 @@ u32 sub_080514BC(u32 a1) { return 1; } - idx = gMenu.unk10.a[3]; + idx = gGenericMenu.unk10.a[3]; if (idx == 0) return 0; @@ -1108,7 +1108,7 @@ NONMATCH("asm/non_matching/fileScreen/sub_08051738.inc", void sub_08051738(void) } else { uVar3++; } - (&gMenu.selectMtx)[i] = uVar3; + (&gGenericMenu.selectMtx)[i] = uVar3; } if (uVar3 == 0) { gMenu.transitionTimer = 0x3c; @@ -1118,9 +1118,9 @@ NONMATCH("asm/non_matching/fileScreen/sub_08051738.inc", void sub_08051738(void) sub_080A7114(1); } uVar3++; - gMenu.unk16 = uVar3; - gMenu.unk10.a[3] = 4; - gMenu.unk14 = uVar3; + gGenericMenu.unk16 = uVar3; + gGenericMenu.unk10.a[3] = 4; + gGenericMenu.unk14 = uVar3; } END_NONMATCH @@ -1128,7 +1128,7 @@ s32 sub_080517B4(s32 a1) { u32 i = gUnk_02019EE0.unk7; if (a1 != 0) { for (i = i + a1; i < 5; i += a1) { - if (gMenu.unk10.a[i] != 0 && gMenu.unk10.a[i] != 4) + if (gGenericMenu.unk10.a[i] != 0 && gGenericMenu.unk10.a[i] != 4) return i; } diff --git a/src/game.c b/src/game.c index ebbb34c9..afb0e3cf 100644 --- a/src/game.c +++ b/src/game.c @@ -652,7 +652,7 @@ static void GameOver_Init(void) { if (gFadeControl.active) return; sub_08052010(); - gMenu.unk10.a[0] = 80; + gGenericMenu.unk10.a[0] = 80; gMenu.transitionTimer = 60; gSave.stats.health = 24; gMain.field_0x5 = 60; @@ -667,8 +667,8 @@ static void GameOver_FadeIn(void) { return; if (gMain.field_0x5 == 0) { - if (gMenu.unk10.a[0] >= 38) { - gMenu.unk10.a[0]--; + if (gGenericMenu.unk10.a[0] >= 38) { + gGenericMenu.unk10.a[0]--; } else { gMenu.transitionTimer--; if (gMenu.transitionTimer == 0) { @@ -839,7 +839,7 @@ static void DrawGameOverText(void) { gOamCmd._4 = 0; gOamCmd._6 = 0; gOamCmd._8 = 0x8600; - gOamCmd.y = gMenu.unk10.a[0]; + gOamCmd.y = gGenericMenu.unk10.a[0]; for (i = 0; i < 8; ++i) { gOamCmd.x = sOffsets[i]; #ifdef EU diff --git a/src/object/fileScreenObjects.c b/src/object/fileScreenObjects.c index a59f8172..921b0b97 100644 --- a/src/object/fileScreenObjects.c +++ b/src/object/fileScreenObjects.c @@ -219,7 +219,7 @@ void sub_0808EABC(Entity* this) { } break; case 5: - switch (gMenu.unk10.a[this->type]) { + switch (gGenericMenu.unk10.a[this->type]) { case 0: var0 = 42; var1 = 40; @@ -228,7 +228,7 @@ void sub_0808EABC(Entity* this) { case 2: var0 = 20; var1 = 144; - var1 -= (gMenu.unk16 - gMenu.unk10.a[this->type]) * 32; + var1 -= (gGenericMenu.unk16 - gGenericMenu.unk10.a[this->type]) * 32; break; } break; @@ -371,9 +371,9 @@ void sub_0808ECBC(Entity* this) { void sub_0808ED64(Entity* this) { int y = 255; - if (gUnk_02032EC0.lastState == 1 && gMenu.unk10.a[1] != 5) { - this->x.HALF.HI = gMenu.unk10.a[0] * 16 + 28; - y = gMenu.unk10.a[1] * 16 + 58; + if (gUnk_02032EC0.lastState == 1 && gGenericMenu.unk10.a[1] != 5) { + this->x.HALF.HI = gGenericMenu.unk10.a[0] * 16 + 28; + y = gGenericMenu.unk10.a[1] * 16 + 58; } this->y.HALF.HI = y; } @@ -384,7 +384,7 @@ void sub_0808ED98(Entity* this) { this->field_0x68.HWORD = 27; y = -10; } else { - u32 var0 = gMenu.unk10.a[3]; + u32 var0 = gGenericMenu.unk10.a[3]; if (var0 > 5) { var0 = 5; } @@ -416,7 +416,7 @@ void sub_0808EE00(Entity* this) { } this->field_0x6a.HWORD = var2; - this->palette.b.b0 = gMenu.unk10.a[1] == 5 && var1 == gMenu.unk10.a[2] ? 11 : 9; + this->palette.b.b0 = gGenericMenu.unk10.a[1] == 5 && var1 == gGenericMenu.unk10.a[2] ? 11 : 9; gUnk_02019EE0.isTransitioning |= sub_0808EF6C(this); } diff --git a/src/subtask.c b/src/subtask.c index 57b28c52..6e32454a 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -155,7 +155,7 @@ void sub_080A3BD0(void) { s32 iVar2; gMenu.column_idx = 1; - gMenu.unk2a = 0; + gGenericMenu.unk2a = 0; sub_080A4D34(); LoadPaletteGroup(0xcb); LoadGfxGroup(0x75); @@ -189,18 +189,18 @@ void sub_080A3BD0(void) { NONMATCH("asm/non_matching/subtask/sub_080A3C6C.inc", void sub_080A3C6C(void)) { s32 tmp1, tmp2, tmp3, tmp4, tmp5; u8* ptr; - Menu* menu; + GenericMenu* menu; if (gFadeControl.active) { return; } - menu = &gMenu; - menu->column_idx = 2; + menu = &gGenericMenu; + menu->base.column_idx = 2; tmp2 = menu->unk28 * 0x10000; tmp1 = tmp2 - menu->unk10.i; if ((tmp1 < 0 ? -tmp1 : tmp1) <= 0x1ffdu) { menu->unk10.i = tmp2; } else { - menu->column_idx = 1; + menu->base.column_idx = 1; tmp2 = sub_08000E44(tmp1); tmp1 = tmp1 / 0x20000; if (tmp1 < 0) @@ -231,8 +231,8 @@ NONMATCH("asm/non_matching/subtask/sub_080A3C6C.inc", void sub_080A3C6C(void)) { break; case 1: if (gMenu.column_idx == 2) { - tmp3 = gMenu.unk10.i / 0x10000; - gMenu.unk2a = gSave.unk118[tmp3]; + tmp3 = gGenericMenu.unk10.i / 0x10000; + gGenericMenu.unk2a = gSave.unk118[tmp3]; sub_080A7114(3); } break; @@ -275,16 +275,16 @@ void sub_080A3E00(void) { } void sub_080A3E20(void) { - gMenu.unk18 = 0; - gMenu.unk2c += 2; - if (0x45 < gMenu.unk2c) { - gMenu.unk2c = 0x46; + gGenericMenu.unk18 = 0; + gGenericMenu.unk2c += 2; + if (0x45 < gGenericMenu.unk2c) { + gGenericMenu.unk2c = 0x46; gMenu.overlayType = 1; } } void sub_080A3E48(void) { - u32 temp = gUnk_080C9CBC[gMenu.unk2a].unk5; + u32 temp = gUnk_080C9CBC[gGenericMenu.unk2a].unk5; if (temp != gUnk_080C9CBC[gFuseInfo._3].unk5) { SoundReq(SFX_ITEM_SHIELD_BOUNCE); sub_080A7114(4); @@ -312,11 +312,11 @@ void sub_080A3EDC(void) { void sub_080A3F10(void) { gMenu.column_idx = 4; - gMenu.unk2c -= 3; - gMenu.unk18 += 0x100; - if (gMenu.unk2c < 0) { - gMenu.unk18 = 0; - gMenu.unk2c = 0; + gGenericMenu.unk2c -= 3; + gGenericMenu.unk18 += 0x100; + if (gGenericMenu.unk2c < 0) { + gGenericMenu.unk18 = 0; + gGenericMenu.unk2c = 0; sub_080A7114(1); SoundReq(SFX_MENU_ERROR); } @@ -350,8 +350,8 @@ void sub_080A3FCC(void) { void sub_080A3FF4(void) { gMenu.transitionTimer -= 1; if (gMenu.transitionTimer != 0) { - gMenu.unk18 += gMenu.unk1a.HWORD; - gMenu.unk1a.HWORD += 0x20; + gGenericMenu.unk18 += gGenericMenu.unk1a.HWORD; + gGenericMenu.unk1a.HWORD += 0x20; } else { gMenu.column_idx = 6; gMenu.overlayType = 3; @@ -391,7 +391,7 @@ void sub_080A4080(void) { gOamCmd._4 = 0; gOamCmd._6 = 0; - gOamCmd.y = 0x10 - (s8)gMenu.unk2e.HALF.HI; + gOamCmd.y = 0x10 - (s8)gGenericMenu.unk2e.HALF.HI; gOamCmd.x = 0x40; gOamCmd._8 = 0x400; #ifdef EU @@ -417,9 +417,9 @@ void sub_080A4080(void) { gOamCmd._8 = 0x4e0; iVar2 = sub_080A3B48() - 1; if (0 < iVar2) { - iVar3 = gMenu.unk10.i; + iVar3 = gGenericMenu.unk10.i; if (iVar3 < 0) { - iVar3 = gMenu.unk10.i + 0xffff; + iVar3 = gGenericMenu.unk10.i + 0xffff; } if (iVar3 >> 0x10 != iVar2) { gOamCmd.y = temp[1] + 0x77; @@ -441,11 +441,11 @@ NONMATCH("asm/non_matching/subtask/sub_080A414C.inc", void sub_080A414C(void)) { gOamCmd._4 = 0; gOamCmd._6 = 0; - uVar1 = gMenu.unk10.h[0] / 0xb21; + uVar1 = gGenericMenu.unk10.h[0] / 0xb21; for (i = -3, uVar1 = -uVar1 - 0x45; i < 4; uVar1 += 0x17, i++) { gOamCmd.y = ((gSineTable[uVar1 & 0xff] * 0x44) / 0x100) + 0x4f; gOamCmd.x = ((gSineTable[(uVar1 + 0x40) & 0xff] * 0x42) / 0x100) - 0x10; - iVar2 = gMenu.unk10.i / 0x10000 + i; + iVar2 = gGenericMenu.unk10.i / 0x10000 + i; if (iVar2 >= 0) { uVar3 = gSave.unk12B[iVar2]; if (i == 0) { @@ -471,14 +471,14 @@ void sub_080A422C(void) { s32 t, t2; u16 t3; - uVar2 = gMenu.unk18 / 256; + uVar2 = gGenericMenu.unk18 / 256; uVar2 %= 27; t3 = uVar2; sub_0805ECEC(0, gUnk_08128120[t3] << 4, 0x100, 0); gOamCmd._4 = 0x100; gOamCmd._6 = 0; gOamCmd.y = 0x4f; - t = gMenu.unk2a; + t = gGenericMenu.unk2a; t2 = 0x180; switch (gMenu.column_idx) { case 5: @@ -487,9 +487,9 @@ void sub_080A422C(void) { break; case 3: case 4: - gOamCmd.x = gMenu.unk2c + 0x32; + gOamCmd.x = gGenericMenu.unk2c + 0x32; sub_080A42E0(t, 0); - t2 = 0x8a - (gMenu.unk2c * 0x12 / 0x46); + t2 = 0x8a - (gGenericMenu.unk2c * 0x12 / 0x46); break; case 6: break; @@ -603,7 +603,7 @@ void sub_080A4468(void) { gUnk_03003DF0[0].unk[2] = 0; gUnk_03003DF0[0].unk2[3] = 0; sub_0801E6C8(gFuseInfo._3); - sub_0801E798(gMenu.unk2a); + sub_0801E798(gGenericMenu.unk2a); } u32 sub_080A4494(void) { @@ -708,7 +708,7 @@ void sub_080A4608(void) { gScreen.controls.windowOutsideControl = 0x1d; gScreen.bg1.updated = 1; for (iVar2 = 0; iVar2 < 0x10; iVar2++) { - gMenu.unk10.a[iVar2] = 0xee; + gGenericMenu.unk10.a[iVar2] = 0xee; } { int r0, r1, r2; @@ -722,7 +722,7 @@ void sub_080A4608(void) { if (r2 < r1) { r1 = 1; } - gMenu.unk1c = r1; + gGenericMenu.unk1c = r1; } SetFade(4, 8); } @@ -741,7 +741,7 @@ void sub_080A46DC(void) { void sub_080A46EC(void) { if (gFadeControl.active == 0) { - CreateObject(0xa2, gUnk_080FC3E4[gMenu.unk1c].unk7, 0); + CreateObject(0xa2, gUnk_080FC3E4[gGenericMenu.unk1c].unk7, 0); sub_080A7114(2); } } @@ -751,13 +751,13 @@ void sub_080A4720(void) { Sound sound; if (gMenu.field_0x0 != 0) { - gMenu.unk20 += 1; - switch (gMenu.unk20) { + gGenericMenu.unk20 += 1; + switch (gGenericMenu.unk20) { case 0x40: - gMenu.unk21 = WriteBit(&gUnk_02002B0E, gMenu.unk1c); + gGenericMenu.unk21 = WriteBit(&gUnk_02002B0E, gGenericMenu.unk1c); gMenu.column_idx = 1; default: - bVar1 = gMenu.unk20 >> 2; + bVar1 = gGenericMenu.unk20 >> 2; if (0x10 < bVar1) { bVar1 = 0x20 - bVar1; } @@ -771,7 +771,7 @@ void sub_080A4720(void) { sub_080A7114(3); sub_080A70AC((KeyButtonLayout*)&gUnk_0812813C); gMenu.column_idx = 0x15; - if (gMenu.unk21 == 0) { + if (gGenericMenu.unk21 == 0) { sound = SFX_109; } else { sound = SFX_MENU_ERROR; @@ -786,7 +786,7 @@ void sub_080A47D0(void) { s32 uVar1; s32 t; - uVar1 = gMenu.unk1f; + uVar1 = gGenericMenu.unk1f; switch (gInput.unk4) { case 2: case 8: @@ -799,14 +799,14 @@ void sub_080A47D0(void) { uVar1 -= 8; break; } - t = gMenu.unk1e; + t = gGenericMenu.unk1e; if (uVar1 < 0) { uVar1 = 0; } if (t < uVar1) { uVar1 = t; } - gMenu.unk1f = uVar1; + gGenericMenu.unk1f = uVar1; gScreen.bg1.yOffset = uVar1 - 0x70; } @@ -824,8 +824,8 @@ void sub_080A4864(void) { if (gFadeControl.active) return; - r5 = gMenu.unk1f; - r4 = gMenu.unk1c; + r5 = gGenericMenu.unk1f; + r4 = gGenericMenu.unk1c; r1 = gInput.unk4; switch (gInput.unk4) { case 2: @@ -860,21 +860,21 @@ void sub_080A4864(void) { if (r1 < r4) { r4 = r1; } - r0 = gMenu.unk1c; + r0 = gGenericMenu.unk1c; if (r0 != r4) { - gMenu.unk1c = r4; + gGenericMenu.unk1c = r4; SoundReq(SFX_TEXTBOX_CHOICE); sub_080A7114(2); r5 = 0; } - r0 = gMenu.unk1e; + r0 = gGenericMenu.unk1e; if (r5 < 0) { r5 = 0; } if (r0 < r5) { r5 = r0; } - gMenu.unk1f = r5; + gGenericMenu.unk1f = r5; gScreen.bg1.yOffset = r5 - 0x70; } @@ -925,9 +925,9 @@ void sub_080A4978(void) { DrawDirect(sub_080A4978_draw_constant, 0); r2 = (gSave.unk6 == 0) ? 0x82 : 0x88; if ((gMenu.column_idx & 2) != 0) { - if (r2 >= (gMenu.unk1c)) { + if (r2 >= (gGenericMenu.unk1c)) { gOamCmd.x = 0xe8; - r0 = (0x5000 / r2) * (gMenu.unk1c - 1); + r0 = (0x5000 / r2) * (gGenericMenu.unk1c - 1); if (r0 < 0) { r0 += 0xff; } @@ -947,14 +947,14 @@ void sub_080A4978(void) { } if (gMain.ticks.HWORD & 0x10) { if (gMenu.column_idx & 0x10) { - if (gMenu.unk1e) { + if (gGenericMenu.unk1e) { gOamCmd.y = 0x10; - if (gMenu.unk1f > 0) { + if (gGenericMenu.unk1f > 0) { gOamCmd.x = 6; gOamCmd.y = 0x9c; DrawDirect(sub_080A4978_draw_constant, 6); } - if (gMenu.unk1e > gMenu.unk1f) { + if (gGenericMenu.unk1e > gGenericMenu.unk1f) { gOamCmd.x = 0xea; gOamCmd.y = 0x9c; DrawDirect(sub_080A4978_draw_constant, 7); @@ -965,7 +965,7 @@ void sub_080A4978(void) { if (gSaveHeader->language) { if (gMenu.column_idx & 0x4) { gOamCmd.y = 0x10; - r4 = gMenu.unk1c; + r4 = gGenericMenu.unk1c; for (r6 = 2; r6 >= 0; r6--) { gOamCmd.x = 0x5d + (r6 * 7); gOamCmd._8 = ((r4 % 10) << 1) | 0x9e0; @@ -975,16 +975,16 @@ void sub_080A4978(void) { } } if (gMenu.column_idx & 1) { - if (sub_080A4948(gMenu.unk1c)) { + if (sub_080A4948(gGenericMenu.unk1c)) { gOamCmd.x = 0x2c; gOamCmd.y = 0x48; gOamCmd._8 = 0xd4 << 7; - DrawDirect(sub_080A4978_draw_constant - 4, gMenu.unk1c - 1); - if (gMenu.unk1d != gMenu.unk1c) { + DrawDirect(sub_080A4978_draw_constant - 4, gGenericMenu.unk1c - 1); + if (gGenericMenu.unk1d != gGenericMenu.unk1c) { const Figurine* fig; u8* gfx; - gMenu.unk1d = gMenu.unk1c; - fig = &gFigurines[gMenu.unk1c]; + gGenericMenu.unk1d = gGenericMenu.unk1c; + fig = &gFigurines[gGenericMenu.unk1c]; LoadPalettes(fig->pal, 0x16, 9); gfx = fig->gfx; if (fig->size < 0) { @@ -1000,9 +1000,9 @@ void sub_080A4978(void) { void sub_080A4B44(void) { u32 uVar1; - uVar1 = gMenu.unk1c; + uVar1 = gGenericMenu.unk1c; if ((gMenu.column_idx & 0x10) != 0) { - gMenu.unk1e = sub_080A4CBC(uVar1); + gGenericMenu.unk1e = sub_080A4CBC(uVar1); } if ((gMenu.column_idx & 4) != 0) { sub_080A4BA0(uVar1, 2); @@ -1022,8 +1022,8 @@ u32 sub_080A4CBC(u32 param_1) { const u16* psVar2; u32 uVar3; - if (gMenu.unk1a.HALF.LO != param_1) { - gMenu.unk1a.HALF.LO = param_1; + if (gGenericMenu.unk1a.HALF.LO != param_1) { + gGenericMenu.unk1a.HALF.LO = param_1; MemClear(&gBG1Buffer, 0x800); MemCopy(&gBG1Buffer, (void*)0x600e000, 0x800); iVar1 = sub_080A4948(param_1); @@ -1083,8 +1083,8 @@ void sub_080A4DB8(u32 param_1) { MemClear(&gBG1Buffer, 0x800); MemClear(&gBG2Buffer, 0x800); MemClear(gUnk_0200AF00.filler25 + 0xf, 0x300); - MemClear(&gMenu, sizeof(gMenu)); - gMenu.unk2e.HWORD = 0xffff; + MemClear(&gGenericMenu, sizeof(gGenericMenu)); + gGenericMenu.unk2e.HWORD = 0xffff; gMenu.field_0x3 = gUnk_02034490.unk2[param_1]; ptr = &gUnk_08128AD8[gUnk_08128A38[param_1].unk0]; gScreen.lcd.displayControl = ptr->unk2 | 0x1940; @@ -1389,7 +1389,7 @@ void sub_080A5238(void) { default: break; } - gMenu.unk10.a[uVar2] = uVar3; + gGenericMenu.unk10.a[uVar2] = uVar3; sub_080A5F48(uVar3, uVar2 * 8 + 0x360); } } @@ -1421,9 +1421,9 @@ void sub_080A529C(void) { break; } case 2: - if (gMenu.unk10.a[uVar3] != 0) { + if (gGenericMenu.unk10.a[uVar3] != 0) { u32 t = !!(gInput.newKeys ^ 1); - ForceEquipItem(gMenu.unk10.a[uVar3], t); + ForceEquipItem(gGenericMenu.unk10.a[uVar3], t); SoundReq(SFX_TEXTBOX_SELECT); } break; @@ -1448,7 +1448,7 @@ void sub_080A529C(void) { gMenu.field_0x3 = uVar3; SoundReq(SFX_TEXTBOX_CHOICE); } - uVar2 = gMenu.unk10.a[uVar3]; + uVar2 = gGenericMenu.unk10.a[uVar3]; switch (uVar3) { case 0xc: case 0xd: @@ -1488,11 +1488,11 @@ void sub_080A5384(void) { gOamCmd._8 = 0; for (uVar3 = 0; uVar3 < 0x11; uVar3++) { u32 item; - if (gMenu.unk10.a[uVar3] != 0) { + if (gGenericMenu.unk10.a[uVar3] != 0) { entry = &gItemMenuTable[uVar3]; gOamCmd.x = entry->x; gOamCmd.y = entry->y; - item = gMenu.unk10.a[uVar3]; + item = gGenericMenu.unk10.a[uVar3]; switch (item) { case 0x1c ... 0x1f: item = gSave.stats.bottles[item - 0x1c]; @@ -1571,7 +1571,7 @@ u32 sub_080A554C(u32 arg0) { if (arg0 != 0) { for (i = 0; i < 17; i++) { - if (arg0 == gMenu.unk10.a[i]) + if (arg0 == gGenericMenu.unk10.a[i]) return i; } } From 82fa5159fdac7c914d3bd2ec9c9ba272935801eb Mon Sep 17 00:00:00 2001 From: Henny022p Date: Tue, 25 Jan 2022 00:44:48 +0100 Subject: [PATCH 5/7] sorted kinstone and figurine menu --- ...080A414C.inc => KinstoneMenu_080A414C.inc} | 0 ...ub_080A3C6C.inc => KinstoneMenu_Type1.inc} | 0 assets/assets.json | 40 - data/data_08127280.s | 56 - include/game.h | 33 - include/kinstone.h | 11 + include/menu.h | 32 +- include/subtask.h | 46 +- linker.ld | 5 + src/common.c | 7 - src/menu/figurine_menu.c | 637 ++++++++++ src/menu/kinstone_menu.c | 660 ++++++++++ src/subtask.c | 1068 +---------------- 13 files changed, 1387 insertions(+), 1208 deletions(-) rename asm/non_matching/subtask/{sub_080A414C.inc => KinstoneMenu_080A414C.inc} (100%) rename asm/non_matching/subtask/{sub_080A3C6C.inc => KinstoneMenu_Type1.inc} (100%) create mode 100644 src/menu/figurine_menu.c create mode 100644 src/menu/kinstone_menu.c diff --git a/asm/non_matching/subtask/sub_080A414C.inc b/asm/non_matching/subtask/KinstoneMenu_080A414C.inc similarity index 100% rename from asm/non_matching/subtask/sub_080A414C.inc rename to asm/non_matching/subtask/KinstoneMenu_080A414C.inc diff --git a/asm/non_matching/subtask/sub_080A3C6C.inc b/asm/non_matching/subtask/KinstoneMenu_Type1.inc similarity index 100% rename from asm/non_matching/subtask/sub_080A3C6C.inc rename to asm/non_matching/subtask/KinstoneMenu_Type1.inc diff --git a/assets/assets.json b/assets/assets.json index daa22a1c..3a683b72 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -47247,46 +47247,6 @@ "start": 1212452, "size": 160 }, - { - "path": "data_08127280/gUnk_081280DC.bin", - "start": 1212636, - "size": 18 - }, - { - "path": "data_08127280/gUnk_081280EE.bin", - "start": 1212654, - "size": 6 - }, - { - "path": "data_08127280/gUnk_08128110.bin", - "start": 1212688, - "size": 16 - }, - { - "path": "data_08127280/gUnk_08128120.bin", - "start": 1212704, - "size": 28 - }, - { - "path": "data_08127280/gUnk_0812813C.bin", - "start": 1212732, - "size": 16 - }, - { - "path": "data_08127280/gUnk_0812816C.bin", - "start": 1212780, - "size": 24 - }, - { - "path": "data_08127280/gUnk_08128184.bin", - "start": 1212804, - "size": 12 - }, - { - "path": "data_08127280/gUnk_08128190.bin", - "start": 1212816, - "size": 24 - }, { "path": "data_08127280/gUnk_08128A38.bin", "start": 1215032, diff --git a/data/data_08127280.s b/data/data_08127280.s index 10b9d48b..cc57aa11 100644 --- a/data/data_08127280.s +++ b/data/data_08127280.s @@ -63,59 +63,3 @@ gUnk_08127F94:: @ 08127F94 gUnk_08128024:: @ 08128024 .incbin "data_08127280/gUnk_08128024.bin" - -gUnk_081280C4:: @ 081280C4 - .4byte sub_080A3BD0 - .4byte sub_080A3C6C - .4byte sub_080A3DB8 - .4byte sub_080A3E00 - .4byte sub_080A3F10 - .4byte sub_080A3F4C - -gUnk_081280DC:: @ 081280DC - .incbin "data_08127280/gUnk_081280DC.bin" - -gUnk_081280EE:: @ 081280EE - .incbin "data_08127280/gUnk_081280EE.bin" - -gUnk_081280F4:: @ 081280F4 - .4byte sub_080A3E20 - .4byte sub_080A3E48 - .4byte sub_080A3EDC - -gUnk_08128100:: @ 08128100 - .4byte sub_080A3F68 - .4byte sub_080A3FCC - .4byte sub_080A3FF4 - .4byte sub_080A4038 - -gUnk_08128110:: @ 08128110 - .incbin "data_08127280/gUnk_08128110.bin" - -gUnk_08128120:: @ 08128120 - .incbin "data_08127280/gUnk_08128120.bin" - -gUnk_0812813C:: @ 0812813C - .incbin "data_08127280/gUnk_0812813C.bin" - -gUnk_0812814C:: @ 0812814C - .4byte sub_080A46DC - .4byte sub_080A46EC - .4byte sub_080A4720 - .4byte sub_080A47D0 - -gUnk_0812815C:: @ 0812815C - .4byte sub_080A4830 - .4byte sub_080A4864 - .4byte sub_080A4934 - .4byte sub_080A4940 - -gUnk_0812816C:: @ 0812816C - .incbin "data_08127280/gUnk_0812816C.bin" - -gUnk_08128184:: @ 08128184 - .incbin "data_08127280/gUnk_08128184.bin" - -gUnk_08128190:: @ 08128190 - .incbin "data_08127280/gUnk_08128190.bin" - diff --git a/include/game.h b/include/game.h index 2b4f950e..a0bf8a98 100644 --- a/include/game.h +++ b/include/game.h @@ -285,37 +285,4 @@ typedef enum { GAMEMAIN_SUBTASK, } EGameMainState; -/** Subtasks override the game task for short periods */ -typedef enum { - SUBTASK_EXIT, - SUBTASK_PAUSEMENU, - SUBTASK_EXIT2, - SUBTASK_MAPHINT, - SUBTASK_KINSTONEMENU, - SUBTASK_AUXCUTSCENE, /* cutscene without presence of player */ - SUBTASK_PORTALCUTSCENE, /* player "falling" down portal cutscene */ - SUBTASK_FIGURINEMENU, - SUBTASK_WORLDEVENT, - SUBTASK_FASTTRAVEL, - SUBTASK_LOCALMAPHINT, -} ESubtask; - -typedef void(Subtask)(void); - -/** @name Subtask entrypoints */ -///@{ -/** Subtask entrypoint. */ -Subtask Subtask_Exit; -Subtask Subtask_PauseMenu; -Subtask Subtask_Exit; -Subtask Subtask_MapHint; -Subtask Subtask_KinstoneMenu; -Subtask Subtask_AuxCutscene; -Subtask Subtask_PortalCutscene; -Subtask Subtask_FigurineMenu; -Subtask Subtask_WorldEvent; -Subtask Subtask_FastTravel; -Subtask Subtask_LocalMapHint; -///@} - #endif // GAME_H diff --git a/include/kinstone.h b/include/kinstone.h index 5d8e3ec8..4d04b9c6 100644 --- a/include/kinstone.h +++ b/include/kinstone.h @@ -27,4 +27,15 @@ typedef struct { static_assert(sizeof(FuseInfo) == 0x10); extern FuseInfo gFuseInfo; +typedef struct { + u8 unk0; + u8 unk1; + u8 unk2; + u8 unk3; + u8 evt_type; + u8 unk5; + u8 _5[2]; +} struct_080C9CBC; +extern struct_080C9CBC gUnk_080C9CBC[]; + #endif // KINSTONE_H diff --git a/include/menu.h b/include/menu.h index 1c1ccc37..4402e192 100644 --- a/include/menu.h +++ b/include/menu.h @@ -82,11 +82,41 @@ typedef struct { static_assert(sizeof(GenericMenu) == 0x30); typedef struct { - Menu base; + /*0x00*/ Menu base; + /*0x10*/ union SplitWord unk10; + /*0x14*/ u8 filler14[4]; + /*0x18*/ u16 unk18; + /*0x1a*/ u16 unk1a; + /*0x1c*/ u8 filler1c[14]; + /*0x2a*/ u8 unk2a; + /*0x2b*/ u8 filler2b[1]; + /*0x2c*/ s8 unk2c; + /*0x2d*/ u8 filler2d[2]; + /*0x2f*/ s8 unk2f; } KinstoneMenu; +typedef struct { + /*0x00*/ Menu base; + /*0x10*/ union { + u16 h[2]; + u8 a[4]; + } unk10; + /*0x14*/ u8 filler14[6]; + /*0x1a*/ u8 unk1a; + /*0x1b*/ u8 filler1b[1]; + /*0x1c*/ u8 unk1c; + /*0x1d*/ u8 unk1d; + /*0x1e*/ u8 unk1e; + /*0x1f*/ s8 unk1f; + /*0x20*/ u8 unk20; + /*0x21*/ u8 unk21; + /*0x22*/ u8 filler22[0xc]; + /*0x2e*/ u16 unk2e; +} FigurineMenu; + extern Menu gMenu; #define gGenericMenu (*(GenericMenu*)&gMenu) #define gKinstoneMenu (*(KinstoneMenu*)&gMenu) +#define gFigurineMenu (*(FigurineMenu*)&gMenu) #endif diff --git a/include/subtask.h b/include/subtask.h index 185210d8..efc0c757 100644 --- a/include/subtask.h +++ b/include/subtask.h @@ -3,14 +3,52 @@ #include "global.h" +/** Subtasks override the game task for short periods */ +typedef enum { + SUBTASK_EXIT, + SUBTASK_PAUSEMENU, + SUBTASK_EXIT2, + SUBTASK_MAPHINT, + SUBTASK_KINSTONEMENU, + SUBTASK_AUXCUTSCENE, /* cutscene without presence of player */ + SUBTASK_PORTALCUTSCENE, /* player "falling" down portal cutscene */ + SUBTASK_FIGURINEMENU, + SUBTASK_WORLDEVENT, + SUBTASK_FASTTRAVEL, + SUBTASK_LOCALMAPHINT, +} ESubtask; + +typedef void(Subtask)(void); + +/** @name Subtask entrypoints */ +///@{ +/** Subtask entrypoint. */ +Subtask Subtask_Exit; +Subtask Subtask_PauseMenu; +Subtask Subtask_Exit; +Subtask Subtask_MapHint; +Subtask Subtask_KinstoneMenu; +Subtask Subtask_AuxCutscene; +Subtask Subtask_PortalCutscene; +Subtask Subtask_FigurineMenu; +Subtask Subtask_WorldEvent; +Subtask Subtask_FastTravel; +Subtask Subtask_LocalMapHint; +///@} + // todo: separate headers for each subtask? -extern void sub_080A4528(void); extern void sub_080A4398(void); extern void sub_080A7114(u32); -extern void sub_080A3B74(void); -extern void sub_080A4054(void); extern void sub_080A4D34(void); -extern u32 sub_080A4494(void); +extern void sub_080A4E90(u8); +extern void sub_080A4E84(u8); + +extern const struct { + u8 unk0; + u8 unk1; + u8 filler[2]; + void (*func)(void); +} gUnk_08128A38[]; #endif // SUBTASK_H diff --git a/linker.ld b/linker.ld index 3cbdac30..8a491f79 100644 --- a/linker.ld +++ b/linker.ld @@ -854,6 +854,8 @@ SECTIONS { #endif src/sound.o(.text); asm/staffroll.o(.text); + src/menu/kinstone_menu.o(.text); + src/menu/figurine_menu.o(.text); src/subtask.o(.text); asm/subtask2.o(.text); /* subtask.c */ src/playerItem/playerItemSword.o(.text); @@ -1598,6 +1600,9 @@ SECTIONS { data/const/demo.o(.rodata); #endif data/data_08127280.o(.rodata); + src/menu/kinstone_menu.o(.rodata); + src/menu/figurine_menu.o(.rodata); + src/subtask.o(.rodata); data/gfx/figurines.o(.rodata); data/data_08128A38.o(.rodata); src/itemMenuTable.o(.rodata); diff --git a/src/common.c b/src/common.c index 28560dca..be03807d 100644 --- a/src/common.c +++ b/src/common.c @@ -61,13 +61,6 @@ typedef struct { extern struct_02017AA0 gUnk_02017AA0[]; extern u8 gUnk_03003DE4; -typedef struct { - u8 _0[4]; - u8 evt_type; - u8 _5[3]; -} struct_080C9CBC; -extern struct_080C9CBC gUnk_080C9CBC[]; - typedef struct { u8 evt_type; u8 entity_idx; diff --git a/src/menu/figurine_menu.c b/src/menu/figurine_menu.c new file mode 100644 index 00000000..c6318a25 --- /dev/null +++ b/src/menu/figurine_menu.c @@ -0,0 +1,637 @@ +#include "global.h" +#include "main.h" +#include "menu.h" +#include "sound.h" +#include "common.h" +#include "screen.h" +#include "save.h" +#include "flags.h" +#include "subtask.h" +#include "object.h" +#include "game.h" +#include "functions.h" + +extern const struct { + u8 filler[7]; + u8 unk7; +} gUnk_080FC3E4[]; +extern u32 gUnk_02002B0E; + +void sub_080A4DA8(u32); +void sub_080A4B44(void); +void FigurineMenu_080A4978(void); +u32 sub_080A4CBC(u32); +u32 sub_080A4BA0(u32, u32); +void sub_080A4DB8(u32); + +const KeyButtonLayout gUnk_0812813C = { + 0xffu, + 0xd8u, + 0u, + 0xd0u, + 0x10u, + 0xeu, + 0xffu, + 0xd8u, + 0u, + { + 0xau, + 0u, + 0x1u, + 0x1u, + 0xffu, + 0u, + 0u, + }, +}; + +extern u8 gUnk_020344A0[8]; +typedef struct { + u8 unk0; + u8 unk1; + u16 unk2; + u16 unk4; + u16 unk6; +} struct_08128AD8; +extern const struct_08128AD8 gUnk_08128AD8[]; + +void FigurineMenu0_Type0(void); +void FigurineMenu0_Type1(void); +void FigurineMenu0_Type2(void); +void FigurineMenu0_Type3(void); +void FigurineMenu1_Type0(void); +void FigurineMenu1_Type1(void); +void FigurineMenu1_Type2(void); +void FigurineMenu1_Type3(void); +void Subtask_FigurineMenu(void) { + static void (*const figurineMenu1_Types[])(void) = { + FigurineMenu0_Type0, + FigurineMenu0_Type1, + FigurineMenu0_Type2, + FigurineMenu0_Type3, + }; + static void (*const figurineMenu0_Types[])(void) = { + FigurineMenu1_Type0, + FigurineMenu1_Type1, + FigurineMenu1_Type2, + FigurineMenu1_Type3, + }; +#if !(defined(DEMO_USA) || defined(DEMO_JP)) + FlushSprites(); + if (gUnk_02032EC0.field_0x3 == 0xff) { + figurineMenu0_Types[gMenu.menuType](); + } else { + figurineMenu1_Types[gMenu.menuType](); + } + UpdateEntities(); + sub_0801C1D4(); + DrawOAMCmd(); + DrawEntities(); + FigurineMenu_080A4978(); + CopyOAM(); + sub_080A4B44(); +#endif +} + +void FigurineMenu_080A4608(void) { + s32 iVar2; + + SetBgmVolume(0x80); + sub_080A4DA8(3); + SetColor(0, gPaletteBuffer[0xfb]); + SetColor(0x15c, gPaletteBuffer[0xd3]); + MemClear(&gBG0Buffer, 0x800); + MemClear(&gBG3Buffer, 0x1000); + gScreen.controls.window0HorizontalDimensions = 0xf0; + gScreen.controls.window0VerticalDimensions = 0x7898; + gScreen.controls.windowInsideControl = 0x1f; + gScreen.controls.windowOutsideControl = 0x1d; + gScreen.bg1.updated = 1; + for (iVar2 = 0; iVar2 < 0x10; iVar2++) { + gFigurineMenu.unk10.a[iVar2] = 0xee; + } + { + int r0, r1, r2; + + r1 = gUnk_02032EC0.field_0x3; + r0 = gSave.unk6; + r2 = 0x88; + if (r0 == 0) { + r2 = 0x82; + } + if (r2 < r1) { + r1 = 1; + } + gFigurineMenu.unk1c = r1; + } + SetFade(4, 8); +} + +void FigurineMenu_080A46C0(void) { + SetBgmVolume(0x100); + SoundReq(SFX_MENU_CANCEL); + ClearRoomFlag(2); + Subtask_Exit(); +} + +void FigurineMenu0_Type0(void) { + FigurineMenu_080A4608(); + sub_080A7114(1); +} + +void FigurineMenu0_Type1(void) { + if (gFadeControl.active == 0) { + CreateObject(OBJECT_A2, gUnk_080FC3E4[gFigurineMenu.unk1c].unk7, 0); + sub_080A7114(2); + } +} + +void FigurineMenu0_Type2(void) { + u32 bVar1; + Sound sound; + + if (gMenu.field_0x0 != 0) { + gFigurineMenu.unk20 += 1; + switch (gFigurineMenu.unk20) { + case 0x40: + gFigurineMenu.unk21 = WriteBit(&gUnk_02002B0E, gFigurineMenu.unk1c); + gMenu.column_idx = 1; + default: + bVar1 = gFigurineMenu.unk20 >> 2; + if (0x10 < bVar1) { + bVar1 = 0x20 - bVar1; + } + gScreen.controls.layerBrightness = bVar1; + gScreen.controls.layerFXControl = 0xbf; + break; + case 0x80: + gScreen.controls.layerBrightness = 0; + gScreen.controls.layerFXControl = 0; + gScreen.lcd.displayControl |= 0x2000; + sub_080A7114(3); + sub_080A70AC((KeyButtonLayout*)&gUnk_0812813C); + gMenu.column_idx = 0x15; + if (gFigurineMenu.unk21 == 0) { + sound = SFX_109; + } else { + sound = SFX_MENU_ERROR; + } + SoundReq(sound); + return; + } + } +} + +void FigurineMenu0_Type3(void) { + s32 uVar1; + s32 t; + + uVar1 = gFigurineMenu.unk1f; + switch (gInput.unk4) { + case 2: + case 8: + FigurineMenu_080A46C0(); + break; + case 0x10: + uVar1 += 8; + break; + case 0x20: + uVar1 -= 8; + break; + } + t = gFigurineMenu.unk1e; + if (uVar1 < 0) { + uVar1 = 0; + } + if (t < uVar1) { + uVar1 = t; + } + gFigurineMenu.unk1f = uVar1; + gScreen.bg1.yOffset = uVar1 - 0x70; +} + +void FigurineMenu1_Type0(void) { + FigurineMenu_080A4608(); + gScreen.lcd.displayControl |= 0x2000; + sub_080A70AC(&gUnk_0812813C); + gMenu.column_idx = 0xff; + sub_080A7114(1); +} + +void FigurineMenu1_Type1(void) { + int r0, r1, r4, r5; + + if (gFadeControl.active) + return; + + r5 = gFigurineMenu.unk1f; + r4 = gFigurineMenu.unk1c; + switch (gInput.unk4) { + case 2: + case 8: + sub_080A7114(3); + break; + case 0x200: + r4 -= 5; + break; + case 0x100: + r4 += 5; + break; + case 0x40: + r4--; + break; + case 0x80: + r4++; + break; + case 0x10: + r5 += 8; + break; + case 0x20: + r5 -= 8; + break; + case 1: + break; + } + r1 = (gSave.unk6 == 0) ? 0x82 : 0x88; + if (r4 <= 0) { + r4 = 1; + } + if (r1 < r4) { + r4 = r1; + } + r0 = gFigurineMenu.unk1c; + if (r0 != r4) { + gFigurineMenu.unk1c = r4; + SoundReq(SFX_TEXTBOX_CHOICE); + sub_080A7114(2); + r5 = 0; + } + r0 = gFigurineMenu.unk1e; + if (r5 < 0) { + r5 = 0; + } + if (r0 < r5) { + r5 = r0; + } + gFigurineMenu.unk1f = r5; + gScreen.bg1.yOffset = r5 - 0x70; +} + +void FigurineMenu1_Type2(void) { + sub_080A7114(1); +} + +void FigurineMenu1_Type3(void) { + FigurineMenu_080A46C0(); +} + +u32 sub_080A4948(s32 param_1) { + s32 iVar1; + u32 uVar2; + + uVar2 = 0; + iVar1 = gSave.unk6 == 0 ? 0x82 : 0x88; + if ((0 < param_1) || (iVar1 >= param_1)) { + if (ReadBit((u32*)&gSave.stats.filler4[4], param_1)) { + uVar2 = 1; + } + } + return uVar2; +} + +typedef struct { + u8* pal; + u8* gfx; + int size; + int zero; +} Figurine; + +extern const Figurine gFigurines[]; + +#ifdef EU +#define sub_080A4978_draw_constant 0x1fb +#else +#define sub_080A4978_draw_constant 0x1fc +#endif +void FigurineMenu_080A4978(void) { + int r0, r2, r4, r6; + + gOamCmd._4 = 0; + gOamCmd._6 = 0; + gOamCmd._8 = 0x800; + gOamCmd.x = 0x9c; + gOamCmd.y = 0x48; + DrawDirect(sub_080A4978_draw_constant, 0); + r2 = (gSave.unk6 == 0) ? 0x82 : 0x88; + if ((gMenu.column_idx & 2) != 0) { + if (r2 >= (gFigurineMenu.unk1c)) { + gOamCmd.x = 0xe8; + r0 = (0x5000 / r2) * (gFigurineMenu.unk1c - 1); + if (r0 < 0) { + r0 += 0xff; + } + r0 >>= 8; + r0 += 0x20; + gOamCmd.y = r0; + DrawDirect(sub_080A4978_draw_constant, 1); + r0 = gMain.ticks.HWORD & 0x10; + r4 = (r0) ? 4 : 2; + gOamCmd.x = 0xe8; + gOamCmd.y = 0x1a; + DrawDirect(sub_080A4978_draw_constant, r4); + gOamCmd.x = 0xe8; + gOamCmd.y = 0x76; + DrawDirect(sub_080A4978_draw_constant, r4 + 1); + } + } + if (gMain.ticks.HWORD & 0x10) { + if (gMenu.column_idx & 0x10) { + if (gFigurineMenu.unk1e) { + gOamCmd.y = 0x10; + if (gFigurineMenu.unk1f > 0) { + gOamCmd.x = 6; + gOamCmd.y = 0x9c; + DrawDirect(sub_080A4978_draw_constant, 6); + } + if (gFigurineMenu.unk1e > gFigurineMenu.unk1f) { + gOamCmd.x = 0xea; + gOamCmd.y = 0x9c; + DrawDirect(sub_080A4978_draw_constant, 7); + } + } + } + } + if (gSaveHeader->language) { + if (gMenu.column_idx & 0x4) { + gOamCmd.y = 0x10; + r4 = gFigurineMenu.unk1c; + for (r6 = 2; r6 >= 0; r6--) { + gOamCmd.x = 0x5d + (r6 * 7); + gOamCmd._8 = ((r4 % 10) << 1) | 0x9e0; + DrawDirect(0, 9); + r4 = r4 / 10; + } + } + } + if (gMenu.column_idx & 1) { + if (sub_080A4948(gFigurineMenu.unk1c)) { + gOamCmd.x = 0x2c; + gOamCmd.y = 0x48; + gOamCmd._8 = 0xd4 << 7; + DrawDirect(sub_080A4978_draw_constant - 4, gFigurineMenu.unk1c - 1); + if (gFigurineMenu.unk1d != gFigurineMenu.unk1c) { + const Figurine* fig; + u8* gfx; + gFigurineMenu.unk1d = gFigurineMenu.unk1c; + fig = &gFigurines[gFigurineMenu.unk1c]; + LoadPalettes(fig->pal, 0x16, 9); + gfx = fig->gfx; + if (fig->size < 0) { + LZ77UnCompVram(gfx, (void*)0x6014000); + } else { + LoadResourceAsync(gfx, 0x6014000, fig->size); + } + } + } + } +} + +void sub_080A4B44(void) { + u32 uVar1; + + uVar1 = gFigurineMenu.unk1c; + if ((gMenu.column_idx & 0x10) != 0) { + gFigurineMenu.unk1e = sub_080A4CBC(uVar1); + } + if ((gMenu.column_idx & 4) != 0) { + sub_080A4BA0(uVar1, 2); + } + if ((gMenu.column_idx & 8) != 0) { + sub_080A4BA0(uVar1 - 2, 0); + sub_080A4BA0(uVar1 - 1, 1); + sub_080A4BA0(uVar1 + 1, 3); + sub_080A4BA0(uVar1 + 2, 4); + } +} + +typedef struct { + u16* unk0; + u32 unk4; + u8 filler8[8]; + u16 unk10; + u8 filler12[2]; + u8 unk14; +} struct_0812816C; +static_assert(sizeof(struct_0812816C) == 0x18); +const struct_0812816C gUnk_0812816C = { + (u16*)0x02001b40, + 0x0600a000, + { 0u, 0xdu, 0u, 0x2u, 0u, 0u, 0u, 0u }, + 0xf100, + { + 0x88u, + 0u, + }, + 0x4u, +}; + +typedef struct { + u32 unk0; + u32 unk4; + u8 unk8; + u8 unk9; +} struct_08128184; +static_assert(sizeof(struct_08128184) == 0xc); +const struct_08128184 gUnk_08128184 = { + 0x01061504, + 0x073a1404, + 0xffu, + 0xffu, +}; + +extern u8 gUnk_020227E8[]; +extern void sub_08057044(u32, u8*, u8*); +extern void sub_0805F46C(u32, const struct_0812816C*); + +NONMATCH("asm/non_matching/subtask/sub_080A4BA0.inc", u32 sub_080A4BA0(u32 unk1, u32 unk2)) { + int r0, r1, r2, r3, r4, r5, r6; + + struct_0812816C s0; + u8 buffer[0x30]; + struct_08128184 s2; + + r5 = unk1; + r6 = unk2; + MemClear(buffer, sizeof(buffer)); + MemCopy(&gUnk_0812816C, &s0, sizeof(gUnk_0812816C)); + MemCopy(&gUnk_08128184, &s2, sizeof(gUnk_08128184)); + r1 = r6 << 1; + r1 += r6; + r2 = r1 << 9; + s0.unk4 += r2; + s0.unk10 += r1 << 4; + r1 = r6 << 7; + s0.unk0 += r1; + if (r6 == 2) { + s0.unk14 = r6; + } + r1 = (gSave.unk6 == 0) ? 0x82 : 0x88; + if (r5 <= 0 || r1 < r5) { + r0 = -1; + } else { + sub_08057044(r5, gUnk_020227E8, (void*)0x303030); + if (sub_080A4948(r5) == 0) { + r5 += 0x8000; + } else { + r5 += 0x800; + } + } + if ((r0 = gFigurineMenu.unk10.h[r6]) == r5) + return r0; + gFigurineMenu.unk10.h[r6] = r5; + r0 = (r6 != 2) ? 0xf00b : 7; + MemFill16(r0, s0.unk0, 0x80); + if (r5 > 0) { + if (r5 > 0x7fff) { + r5 = 0x889; + } + r0 = r5; + if (r5 < 0) { + r0 += 0xff; + } + s2.unk8 = r0 >> 8; + s2.unk9 = r5; + s0.unk0 += 0x16; + if (gSaveHeader->language == 0) { + sub_0805F46C((u32)&s2, &s0); + } else { + sub_0805F46C(r5, &s0); + } + } + gScreen.bg3.updated = 1; + return 1; +} +END_NONMATCH + +const struct_0812816C gUnk_08128190 = { + (u16*)0x02021f72, + 0x06004000, + { + 0u, + 0xdu, + 0u, + 0x2u, + 0u, + 0u, + 0u, + 0u, + }, + 0xc200, + { + 0xe0u, + 0u, + }, + 0x5u, +}; + +u32 sub_080A4CBC(u32 param_1) { + s32 iVar1; + const u16* psVar2; + u32 uVar3; + + if (gFigurineMenu.unk1a != param_1) { + gFigurineMenu.unk1a = param_1; + MemClear(&gBG1Buffer, 0x800); + MemCopy(&gBG1Buffer, (void*)0x600e000, 0x800); + iVar1 = sub_080A4948(param_1); + if (iVar1 != 0) { + sub_0805F46C(param_1 + 0x900, &gUnk_08128190); + } + gScreen.bg1.updated = 1; + } + psVar2 = gUnk_08128190.unk0 + 0x80; + + for (uVar3 = 0; uVar3 < 0x14; uVar3++) { + if (*psVar2 == 0) + break; + psVar2 += 0x20; + } + return uVar3 << 3; +} + +void sub_080A4D34(void) { + s32 iVar1; + + LoadGfxGroups(); + LoadPaletteGroup(0xb5); + if (gSave.stats.health <= 8) { + iVar1 = 2; + } else { + s32 missingHealth = gSave.stats.maxHealth - gSave.stats.health; + if (missingHealth < 9) { + iVar1 = 0; + } else { + iVar1 = 1; + } + } + LoadGfxGroup(iVar1 + 0x56); + gScreen.bg3.xOffset = 0; + gScreen.bg3.yOffset = 0; + gScreen.bg3.control = 0x1e0b; + gScreen.bg3.updated = 1; +} + +void sub_080A4D88(void) { + MemClear(gUnk_020344A0, sizeof(gUnk_020344A0)); + MenuFadeIn(1, 0); + SetBgmVolume(0x80); +} + +void sub_080A4DA8(u32 param_1) { + sub_080A4D34(); + sub_080A4DB8(param_1); +} + +void sub_080A4DB8(u32 param_1) { + const struct_08128AD8* ptr; + + sub_08056250(); + MemClear(&gBG0Buffer, 0x800); + MemClear(&gBG1Buffer, 0x800); + MemClear(&gBG2Buffer, 0x800); + MemClear(gUnk_0200AF00.filler25 + 0xf, 0x300); + MemClear(&gFigurineMenu, sizeof(gFigurineMenu)); + gFigurineMenu.unk2e = 0xffff; + gMenu.field_0x3 = gUnk_02034490.unk2[param_1]; + ptr = &gUnk_08128AD8[gUnk_08128A38[param_1].unk0]; + gScreen.lcd.displayControl = ptr->unk2 | 0x1940; + gScreen.bg0.xOffset = 0; + gScreen.bg0.yOffset = 0; + gScreen.bg0.updated = 1; + gScreen.bg1.xOffset = 0; + gScreen.bg1.yOffset = 0; + gScreen.bg1.control = ptr->unk4; + gScreen.bg1.updated = 1; + gScreen.bg2.xOffset = 0; + gScreen.bg2.yOffset = 0; + gScreen.bg2.control = ptr->unk6; + gScreen.bg2.updated = 1; + gScreen.bg3.xOffset = 0; + gScreen.bg3.yOffset = 0; + gScreen.bg3.control = 0x1e0b; + if (ptr->unk0 != 0) { + LoadPaletteGroup(ptr->unk0); + } + if (ptr->unk1 != 0) { + LoadGfxGroup(ptr->unk1); + } +} + +void sub_080A4E84(u8 param_1) { + gUnk_02034490.unk14 = param_1; +} + +void sub_080A4E90(u8 param_1) { + gUnk_02034490.unk11 = param_1; + gUnk_02034490.unk12 = 0; +} diff --git a/src/menu/kinstone_menu.c b/src/menu/kinstone_menu.c new file mode 100644 index 00000000..10d2da5f --- /dev/null +++ b/src/menu/kinstone_menu.c @@ -0,0 +1,660 @@ +#include "global.h" +#include "menu.h" +#include "room.h" +#include "subtask.h" +#include "common.h" +#include "screen.h" +#include "sound.h" +#include "save.h" +#include "kinstone.h" +#include "flags.h" +#include "message.h" +#include "main.h" +#include "object.h" +#include "npc.h" +#include "enemy.h" +#include "functions.h" + +typedef struct { + u8 filler0[0x1]; + u8 unk1; + u8 charColor; + u8 bgColor; + u16 unk4; + u16 unk6; + u8* unk8; +} struct_02036540; + +extern u32 sub_08000E44(u32); +extern void sub_080A3B74(void); +extern s32 sub_080A3B48(void); +extern void sub_0805ECEC(u32, u32, u32, u32); +extern void sub_0801C2F0(u32, u32); +extern void sub_0801E6C8(u32); +extern void sub_0801E798(u32); +extern struct_02036540* sub_0805F2C8(void); +extern void sub_0805F300(struct_02036540*); +extern u32 sub_0805F76C(u8*, struct_02036540*); + +typedef struct { + void* sourceAddress; + void* destinationAddress; + union { + u32 word; + struct { + u16 low; + u16 high; + } half; + } control; +} DMARegisters; + +#define DMA3 ((volatile DMARegisters*)REG_ADDR_DMA3SAD) + +extern const u32 gUnk_080CA06C[]; +extern const u8 gGlobalGfxAndPalettes[]; +extern u8 gTextGfxBuffer[]; +extern u8 gUnk_02002AC0[]; + +u32 sub_080A44E0(struct_02036540*, u8*, u32); +u32 sub_080A4418(u32, u32); +u32 sub_080A43DC(u32); +u32 sub_080A43A8(u32); +void sub_080A42E0(u32, u32); +void KinstoneMenu_080A4054(void); +void KinstoneMenu_080A4468(void); +void KinstoneMenu_080A422C(void); +void KinstoneMenu_080A414C(void); +void KinstoneMenu_080A4080(void); +u32 KinstoneMenu_080A4494(void); +void KinstoneMenu_080A4528(void); + +void KinstoneMenu_Type0(void); +void KinstoneMenu_Type1(void); +void KinstoneMenu_Type2(void); +void KinstoneMenu_Type3(void); +void KinstoneMenu_Type4(void); +void KinstoneMenu_Type5(void); +void Subtask_KinstoneMenu(void) { + static void (*const kinstoneMenuTypes[])(void) = { + KinstoneMenu_Type0, KinstoneMenu_Type1, KinstoneMenu_Type2, + KinstoneMenu_Type3, KinstoneMenu_Type4, KinstoneMenu_Type5, + }; +#if !(defined(DEMO_USA) || defined(DEMO_JP)) + gRoomTransition.player_status.field_0x24[8] = 2; + FlushSprites(); + kinstoneMenuTypes[gMenu.menuType](); + sub_080A3B74(); + KinstoneMenu_080A4054(); + sub_0801C1D4(); + DrawOAMCmd(); + UpdateEntities(); + DrawEntities(); + CopyOAM(); + gRoomTransition.player_status.field_0x24[8] = 0; +#endif +} + +const u8 gUnk_081280DC[] = { + 0xd8u, 0xeu, 0xdu, 0xc4u, 0x1au, 0xeu, 0xffu, 0xd8u, 0u, 0x9u, 0u, 0u, 0x1u, 0xau, 0u, 0x1u, 0x1u, 0xffu, +}; + +void KinstoneMenu_Type0(void) { + s32 iVar1; + s32 iVar2; + + gMenu.column_idx = 1; + gKinstoneMenu.unk2a = 0; + sub_080A4D34(); + LoadPaletteGroup(0xcb); + LoadGfxGroup(0x75); + + iVar1 = KinstoneMenu_080A4494(); + iVar2 = iVar1 + 7; + if (iVar2 < 0) { + iVar2 += 0x7; + } + + iVar1 = (iVar2 >> 3) - 6; + iVar1 = max(iVar1, 0); + iVar1 = min(iVar1, 6); + + LoadGfxGroup(iVar1 + 0x76); + gScreen.lcd.displayControl |= 0x1e00; + gScreen.bg1.control = 0x1c01; + gScreen.bg2.control = 0x1d02; + gScreen.bg3.control = 0x1e0b; + gScreen.bg1.updated = 1; + gScreen.bg2.updated = 1; + gScreen.bg3.updated = 1; + KinstoneMenu_080A4528(); + sub_080A4398(); + sub_0801E738(0); + sub_080A70AC((void*)gUnk_081280DC); + sub_080A7114(1); + SetFade(6, 8); +} + +const u8 gUnk_081280EE[] = { + 0x5u, 0x7u, 0xau, 0xeu, 0x13u, 0x1au, +}; + +NONMATCH("asm/non_matching/subtask/KinstoneMenu_Type1.inc", void KinstoneMenu_Type1(void)) { + s32 tmp1, tmp2, tmp3, tmp4, tmp5; + u8* ptr; + GenericMenu* menu; + if (gFadeControl.active) { + return; + } + menu = &gGenericMenu; + menu->base.column_idx = 2; + tmp2 = menu->unk28 * 0x10000; + tmp1 = tmp2 - menu->unk10.i; + if ((tmp1 < 0 ? -tmp1 : tmp1) <= 0x1ffdu) { + menu->unk10.i = tmp2; + } else { + menu->base.column_idx = 1; + tmp2 = sub_08000E44(tmp1); + tmp1 = tmp1 / 0x20000; + if (tmp1 < 0) + tmp1 = -tmp1; + if (tmp1 > 5) { + tmp1 = 5; + } + menu->unk10.i += gUnk_081280EE[tmp1] * 0x666 * tmp2; + } + if (menu->unk29 != menu->unk10.i / 0x10000) { + menu->unk29 = menu->unk10.i / 0x10000; + SoundReq(SFX_TEXTBOX_CHOICE); + } + if ((gInput.newKeys & 0x20a) != 0) { + sub_080A7114(2); + SoundReq(SFX_MENU_CANCEL); + return; + } + tmp3 = menu->unk28; + switch (gInput.unk4) { + case 0x20: + case 0x40: + tmp3 -= 1; + break; + case 0x10: + case 0x80: + tmp3 += 1; + break; + case 1: + if (gMenu.column_idx == 2) { + tmp3 = gGenericMenu.unk10.i / 0x10000; + gGenericMenu.unk2a = gSave.unk118[tmp3]; + sub_080A7114(3); + } + break; + } + tmp4 = sub_080A3B48(); + if (tmp4 <= tmp3) { + tmp3 = tmp4 - 1; + } + if (tmp4 < 2) { + tmp3 = 0; + } + if (tmp3 < 0) { + tmp3 = 0; + } + if (menu->unk28 != tmp3) { + menu->unk28 = tmp3; + } +} +END_NONMATCH + +void KinstoneMenu_Type2(void) { + const struct_080C9CBC* ptr; + if (gMenu.column_idx == 6) { + gFuseInfo._0 = 6; + ptr = &gUnk_080C9CBC[gFuseInfo._3]; + if (ptr->unk3 != 0) { + MenuFadeIn(ptr->unk3, ptr->evt_type); + } else { + Subtask_Exit(); + } + } else { + gFuseInfo._0 = 5; + Subtask_Exit(); + } +} + +void KinstoneMenu_Type3_Overlay0(void); +void KinstoneMenu_Type3_Overlay1(void); +void KinstoneMenu_Type3_Overlay2(void); +void KinstoneMenu_Type3(void) { + static void (*const kinstoneMenu_Type3_overlays[])(void) = { + KinstoneMenu_Type3_Overlay0, + KinstoneMenu_Type3_Overlay1, + KinstoneMenu_Type3_Overlay2, + }; + gMenu.column_idx = 3; + kinstoneMenu_Type3_overlays[gMenu.overlayType](); +} + +void KinstoneMenu_Type3_Overlay0(void) { + gKinstoneMenu.unk18 = 0; + gKinstoneMenu.unk2c += 2; + if (0x45 < gKinstoneMenu.unk2c) { + gKinstoneMenu.unk2c = 0x46; + gMenu.overlayType = 1; + } +} + +void KinstoneMenu_Type3_Overlay1(void) { + u32 temp = gUnk_080C9CBC[gKinstoneMenu.unk2a].unk5; + if (temp != gUnk_080C9CBC[gFuseInfo._3].unk5) { + SoundReq(SFX_ITEM_SHIELD_BOUNCE); + sub_080A7114(4); + } else { + gMenu.overlayType = 2; + gMenu.transitionTimer = 0x14; + gScreen.lcd.displayControl |= 0x2000; + gScreen.controls.window0HorizontalDimensions = 0x6887; + gScreen.controls.window0VerticalDimensions = 0x405f; + gScreen.controls.windowInsideControl = 0x3f; + gScreen.controls.windowOutsideControl = 0x1f; + gScreen.controls.layerFXControl = 0x3f90; + gScreen.controls.layerBrightness = 0; + SoundReq(SFX_FA); + } +} + +void KinstoneMenu_Type3_Overlay2(void) { + if (++gScreen.controls.layerBrightness > 14) { + gScreen.controls.layerBrightness = 0; + gScreen.lcd.displayControl &= 0xdfff; + sub_080A7114(5); + } +} + +void KinstoneMenu_Type4(void) { + gMenu.column_idx = 4; + gKinstoneMenu.unk2c -= 3; + gKinstoneMenu.unk18 += 0x100; + if (gKinstoneMenu.unk2c < 0) { + gKinstoneMenu.unk18 = 0; + gKinstoneMenu.unk2c = 0; + sub_080A7114(1); + SoundReq(SFX_MENU_ERROR); + } +} + +void KinstoneMenu_Type5_Overlay0(void); +void KinstoneMenu_Type5_Overlay1(void); +void KinstoneMenu_Type5_Overlay2(void); +void KinstoneMenu_Type5_Overlay3(void); +void KinstoneMenu_Type5(void) { + static void (*const kinstoneMenu_Type5_Overlays[])(void) = { + KinstoneMenu_Type5_Overlay0, + KinstoneMenu_Type5_Overlay1, + KinstoneMenu_Type5_Overlay2, + KinstoneMenu_Type5_Overlay3, + }; + kinstoneMenu_Type5_Overlays[gMenu.overlayType](); +} + +extern u8 gUnk_02002C81[]; + +void KinstoneMenu_Type5_Overlay0(void) { + gMenu.column_idx = 5; + WriteBit((u32*)gUnk_02002C81, gFuseInfo._3); + if (99 < ++gUnk_02002C81[-298]) { + gUnk_02002C81[-299] = 1; + } + KinstoneMenu_080A4468(); + SoundReq(SFX_TASK_COMPLETE); + MessageAtHeight(0x702, 0xe); + gMenu.overlayType = 1; + gMenu.transitionTimer = 0x78; +} + +void KinstoneMenu_Type5_Overlay1(void) { + if ((gMessage.doTextBox & 0x7f) == 0) { + gMenu.overlayType = 2; + SoundReq(SFX_147); + } +} + +void KinstoneMenu_Type5_Overlay2(void) { + gMenu.transitionTimer -= 1; + if (gMenu.transitionTimer != 0) { + gKinstoneMenu.unk18 += gKinstoneMenu.unk1a; + gKinstoneMenu.unk1a += 0x20; + } else { + gMenu.column_idx = 6; + gMenu.overlayType = 3; + gMenu.transitionTimer = 0x4f; + CreateObject(OBJECT_B3, 1, 0); + SoundReq(SFX_1CA); + } +} + +void KinstoneMenu_Type5_Overlay3(void) { + // TODO figure out why in some place s16 is needed and u16 in others + if (--(s16)gMenu.transitionTimer < 0) { + sub_080A7114(2); + } +} + +// something kinstone related, maybe inventory +typedef struct { + u8 unk_00[1]; + u8 unk_01; + u8 unk_02[2]; +} struct_02019EE0; +extern struct_02019EE0 gUnk_02019EE0[16]; + +void KinstoneMenu_080A4054(void) { + u32 uVar2; + KinstoneMenu_080A422C(); + KinstoneMenu_080A414C(); + KinstoneMenu_080A4080(); + for (uVar2 = 0; uVar2 < 0x10; uVar2++) { + if (gUnk_02019EE0[uVar2].unk_01 != 0) { + gUnk_02019EE0[uVar2].unk_01 -= 1; + } + } +} + +void KinstoneMenu_080A4080(void) { + static const u8 gUnk_08128110[] = { + 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0x1u, 0x1u, 0x1u, 0x2u, 0x2u, 0x3u, 0x2u, 0x3u, 0x2u, + }; + + u32 uVar1; + s32 iVar2; + s32 iVar3; + const u8* temp; + + u32 t; + + gOamCmd._4 = 0; + gOamCmd._6 = 0; + gOamCmd.y = 0x10 - gKinstoneMenu.unk2f; + gOamCmd.x = 0x40; + gOamCmd._8 = 0x400; +#ifdef EU + DrawDirect(0x1fa, 0); +#else + DrawDirect(0x1fb, 0); +#endif + gOamCmd.y = 0x94; + gOamCmd.x = 0x50; + gOamCmd._8 = 0x480; +#ifdef EU + t = 0x1f9; +#else + t = 0x1fa; +#endif + DrawDirect(t, 0); + gOamCmd.x = 0xb8; + gOamCmd._8 = 0x4a0; + DrawDirect(t, 1); + uVar1 = gMain.ticks.HWORD >> 2 & 0xe; + temp = &gUnk_08128110[uVar1]; + gOamCmd.x = 10 - temp[0]; + gOamCmd._8 = 0x4e0; + iVar2 = sub_080A3B48() - 1; + if (0 < iVar2) { + iVar3 = gKinstoneMenu.unk10.WORD; + if (iVar3 < 0) { + iVar3 = gKinstoneMenu.unk10.WORD + 0xffff; + } + if (iVar3 >> 0x10 != iVar2) { + gOamCmd.y = temp[1] + 0x77; + DrawDirect(t, 3); + } + if (iVar3 >> 0x10 != 0) { + gOamCmd.y = 0x27 - temp[1]; + DrawDirect(t, 2); + } + } +} + +NONMATCH("asm/non_matching/subtask/KinstoneMenu_080A414C.inc", void KinstoneMenu_080A414C(void)) { + s32 uVar1; + s32 iVar2; + s32 uVar3; + + s32 i; + + gOamCmd._4 = 0; + gOamCmd._6 = 0; + uVar1 = gKinstoneMenu.unk10.HALF.LO / 0xb21; + for (i = -3, uVar1 = -uVar1 - 0x45; i < 4; uVar1 += 0x17, i++) { + gOamCmd.y = ((gSineTable[uVar1 & 0xff] * 0x44) / 0x100) + 0x4f; + gOamCmd.x = ((gSineTable[(uVar1 + 0x40) & 0xff] * 0x42) / 0x100) - 0x10; + iVar2 = gKinstoneMenu.unk10.WORD / 0x10000 + i; + if (iVar2 >= 0) { + uVar3 = gSave.unk12B[iVar2]; + if (i == 0) { + switch (gMenu.column_idx) { + case 3: + case 4: + uVar3 -= 1; + break; + default: + break; + } + } + if (0 < uVar3) { + sub_080A42E0(gSave.unk118[iVar2], uVar3); + } + } + } +} +END_NONMATCH + +void KinstoneMenu_080A422C(void) { + static const s8 gUnk_08128120[] = { + 16, 18, 19, 22, 25, 34, 64, 123, -64, -34, -25, -22, -19, -18, + -16, -18, -19, -22, -25, -34, -64, 123, 64, 34, 25, 22, 19, 0, + }; + + s32 uVar2; + s32 t, t2; + u16 t3; + + uVar2 = gKinstoneMenu.unk18 / 256; + uVar2 %= 27; + t3 = uVar2; + sub_0805ECEC(0, gUnk_08128120[t3] << 4, 0x100, 0); + gOamCmd._4 = 0x100; + gOamCmd._6 = 0; + gOamCmd.y = 0x4f; + t = gKinstoneMenu.unk2a; + t2 = 0x180; + switch (gMenu.column_idx) { + case 5: + gOamCmd.x = 0x78; + sub_080A42E0(t, 0xff); + break; + case 3: + case 4: + gOamCmd.x = gKinstoneMenu.unk2c + 0x32; + sub_080A42E0(t, 0); + t2 = 0x8a - (gKinstoneMenu.unk2c * 0x12 / 0x46); + break; + case 6: + break; + default: + t2 = 0x8a; + break; + } + + gOamCmd.x = t2; + sub_080A42E0(gFuseInfo._3, 0); +} + +void sub_080A42E0(u32 param_1, u32 param_2) { + u8 uVar1; + s32 sVar2; + s32 sVar3; + s32 iVar4; + + const struct_080C9CBC* ptr = &gUnk_080C9CBC[param_1]; + + if (param_2 == 0xff) { + uVar1 = ptr->unk2; + } else { + uVar1 = ptr->unk1; + } + iVar4 = sub_080A43A8(uVar1); + if ((param_2 != 0) && (param_2 != 0xff)) { + int index = iVar4 * 4; + if (param_2 != gUnk_02019EE0[iVar4].unk_02[0]) { + gUnk_02019EE0[iVar4].unk_02[0] = param_2; + sub_0801C2F0(iVar4 * 2 + 0x2e0, param_2); + } + gOamCmd._8 = (s16)(iVar4 * 2) + 0x3ae0; + sVar2 = gOamCmd.x; + sVar3 = gOamCmd.y; + if (gMenu.column_idx == 0) { + gOamCmd.x += 0x10; + gOamCmd.y += 9; + } else { + gOamCmd.x += 8; + gOamCmd.y += 10; + } + DrawDirect(0, 5); + gOamCmd.x = sVar2; + gOamCmd.y = sVar3; + } + { + int t; + t = ptr->unk0; + t <<= 0xc; + t |= 0x800; + t |= (iVar4 << 4) + 0x300; + gOamCmd._8 = t; + } + DrawDirect(0, 3); +} + +void sub_080A4398(void) { + MemClear(&gUnk_02019EE0, sizeof(gUnk_02019EE0)); +} + +u32 sub_080A43A8(u32 param_1) { + u32 uVar1; + + uVar1 = sub_080A43DC(param_1); + if (0xf < uVar1) { + uVar1 &= 0xf; + sub_080A4418(param_1, uVar1 * 0x10 + 0x300); + } + { int index = uVar1 * 4; } + gUnk_02019EE0[uVar1].unk_00[0] = param_1; + gUnk_02019EE0[uVar1].unk_01 = 2; + return uVar1; +} + +u32 sub_080A43DC(u32 unk1) { + u32 i; + for (i = 0; i < 16; i++) { + if (unk1 == gUnk_02019EE0[i].unk_00[0]) { + return i; + } + } + for (i = 0; i < 16; i++) { + if (gUnk_02019EE0[i].unk_01 == 0) { + return i + 0x10; + } + } + return 0; +} + +u32 sub_080A4418(u32 param_1, u32 param_2) { + void* src; + u32 t, t2; + void* dest; + + dest = (void*)(param_2 * 0x20 + 0x6010000); + t = gUnk_080CA06C[param_1]; + t2 = t & 0x80000000; + src = (void*)&gGlobalGfxAndPalettes[~t2 & t]; + if (t2) { + LZ77UnCompVram(src, dest); + } else { + DMA3->sourceAddress = src; + DMA3->destinationAddress = dest; + DMA3->control.word = 0x84000080; + return DMA3->control.word; + } +} + +void KinstoneMenu_080A4468(void) { + gUnk_03003DF0[0].unk[2] = 0; + gUnk_03003DF0[0].unk2[3] = 0; + sub_0801E6C8(gFuseInfo._3); + sub_0801E798(gKinstoneMenu.unk2a); +} + +u32 KinstoneMenu_080A4494(void) { + struct_02036540* psVar1; + u8* r1; + u32 ret; + + psVar1 = sub_0805F2C8(); + if (psVar1 != NULL) { + psVar1->unk8 = gTextGfxBuffer; + psVar1->charColor = 0; + psVar1->bgColor = 5; + psVar1->unk1 = 0; + sub_080A44E0(psVar1, gUnk_02002AC0, 0x80); +#if NON_MATCHING + ret = sub_080A44E0(psVar1, sub_08002632(gFuseInfo.ent) >> 0x20, 0xa0); +#else + sub_08002632(gFuseInfo.ent); + asm("" : "=r"(r1)); + ret = sub_080A44E0(psVar1, r1, 0xa0); +#endif + sub_0805F300(psVar1); + } + return ret; +} + +u32 sub_080A44E0(struct_02036540* param_1, u8* param_2, u32 param_3) { + u32 uVar1; + u32 size; + + param_1->unk6 = 0; + param_1->unk4 = 0x60; + size = 0x300; + MemClear(param_1->unk8, size); + uVar1 = sub_0805F76C(param_2, param_1); + MemCopy(param_1->unk8, (void*)(param_3 * 0x20 + 0x6010000), size); + return uVar1; +} + +void KinstoneMenu_080A4528(void) { + Entity* entity; + + if (gFuseInfo.ent->kind == NPC) { + entity = CreateNPC(gFuseInfo.ent->id, gFuseInfo.ent->type, gFuseInfo.ent->type2); + } else { + if (gFuseInfo.ent->kind != ENEMY) { + return; + } + entity = CreateEnemy(gFuseInfo.ent->id, gFuseInfo.ent->type); + } + if (entity != NULL) { + if (entity->kind == NPC) { + NPCInit(entity); + entity->field_0xf = entity->id; + entity->id = 0x56; + } else { + EnemyInit(entity); + entity->field_0xf = entity->id; + entity->id = 0x66; + } + entity->x.HALF.HI = 0xcc; + entity->y.HALF.HI = 0x60; + entity->spritePriority.b1 = 2; + entity->spriteSettings.draw = 1; + entity->hitbox = NULL; + } +} diff --git a/src/subtask.c b/src/subtask.c index 6e32454a..4b2fad5a 100644 --- a/src/subtask.c +++ b/src/subtask.c @@ -17,7 +17,6 @@ #include "functions.h" #include "structures.h" -extern const u32 gUnk_080CA06C[]; extern const u8 gGlobalGfxAndPalettes[]; typedef struct { u8 filler0[0x1]; @@ -29,30 +28,17 @@ typedef struct { u8* unk8; } struct_02036540; -u32 sub_08000E44(u32); -s32 sub_080A3B48(void); -void sub_080A4468(void); -void sub_080A422C(void); -void sub_080A414C(void); -void sub_080A4080(void); void sub_080A42E0(u32, u32); void sub_0805ECEC(u32, u32, u32, u32); u32 sub_080A43A8(u32); -void sub_0801C2F0(u32, u32); u32 sub_080A4418(u32, u32); u32 sub_080A43DC(u32); -void sub_0801E6C8(u32); -void sub_0801E798(u32); u32 sub_080A44E0(struct_02036540*, u8*, u32); struct_02036540* sub_0805F2C8(void); -void sub_0805F300(struct_02036540*); -u32 sub_0805F76C(u8*, struct_02036540*); -void sub_080A4978(void); +void FigurineMenu_080A4978(void); void sub_080A4B44(void); void sub_080A4DA8(u32); u32 sub_080A4CBC(u32); -void sub_080A4BA0(u32, u32); -void sub_0805F46C(u32, const u16**); void sub_080A4DB8(u32); void sub_08056250(void); void sub_080A5128(void); @@ -60,1065 +46,13 @@ u32 sub_080A51F4(void); void sub_080A51D4(void); void sub_080A5F48(u32, u32); -extern void (*const gUnk_081280C4[])(void); -extern const u8 gUnk_081280EE[]; - -typedef struct { - u8 unk0; - u8 unk1; - u8 unk2; - u8 unk3; - u8 unk4; - u8 unk5; - u8 unk6; - u8 unk7; -} struct_080C9CBC; - -extern const struct_080C9CBC gUnk_080C9CBC[]; -extern void (*const gUnk_081280F4[])(void); - extern u8 gUnk_02002C81[]; -typedef struct { - u8 unk_00[1]; - u8 unk_01; - u8 unk_02[2]; -} struct_02019EE0; - -extern struct_02019EE0 gUnk_02019EE0[]; -extern s8 gUnk_08128120[]; - -typedef struct { - void* sourceAddress; - void* destinationAddress; - union { - u32 word; - struct { - u16 low; - u16 high; - } half; - } control; -} DMARegisters; - -#define DMA3 ((volatile DMARegisters*)REG_ADDR_DMA3SAD) extern u8 gTextGfxBuffer[]; -extern u8 gUnk_02002AC0[]; - -extern const struct { - u8 filler[7]; - u8 unk7; -} gUnk_080FC3E4[]; - -extern u32 gUnk_02002B0E; -extern const KeyButtonLayout gUnk_0812813C; -extern const u16* gUnk_08128190; -extern u8 gUnk_020344A0[8]; -typedef struct { - u8 unk0; - u8 unk1; - u16 unk2; - u16 unk4; - u16 unk6; -} struct_08128AD8; -extern const struct_08128AD8 gUnk_08128AD8[]; - -extern const struct { - u8 unk0; - u8 unk1; - u8 filler[2]; - void (*func)(void); -} gUnk_08128A38[]; extern const KeyButtonLayout gUnk_08128B50; extern const u8 gUnk_080FD5B4[]; -void Subtask_KinstoneMenu(void) { -#if !(defined(DEMO_USA) || defined(DEMO_JP)) - gRoomTransition.player_status.field_0x24[8] = 2; - FlushSprites(); - gUnk_081280C4[gMenu.menuType](); - sub_080A3B74(); - sub_080A4054(); - sub_0801C1D4(); - DrawOAMCmd(); - UpdateEntities(); - DrawEntities(); - CopyOAM(); - gRoomTransition.player_status.field_0x24[8] = 0; -#endif -} - -extern void gUnk_081280DC; - -void sub_080A3BD0(void) { - s32 iVar1; - s32 iVar2; - - gMenu.column_idx = 1; - gGenericMenu.unk2a = 0; - sub_080A4D34(); - LoadPaletteGroup(0xcb); - LoadGfxGroup(0x75); - - iVar1 = sub_080A4494(); - iVar2 = iVar1 + 7; - if (iVar2 < 0) { - iVar2 += 0x7; - } - - iVar1 = (iVar2 >> 3) - 6; - iVar1 = max(iVar1, 0); - iVar1 = min(iVar1, 6); - - LoadGfxGroup(iVar1 + 0x76); - gScreen.lcd.displayControl |= 0x1e00; - gScreen.bg1.control = 0x1c01; - gScreen.bg2.control = 0x1d02; - gScreen.bg3.control = 0x1e0b; - gScreen.bg1.updated = 1; - gScreen.bg2.updated = 1; - gScreen.bg3.updated = 1; - sub_080A4528(); - sub_080A4398(); - sub_0801E738(0); - sub_080A70AC(&gUnk_081280DC); - sub_080A7114(1); - SetFade(6, 8); -} - -NONMATCH("asm/non_matching/subtask/sub_080A3C6C.inc", void sub_080A3C6C(void)) { - s32 tmp1, tmp2, tmp3, tmp4, tmp5; - u8* ptr; - GenericMenu* menu; - if (gFadeControl.active) { - return; - } - menu = &gGenericMenu; - menu->base.column_idx = 2; - tmp2 = menu->unk28 * 0x10000; - tmp1 = tmp2 - menu->unk10.i; - if ((tmp1 < 0 ? -tmp1 : tmp1) <= 0x1ffdu) { - menu->unk10.i = tmp2; - } else { - menu->base.column_idx = 1; - tmp2 = sub_08000E44(tmp1); - tmp1 = tmp1 / 0x20000; - if (tmp1 < 0) - tmp1 = -tmp1; - if (tmp1 > 5) { - tmp1 = 5; - } - menu->unk10.i += gUnk_081280EE[tmp1] * 0x666 * tmp2; - } - if (menu->unk29 != menu->unk10.i / 0x10000) { - menu->unk29 = menu->unk10.i / 0x10000; - SoundReq(SFX_TEXTBOX_CHOICE); - } - if ((gInput.newKeys & 0x20a) != 0) { - sub_080A7114(2); - SoundReq(SFX_MENU_CANCEL); - return; - } - tmp3 = menu->unk28; - switch (gInput.unk4) { - case 0x20: - case 0x40: - tmp3 -= 1; - break; - case 0x10: - case 0x80: - tmp3 += 1; - break; - case 1: - if (gMenu.column_idx == 2) { - tmp3 = gGenericMenu.unk10.i / 0x10000; - gGenericMenu.unk2a = gSave.unk118[tmp3]; - sub_080A7114(3); - } - break; - } - tmp4 = sub_080A3B48(); - if (tmp4 <= tmp3) { - tmp3 = tmp4 - 1; - } - if (tmp4 < 2) { - tmp3 = 0; - } - if (tmp3 < 0) { - tmp3 = 0; - } - if (menu->unk28 != tmp3) { - menu->unk28 = tmp3; - } -} -END_NONMATCH - -void sub_080A3DB8(void) { - const struct_080C9CBC* ptr; - if (gMenu.column_idx == 6) { - gFuseInfo._0 = 6; - ptr = &gUnk_080C9CBC[gFuseInfo._3]; - if (ptr->unk3 != 0) { - MenuFadeIn(ptr->unk3, ptr->unk4); - } else { - Subtask_Exit(); - } - } else { - gFuseInfo._0 = 5; - Subtask_Exit(); - } -} - -void sub_080A3E00(void) { - gMenu.column_idx = 3; - gUnk_081280F4[gMenu.overlayType](); -} - -void sub_080A3E20(void) { - gGenericMenu.unk18 = 0; - gGenericMenu.unk2c += 2; - if (0x45 < gGenericMenu.unk2c) { - gGenericMenu.unk2c = 0x46; - gMenu.overlayType = 1; - } -} - -void sub_080A3E48(void) { - u32 temp = gUnk_080C9CBC[gGenericMenu.unk2a].unk5; - if (temp != gUnk_080C9CBC[gFuseInfo._3].unk5) { - SoundReq(SFX_ITEM_SHIELD_BOUNCE); - sub_080A7114(4); - } else { - gMenu.overlayType = 2; - gMenu.transitionTimer = 0x14; - gScreen.lcd.displayControl |= 0x2000; - gScreen.controls.window0HorizontalDimensions = 0x6887; - gScreen.controls.window0VerticalDimensions = 0x405f; - gScreen.controls.windowInsideControl = 0x3f; - gScreen.controls.windowOutsideControl = 0x1f; - gScreen.controls.layerFXControl = 0x3f90; - gScreen.controls.layerBrightness = 0; - SoundReq(SFX_FA); - } -} - -void sub_080A3EDC(void) { - if (++gScreen.controls.layerBrightness > 14) { - gScreen.controls.layerBrightness = 0; - gScreen.lcd.displayControl &= 0xdfff; - sub_080A7114(5); - } -} - -void sub_080A3F10(void) { - gMenu.column_idx = 4; - gGenericMenu.unk2c -= 3; - gGenericMenu.unk18 += 0x100; - if (gGenericMenu.unk2c < 0) { - gGenericMenu.unk18 = 0; - gGenericMenu.unk2c = 0; - sub_080A7114(1); - SoundReq(SFX_MENU_ERROR); - } -} - -void sub_080A3F4C(void) { - extern void (*const gUnk_08128100[])(void); - gUnk_08128100[gMenu.overlayType](); -} - -void sub_080A3F68(void) { - gMenu.column_idx = 5; - WriteBit((u32*)gUnk_02002C81, gFuseInfo._3); - if (99 < ++gUnk_02002C81[-298]) { - gUnk_02002C81[-299] = 1; - } - sub_080A4468(); - SoundReq(SFX_TASK_COMPLETE); - MessageAtHeight(0x702, 0xe); - gMenu.overlayType = 1; - gMenu.transitionTimer = 0x78; -} - -void sub_080A3FCC(void) { - if ((gMessage.doTextBox & 0x7f) == 0) { - gMenu.overlayType = 2; - SoundReq(SFX_147); - } -} - -void sub_080A3FF4(void) { - gMenu.transitionTimer -= 1; - if (gMenu.transitionTimer != 0) { - gGenericMenu.unk18 += gGenericMenu.unk1a.HWORD; - gGenericMenu.unk1a.HWORD += 0x20; - } else { - gMenu.column_idx = 6; - gMenu.overlayType = 3; - gMenu.transitionTimer = 0x4f; - CreateObject(OBJECT_B3, 1, 0); - SoundReq(SFX_1CA); - } -} - -void sub_080A4038(void) { - // TODO figure out why in some place s16 is needed and u16 in others - if (--(s16)gMenu.transitionTimer < 0) { - sub_080A7114(2); - } -} - -void sub_080A4054(void) { - u32 uVar2; - sub_080A422C(); - sub_080A414C(); - sub_080A4080(); - for (uVar2 = 0; uVar2 < 0x10; uVar2++) { - if (gUnk_02019EE0[uVar2].unk_01 != 0) { - gUnk_02019EE0[uVar2].unk_01 -= 1; - } - } -} - -extern u8 gUnk_08128110[]; -void sub_080A4080(void) { - u32 uVar1; - s32 iVar2; - s32 iVar3; - u8* temp; - - u32 t; - - gOamCmd._4 = 0; - gOamCmd._6 = 0; - gOamCmd.y = 0x10 - (s8)gGenericMenu.unk2e.HALF.HI; - gOamCmd.x = 0x40; - gOamCmd._8 = 0x400; -#ifdef EU - DrawDirect(0x1fa, 0); -#else - DrawDirect(0x1fb, 0); -#endif - gOamCmd.y = 0x94; - gOamCmd.x = 0x50; - gOamCmd._8 = 0x480; -#ifdef EU - t = 0x1f9; -#else - t = 0x1fa; -#endif - DrawDirect(t, 0); - gOamCmd.x = 0xb8; - gOamCmd._8 = 0x4a0; - DrawDirect(t, 1); - uVar1 = gMain.ticks.HWORD >> 2 & 0xe; - temp = &gUnk_08128110[uVar1]; - gOamCmd.x = 10 - temp[0]; - gOamCmd._8 = 0x4e0; - iVar2 = sub_080A3B48() - 1; - if (0 < iVar2) { - iVar3 = gGenericMenu.unk10.i; - if (iVar3 < 0) { - iVar3 = gGenericMenu.unk10.i + 0xffff; - } - if (iVar3 >> 0x10 != iVar2) { - gOamCmd.y = temp[1] + 0x77; - DrawDirect(t, 3); - } - if (iVar3 >> 0x10 != 0) { - gOamCmd.y = 0x27 - temp[1]; - DrawDirect(t, 2); - } - } -} - -NONMATCH("asm/non_matching/subtask/sub_080A414C.inc", void sub_080A414C(void)) { - s32 uVar1; - s32 iVar2; - s32 uVar3; - - s32 i; - - gOamCmd._4 = 0; - gOamCmd._6 = 0; - uVar1 = gGenericMenu.unk10.h[0] / 0xb21; - for (i = -3, uVar1 = -uVar1 - 0x45; i < 4; uVar1 += 0x17, i++) { - gOamCmd.y = ((gSineTable[uVar1 & 0xff] * 0x44) / 0x100) + 0x4f; - gOamCmd.x = ((gSineTable[(uVar1 + 0x40) & 0xff] * 0x42) / 0x100) - 0x10; - iVar2 = gGenericMenu.unk10.i / 0x10000 + i; - if (iVar2 >= 0) { - uVar3 = gSave.unk12B[iVar2]; - if (i == 0) { - switch (gMenu.column_idx) { - case 3: - case 4: - uVar3 -= 1; - break; - default: - break; - } - } - if (0 < uVar3) { - sub_080A42E0(gSave.unk118[iVar2], uVar3); - } - } - } -} -END_NONMATCH - -void sub_080A422C(void) { - s32 uVar2; - s32 t, t2; - u16 t3; - - uVar2 = gGenericMenu.unk18 / 256; - uVar2 %= 27; - t3 = uVar2; - sub_0805ECEC(0, gUnk_08128120[t3] << 4, 0x100, 0); - gOamCmd._4 = 0x100; - gOamCmd._6 = 0; - gOamCmd.y = 0x4f; - t = gGenericMenu.unk2a; - t2 = 0x180; - switch (gMenu.column_idx) { - case 5: - gOamCmd.x = 0x78; - sub_080A42E0(t, 0xff); - break; - case 3: - case 4: - gOamCmd.x = gGenericMenu.unk2c + 0x32; - sub_080A42E0(t, 0); - t2 = 0x8a - (gGenericMenu.unk2c * 0x12 / 0x46); - break; - case 6: - break; - default: - t2 = 0x8a; - break; - } - - gOamCmd.x = t2; - sub_080A42E0(gFuseInfo._3, 0); -} - -void sub_080A42E0(u32 param_1, u32 param_2) { - u8 uVar1; - s32 sVar2; - s32 sVar3; - s32 iVar4; - - const struct_080C9CBC* ptr = &gUnk_080C9CBC[param_1]; - - if (param_2 == 0xff) { - uVar1 = ptr->unk2; - } else { - uVar1 = ptr->unk1; - } - iVar4 = sub_080A43A8(uVar1); - if ((param_2 != 0) && (param_2 != 0xff)) { - int index = iVar4 * 4; - if (param_2 != gUnk_02019EE0[iVar4].unk_02[0]) { - gUnk_02019EE0[iVar4].unk_02[0] = param_2; - sub_0801C2F0(iVar4 * 2 + 0x2e0, param_2); - } - gOamCmd._8 = (s16)(iVar4 * 2) + 0x3ae0; - sVar2 = gOamCmd.x; - sVar3 = gOamCmd.y; - if (gMenu.column_idx == 0) { - gOamCmd.x += 0x10; - gOamCmd.y += 9; - } else { - gOamCmd.x += 8; - gOamCmd.y += 10; - } - DrawDirect(0, 5); - gOamCmd.x = sVar2; - gOamCmd.y = sVar3; - } - { - int t; - t = ptr->unk0; - t <<= 0xc; - t |= 0x800; - t |= (iVar4 << 4) + 0x300; - gOamCmd._8 = t; - } - DrawDirect(0, 3); -} - -void sub_080A4398(void) { - MemClear(&gUnk_02019EE0, 0x40); -} - -u32 sub_080A43A8(u32 param_1) { - u32 uVar1; - - uVar1 = sub_080A43DC(param_1); - if (0xf < uVar1) { - uVar1 &= 0xf; - sub_080A4418(param_1, uVar1 * 0x10 + 0x300); - } - { int index = uVar1 * 4; } - gUnk_02019EE0[uVar1].unk_00[0] = param_1; - gUnk_02019EE0[uVar1].unk_01 = 2; - return uVar1; -} - -u32 sub_080A43DC(u32 unk1) { - u32 i; - for (i = 0; i < 16; i++) { - if (unk1 == gUnk_02019EE0[i].unk_00[0]) { - return i; - } - } - for (i = 0; i < 16; i++) { - if (gUnk_02019EE0[i].unk_01 == 0) { - return i + 0x10; - } - } - return 0; -} - -u32 sub_080A4418(u32 param_1, u32 param_2) { - void* src; - u32 t, t2; - void* dest; - - dest = (void*)(param_2 * 0x20 + 0x6010000); - t = gUnk_080CA06C[param_1]; - t2 = t & 0x80000000; - src = (void*)&gGlobalGfxAndPalettes[~t2 & t]; - if (t2) { - LZ77UnCompVram(src, dest); - } else { - DMA3->sourceAddress = src; - DMA3->destinationAddress = dest; - DMA3->control.word = 0x84000080; - return DMA3->control.word; - } -} - -void sub_080A4468(void) { - gUnk_03003DF0[0].unk[2] = 0; - gUnk_03003DF0[0].unk2[3] = 0; - sub_0801E6C8(gFuseInfo._3); - sub_0801E798(gGenericMenu.unk2a); -} - -u32 sub_080A4494(void) { - struct_02036540* psVar1; - u8* r1; - u32 ret; - - psVar1 = sub_0805F2C8(); - if (psVar1 != NULL) { - psVar1->unk8 = gTextGfxBuffer; - psVar1->charColor = 0; - psVar1->bgColor = 5; - psVar1->unk1 = 0; - sub_080A44E0(psVar1, gUnk_02002AC0, 0x80); -#if NON_MATCHING - ret = sub_080A44E0(psVar1, sub_08002632(gFuseInfo.ent) >> 0x20, 0xa0); -#else - sub_08002632(gFuseInfo.ent); - asm("" : "=r"(r1)); - ret = sub_080A44E0(psVar1, r1, 0xa0); -#endif - sub_0805F300(psVar1); - } - return ret; -} - -u32 sub_080A44E0(struct_02036540* param_1, u8* param_2, u32 param_3) { - u32 uVar1; - u32 size; - - param_1->unk6 = 0; - param_1->unk4 = 0x60; - size = 0x300; - MemClear(param_1->unk8, size); - uVar1 = sub_0805F76C(param_2, param_1); - MemCopy(param_1->unk8, (void*)(param_3 * 0x20 + 0x6010000), size); - return uVar1; -} - -void sub_080A4528(void) { - Entity* entity; - - if (gFuseInfo.ent->kind == NPC) { - entity = CreateNPC(gFuseInfo.ent->id, gFuseInfo.ent->type, gFuseInfo.ent->type2); - } else { - if (gFuseInfo.ent->kind != ENEMY) { - return; - } - entity = CreateEnemy(gFuseInfo.ent->id, gFuseInfo.ent->type); - } - if (entity != NULL) { - if (entity->kind == NPC) { - NPCInit(entity); - entity->field_0xf = entity->id; - entity->id = 0x56; - } else { - EnemyInit(entity); - entity->field_0xf = entity->id; - entity->id = 0x66; - } - entity->x.HALF.HI = 0xcc; - entity->y.HALF.HI = 0x60; - entity->spritePriority.b1 = 2; - entity->spriteSettings.draw = 1; - entity->hitbox = NULL; - } -} - -extern void (*const gUnk_0812815C[])(void); -extern void (*const gUnk_0812814C[])(void); - -void Subtask_FigurineMenu(void) { -#if !(defined(DEMO_USA) || defined(DEMO_JP)) - FlushSprites(); - if (gUnk_02032EC0.field_0x3 == 0xff) { - gUnk_0812815C[gMenu.menuType](); - } else { - gUnk_0812814C[gMenu.menuType](); - } - UpdateEntities(); - sub_0801C1D4(); - DrawOAMCmd(); - DrawEntities(); - sub_080A4978(); - CopyOAM(); - sub_080A4B44(); -#endif -} - -void sub_080A4608(void) { - s32 iVar2; - - SetBgmVolume(0x80); - sub_080A4DA8(3); - SetColor(0, gPaletteBuffer[0xfb]); - SetColor(0x15c, gPaletteBuffer[0xd3]); - MemClear(&gBG0Buffer, 0x800); - MemClear(&gBG3Buffer, 0x1000); - gScreen.controls.window0HorizontalDimensions = 0xf0; - gScreen.controls.window0VerticalDimensions = 0x7898; - gScreen.controls.windowInsideControl = 0x1f; - gScreen.controls.windowOutsideControl = 0x1d; - gScreen.bg1.updated = 1; - for (iVar2 = 0; iVar2 < 0x10; iVar2++) { - gGenericMenu.unk10.a[iVar2] = 0xee; - } - { - int r0, r1, r2; - - r1 = gUnk_02032EC0.field_0x3; - r0 = gSave.unk6; - r2 = 0x88; - if (r0 == 0) { - r2 = 0x82; - } - if (r2 < r1) { - r1 = 1; - } - gGenericMenu.unk1c = r1; - } - SetFade(4, 8); -} - -void sub_080A46C0(void) { - SetBgmVolume(0x100); - SoundReq(SFX_MENU_CANCEL); - ClearRoomFlag(2); - Subtask_Exit(); -} - -void sub_080A46DC(void) { - sub_080A4608(); - sub_080A7114(1); -} - -void sub_080A46EC(void) { - if (gFadeControl.active == 0) { - CreateObject(0xa2, gUnk_080FC3E4[gGenericMenu.unk1c].unk7, 0); - sub_080A7114(2); - } -} - -void sub_080A4720(void) { - u32 bVar1; - Sound sound; - - if (gMenu.field_0x0 != 0) { - gGenericMenu.unk20 += 1; - switch (gGenericMenu.unk20) { - case 0x40: - gGenericMenu.unk21 = WriteBit(&gUnk_02002B0E, gGenericMenu.unk1c); - gMenu.column_idx = 1; - default: - bVar1 = gGenericMenu.unk20 >> 2; - if (0x10 < bVar1) { - bVar1 = 0x20 - bVar1; - } - gScreen.controls.layerBrightness = bVar1; - gScreen.controls.layerFXControl = 0xbf; - break; - case 0x80: - gScreen.controls.layerBrightness = 0; - gScreen.controls.layerFXControl = 0; - gScreen.lcd.displayControl |= 0x2000; - sub_080A7114(3); - sub_080A70AC((KeyButtonLayout*)&gUnk_0812813C); - gMenu.column_idx = 0x15; - if (gGenericMenu.unk21 == 0) { - sound = SFX_109; - } else { - sound = SFX_MENU_ERROR; - } - SoundReq(sound); - return; - } - } -} - -void sub_080A47D0(void) { - s32 uVar1; - s32 t; - - uVar1 = gGenericMenu.unk1f; - switch (gInput.unk4) { - case 2: - case 8: - sub_080A46C0(); - break; - case 0x10: - uVar1 += 8; - break; - case 0x20: - uVar1 -= 8; - break; - } - t = gGenericMenu.unk1e; - if (uVar1 < 0) { - uVar1 = 0; - } - if (t < uVar1) { - uVar1 = t; - } - gGenericMenu.unk1f = uVar1; - gScreen.bg1.yOffset = uVar1 - 0x70; -} - -void sub_080A4830(void) { - sub_080A4608(); - gScreen.lcd.displayControl |= 0x2000; - sub_080A70AC(&gUnk_0812813C); - gMenu.column_idx = 0xff; - sub_080A7114(1); -} - -void sub_080A4864(void) { - int r0, r1, r2, r3, r4, r5, r6; - - if (gFadeControl.active) - return; - - r5 = gGenericMenu.unk1f; - r4 = gGenericMenu.unk1c; - r1 = gInput.unk4; - switch (gInput.unk4) { - case 2: - case 8: - sub_080A7114(3); - break; - case 0x200: - r4 -= 5; - break; - case 0x100: - r4 += 5; - break; - case 0x40: - r4--; - break; - case 0x80: - r4++; - break; - case 0x10: - r5 += 8; - break; - case 0x20: - r5 -= 8; - break; - case 1: - break; - } - r1 = (gSave.unk6 == 0) ? 0x82 : 0x88; - if (r4 <= 0) { - r4 = 1; - } - if (r1 < r4) { - r4 = r1; - } - r0 = gGenericMenu.unk1c; - if (r0 != r4) { - gGenericMenu.unk1c = r4; - SoundReq(SFX_TEXTBOX_CHOICE); - sub_080A7114(2); - r5 = 0; - } - r0 = gGenericMenu.unk1e; - if (r5 < 0) { - r5 = 0; - } - if (r0 < r5) { - r5 = r0; - } - gGenericMenu.unk1f = r5; - gScreen.bg1.yOffset = r5 - 0x70; -} - -void sub_080A4934(void) { - sub_080A7114(1); -} - -void sub_080A4940(void) { - sub_080A46C0(); -} - -u32 sub_080A4948(s32 param_1) { - s32 iVar1; - u32 uVar2; - - uVar2 = 0; - iVar1 = gSave.unk6 == 0 ? 0x82 : 0x88; - if ((0 < param_1) || (iVar1 >= param_1)) { - if (ReadBit((u32*)&gSave.stats.filler4[4], param_1)) { - uVar2 = 1; - } - } - return uVar2; -} - -typedef struct { - u8* pal; - u8* gfx; - int size; - int zero; -} Figurine; - -extern const Figurine gFigurines[]; - -#ifdef EU -#define sub_080A4978_draw_constant 0x1fb -#else -#define sub_080A4978_draw_constant 0x1fc -#endif -void sub_080A4978(void) { - int r0, r2, r4, r6; - - gOamCmd._4 = 0; - gOamCmd._6 = 0; - gOamCmd._8 = 0x800; - gOamCmd.x = 0x9c; - gOamCmd.y = 0x48; - DrawDirect(sub_080A4978_draw_constant, 0); - r2 = (gSave.unk6 == 0) ? 0x82 : 0x88; - if ((gMenu.column_idx & 2) != 0) { - if (r2 >= (gGenericMenu.unk1c)) { - gOamCmd.x = 0xe8; - r0 = (0x5000 / r2) * (gGenericMenu.unk1c - 1); - if (r0 < 0) { - r0 += 0xff; - } - r0 >>= 8; - r0 += 0x20; - gOamCmd.y = r0; - DrawDirect(sub_080A4978_draw_constant, 1); - r0 = gMain.ticks.HWORD & 0x10; - r4 = (r0) ? 4 : 2; - gOamCmd.x = 0xe8; - gOamCmd.y = 0x1a; - DrawDirect(sub_080A4978_draw_constant, r4); - gOamCmd.x = 0xe8; - gOamCmd.y = 0x76; - DrawDirect(sub_080A4978_draw_constant, r4 + 1); - } - } - if (gMain.ticks.HWORD & 0x10) { - if (gMenu.column_idx & 0x10) { - if (gGenericMenu.unk1e) { - gOamCmd.y = 0x10; - if (gGenericMenu.unk1f > 0) { - gOamCmd.x = 6; - gOamCmd.y = 0x9c; - DrawDirect(sub_080A4978_draw_constant, 6); - } - if (gGenericMenu.unk1e > gGenericMenu.unk1f) { - gOamCmd.x = 0xea; - gOamCmd.y = 0x9c; - DrawDirect(sub_080A4978_draw_constant, 7); - } - } - } - } - if (gSaveHeader->language) { - if (gMenu.column_idx & 0x4) { - gOamCmd.y = 0x10; - r4 = gGenericMenu.unk1c; - for (r6 = 2; r6 >= 0; r6--) { - gOamCmd.x = 0x5d + (r6 * 7); - gOamCmd._8 = ((r4 % 10) << 1) | 0x9e0; - DrawDirect(0, 9); - r4 = r4 / 10; - } - } - } - if (gMenu.column_idx & 1) { - if (sub_080A4948(gGenericMenu.unk1c)) { - gOamCmd.x = 0x2c; - gOamCmd.y = 0x48; - gOamCmd._8 = 0xd4 << 7; - DrawDirect(sub_080A4978_draw_constant - 4, gGenericMenu.unk1c - 1); - if (gGenericMenu.unk1d != gGenericMenu.unk1c) { - const Figurine* fig; - u8* gfx; - gGenericMenu.unk1d = gGenericMenu.unk1c; - fig = &gFigurines[gGenericMenu.unk1c]; - LoadPalettes(fig->pal, 0x16, 9); - gfx = fig->gfx; - if (fig->size < 0) { - LZ77UnCompVram(gfx, (void*)0x6014000); - } else { - LoadResourceAsync(gfx, 0x6014000, fig->size); - } - } - } - } -} - -void sub_080A4B44(void) { - u32 uVar1; - - uVar1 = gGenericMenu.unk1c; - if ((gMenu.column_idx & 0x10) != 0) { - gGenericMenu.unk1e = sub_080A4CBC(uVar1); - } - if ((gMenu.column_idx & 4) != 0) { - sub_080A4BA0(uVar1, 2); - } - if ((gMenu.column_idx & 8) != 0) { - sub_080A4BA0(uVar1 - 2, 0); - sub_080A4BA0(uVar1 - 1, 1); - sub_080A4BA0(uVar1 + 1, 3); - sub_080A4BA0(uVar1 + 2, 4); - } -} - -ASM_FUNC("asm/non_matching/subtask/sub_080A4BA0.inc", void sub_080A4BA0(u32 unk1, u32 unk2)) - -u32 sub_080A4CBC(u32 param_1) { - s32 iVar1; - const u16* psVar2; - u32 uVar3; - - if (gGenericMenu.unk1a.HALF.LO != param_1) { - gGenericMenu.unk1a.HALF.LO = param_1; - MemClear(&gBG1Buffer, 0x800); - MemCopy(&gBG1Buffer, (void*)0x600e000, 0x800); - iVar1 = sub_080A4948(param_1); - if (iVar1 != 0) { - sub_0805F46C(param_1 + 0x900, &gUnk_08128190); - } - gScreen.bg1.updated = 1; - } - psVar2 = gUnk_08128190 + 0x80; - - for (uVar3 = 0; uVar3 < 0x14; uVar3++) { - if (*psVar2 == 0) - break; - psVar2 += 0x20; - } - return uVar3 << 3; -} - -void sub_080A4D34(void) { - s32 iVar1; - - LoadGfxGroups(); - LoadPaletteGroup(0xb5); - if (gSave.stats.health <= 8) { - iVar1 = 2; - } else { - s32 missingHealth = gSave.stats.maxHealth - gSave.stats.health; - if (missingHealth < 9) { - iVar1 = 0; - } else { - iVar1 = 1; - } - } - LoadGfxGroup(iVar1 + 0x56); - gScreen.bg3.xOffset = 0; - gScreen.bg3.yOffset = 0; - gScreen.bg3.control = 0x1e0b; - gScreen.bg3.updated = 1; -} - -void sub_080A4D88(void) { - MemClear(gUnk_020344A0, sizeof(gUnk_020344A0)); - MenuFadeIn(1, 0); - SetBgmVolume(0x80); -} - -void sub_080A4DA8(u32 param_1) { - sub_080A4D34(); - sub_080A4DB8(param_1); -} - -void sub_080A4DB8(u32 param_1) { - const struct_08128AD8* ptr; - - sub_08056250(); - MemClear(&gBG0Buffer, 0x800); - MemClear(&gBG1Buffer, 0x800); - MemClear(&gBG2Buffer, 0x800); - MemClear(gUnk_0200AF00.filler25 + 0xf, 0x300); - MemClear(&gGenericMenu, sizeof(gGenericMenu)); - gGenericMenu.unk2e.HWORD = 0xffff; - gMenu.field_0x3 = gUnk_02034490.unk2[param_1]; - ptr = &gUnk_08128AD8[gUnk_08128A38[param_1].unk0]; - gScreen.lcd.displayControl = ptr->unk2 | 0x1940; - gScreen.bg0.xOffset = 0; - gScreen.bg0.yOffset = 0; - gScreen.bg0.updated = 1; - gScreen.bg1.xOffset = 0; - gScreen.bg1.yOffset = 0; - gScreen.bg1.control = ptr->unk4; - gScreen.bg1.updated = 1; - gScreen.bg2.xOffset = 0; - gScreen.bg2.yOffset = 0; - gScreen.bg2.control = ptr->unk6; - gScreen.bg2.updated = 1; - gScreen.bg3.xOffset = 0; - gScreen.bg3.yOffset = 0; - gScreen.bg3.control = 0x1e0b; - if (ptr->unk0 != 0) { - LoadPaletteGroup(ptr->unk0); - } - if (ptr->unk1 != 0) { - LoadGfxGroup(ptr->unk1); - } -} - -void sub_080A4E84(u8 param_1) { - gUnk_02034490.unk14 = param_1; -} - -void sub_080A4E90(u8 param_1) { - gUnk_02034490.unk11 = param_1; - gUnk_02034490.unk12 = 0; -} - void Subtask_PauseMenu(void) { extern const void (*const gUnk_08128B30[])(void); From 9b60d9c5e24ed592524c25a9dc013417d6e7ee0c Mon Sep 17 00:00:00 2001 From: Henny022p Date: Mon, 31 Jan 2022 17:21:01 +0100 Subject: [PATCH 6/7] sorted pause menu --- asm/non_matching/fileScreen/sub_08050EF4.inc | 2 +- asm/non_matching/fileScreen/sub_08051738.inc | 4 +- asm/non_matching/fileScreen/sub_080610B8.inc | 2 +- .../figurine_menu}/sub_080A4BA0.inc | 0 .../kinstone_menu}/KinstoneMenu_080A414C.inc | 0 .../kinstone_menu}/KinstoneMenu_Type1.inc | 4 +- asm/subtask2.s | 42 +- assets/assets.json | 10 - data/data_08128A38.s | 39 +- data/data_08128BF4.s | 7 - include/itemMenuTable.h | 39 -- include/menu.h | 6 + include/subtask.h | 2 +- linker.ld | 7 +- src/fileselect.c | 36 +- src/game.c | 16 +- src/itemMenuTable.c | 39 -- src/menu/figurine_menu.c | 36 +- src/menu/kinstone_menu.c | 50 +- src/menu/pause_menu.c | 598 ++++++++++++++++++ src/subtask.c | 518 --------------- 21 files changed, 716 insertions(+), 741 deletions(-) rename asm/non_matching/{subtask => menu/figurine_menu}/sub_080A4BA0.inc (100%) rename asm/non_matching/{subtask => menu/kinstone_menu}/KinstoneMenu_080A414C.inc (100%) rename asm/non_matching/{subtask => menu/kinstone_menu}/KinstoneMenu_Type1.inc (98%) delete mode 100644 include/itemMenuTable.h delete mode 100644 src/itemMenuTable.c create mode 100644 src/menu/pause_menu.c delete mode 100644 src/subtask.c diff --git a/asm/non_matching/fileScreen/sub_08050EF4.inc b/asm/non_matching/fileScreen/sub_08050EF4.inc index dbad9f1e..04388489 100644 --- a/asm/non_matching/fileScreen/sub_08050EF4.inc +++ b/asm/non_matching/fileScreen/sub_08050EF4.inc @@ -106,7 +106,7 @@ _08050FAC: bl SoundReq _08050FBA: adds r0, r5, #0 - bl sub_080A7114 + bl SetMenuType ldr r0, _08050FCC @ =gUnk_02019EE0 ldrb r0, [r0, #6] bl SetActiveSave diff --git a/asm/non_matching/fileScreen/sub_08051738.inc b/asm/non_matching/fileScreen/sub_08051738.inc index 16ca61e3..6b6c621c 100644 --- a/asm/non_matching/fileScreen/sub_08051738.inc +++ b/asm/non_matching/fileScreen/sub_08051738.inc @@ -45,13 +45,13 @@ _08051774: movs r1, #0 bl CreateDialogBox movs r0, #3 - bl sub_080A7114 + bl SetMenuType b _080517A2 .align 2, 0 _08051798: .4byte gMenu _0805179C: movs r0, #1 - bl sub_080A7114 + bl SetMenuType _080517A2: adds r4, #1 ldr r0, _080517B0 @ =gMenu diff --git a/asm/non_matching/fileScreen/sub_080610B8.inc b/asm/non_matching/fileScreen/sub_080610B8.inc index 037a8765..93548d8d 100644 --- a/asm/non_matching/fileScreen/sub_080610B8.inc +++ b/asm/non_matching/fileScreen/sub_080610B8.inc @@ -319,7 +319,7 @@ _08051316: movs r0, #0x6a bl sub_08051574 adds r0, r7, #0 - bl sub_080A7114 + bl SetMenuType _08051322: movs r0, #0x80 lsls r0, r0, #0x12 diff --git a/asm/non_matching/subtask/sub_080A4BA0.inc b/asm/non_matching/menu/figurine_menu/sub_080A4BA0.inc similarity index 100% rename from asm/non_matching/subtask/sub_080A4BA0.inc rename to asm/non_matching/menu/figurine_menu/sub_080A4BA0.inc diff --git a/asm/non_matching/subtask/KinstoneMenu_080A414C.inc b/asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc similarity index 100% rename from asm/non_matching/subtask/KinstoneMenu_080A414C.inc rename to asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc diff --git a/asm/non_matching/subtask/KinstoneMenu_Type1.inc b/asm/non_matching/menu/kinstone_menu/KinstoneMenu_Type1.inc similarity index 98% rename from asm/non_matching/subtask/KinstoneMenu_Type1.inc rename to asm/non_matching/menu/kinstone_menu/KinstoneMenu_Type1.inc index d55c1997..19ed0509 100644 --- a/asm/non_matching/subtask/KinstoneMenu_Type1.inc +++ b/asm/non_matching/menu/kinstone_menu/KinstoneMenu_Type1.inc @@ -84,7 +84,7 @@ _080A3CFE: cmp r0, #0 beq _080A3D30 movs r0, #2 - bl sub_080A7114 + bl SetMenuType movs r0, #0x6c bl SoundReq b _080A3DA8 @@ -144,7 +144,7 @@ _080A3D70: adds r0, #0x2a strb r1, [r0] movs r0, #3 - bl sub_080A7114 + bl SetMenuType _080A3D8A: bl sub_080A3B48 cmp r0, r4 diff --git a/asm/subtask2.s b/asm/subtask2.s index 58b34906..c1381564 100644 --- a/asm/subtask2.s +++ b/asm/subtask2.s @@ -134,7 +134,7 @@ _080A5688: movs r0, #1 strb r0, [r1, #0x14] strb r0, [r1, #0x15] - bl sub_080A7114 + bl SetMenuType pop {r4, r5, r6, r7, pc} .align 2, 0 _080A5698: .4byte gMenu @@ -815,7 +815,7 @@ sub_080A59AC: @ 0x080A59AC movs r1, #0 bl SetPopupState movs r0, #1 - bl sub_080A7114 + bl SetMenuType pop {pc} .align 2, 0 _080A59C4: .4byte gMenu @@ -870,13 +870,13 @@ _080A5A10: movs r1, #0 bl CreateDialogBox movs r0, #2 - bl sub_080A7114 + bl SetMenuType movs r0, #0x6a bl SoundReq b _080A5A52 _080A5A2E: movs r0, #3 - bl sub_080A7114 + bl SetMenuType movs r0, #0x6c bl SoundReq b _080A5A52 @@ -921,7 +921,7 @@ _080A5A76: strh r0, [r1, #8] _080A5A84: movs r0, #3 - bl sub_080A7114 + bl SetMenuType _080A5A8A: pop {pc} .align 2, 0 @@ -1019,7 +1019,7 @@ _080A5B24: .endif _080A5B28: movs r0, #1 - bl sub_080A7114 + bl SetMenuType .ifdef EU pop {pc} .else @@ -1091,7 +1091,7 @@ _080A5B8E: movs r0, #0x3c strh r0, [r6, #8] movs r0, #2 - bl sub_080A7114 + bl SetMenuType b _080A5BB6 _080A5BAA: movs r0, #0x6c @@ -1182,7 +1182,7 @@ sub_080A5C44: @ 0x080A5C44 movs r1, #1 bl sub_080A6FB4 movs r0, #1 - bl sub_080A7114 + bl SetMenuType ldrb r1, [r4, #3] lsls r1, r1, #1 ldr r0, _080A5C94 @ =gUnk_08128D43 @@ -1925,7 +1925,7 @@ sub_080A6024: @ 0x080A6024 bl sub_0801E738 bl sub_080A4398 movs r0, #1 - bl sub_080A7114 + bl SetMenuType pop {pc} .align 2, 0 _080A6040: .4byte gUnk_08128D60 @@ -2033,7 +2033,7 @@ sub_080A6108: @ 0x080A6108 ldr r0, _080A6128 @ =gUnk_08128DBC bl sub_080A70AC movs r0, #1 - bl sub_080A7114 + bl SetMenuType pop {pc} .align 2, 0 _080A6120: .4byte gMenu @@ -2893,7 +2893,7 @@ sub_080A6534: @ 0x080A6534 movs r0, #0x3c strh r0, [r1, #8] movs r0, #1 - bl sub_080A7114 + bl SetMenuType movs r0, #4 movs r1, #8 bl SetFade @@ -3000,7 +3000,7 @@ sub_080A6650: @ 0x080A6650 bl sub_080A67C4 bl sub_080A68D4 movs r0, #1 - bl sub_080A7114 + bl SetMenuType pop {pc} .align 2, 0 _080A6670: .4byte gUnk_08128E84 @@ -3917,7 +3917,7 @@ _080A6BD4: movs r0, #0x1e strh r0, [r1, #8] movs r0, #1 - bl sub_080A7114 + bl SetMenuType movs r0, #4 movs r1, #8 bl SetFade @@ -4020,7 +4020,7 @@ sub_080A6CA8: @ 0x080A6CA8 ldr r1, _080A6CD4 @ =gMenu strb r0, [r1, #3] movs r0, #1 - bl sub_080A7114 + bl SetMenuType movs r0, #4 movs r1, #8 bl SetFade @@ -4083,7 +4083,7 @@ _080A6D34: _080A6D38: movs r0, #2 strb r0, [r2] - bl sub_080A7114 + bl SetMenuType ldr r0, _080A6D48 @ =0x00000704 bl MessageFromTarget b _080A6D54 @@ -4092,7 +4092,7 @@ _080A6D48: .4byte 0x00000704 _080A6D4C: movs r0, #3 strb r0, [r1] - bl sub_080A7114 + bl SetMenuType _080A6D54: cmp r4, #0 beq _080A6D6E @@ -4188,7 +4188,7 @@ _080A65DC: cmp r0, #0 beq _080A65EA movs r0, #3 - bl sub_080A7114 + bl SetMenuType _080A65EA: pop {pc} .align 2, 0 @@ -4213,7 +4213,7 @@ _080A6DEC: .4byte gMenu _080A6DF0: movs r0, #1 _080A6DF2: - bl sub_080A7114 + bl SetMenuType _080A6DF6: pop {pc} .endif @@ -4226,7 +4226,7 @@ sub_080A6DF8: @ 0x080A6DF8 cmp r0, #2 bne _080A6E18 movs r0, #4 - bl sub_080A7114 + bl SetMenuType movs r0, #5 movs r1, #8 bl SetFade @@ -4666,8 +4666,8 @@ _080A70FC: .align 2, 0 _080A7110: .4byte gUnk_0200AF34 - thumb_func_start sub_080A7114 -sub_080A7114: @ 0x080A7114 + thumb_func_start SetMenuType +SetMenuType: @ 0x080A7114 ldr r1, _080A7120 @ =gMenu movs r2, #0 strb r0, [r1, #5] diff --git a/assets/assets.json b/assets/assets.json index 3a683b72..4b211987 100644 --- a/assets/assets.json +++ b/assets/assets.json @@ -47368,16 +47368,6 @@ "start": 1215192, "size": 88 }, - { - "path": "data_08127280/gUnk_08128B50.bin", - "start": 1215312, - "size": 20 - }, - { - "path": "data_08127280/gUnk_08128BF4.bin", - "start": 1215476, - "size": 4 - }, { "path": "data_08127280/gUnk_08128C00.bin", "start": 1215488, diff --git a/data/data_08128A38.s b/data/data_08128A38.s index aa7e88a2..932d8c47 100644 --- a/data/data_08128A38.s +++ b/data/data_08128A38.s @@ -6,13 +6,13 @@ gUnk_08128A38:: @ 08128A38 .incbin "data_08127280/gUnk_08128A38.bin" - .4byte sub_080A4F28 + .4byte PauseMenu_Variant0 .incbin "data_08127280/gUnk_08128A38_1.bin" - .4byte sub_080A5218 + .4byte PauseMenu_ItemMenu .incbin "data_08127280/gUnk_08128A38_2.bin" - .4byte sub_080A5574 + .4byte PauseMenu2 .incbin "data_08127280/gUnk_08128A38_3.bin" - .4byte sub_080A4F28 + .4byte PauseMenu_Variant0 .incbin "data_08127280/gUnk_08128A38_4.bin" .4byte sub_080A6270 .incbin "data_08127280/gUnk_08128A38_5.bin" @@ -30,21 +30,21 @@ gUnk_08128A38:: @ 08128A38 .incbin "data_08127280/gUnk_08128A38_11.bin" .4byte sub_080A5990 .incbin "data_08127280/gUnk_08128A38_12.bin" - .4byte sub_080A4F28 + .4byte PauseMenu_Variant0 .incbin "data_08127280/gUnk_08128A38_13.bin" - .4byte sub_080A4F28 + .4byte PauseMenu_Variant0 .incbin "data_08127280/gUnk_08128A38_14.bin" - .4byte sub_080A4F28 + .4byte PauseMenu_Variant0 .incbin "data_08127280/gUnk_08128A38_15.bin" - .4byte sub_080A4F28 + .4byte PauseMenu_Variant0 .incbin "data_08127280/gUnk_08128A38_16.bin" - .4byte sub_080A4F28 + .4byte PauseMenu_Variant0 .incbin "data_08127280/gUnk_08128A38_17.bin" - .4byte sub_080A4F28 + .4byte PauseMenu_Variant0 .incbin "data_08127280/gUnk_08128A38_18.bin" - .4byte sub_080A4F28 + .4byte PauseMenu_Variant0 .incbin "data_08127280/gUnk_08128A38_19.bin" - .4byte sub_080A4F28 + .4byte PauseMenu_Variant0 gUnk_08128AD8:: @ 08128AD8 .ifdef EU @@ -53,18 +53,3 @@ gUnk_08128AD8:: @ 08128AD8 .else .incbin "data_08127280/gUnk_08128AD8_1_USA-JP-DEMO_USA-DEMO_JP.bin" .endif - -gUnk_08128B30:: @ 08128B30 - .4byte sub_080A4F28 - .4byte sub_080A4FA0 - .4byte sub_080A4FB8 - .4byte sub_080A50B8 - .4byte sub_080A50E8 - .4byte sub_080A5108 - -gUnk_08128B48:: @ 08128B48 - .4byte sub_080A5238 - .4byte sub_080A529C - -gUnk_08128B50:: @ 08128B50 - .incbin "data_08127280/gUnk_08128B50.bin" diff --git a/data/data_08128BF4.s b/data/data_08128BF4.s index 90f0801d..d19f524e 100644 --- a/data/data_08128BF4.s +++ b/data/data_08128BF4.s @@ -4,13 +4,6 @@ .section .rodata .align 2 -gUnk_08128BF4:: @ 08128BF4 - .incbin "data_08127280/gUnk_08128BF4.bin" - -gUnk_08128BF8:: @ 08128BF8 - .4byte sub_080A5594 - .4byte sub_080A56A0 - gUnk_08128C00:: @ 08128C00 .incbin "data_08127280/gUnk_08128C00.bin" diff --git a/include/itemMenuTable.h b/include/itemMenuTable.h deleted file mode 100644 index f1d6aaa5..00000000 --- a/include/itemMenuTable.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef SUBTASK_ITEMMENUTABLE_H -#define SUBTASK_ITEMMENUTABLE_H - -#include "global.h" - -typedef enum { - MENU_SLOT_SWORD, - MENU_SLOT_GUST_JAR, - MENU_SLOT_CANE, - MENU_SLOT_BOOMERANG, - MENU_SLOT_SHIELD, - MENU_SLOT_MOLE_MITTS, - MENU_SLOT_LANTERN, - MENU_SLOT_BOMBS, - MENU_SLOT_PEGASUS_BOOTS, - MENU_SLOT_ROCS_CAPE, - MENU_SLOT_OCARINA, - MENU_SLOT_BOW, - MENU_SLOT_BOTTLE0, - MENU_SLOT_BOTTLE1, - MENU_SLOT_BOTTLE2, - MENU_SLOT_BOTTLE3, - MENU_SLOT_SAVE_BUTTON, -} ItemMenuTableSlot; - -typedef struct { - u8 up; - u8 down; - u8 left; - u8 right; - u8 type; - u8 unk0; - u8 x; - u8 y; -} ItemMenuTableEntry; - -extern const ItemMenuTableEntry gItemMenuTable[]; - -#endif // SUBTASK_ITEMMENUTABLE_H diff --git a/include/menu.h b/include/menu.h index 4402e192..f590e999 100644 --- a/include/menu.h +++ b/include/menu.h @@ -114,9 +114,15 @@ typedef struct { /*0x2e*/ u16 unk2e; } FigurineMenu; +typedef struct { + /*0x00*/ Menu base; + /*0x10*/ u8 items[17]; // unsure about size +} PauseMenu; + extern Menu gMenu; #define gGenericMenu (*(GenericMenu*)&gMenu) #define gKinstoneMenu (*(KinstoneMenu*)&gMenu) #define gFigurineMenu (*(FigurineMenu*)&gMenu) +#define gPauseMenu (*(PauseMenu*)&gMenu) #endif diff --git a/include/subtask.h b/include/subtask.h index efc0c757..46412946 100644 --- a/include/subtask.h +++ b/include/subtask.h @@ -39,7 +39,7 @@ Subtask Subtask_LocalMapHint; // todo: separate headers for each subtask? extern void sub_080A4398(void); -extern void sub_080A7114(u32); +extern void SetMenuType(u32); extern void sub_080A4D34(void); extern void sub_080A4E90(u8); extern void sub_080A4E84(u8); diff --git a/linker.ld b/linker.ld index 8a491f79..a2e6e685 100644 --- a/linker.ld +++ b/linker.ld @@ -856,8 +856,8 @@ SECTIONS { asm/staffroll.o(.text); src/menu/kinstone_menu.o(.text); src/menu/figurine_menu.o(.text); - src/subtask.o(.text); - asm/subtask2.o(.text); /* subtask.c */ + src/menu/pause_menu.o(.text); + asm/subtask2.o(.text); src/playerItem/playerItemSword.o(.text); src/playerItemUtils.o(.text); src/projectileUtils.o(.text); @@ -1602,10 +1602,9 @@ SECTIONS { data/data_08127280.o(.rodata); src/menu/kinstone_menu.o(.rodata); src/menu/figurine_menu.o(.rodata); - src/subtask.o(.rodata); data/gfx/figurines.o(.rodata); data/data_08128A38.o(.rodata); - src/itemMenuTable.o(.rodata); + src/menu/pause_menu.o(.rodata); data/data_08128BF4.o(.rodata); data/const/playerItem/playerItemSword.o(.rodata); data/projectile_functions.o(.rodata); diff --git a/src/fileselect.c b/src/fileselect.c index 724444f3..129bd6da 100644 --- a/src/fileselect.c +++ b/src/fileselect.c @@ -363,7 +363,7 @@ void sub_08050848(void) { sub_0805070C(); gUnk_02019EE0.unk7 = 0; sub_08050AFC(gUnk_02019EE0.unk6); - sub_080A7114(1); + SetMenuType(1); } void sub_0805086C(void) { @@ -404,7 +404,7 @@ void sub_080508E4(void) { void sub_08050910(void) { sub_08050384(); if (++gUnk_02019EE0.unk7 > 2) { - sub_080A7114(2); + SetMenuType(2); } else { gChooseFileState.subState = 0; } @@ -630,7 +630,7 @@ void sub_08050C54(void) { SoundReq(SONG_VOL_FADE_OUT); } gMenu.transitionTimer = 0xf; - sub_080A7114(1); + SetMenuType(1); SoundReq(SFX_TEXTBOX_SELECT); break; case B_BUTTON: @@ -686,7 +686,7 @@ void sub_08050DB8(void) { MemClear(&gBG2Buffer, sizeof(gBG2Buffer)); sub_080503A8(0xc); gMenu.field_0x4 = gSaveHeader->language; - sub_080A7114(1); + SetMenuType(1); } void sub_08050DE4(void) { @@ -707,7 +707,7 @@ void sub_08050DE4(void) { case START_BUTTON: SoundReq(SFX_TEXTBOX_SELECT); if (gMenu.field_0x4 != row_idx) { - sub_080A7114(2); + SetMenuType(2); CreateDialogBox(8, 0); } else { SetFileSelectState(STATE_NONE); @@ -751,7 +751,7 @@ void sub_08050EB8(void) { gUnk_02019EE0.unk5 = save->brightness; gMenu.column_idx = 0; gMenu.transitionTimer = 0xff; - sub_080A7114(1); + SetMenuType(1); } NONMATCH("asm/non_matching/fileScreen/sub_08050EF4.inc", void sub_08050EF4(void)) { @@ -804,7 +804,7 @@ NONMATCH("asm/non_matching/fileScreen/sub_08050EF4.inc", void sub_08050EF4(void) gUnk_02019EE0.saves[gUnk_02019EE0.unk6].msg_speed = gUnk_02019EE0.unk4; gUnk_02019EE0.saves[gUnk_02019EE0.unk6].brightness = gUnk_02019EE0.unk5; SoundReq(SFX_MENU_CANCEL); - sub_080A7114(mode); + SetMenuType(mode); SetActiveSave(gUnk_02019EE0.unk6); break; case 2: @@ -812,7 +812,7 @@ NONMATCH("asm/non_matching/fileScreen/sub_08050EF4.inc", void sub_08050EF4(void) SoundReq(SFX_TEXTBOX_SELECT); default: case 1: - sub_080A7114(mode); + SetMenuType(mode); SetActiveSave(gUnk_02019EE0.unk6); break; case 0: @@ -836,7 +836,7 @@ void sub_08050FFC(void) { sub_0805194C(gUnk_02019EE0.unk6); CreateDialogBox(9, 0); case SAVE_OK: - sub_080A7114(3); + SetMenuType(3); break; } } @@ -867,7 +867,7 @@ void sub_08051090(void) { sub_08051458(); gScreen.bg1.yOffset = 0xff; gScreen.bg2.yOffset = 0xff; - sub_080A7114(1); + SetMenuType(1); } NONMATCH("asm/non_matching/fileScreen/sub_080610B8.inc", void sub_080610B8(void)) { @@ -897,7 +897,7 @@ void sub_080513C0(void) { switch (HandleSave(0)) { case 1: gUnk_02019EE0.saveStatus[gUnk_02019EE0.unk6] = 1; - sub_080A7114(3); + SetMenuType(3); break; case 0: break; @@ -914,7 +914,7 @@ void sub_0805141C(void) { switch (gMenu.transitionTimer) { case 0: if (gInput.newKeys & (A_BUTTON | START_BUTTON)) { - sub_080A7114(3); + SetMenuType(3); } break; default: @@ -1039,7 +1039,7 @@ void HandleFileDelete(void) { } void sub_080515c8(void) { - sub_080A7114(1); + SetMenuType(1); } void sub_080515D4(void) { @@ -1058,7 +1058,7 @@ void sub_080515D4(void) { case START_BUTTON: if (column_idx == 1) { CreateDialogBox(4, 0); - sub_080A7114(2); + SetMenuType(2); SoundReq(SFX_TEXTBOX_SELECT); } else { SetFileSelectState(0); @@ -1113,9 +1113,9 @@ NONMATCH("asm/non_matching/fileScreen/sub_08051738.inc", void sub_08051738(void) if (uVar3 == 0) { gMenu.transitionTimer = 0x3c; CreateDialogBox(1, 0); - sub_080A7114(3); + SetMenuType(3); } else { - sub_080A7114(1); + SetMenuType(1); } uVar3++; gGenericMenu.unk16 = uVar3; @@ -1156,7 +1156,7 @@ void sub_080517EC(void) { case START_BUTTON: if (gUnk_02019EE0.unk7 < 3) { CreateDialogBox(2, 0); - sub_080A7114(2); + SetMenuType(2); SoundReq(SFX_TEXTBOX_SELECT); break; } @@ -1188,7 +1188,7 @@ void sub_08051874(void) { sub_0805194C(gUnk_02019EE0.unk7); CreateDialogBox(3, 0); gMenu.transitionTimer = 0x1e; - sub_080A7114(3); + SetMenuType(3); break; } } diff --git a/src/game.c b/src/game.c index afb0e3cf..009c9859 100644 --- a/src/game.c +++ b/src/game.c @@ -645,7 +645,7 @@ void GameOverTask(void) { static void switch_state(u32 idx) { gMain.state = idx; - sub_080A7114(0); + SetMenuType(0); } static void GameOver_Init(void) { @@ -706,7 +706,7 @@ static void GameOver_TextMove(void) { case 0: gMenu.transitionTimer = 30; gMenu.field_0x3 = 0; - sub_080A7114(1); + SetMenuType(1); SetPopupState(0, 0); gFadeControl.mask = 0xffffffff; return; @@ -728,7 +728,7 @@ static void GameOver_TextMove(void) { temp2 = 2; } gMenu.transitionTimer = 60; - sub_080A7114(temp2); + SetMenuType(temp2); SoundReq(SFX_TEXTBOX_SELECT); break; } @@ -746,12 +746,12 @@ static void GameOver_TextMove(void) { gMenu.field_0x0 = temp3; switch (temp3) { case 1: - sub_080A7114(4); + SetMenuType(4); break; case -1: gMenu.transitionTimer = 60; CreateDialogBox(9, 0); - sub_080A7114(3); + SetMenuType(3); break; } return; @@ -759,7 +759,7 @@ static void GameOver_TextMove(void) { if (gMenu.transitionTimer != 0) { gMenu.transitionTimer--; } else if (gInput.newKeys & (A_BUTTON | B_BUTTON | START_BUTTON)) { - sub_080A7114(0); + SetMenuType(0); } return; case 4: @@ -777,7 +777,7 @@ static void GameOver_Update(void) { case 0x0: gMenu.transitionTimer = 0x1e; gMenu.field_0x3 = 0; - sub_080A7114(1); + SetMenuType(1); SetPopupState(1, 0); return; case 0x1: @@ -795,7 +795,7 @@ static void GameOver_Update(void) { temp = 1; break; case A_BUTTON: - sub_080A7114(2); + SetMenuType(2); SoundReq(SFX_TEXTBOX_SELECT); if (temp == 0) { SetFade(5, 8); diff --git a/src/itemMenuTable.c b/src/itemMenuTable.c deleted file mode 100644 index 13c6e8b1..00000000 --- a/src/itemMenuTable.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "itemMenuTable.h" - -const ItemMenuTableEntry gItemMenuTable[] = { - [MENU_SLOT_SWORD] = { MENU_SLOT_BOTTLE0, MENU_SLOT_SHIELD, MENU_SLOT_BOOMERANG, MENU_SLOT_GUST_JAR, 0x01, 0x0c, - 0x42, 0x33 }, - [MENU_SLOT_GUST_JAR] = { MENU_SLOT_BOTTLE1, MENU_SLOT_MOLE_MITTS, MENU_SLOT_SWORD, MENU_SLOT_CANE, 0x01, 0x10, 0x66, - 0x33 }, - [MENU_SLOT_CANE] = { MENU_SLOT_BOTTLE3, MENU_SLOT_LANTERN, MENU_SLOT_GUST_JAR, MENU_SLOT_BOOMERANG, 0x01, 0x14, - 0x8a, 0x33 }, - [MENU_SLOT_BOOMERANG] = { MENU_SLOT_SAVE_BUTTON, MENU_SLOT_BOMBS, MENU_SLOT_CANE, MENU_SLOT_SWORD, 0x01, 0x15, 0xae, - 0x33 }, - [MENU_SLOT_SHIELD] = { MENU_SLOT_SWORD, MENU_SLOT_PEGASUS_BOOTS, MENU_SLOT_BOMBS, MENU_SLOT_MOLE_MITTS, 0x01, 0x16, - 0x42, 0x4b }, - [MENU_SLOT_MOLE_MITTS] = { MENU_SLOT_GUST_JAR, MENU_SLOT_ROCS_CAPE, MENU_SLOT_SHIELD, MENU_SLOT_LANTERN, 0x01, 0x17, - 0x66, 0x4b }, - [MENU_SLOT_LANTERN] = { MENU_SLOT_CANE, MENU_SLOT_OCARINA, MENU_SLOT_MOLE_MITTS, MENU_SLOT_BOMBS, 0x01, 0x00, 0x8a, - 0x4b }, - [MENU_SLOT_BOMBS] = { MENU_SLOT_BOOMERANG, MENU_SLOT_BOW, MENU_SLOT_LANTERN, MENU_SLOT_SHIELD, 0x01, 0x00, 0xae, - 0x4b }, - [MENU_SLOT_PEGASUS_BOOTS] = { MENU_SLOT_SHIELD, MENU_SLOT_BOTTLE0, MENU_SLOT_BOW, MENU_SLOT_ROCS_CAPE, 0x01, 0x00, - 0x42, 0x63 }, - [MENU_SLOT_ROCS_CAPE] = { MENU_SLOT_MOLE_MITTS, MENU_SLOT_BOTTLE1, MENU_SLOT_PEGASUS_BOOTS, MENU_SLOT_OCARINA, 0x01, - 0x00, 0x66, 0x63 }, - [MENU_SLOT_OCARINA] = { MENU_SLOT_LANTERN, MENU_SLOT_BOTTLE3, MENU_SLOT_ROCS_CAPE, MENU_SLOT_BOW, 0x01, 0x00, 0x8a, - 0x63 }, - [MENU_SLOT_BOW] = { MENU_SLOT_BOMBS, MENU_SLOT_SAVE_BUTTON, MENU_SLOT_OCARINA, MENU_SLOT_PEGASUS_BOOTS, 0x01, 0x00, - 0xae, 0x63 }, - [MENU_SLOT_BOTTLE0] = { MENU_SLOT_PEGASUS_BOOTS, MENU_SLOT_SWORD, MENU_SLOT_SAVE_BUTTON, MENU_SLOT_BOTTLE1, 0x01, - 0x00, 0x42, 0x7b }, - [MENU_SLOT_BOTTLE1] = { MENU_SLOT_ROCS_CAPE, MENU_SLOT_GUST_JAR, MENU_SLOT_BOTTLE0, MENU_SLOT_BOTTLE2, 0x01, 0x00, - 0x5a, 0x7b }, - [MENU_SLOT_BOTTLE2] = { MENU_SLOT_ROCS_CAPE, MENU_SLOT_GUST_JAR, MENU_SLOT_BOTTLE1, MENU_SLOT_BOTTLE3, 0x01, 0x00, - 0x72, 0x7b }, - [MENU_SLOT_BOTTLE3] = { MENU_SLOT_OCARINA, MENU_SLOT_CANE, MENU_SLOT_BOTTLE2, MENU_SLOT_SAVE_BUTTON, 0x01, 0x00, - 0x8a, 0x7b }, - [MENU_SLOT_SAVE_BUTTON] = { MENU_SLOT_BOW, MENU_SLOT_BOOMERANG, MENU_SLOT_BOTTLE3, MENU_SLOT_BOTTLE0, 0x03, 0x00, - 0xb5, 0x75 }, - { MENU_SLOT_BOW, MENU_SLOT_BOOMERANG, MENU_SLOT_BOTTLE3, MENU_SLOT_BOTTLE0, 0x05, 0x00, 0xb5, 0x75 }, -}; diff --git a/src/menu/figurine_menu.c b/src/menu/figurine_menu.c index c6318a25..7405260e 100644 --- a/src/menu/figurine_menu.c +++ b/src/menu/figurine_menu.c @@ -55,22 +55,22 @@ typedef struct { } struct_08128AD8; extern const struct_08128AD8 gUnk_08128AD8[]; -void FigurineMenu0_Type0(void); -void FigurineMenu0_Type1(void); -void FigurineMenu0_Type2(void); -void FigurineMenu0_Type3(void); -void FigurineMenu1_Type0(void); -void FigurineMenu1_Type1(void); -void FigurineMenu1_Type2(void); -void FigurineMenu1_Type3(void); +Subtask FigurineMenu0_Type0; +Subtask FigurineMenu0_Type1; +Subtask FigurineMenu0_Type2; +Subtask FigurineMenu0_Type3; +Subtask FigurineMenu1_Type0; +Subtask FigurineMenu1_Type1; +Subtask FigurineMenu1_Type2; +Subtask FigurineMenu1_Type3; void Subtask_FigurineMenu(void) { - static void (*const figurineMenu1_Types[])(void) = { + static Subtask* const figurineMenu1_Types[] = { FigurineMenu0_Type0, FigurineMenu0_Type1, FigurineMenu0_Type2, FigurineMenu0_Type3, }; - static void (*const figurineMenu0_Types[])(void) = { + static Subtask* const figurineMenu0_Types[] = { FigurineMenu1_Type0, FigurineMenu1_Type1, FigurineMenu1_Type2, @@ -136,13 +136,13 @@ void FigurineMenu_080A46C0(void) { void FigurineMenu0_Type0(void) { FigurineMenu_080A4608(); - sub_080A7114(1); + SetMenuType(1); } void FigurineMenu0_Type1(void) { if (gFadeControl.active == 0) { CreateObject(OBJECT_A2, gUnk_080FC3E4[gFigurineMenu.unk1c].unk7, 0); - sub_080A7114(2); + SetMenuType(2); } } @@ -168,7 +168,7 @@ void FigurineMenu0_Type2(void) { gScreen.controls.layerBrightness = 0; gScreen.controls.layerFXControl = 0; gScreen.lcd.displayControl |= 0x2000; - sub_080A7114(3); + SetMenuType(3); sub_080A70AC((KeyButtonLayout*)&gUnk_0812813C); gMenu.column_idx = 0x15; if (gFigurineMenu.unk21 == 0) { @@ -215,7 +215,7 @@ void FigurineMenu1_Type0(void) { gScreen.lcd.displayControl |= 0x2000; sub_080A70AC(&gUnk_0812813C); gMenu.column_idx = 0xff; - sub_080A7114(1); + SetMenuType(1); } void FigurineMenu1_Type1(void) { @@ -229,7 +229,7 @@ void FigurineMenu1_Type1(void) { switch (gInput.unk4) { case 2: case 8: - sub_080A7114(3); + SetMenuType(3); break; case 0x200: r4 -= 5; @@ -263,7 +263,7 @@ void FigurineMenu1_Type1(void) { if (r0 != r4) { gFigurineMenu.unk1c = r4; SoundReq(SFX_TEXTBOX_CHOICE); - sub_080A7114(2); + SetMenuType(2); r5 = 0; } r0 = gFigurineMenu.unk1e; @@ -278,7 +278,7 @@ void FigurineMenu1_Type1(void) { } void FigurineMenu1_Type2(void) { - sub_080A7114(1); + SetMenuType(1); } void FigurineMenu1_Type3(void) { @@ -453,7 +453,7 @@ extern u8 gUnk_020227E8[]; extern void sub_08057044(u32, u8*, u8*); extern void sub_0805F46C(u32, const struct_0812816C*); -NONMATCH("asm/non_matching/subtask/sub_080A4BA0.inc", u32 sub_080A4BA0(u32 unk1, u32 unk2)) { +NONMATCH("asm/non_matching/menu/figurine_menu/sub_080A4BA0.inc", u32 sub_080A4BA0(u32 unk1, u32 unk2)) { int r0, r1, r2, r3, r4, r5, r6; struct_0812816C s0; diff --git a/src/menu/kinstone_menu.c b/src/menu/kinstone_menu.c index 10d2da5f..890ac05e 100644 --- a/src/menu/kinstone_menu.c +++ b/src/menu/kinstone_menu.c @@ -68,14 +68,14 @@ void KinstoneMenu_080A4080(void); u32 KinstoneMenu_080A4494(void); void KinstoneMenu_080A4528(void); -void KinstoneMenu_Type0(void); -void KinstoneMenu_Type1(void); -void KinstoneMenu_Type2(void); -void KinstoneMenu_Type3(void); -void KinstoneMenu_Type4(void); -void KinstoneMenu_Type5(void); +Subtask KinstoneMenu_Type0; +Subtask KinstoneMenu_Type1; +Subtask KinstoneMenu_Type2; +Subtask KinstoneMenu_Type3; +Subtask KinstoneMenu_Type4; +Subtask KinstoneMenu_Type5; void Subtask_KinstoneMenu(void) { - static void (*const kinstoneMenuTypes[])(void) = { + static Subtask* const kinstoneMenuTypes[] = { KinstoneMenu_Type0, KinstoneMenu_Type1, KinstoneMenu_Type2, KinstoneMenu_Type3, KinstoneMenu_Type4, KinstoneMenu_Type5, }; @@ -130,7 +130,7 @@ void KinstoneMenu_Type0(void) { sub_080A4398(); sub_0801E738(0); sub_080A70AC((void*)gUnk_081280DC); - sub_080A7114(1); + SetMenuType(1); SetFade(6, 8); } @@ -138,7 +138,7 @@ const u8 gUnk_081280EE[] = { 0x5u, 0x7u, 0xau, 0xeu, 0x13u, 0x1au, }; -NONMATCH("asm/non_matching/subtask/KinstoneMenu_Type1.inc", void KinstoneMenu_Type1(void)) { +NONMATCH("asm/non_matching/menu/kinstone_menu/KinstoneMenu_Type1.inc", void KinstoneMenu_Type1(void)) { s32 tmp1, tmp2, tmp3, tmp4, tmp5; u8* ptr; GenericMenu* menu; @@ -167,7 +167,7 @@ NONMATCH("asm/non_matching/subtask/KinstoneMenu_Type1.inc", void KinstoneMenu_Ty SoundReq(SFX_TEXTBOX_CHOICE); } if ((gInput.newKeys & 0x20a) != 0) { - sub_080A7114(2); + SetMenuType(2); SoundReq(SFX_MENU_CANCEL); return; } @@ -185,7 +185,7 @@ NONMATCH("asm/non_matching/subtask/KinstoneMenu_Type1.inc", void KinstoneMenu_Ty if (gMenu.column_idx == 2) { tmp3 = gGenericMenu.unk10.i / 0x10000; gGenericMenu.unk2a = gSave.unk118[tmp3]; - sub_080A7114(3); + SetMenuType(3); } break; } @@ -221,11 +221,11 @@ void KinstoneMenu_Type2(void) { } } -void KinstoneMenu_Type3_Overlay0(void); -void KinstoneMenu_Type3_Overlay1(void); -void KinstoneMenu_Type3_Overlay2(void); +Subtask KinstoneMenu_Type3_Overlay0; +Subtask KinstoneMenu_Type3_Overlay1; +Subtask KinstoneMenu_Type3_Overlay2; void KinstoneMenu_Type3(void) { - static void (*const kinstoneMenu_Type3_overlays[])(void) = { + static Subtask* const kinstoneMenu_Type3_overlays[] = { KinstoneMenu_Type3_Overlay0, KinstoneMenu_Type3_Overlay1, KinstoneMenu_Type3_Overlay2, @@ -247,7 +247,7 @@ void KinstoneMenu_Type3_Overlay1(void) { u32 temp = gUnk_080C9CBC[gKinstoneMenu.unk2a].unk5; if (temp != gUnk_080C9CBC[gFuseInfo._3].unk5) { SoundReq(SFX_ITEM_SHIELD_BOUNCE); - sub_080A7114(4); + SetMenuType(4); } else { gMenu.overlayType = 2; gMenu.transitionTimer = 0x14; @@ -266,7 +266,7 @@ void KinstoneMenu_Type3_Overlay2(void) { if (++gScreen.controls.layerBrightness > 14) { gScreen.controls.layerBrightness = 0; gScreen.lcd.displayControl &= 0xdfff; - sub_080A7114(5); + SetMenuType(5); } } @@ -277,17 +277,17 @@ void KinstoneMenu_Type4(void) { if (gKinstoneMenu.unk2c < 0) { gKinstoneMenu.unk18 = 0; gKinstoneMenu.unk2c = 0; - sub_080A7114(1); + SetMenuType(1); SoundReq(SFX_MENU_ERROR); } } -void KinstoneMenu_Type5_Overlay0(void); -void KinstoneMenu_Type5_Overlay1(void); -void KinstoneMenu_Type5_Overlay2(void); -void KinstoneMenu_Type5_Overlay3(void); +Subtask KinstoneMenu_Type5_Overlay0; +Subtask KinstoneMenu_Type5_Overlay1; +Subtask KinstoneMenu_Type5_Overlay2; +Subtask KinstoneMenu_Type5_Overlay3; void KinstoneMenu_Type5(void) { - static void (*const kinstoneMenu_Type5_Overlays[])(void) = { + static Subtask* const kinstoneMenu_Type5_Overlays[] = { KinstoneMenu_Type5_Overlay0, KinstoneMenu_Type5_Overlay1, KinstoneMenu_Type5_Overlay2, @@ -335,7 +335,7 @@ void KinstoneMenu_Type5_Overlay2(void) { void KinstoneMenu_Type5_Overlay3(void) { // TODO figure out why in some place s16 is needed and u16 in others if (--(s16)gMenu.transitionTimer < 0) { - sub_080A7114(2); + SetMenuType(2); } } @@ -414,7 +414,7 @@ void KinstoneMenu_080A4080(void) { } } -NONMATCH("asm/non_matching/subtask/KinstoneMenu_080A414C.inc", void KinstoneMenu_080A414C(void)) { +NONMATCH("asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc", void KinstoneMenu_080A414C(void)) { s32 uVar1; s32 iVar2; s32 uVar3; diff --git a/src/menu/pause_menu.c b/src/menu/pause_menu.c new file mode 100644 index 00000000..4213bc47 --- /dev/null +++ b/src/menu/pause_menu.c @@ -0,0 +1,598 @@ +#include "global.h" +#include "menu.h" +#include "sound.h" +#include "subtask.h" +#include "screen.h" +#include "item.h" +#include "common.h" +#include "game.h" +#include "main.h" +#include "save.h" +#include "structures.h" +#include "functions.h" + +extern void sub_080A4DB8(u32); + +void sub_080A5128(void); +void sub_080A51D4(void); +u32 sub_080A51F4(void); +void sub_080A5F48(u32, u32); + +extern const u8 gUnk_080FD5B4[]; + +Subtask PauseMenu_Variant0; +Subtask PauseMenu_Variant1; +Subtask PauseMenu_Variant2; +Subtask PauseMenu_Variant3; +Subtask PauseMenu_Variant4; +Subtask PauseMenu_Variant5; +void Subtask_PauseMenu(void) { + static Subtask* const pauseMenu_Variants[] = { + PauseMenu_Variant0, PauseMenu_Variant1, PauseMenu_Variant2, + PauseMenu_Variant3, PauseMenu_Variant4, PauseMenu_Variant5, + }; + + if (gUnk_02034490.unk11 == 6) { + SetBgmVolume(0x100); + Subtask_Exit(); + } else { + FlushSprites(); + pauseMenu_Variants[gUnk_02034490.unk11](); + sub_080A5128(); + sub_0801C1D4(); + DrawOAMCmd(); + if (gUnk_02034490.unk11 != 4) { + gUnk_08128A38[gUnk_02034490.unk1].func(); + } + CopyOAM(); + { + u32 t = gUnk_02034490.unk16; + u32 t2 = (t != 0) ? 0xe46 : 0; + gScreen.controls.layerFXControl = t2; + gScreen.controls.alphaBlend = (t << 8) | (0x10 - t); + } + } +} + +typedef struct { + u8 _0; + u8 _1; + u8 _2; + u8 _3; + u8 _4; + u16 _6; +} struct_08127F94; +struct_08127F94* sub_080A6A80(u32, u32); + +extern u8 gUnk_02034492[]; +void sub_0801E8D4(void); +u32 sub_0801DB94(void); +s32 sub_080A50A0(s32); + +void PauseMenu_Variant0(void) { + struct_08127F94* ptr; + int r0, r1; + + sub_0801E8D4(); + sub_080A4D34(); + r1 = 4; + do { + gUnk_02034492[r1] = 0; + r1++; + } while (r1 <= 0xd); + ptr = sub_080A6A80((u16)gRoomTransition.player_status.overworld_map_x, + (u16)gRoomTransition.player_status.overworld_map_y); + gUnk_02034490.unk2[4] = ptr->_4; + gUnk_02034490.unk2[5] = sub_0801DB94(); + if (IsItemEquipped(ITEM_LANTERN_ON) != 2) { + r1 = 0x10; + } else { + r1 = 0xf; + } + gUnk_02034490.unk15 = r1; + r0 = gUnk_08128A38[gUnk_02034490.unk1].unk1; + r0 = sub_080A50A0(r0); + gUnk_02034490.unk1 = r0; + gUnk_02034490.unk14 = r0; + sub_080A4DB8(r0); + SetFade(4, 0x20); + sub_080A4E90(1); +} + +void PauseMenu_Variant1(void) { + if (gFadeControl.active == 0) { + sub_080A4E90(2); + } +} + +void PauseMenu_Variant2(void) { + int iVar1; + u32 uVar2; + int iVar4; + s32 bVar5; + + if ((sub_080A51F4() != 0) && (gMenu.field_0xc != NULL)) { + iVar1 = -1; + switch (gInput.newKeys) { + case START_BUTTON: + iVar1 = 0; + break; + case L_BUTTON: + iVar1 = 1; + break; + case R_BUTTON: + iVar1 = 2; + break; + case B_BUTTON: + iVar1 = 3; + break; + } + if (iVar1 >= 0) { + switch (bVar5 = gMenu.field_0xc[iVar1]) { + case 0: + break; + case 4 ... 6: + case 0xf: + uVar2 = GetInventoryValue(ITEM_MAP); + if (uVar2 == 0) { + iVar4 = 1; + if (iVar1 == 1) { + iVar4 = 2; + } + bVar5 = gMenu.field_0xc[iVar4]; + } + default: + gUnk_02034490.unk14 = bVar5; + SoundReq(SFX_TEXTBOX_OPEN); + gMenu.field_0xc = NULL; + break; + } + } + } + bVar5 = sub_080A50A0(gUnk_02034490.unk14); + if (gUnk_02034490.unk1 != bVar5) { + gUnk_02034490.unk14 = bVar5; + sub_080A51D4(); + if (bVar5 == 0xe) { + sub_080A4E90(6); + } else { + sub_080A4E90(3); + MemClear(&gBG0Buffer, 0x800); + gScreen.bg0.updated = 1; + } + } +} + +s32 sub_080A50A0(s32 param_1) { + s32 iVar1; + + if (param_1 == 0xf) { + iVar1 = AreaHasMap(); + param_1 = 4; + if (iVar1 != 0) { + param_1 = 5; + } + } + return param_1; +} + +void PauseMenu_Variant3(void) { + s32 iVar1; + + iVar1 = gUnk_02034490.unk16 + 2; + if (0x10 < iVar1) { + gScreen.lcd.displayControl &= 0xf8ff; + sub_080A4E90(4); + iVar1 = 0x10; + } + gUnk_02034490.unk16 = iVar1; +} + +void PauseMenu_Variant4(void) { + u32 t; + gUnk_02034490.unk16 = 0x10; + gUnk_02034490.unk1 = t = gUnk_02034490.unk14; + sub_080A4DB8(t); + sub_080A4E90(5); +} + +void PauseMenu_Variant5(void) { + s32 iVar1; + + iVar1 = gUnk_02034490.unk16 - 2; + if (iVar1 < 0) { + sub_080A4E90(2); + iVar1 = 0; + } + gUnk_02034490.unk16 = iVar1; +} + +void sub_080A5128(void) { + int r5, t; + struct { + int x; + int y; + } p[3]; + + switch (gUnk_02034490.unk1) { + case 7: + case 8: + p[0].x = 0x60; + p[0].y = 0x18; + p[1].x = -0x10; + p[1].y = 0x48; + p[2].x = 0x100; + p[2].y = 0x48; + break; + case 9: + case 10: + case 11: + return; + default: + p[0].x = 0x40; + p[0].y = 0x10 - (gUnk_02034490.unk16 << 1); + t = (gUnk_02034490.unk16 / 3); + p[1].x = 0x10 - t; + p[1].y = 0x48; + p[2].x = 0xe0 + t; + p[2].y = 0x48; + break; + } + gOamCmd._4 = 0; + gOamCmd._6 = 0; + gOamCmd._8 = 0x400; + gOamCmd.x = p[0].x; + gOamCmd.y = p[0].y; +#ifdef EU + r5 = 0x1fa; +#else + r5 = 0x1fb; +#endif + DrawDirect(r5, 0); + gOamCmd.x = p[1].x; + gOamCmd.y = p[1].y; + DrawDirect(r5, 1); + gOamCmd.x = p[2].x; + gOamCmd.y = p[2].y; + DrawDirect(r5, 2); +} + +void sub_080A51D4(void) { + u32 i = gUnk_02034490.unk1; + if (i < 0xe) { + gUnk_02034490.unk2[i] = gMenu.field_0x3; + } +} + +u32 sub_080A51F4(void) { + u32 retval = 1; + if (gFadeControl.active != 0) + retval = 0; + if (gUnk_02034490.unk11 != 2) + retval = 0; + return retval; +} + +typedef enum { + MENU_SLOT_SWORD, + MENU_SLOT_GUST_JAR, + MENU_SLOT_CANE, + MENU_SLOT_BOOMERANG, + MENU_SLOT_SHIELD, + MENU_SLOT_MOLE_MITTS, + MENU_SLOT_LANTERN, + MENU_SLOT_BOMBS, + MENU_SLOT_PEGASUS_BOOTS, + MENU_SLOT_ROCS_CAPE, + MENU_SLOT_OCARINA, + MENU_SLOT_BOW, + MENU_SLOT_BOTTLE0, + MENU_SLOT_BOTTLE1, + MENU_SLOT_BOTTLE2, + MENU_SLOT_BOTTLE3, + MENU_SLOT_SAVE_BUTTON, + MENU_SLOT_SAVE_BUTTON_JP, + MENU_SLOT_COUNT = MENU_SLOT_SAVE_BUTTON_JP +} ItemMenuTableSlot; + +typedef struct { + u8 up; + u8 down; + u8 left; + u8 right; + u8 type; + u8 unk0; + u8 x; + u8 y; +} ItemMenuTableEntry; + +Subtask PauseMenu_ItemMenu_Draw; +Subtask PauseMenu_ItemMenu_Init; +Subtask PauseMenu_ItemMenu_Update; +void PauseMenu_ItemMenu(void) { + static Subtask* const pauseMenu_Types[] = { PauseMenu_ItemMenu_Init, PauseMenu_ItemMenu_Update }; + + pauseMenu_Types[gMenu.menuType](); + PauseMenu_ItemMenu_Draw(); +} + +void PauseMenu_ItemMenu_Init(void) { + static const KeyButtonLayout gUnk_08128B50 = { + 0xd0u, + 0x10u, + 0u, + 0xb8u, + 0x10u, + 0u, + 0xffu, + 0xd8u, + 0u, + { + 0x3u, + 0u, + 0x4u, + 0u, + 0u, + 0u, + 0x1u, + 0u, + 0xffu, + 0u, + 0u, + }, + }; + + u32 uVar1; + u32 i; + u32 item; + + gMenu.field_0xc = NULL; + sub_080A70AC((KeyButtonLayout*)&gUnk_08128B50); + for (item = ITEM_SMITH_SWORD; item < ITEM_BOTTLE_EMPTY; item++) { + uVar1 = GetInventoryValue(item); + if ((uVar1 == 1) && (i = gUnk_080FD5B4[item * 8], i <= MENU_SLOT_SAVE_BUTTON_JP)) { + switch (item) { + case ITEM_LANTERN_OFF: + case ITEM_LANTERN_ON: + item = gUnk_02034490.unk15; + break; + default: + break; + } + gPauseMenu.items[i] = item; + sub_080A5F48(item, i * 8 + 0x360); + } + } + SetMenuType(1); +} + +const ItemMenuTableEntry gItemMenuTable[] = { + [MENU_SLOT_SWORD] = { MENU_SLOT_BOTTLE0, MENU_SLOT_SHIELD, MENU_SLOT_BOOMERANG, MENU_SLOT_GUST_JAR, 0x01, 0x0c, + 0x42, 0x33 }, + [MENU_SLOT_GUST_JAR] = { MENU_SLOT_BOTTLE1, MENU_SLOT_MOLE_MITTS, MENU_SLOT_SWORD, MENU_SLOT_CANE, 0x01, 0x10, 0x66, + 0x33 }, + [MENU_SLOT_CANE] = { MENU_SLOT_BOTTLE3, MENU_SLOT_LANTERN, MENU_SLOT_GUST_JAR, MENU_SLOT_BOOMERANG, 0x01, 0x14, + 0x8a, 0x33 }, + [MENU_SLOT_BOOMERANG] = { MENU_SLOT_SAVE_BUTTON, MENU_SLOT_BOMBS, MENU_SLOT_CANE, MENU_SLOT_SWORD, 0x01, 0x15, 0xae, + 0x33 }, + [MENU_SLOT_SHIELD] = { MENU_SLOT_SWORD, MENU_SLOT_PEGASUS_BOOTS, MENU_SLOT_BOMBS, MENU_SLOT_MOLE_MITTS, 0x01, 0x16, + 0x42, 0x4b }, + [MENU_SLOT_MOLE_MITTS] = { MENU_SLOT_GUST_JAR, MENU_SLOT_ROCS_CAPE, MENU_SLOT_SHIELD, MENU_SLOT_LANTERN, 0x01, 0x17, + 0x66, 0x4b }, + [MENU_SLOT_LANTERN] = { MENU_SLOT_CANE, MENU_SLOT_OCARINA, MENU_SLOT_MOLE_MITTS, MENU_SLOT_BOMBS, 0x01, 0x00, 0x8a, + 0x4b }, + [MENU_SLOT_BOMBS] = { MENU_SLOT_BOOMERANG, MENU_SLOT_BOW, MENU_SLOT_LANTERN, MENU_SLOT_SHIELD, 0x01, 0x00, 0xae, + 0x4b }, + [MENU_SLOT_PEGASUS_BOOTS] = { MENU_SLOT_SHIELD, MENU_SLOT_BOTTLE0, MENU_SLOT_BOW, MENU_SLOT_ROCS_CAPE, 0x01, 0x00, + 0x42, 0x63 }, + [MENU_SLOT_ROCS_CAPE] = { MENU_SLOT_MOLE_MITTS, MENU_SLOT_BOTTLE1, MENU_SLOT_PEGASUS_BOOTS, MENU_SLOT_OCARINA, 0x01, + 0x00, 0x66, 0x63 }, + [MENU_SLOT_OCARINA] = { MENU_SLOT_LANTERN, MENU_SLOT_BOTTLE3, MENU_SLOT_ROCS_CAPE, MENU_SLOT_BOW, 0x01, 0x00, 0x8a, + 0x63 }, + [MENU_SLOT_BOW] = { MENU_SLOT_BOMBS, MENU_SLOT_SAVE_BUTTON, MENU_SLOT_OCARINA, MENU_SLOT_PEGASUS_BOOTS, 0x01, 0x00, + 0xae, 0x63 }, + [MENU_SLOT_BOTTLE0] = { MENU_SLOT_PEGASUS_BOOTS, MENU_SLOT_SWORD, MENU_SLOT_SAVE_BUTTON, MENU_SLOT_BOTTLE1, 0x01, + 0x00, 0x42, 0x7b }, + [MENU_SLOT_BOTTLE1] = { MENU_SLOT_ROCS_CAPE, MENU_SLOT_GUST_JAR, MENU_SLOT_BOTTLE0, MENU_SLOT_BOTTLE2, 0x01, 0x00, + 0x5a, 0x7b }, + [MENU_SLOT_BOTTLE2] = { MENU_SLOT_ROCS_CAPE, MENU_SLOT_GUST_JAR, MENU_SLOT_BOTTLE1, MENU_SLOT_BOTTLE3, 0x01, 0x00, + 0x72, 0x7b }, + [MENU_SLOT_BOTTLE3] = { MENU_SLOT_OCARINA, MENU_SLOT_CANE, MENU_SLOT_BOTTLE2, MENU_SLOT_SAVE_BUTTON, 0x01, 0x00, + 0x8a, 0x7b }, + [MENU_SLOT_SAVE_BUTTON] = { MENU_SLOT_BOW, MENU_SLOT_BOOMERANG, MENU_SLOT_BOTTLE3, MENU_SLOT_BOTTLE0, 0x03, 0x00, + 0xb5, 0x75 }, + [MENU_SLOT_SAVE_BUTTON_JP] = { MENU_SLOT_BOW, MENU_SLOT_BOOMERANG, MENU_SLOT_BOTTLE3, MENU_SLOT_BOTTLE0, 0x05, 0x00, + 0xb5, 0x75 }, +}; + +void sub_080A6F6C(u32); +void PauseMenu_ItemMenu_Update(void) { + static const u8 gUnk_08128BF4[] = { 14, 15, 2, 0 }; + u32 item; + u32 menuSlot; + const ItemMenuTableEntry* entry; + + if (sub_080A51F4()) { + gMenu.field_0xc = (u8*)gUnk_08128BF4; + menuSlot = gMenu.field_0x3; + + entry = &gItemMenuTable[menuSlot]; + switch (gInput.newKeys) { + case A_BUTTON: + if (menuSlot == MENU_SLOT_SAVE_BUTTON) { +#if defined(DEMO_USA) || defined(DEMO_JP) + SoundReq(SFX_MENU_ERROR); +#else + sub_080A4E84(0xb); + SoundReq(SFX_TEXTBOX_SELECT); +#endif + break; + } + case B_BUTTON: + if (gPauseMenu.items[menuSlot] != 0) { + u32 t = !!(gInput.newKeys ^ 1); + ForceEquipItem(gPauseMenu.items[menuSlot], t); + SoundReq(SFX_TEXTBOX_SELECT); + } + break; + default: + switch (gInput.unk4) { + case DPAD_UP: + menuSlot = entry->up; + break; + case DPAD_DOWN: + menuSlot = entry->down; + break; + case DPAD_LEFT: + menuSlot = entry->left; + break; + case DPAD_RIGHT: + menuSlot = entry->right; + break; + } + break; + } + if (gMenu.field_0x3 != menuSlot) { + gMenu.field_0x3 = menuSlot; + SoundReq(SFX_TEXTBOX_CHOICE); + } + item = gPauseMenu.items[menuSlot]; + switch (menuSlot) { + case MENU_SLOT_BOTTLE0: + case MENU_SLOT_BOTTLE1: + case MENU_SLOT_BOTTLE2: + case MENU_SLOT_BOTTLE3: + if (item != 0) { + item = gSave.saved_status.field_0x24[item - 6]; + } + break; + case MENU_SLOT_SAVE_BUTTON: + // ITEM_SKILL_FAST_SPIN, but that does not make any sense at all + item = 0x73; + break; + default: + break; + } + sub_080A6F6C(item + 0x400); + } +} + +u32 GetMenuSlotForItem(u32 item); +extern u8* gSpriteAnimations_322[]; +#ifdef EU +#define sub_080A5384_draw_constant0 0x1fa +#define sub_080A5384_draw_constant1 0x141 +#else +#define sub_080A5384_draw_constant0 0x1fb +#define sub_080A5384_draw_constant1 0x142 +#endif +void PauseMenu_ItemMenu_Draw(void) { + u32 tmp; + u32 i; + s32 color; + const ItemMenuTableEntry* entry; + + gOamCmd._4 = 0x400; + gOamCmd._6 = 0; + gOamCmd._8 = 0; + for (i = 0; i < MENU_SLOT_COUNT; i++) { + u32 item; + if (gPauseMenu.items[i] != 0) { + entry = &gItemMenuTable[i]; + gOamCmd.x = entry->x; + gOamCmd.y = entry->y; + item = gPauseMenu.items[i]; + switch (item) { + case ITEM_BOTTLE1: + case ITEM_BOTTLE2: + case ITEM_BOTTLE3: + case ITEM_BOTTLE4: + item = gSave.stats.bottles[item - ITEM_BOTTLE1]; + break; + default: + break; + } + color = 3; + switch (item) { + case ITEM_BOMBS: + case ITEM_REMOTE_BOMBS: + if (gBombBagSizes[gSave.stats.bombBagType] <= gSave.stats.bombCount) { + color = 4; + } + break; + case ITEM_BOW: + case ITEM_LIGHT_ARROW: + if (gQuiverSizes[gSave.stats.quiverType] <= gSave.stats.arrowCount) { + color = 4; + } + break; + default: + break; + } + gOamCmd._8 = 0x800 | color << 0xc | ((i * 8) + 0x360); + DrawDirect(sub_080A5384_draw_constant1, *gSpriteAnimations_322[item]); + } + } + gOamCmd._8 = 0x800; + { + u32 slot = gMenu.field_0x3; + if ((slot == MENU_SLOT_SAVE_BUTTON) && (gSaveHeader->language != 0)) { + slot = MENU_SLOT_SAVE_BUTTON_JP; + } + entry = &gItemMenuTable[slot]; + gOamCmd.x = entry->x; + gOamCmd.y = entry->y; + tmp = entry->type + ((gMain.ticks.HWORD & 0x10) != 0 ? 3 : 4); + DrawDirect(sub_080A5384_draw_constant0, tmp); + } + { + u32 slot; + if (gSaveHeader->language != 0) { + slot = MENU_SLOT_SAVE_BUTTON; + } else { + slot = MENU_SLOT_SAVE_BUTTON_JP; + } + entry = &gItemMenuTable[slot]; + gOamCmd.x = entry->x; + gOamCmd.y = entry->y; + gOamCmd._8 = 0x800; + DrawDirect(sub_080A5384_draw_constant0, 0x22); + } + i = GetMenuSlotForItem(gSave.stats.itemButtons[0]); + if (i < MENU_SLOT_COUNT) { + entry = &gItemMenuTable[i]; + gOamCmd.x = entry->x; + gOamCmd.y = entry->y; + DrawDirect(sub_080A5384_draw_constant0, 3); + } + i = GetMenuSlotForItem(gSave.stats.itemButtons[1]); + if (i < MENU_SLOT_COUNT) { + entry = &gItemMenuTable[i]; + gOamCmd.x = entry->x; + gOamCmd.y = entry->y; + DrawDirect(sub_080A5384_draw_constant0, 3); + } +} + +u32 GetMenuSlotForItem(u32 item) { + u32 i; + + if (item != 0) { + for (i = 0; i < MENU_SLOT_COUNT; i++) { + if (item == gPauseMenu.items[i]) + return i; + } + } + return MENU_SLOT_SAVE_BUTTON_JP; +} + +Subtask sub_080A5594; +Subtask sub_080A56A0; +void PauseMenu2(void) { + static Subtask* const pauseMenu2_Types[] = { + sub_080A5594, + sub_080A56A0, + }; + pauseMenu2_Types[gMenu.menuType](); + sub_080A57F4(); +} diff --git a/src/subtask.c b/src/subtask.c deleted file mode 100644 index 4b2fad5a..00000000 --- a/src/subtask.c +++ /dev/null @@ -1,518 +0,0 @@ -#include "global.h" -#include "menu.h" -#include "screen.h" -#include "common.h" -#include "subtask.h" -#include "sound.h" -#include "save.h" -#include "kinstone.h" -#include "game.h" -#include "message.h" -#include "object.h" -#include "main.h" -#include "npc.h" -#include "enemy.h" -#include "item.h" -#include "itemMenuTable.h" -#include "functions.h" -#include "structures.h" - -extern const u8 gGlobalGfxAndPalettes[]; -typedef struct { - u8 filler0[0x1]; - u8 unk1; - u8 charColor; - u8 bgColor; - u16 unk4; - u16 unk6; - u8* unk8; -} struct_02036540; - -void sub_080A42E0(u32, u32); -void sub_0805ECEC(u32, u32, u32, u32); -u32 sub_080A43A8(u32); -u32 sub_080A4418(u32, u32); -u32 sub_080A43DC(u32); -u32 sub_080A44E0(struct_02036540*, u8*, u32); -struct_02036540* sub_0805F2C8(void); -void FigurineMenu_080A4978(void); -void sub_080A4B44(void); -void sub_080A4DA8(u32); -u32 sub_080A4CBC(u32); -void sub_080A4DB8(u32); -void sub_08056250(void); -void sub_080A5128(void); -u32 sub_080A51F4(void); -void sub_080A51D4(void); -void sub_080A5F48(u32, u32); - -extern u8 gUnk_02002C81[]; - -extern u8 gTextGfxBuffer[]; - -extern const KeyButtonLayout gUnk_08128B50; -extern const u8 gUnk_080FD5B4[]; - -void Subtask_PauseMenu(void) { - extern const void (*const gUnk_08128B30[])(void); - - if (gUnk_02034490.unk11 == 6) { - SetBgmVolume(0x100); - Subtask_Exit(); - } else { - FlushSprites(); - gUnk_08128B30[gUnk_02034490.unk11](); - sub_080A5128(); - sub_0801C1D4(); - DrawOAMCmd(); - if (gUnk_02034490.unk11 != 4) { - gUnk_08128A38[gUnk_02034490.unk1].func(); - } - CopyOAM(); - { - u32 t = gUnk_02034490.unk16; - u32 t2 = (t != 0) ? 0xe46 : 0; - gScreen.controls.layerFXControl = t2; - gScreen.controls.alphaBlend = (t << 8) | (0x10 - t); - } - } -} - -typedef struct { - u8 _0; - u8 _1; - u8 _2; - u8 _3; - u8 _4; - u16 _6; -} struct_08127F94; -struct_08127F94* sub_080A6A80(u32, u32); - -extern u8 gUnk_02034492[]; -void sub_0801E8D4(void); -u32 sub_0801DB94(void); -s32 sub_080A50A0(s32); - -void sub_080A4F28(void) { - struct_08127F94* ptr; - int r0, r1; - - sub_0801E8D4(); - sub_080A4D34(); - r1 = 4; - do { - gUnk_02034492[r1] = 0; - r1++; - } while (r1 <= 0xd); - ptr = sub_080A6A80((u16)gRoomTransition.player_status.overworld_map_x, - (u16)gRoomTransition.player_status.overworld_map_y); - gUnk_02034490.unk2[4] = ptr->_4; - gUnk_02034490.unk2[5] = sub_0801DB94(); - if (IsItemEquipped(ITEM_LANTERN_ON) != 2) { - r1 = 0x10; - } else { - r1 = 0xf; - } - gUnk_02034490.unk15 = r1; - r0 = gUnk_08128A38[gUnk_02034490.unk1].unk1; - r0 = sub_080A50A0(r0); - gUnk_02034490.unk1 = r0; - gUnk_02034490.unk14 = r0; - sub_080A4DB8(r0); - SetFade(4, 0x20); - sub_080A4E90(1); -} - -void sub_080A4FA0(void) { - if (gFadeControl.active == 0) { - sub_080A4E90(2); - } -} - -void sub_080A4FB8(void) { - int iVar1; - u32 uVar2; - int iVar4; - s32 bVar5; - - if ((sub_080A51F4() != 0) && (gMenu.field_0xc != NULL)) { - iVar1 = -1; - switch (gInput.newKeys) { - case 8: - iVar1 = 0; - break; - case 0x200: - iVar1 = 1; - break; - case 0x100: - iVar1 = 2; - break; - case 0x2: - iVar1 = 3; - break; - } - if (iVar1 >= 0) { - switch (bVar5 = gMenu.field_0xc[iVar1]) { - case 0: - break; - case 4 ... 6: - case 0xf: - uVar2 = GetInventoryValue(0x47); - if (uVar2 == 0) { - iVar4 = 1; - if (iVar1 == 1) { - iVar4 = 2; - } - bVar5 = gMenu.field_0xc[iVar4]; - } - default: - gUnk_02034490.unk14 = bVar5; - SoundReq(SFX_TEXTBOX_OPEN); - gMenu.field_0xc = NULL; - break; - } - } - } - bVar5 = sub_080A50A0(gUnk_02034490.unk14); - if (gUnk_02034490.unk1 != bVar5) { - gUnk_02034490.unk14 = bVar5; - sub_080A51D4(); - if (bVar5 == 0xe) { - sub_080A4E90(6); - } else { - sub_080A4E90(3); - MemClear(&gBG0Buffer, 0x800); - gScreen.bg0.updated = 1; - } - } -} - -s32 sub_080A50A0(s32 param_1) { - s32 iVar1; - - if (param_1 == 0xf) { - iVar1 = AreaHasMap(); - param_1 = 4; - if (iVar1 != 0) { - param_1 = 5; - } - } - return param_1; -} - -void sub_080A50B8(void) { - s32 iVar1; - - iVar1 = gUnk_02034490.unk16 + 2; - if (0x10 < iVar1) { - gScreen.lcd.displayControl &= 0xf8ff; - sub_080A4E90(4); - iVar1 = 0x10; - } - gUnk_02034490.unk16 = iVar1; -} - -void sub_080A50E8(void) { - u32 t; - gUnk_02034490.unk16 = 0x10; - gUnk_02034490.unk1 = t = gUnk_02034490.unk14; - sub_080A4DB8(t); - sub_080A4E90(5); -} - -void sub_080A5108(void) { - s32 iVar1; - - iVar1 = gUnk_02034490.unk16 - 2; - if (iVar1 < 0) { - sub_080A4E90(2); - iVar1 = 0; - } - gUnk_02034490.unk16 = iVar1; -} - -void sub_080A5128(void) { - int r5, t; - struct { - int x; - int y; - } p[3]; - - switch (gUnk_02034490.unk1) { - case 7: - case 8: - p[0].x = 0x60; - p[0].y = 0x18; - p[1].x = -0x10; - p[1].y = 0x48; - p[2].x = 0x100; - p[2].y = 0x48; - break; - case 9: - case 10: - case 11: - return; - default: - p[0].x = 0x40; - p[0].y = 0x10 - (gUnk_02034490.unk16 << 1); - t = (gUnk_02034490.unk16 / 3); - p[1].x = 0x10 - t; - p[1].y = 0x48; - p[2].x = 0xe0 + t; - p[2].y = 0x48; - break; - } - gOamCmd._4 = 0; - gOamCmd._6 = 0; - gOamCmd._8 = 0x400; - gOamCmd.x = p[0].x; - gOamCmd.y = p[0].y; -#ifdef EU - r5 = 0xfd << 1; -#else - r5 = 0x1fb; -#endif - DrawDirect(r5, 0); - gOamCmd.x = p[1].x; - gOamCmd.y = p[1].y; - DrawDirect(r5, 1); - gOamCmd.x = p[2].x; - gOamCmd.y = p[2].y; - DrawDirect(r5, 2); -} - -void sub_080A51D4(void) { - u32 i = gUnk_02034490.unk1; - if (i < 0xe) { - gUnk_02034490.unk2[i] = gMenu.field_0x3; - } -} - -u32 sub_080A51F4(void) { - u32 retval = 1; - if (gFadeControl.active != 0) - retval = 0; - if (gUnk_02034490.unk11 != 2) - retval = 0; - return retval; -} - -void sub_080A5384(void); -void sub_080A5218(void) { - extern void (*const gUnk_08128B48[])(void); - - gUnk_08128B48[gMenu.menuType](); - sub_080A5384(); -} - -void sub_080A5238(void) { - u32 uVar1; - u32 uVar2; - u32 uVar3; - - gMenu.field_0xc = NULL; - sub_080A70AC((KeyButtonLayout*)&gUnk_08128B50); - for (uVar3 = 1; uVar3 < 0x20; uVar3++) { - uVar1 = GetInventoryValue(uVar3); - if ((uVar1 == 1) && (uVar2 = gUnk_080FD5B4[uVar3 * 8], uVar2 < 0x12)) { - switch (uVar3) { - case 0xf: - case 0x10: - uVar3 = gUnk_02034490.unk15; - break; - default: - break; - } - gGenericMenu.unk10.a[uVar2] = uVar3; - sub_080A5F48(uVar3, uVar2 * 8 + 0x360); - } - } - sub_080A7114(1); -} - -extern const u8 gUnk_08128BF4[]; -void sub_080A6F6C(u32); -void sub_080A529C(void) { - s32 iVar1; - u32 uVar2; - u32 uVar3; - const ItemMenuTableEntry* entry; - - if (sub_080A51F4()) { - gMenu.field_0xc = (u8*)gUnk_08128BF4; - uVar3 = gMenu.field_0x3; - - entry = &gItemMenuTable[uVar3]; - switch (gInput.newKeys) { - case 1: - if (uVar3 == 0x10) { -#if defined(DEMO_USA) || defined(DEMO_JP) - SoundReq(SFX_MENU_ERROR); -#else - sub_080A4E84(0xb); - SoundReq(SFX_TEXTBOX_SELECT); -#endif - break; - } - case 2: - if (gGenericMenu.unk10.a[uVar3] != 0) { - u32 t = !!(gInput.newKeys ^ 1); - ForceEquipItem(gGenericMenu.unk10.a[uVar3], t); - SoundReq(SFX_TEXTBOX_SELECT); - } - break; - default: - switch (gInput.unk4) { - case DPAD_UP: - uVar3 = entry->up; - break; - case DPAD_DOWN: - uVar3 = entry->down; - break; - case DPAD_LEFT: - uVar3 = entry->left; - break; - case DPAD_RIGHT: - uVar3 = entry->right; - break; - } - break; - } - if (gMenu.field_0x3 != uVar3) { - gMenu.field_0x3 = uVar3; - SoundReq(SFX_TEXTBOX_CHOICE); - } - uVar2 = gGenericMenu.unk10.a[uVar3]; - switch (uVar3) { - case 0xc: - case 0xd: - case 0xe: - case 0xf: - if (uVar2 != 0) { - uVar2 = gSave.saved_status.field_0x24[uVar2 - 6]; - } - break; - case 0x10: - uVar2 = 0x73; - break; - default: - break; - } - sub_080A6F6C(uVar2 + 0x400); - } -} - -u32 sub_080A554C(u32); -extern u8* gSpriteAnimations_322[]; -#ifdef EU -#define sub_080A5384_draw_constant0 0x1fa -#define sub_080A5384_draw_constant1 0x141 -#else -#define sub_080A5384_draw_constant0 0x1fb -#define sub_080A5384_draw_constant1 0x142 -#endif -void sub_080A5384(void) { - u32 tmp; - u32 uVar3; - s32 iVar2; - const ItemMenuTableEntry* entry; - - gOamCmd._4 = 0x400; - gOamCmd._6 = 0; - gOamCmd._8 = 0; - for (uVar3 = 0; uVar3 < 0x11; uVar3++) { - u32 item; - if (gGenericMenu.unk10.a[uVar3] != 0) { - entry = &gItemMenuTable[uVar3]; - gOamCmd.x = entry->x; - gOamCmd.y = entry->y; - item = gGenericMenu.unk10.a[uVar3]; - switch (item) { - case 0x1c ... 0x1f: - item = gSave.stats.bottles[item - 0x1c]; - break; - } - iVar2 = 3; - switch (item) { - case 7: - case 8: - if (gBombBagSizes[gSave.stats.bombBagType] <= gSave.stats.bombCount) { - iVar2 = 4; - } - break; - case 9: - case 10: - if (gQuiverSizes[gSave.stats.quiverType] <= gSave.stats.arrowCount) { - iVar2 = 4; - } - break; - } - gOamCmd._8 = 0x800 | iVar2 << 0xc | ((uVar3 * 8) + 0x360); - DrawDirect(sub_080A5384_draw_constant1, *gSpriteAnimations_322[item]); - } - } - gOamCmd._8 = 0x800; - { - u32 uVar3 = gMenu.field_0x3; - if ((uVar3 == 0x10) && (gSaveHeader->language != 0)) { - uVar3 = 0x11; - } - entry = &gItemMenuTable[uVar3]; - } - gOamCmd.x = entry->x; - gOamCmd.y = entry->y; - tmp = entry->type + ((gMain.ticks.HWORD & 0x10) != 0 ? 3 : 4); - DrawDirect(sub_080A5384_draw_constant0, tmp); - { - u32 uVar3; - if (gSaveHeader->language != 0) { - uVar3 = 0x10; - } else { - uVar3 = 0x11; - } - entry = &gItemMenuTable[uVar3]; - } - gOamCmd.x = entry->x; - gOamCmd.y = entry->y; - gOamCmd._8 = 0x800; - DrawDirect(sub_080A5384_draw_constant0, 0x22); - { - uVar3 = sub_080A554C(gSave.stats.itemButtons[0]); - if (uVar3 < 0x11) { - entry = &gItemMenuTable[uVar3]; - gOamCmd.x = entry->x; - gOamCmd.y = entry->y; - DrawDirect(sub_080A5384_draw_constant0, 3); - } - } - { - uVar3 = sub_080A554C(gSave.stats.itemButtons[1]); - if (uVar3 < 0x11) { - entry = &gItemMenuTable[uVar3]; - gOamCmd.x = entry->x; - gOamCmd.y = entry->y; - DrawDirect(sub_080A5384_draw_constant0, 3); - } - } -} - -extern void (*const gUnk_08128BF8[])(void); - -extern u8 gUnk_02000090; - -u32 sub_080A554C(u32 arg0) { - u32 i; - - if (arg0 != 0) { - for (i = 0; i < 17; i++) { - if (arg0 == gGenericMenu.unk10.a[i]) - return i; - } - } - return 17; -} - -void sub_080A5574(void) { - gUnk_08128BF8[gMenu.menuType](); - sub_080A57F4(); -} From 5824dc8467b41e064ddc7d5118b54cf1bf08e54d Mon Sep 17 00:00:00 2001 From: Henny022p Date: Mon, 31 Jan 2022 17:33:26 +0100 Subject: [PATCH 7/7] clang format --- include/structures.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/structures.h b/include/structures.h index 327666d1..eba95243 100644 --- a/include/structures.h +++ b/include/structures.h @@ -99,7 +99,7 @@ typedef struct { } PriorityHandler; extern PriorityHandler gPriorityHandler; -extern struct{ +extern struct { u8 unk0; u8 unk1; u8 unk2[0xf]; @@ -111,7 +111,7 @@ extern struct{ s8 unk16; u8 unk17; } gUnk_02034490; -static_assert(sizeof(gUnk_02034490)==0x18); +static_assert(sizeof(gUnk_02034490) == 0x18); typedef struct { u8 unk0;