From d4e8e230287dce05ee630ad713ee9079a356c184 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Thu, 7 Apr 2022 14:32:18 +0300 Subject: [PATCH] Match sub_080A6378 --- asm/non_matching/subtask2/sub_080A6378.inc | 180 --------------------- src/subtask2.c | 60 +++++-- 2 files changed, 44 insertions(+), 196 deletions(-) delete mode 100644 asm/non_matching/subtask2/sub_080A6378.inc diff --git a/asm/non_matching/subtask2/sub_080A6378.inc b/asm/non_matching/subtask2/sub_080A6378.inc deleted file mode 100644 index 2b5b18ef..00000000 --- a/asm/non_matching/subtask2/sub_080A6378.inc +++ /dev/null @@ -1,180 +0,0 @@ - .syntax unified -.ifdef EU - push {r4, r5, r6, lr} - ldr r0, _080A5C18 @ =gMenu - adds r4, r0, #0 - adds r4, #0x2c - ldrb r0, [r4] - adds r0, #1 - strb r0, [r4] - movs r6, #0x20 - ands r0, r6 - cmp r0, #0 - beq _080A5B86 - bl sub_080A6438 -_080A5B86: - ldr r5, _080A5C1C @ =gOamCmd - movs r0, #0x80 - lsls r0, r0, #3 - strh r0, [r5, #4] - movs r0, #0 - strh r0, [r5, #6] - movs r0, #0xe0 - lsls r0, r0, #7 - strh r0, [r5, #8] - ldrb r1, [r4] - adds r0, r6, #0 - ands r0, r1 - cmp r0, #0 - bne _080A5BE0 - ldr r4, _080A5C20 @ =gRoomTransition - ldrh r1, [r4, #0x20] - lsls r0, r1, #2 - adds r0, r0, r1 - lsls r0, r0, #5 - movs r1, #0xf9 - lsls r1, r1, #4 - bl __divsi3 - adds r0, #0x28 - strh r0, [r5] - ldrh r0, [r4, #0x22] - lsls r0, r0, #7 - movs r1, #0xc6 - lsls r1, r1, #4 - bl __divsi3 - adds r0, #0xc - strh r0, [r5, #2] - ldr r0, _080A5C24 @ =gPlayerState - ldr r0, [r0, #0x30] - movs r1, #8 - ands r0, r1 - movs r1, #0x59 - cmp r0, #0 - beq _080A5BD8 - movs r1, #0x5a -_080A5BD8: - movs r0, #0xfd - lsls r0, r0, #1 - bl DrawDirect -_080A5BE0: - ldr r3, _080A5C18 @ =gMenu - ldrb r0, [r3, #3] - lsls r0, r0, #3 - ldr r1, _080A5C28 @ =gUnk_08128DE8 - adds r0, r0, r1 - ldr r2, _080A5C1C @ =gOamCmd - ldrb r1, [r0, #6] - strh r1, [r2] - ldrb r0, [r0, #7] - strh r0, [r2, #2] - ldrb r0, [r3, #3] - lsls r2, r0, #1 - adds r2, r2, r0 - adds r2, #0x26 - adds r3, #0x2c - ldrb r1, [r3] - lsrs r1, r1, #4 - movs r0, #1 - bics r0, r1 - adds r1, r2, r0 - movs r0, #0xfd - lsls r0, r0, #1 - bl DrawDirect - bl sub_080A6498 - pop {r4, r5, r6, pc} - .align 2, 0 -_080A5C18: .4byte gMenu -_080A5C1C: .4byte gOamCmd -_080A5C20: .4byte gRoomTransition -_080A5C24: .4byte gPlayerState -_080A5C28: .4byte gUnk_08128DE8 -.else - push {r4, r5, r6, lr} - ldr r0, _080A6420 @ =gMenu - adds r4, r0, #0 - adds r4, #0x2c - ldrb r0, [r4] - adds r0, #1 - strb r0, [r4] - movs r6, #0x20 - ands r0, r6 - cmp r0, #0 - beq _080A6392 - bl sub_080A6438 -_080A6392: - ldr r5, _080A6424 @ =gOamCmd - movs r0, #0x80 - lsls r0, r0, #3 - strh r0, [r5, #4] - movs r0, #0 - strh r0, [r5, #6] - movs r0, #0xe0 - lsls r0, r0, #7 - strh r0, [r5, #8] - ldrb r1, [r4] - adds r0, r6, #0 - ands r0, r1 - cmp r0, #0 - bne _080A63EA - ldr r4, _080A6428 @ =gRoomTransition - ldrh r1, [r4, #0x20] - lsls r0, r1, #2 - adds r0, r0, r1 - lsls r0, r0, #5 - movs r1, #0xf9 - lsls r1, r1, #4 - bl __divsi3 - adds r0, #0x28 - strh r0, [r5] - ldrh r0, [r4, #0x22] - lsls r0, r0, #7 - movs r1, #0xc6 - lsls r1, r1, #4 - bl __divsi3 - adds r0, #0xc - strh r0, [r5, #2] - ldr r0, _080A642C @ =gPlayerState - ldr r0, [r0, #0x30] - movs r1, #8 - ands r0, r1 - movs r1, #0x59 - cmp r0, #0 - beq _080A63E4 - movs r1, #0x5a -_080A63E4: - ldr r0, _080A6430 @ =0x000001FB - bl DrawDirect -_080A63EA: - ldr r3, _080A6420 @ =gMenu - ldrb r0, [r3, #3] - lsls r0, r0, #3 - ldr r1, _080A6434 @ =gUnk_08128DE8 - adds r0, r0, r1 - ldr r2, _080A6424 @ =gOamCmd - ldrb r1, [r0, #6] - strh r1, [r2] - ldrb r0, [r0, #7] - strh r0, [r2, #2] - ldrb r0, [r3, #3] - lsls r2, r0, #1 - adds r2, r2, r0 - adds r2, #0x26 - adds r3, #0x2c - ldrb r1, [r3] - lsrs r1, r1, #4 - movs r0, #1 - bics r0, r1 - adds r1, r2, r0 - ldr r0, _080A6430 @ =0x000001FB - bl DrawDirect - bl sub_080A6498 - pop {r4, r5, r6, pc} - .align 2, 0 -_080A6420: .4byte gMenu -_080A6424: .4byte gOamCmd -_080A6428: .4byte gRoomTransition -_080A642C: .4byte gPlayerState -_080A6430: .4byte 0x000001FB -_080A6434: .4byte gUnk_08128DE8 -.endif - .syntax divided diff --git a/src/subtask2.c b/src/subtask2.c index 2dd6be06..6ce3cb28 100644 --- a/src/subtask2.c +++ b/src/subtask2.c @@ -14,9 +14,9 @@ #include "kinstone.h" #ifdef EU -#define DRAW_DIRECT_VAL 0x1fa +#define DRAW_DIRECT_SPRITE_INDEX 0x1fa #else -#define DRAW_DIRECT_VAL 0x1fb +#define DRAW_DIRECT_SPRITE_INDEX 0x1fb #endif extern u8 gUnk_08128D38[]; @@ -37,6 +37,7 @@ u32 sub_080A69E0(); void sub_080A6EE0(u32 param_1); struct_08127F94* sub_080A6A80(u32 param_1, u32 param_2); void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4); +void sub_080A6438(); extern void DrawDungeonMap(u32 floor, struct_02019EE0* data, u32 size); extern void LoadDungeonMap(void); @@ -56,7 +57,7 @@ extern u8 gUnk_08128E80[]; extern KeyButtonLayout gUnk_08128DBC; typedef struct { - u8 unk0; + u8 frameIndex; u8 unk1; u8 unk2; u8 unk3; @@ -450,7 +451,34 @@ void sub_080A6290(void) { ASM_FUNC("asm/non_matching/subtask2/sub_080A62E0.inc", void sub_080A62E0()) -ASM_FUNC("asm/non_matching/subtask2/sub_080A6378.inc", void sub_080A6378()) +void sub_080A6378(void) { + u32 frameIndex; + gUnk_08128DE8_struct* ptr; + + gGenericMenu.unk2c++; + if ((gGenericMenu.unk2c & 0x20) != 0) { + sub_080A6438(); + } + gOamCmd._4 = 0x400; + gOamCmd._6 = 0; + gOamCmd._8 = 0x7000; + if ((gGenericMenu.unk2c & 0x20) == 0) { + gOamCmd.x = gRoomTransition.player_status.overworld_map_x * 0xa0 / 0xf90 + 0x28; + gOamCmd.y = (gRoomTransition.player_status.overworld_map_y << 7) / 0xc60 + 0xc; + if ((gPlayerState.flags & 8) != 0) { + frameIndex = 0x5a; + } else { + frameIndex = 0x59; + } + DrawDirect(DRAW_DIRECT_SPRITE_INDEX, frameIndex); + } + ptr = &gUnk_08128DE8[gMenu.field_0x3]; + gOamCmd.x = ptr->unk6; + gOamCmd.y = ptr->unk7; + frameIndex = gMenu.field_0x3 * 3 + 0x26 + (((gGenericMenu.unk2c >> 4) & 1) == 0); + DrawDirect(DRAW_DIRECT_SPRITE_INDEX, frameIndex); + sub_080A6498(); +} void sub_080A6438(void) { u32 uVar1; @@ -461,11 +489,11 @@ void sub_080A6438(void) { gOamCmd._6 = 0; gOamCmd._8 = 0; uVar1 = gSave.field_0x20 & gGenericMenu.unk10.h[0]; - for (pcVar2 = gUnk_08128F58, uVar3 = 0; pcVar2->unk0 != 0; uVar3++, pcVar2++) { + for (pcVar2 = gUnk_08128F58, uVar3 = 0; pcVar2->frameIndex != 0; uVar3++, pcVar2++) { if ((1 << uVar3 & uVar1) != 0) { gOamCmd.x = pcVar2->unk1; gOamCmd.y = pcVar2->unk2; - DrawDirect(DRAW_DIRECT_VAL, pcVar2->unk0); + DrawDirect(DRAW_DIRECT_SPRITE_INDEX, pcVar2->frameIndex); } } } @@ -481,7 +509,7 @@ void sub_080A6498(void) { gUnk_08128DE8_struct* ptr = &gUnk_08128DE8[i]; gOamCmd.x = ptr->unk6; gOamCmd.y = ptr->unk7; - DrawDirect(DRAW_DIRECT_VAL, 0x28 + 3 * i); + DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x28 + 3 * i); } } gScreen.controls.windowOutsideControl = 0x3d3f; @@ -607,13 +635,13 @@ void sub_080A68D4(void) { iVar6 = 100; } sub_080A698C(gRoomTransition.player_status.overworld_map_x, gRoomTransition.player_status.overworld_map_y, - DRAW_DIRECT_VAL, iVar6 + 0x100); + DRAW_DIRECT_SPRITE_INDEX, iVar6 + 0x100); uVar1 = sub_080A6F40(); uVar1 &= gSave.field_0x20; - for (pcVar4 = gUnk_08128F58, i = 0; pcVar4->unk0 != 0; i++, pcVar4++) { + for (pcVar4 = gUnk_08128F58, i = 0; pcVar4->frameIndex != 0; i++, pcVar4++) { if (((1 << i) & uVar1) != 0) { - sub_080A698C(pcVar4->unk4, pcVar4->unk6, DRAW_DIRECT_VAL, pcVar4->unk3); + sub_080A698C(pcVar4->unk4, pcVar4->unk6, DRAW_DIRECT_SPRITE_INDEX, pcVar4->unk3); } } @@ -621,7 +649,7 @@ void sub_080A68D4(void) { if (CheckKinstoneFused(i) && !sub_0801E810(i)) { uVar4 = gUnk_080C9CBC[i]._5[1]; ptr = &gUnk_080FE320[gUnk_080C9CBC[i].evt_type]; - sub_080A698C(ptr->_c, ptr->_e, DRAW_DIRECT_VAL, uVar4 + 100); + sub_080A698C(ptr->_c, ptr->_e, DRAW_DIRECT_SPRITE_INDEX, uVar4 + 100); } } } @@ -863,7 +891,7 @@ void sub_080A6E44(void) { } void sub_080A6E70(void) { - u32 uVar1; + u32 frameIndex; u32 i; gOamCmd._4 = 0; @@ -872,16 +900,16 @@ void sub_080A6E70(void) { gGenericMenu.unk2c++; sub_080A6EE0(gMenu.field_0x3); if ((gGenericMenu.unk2c & 0x10) != 0) { - uVar1 = 0x5d; + frameIndex = 0x5d; } else { - uVar1 = 0x5e; + frameIndex = 0x5e; } - DrawDirect(DRAW_DIRECT_VAL, uVar1); + DrawDirect(DRAW_DIRECT_SPRITE_INDEX, frameIndex); for (i = 0; i < 8; i++) { if ((gSave.windcrests & (1 << (i + 0x18))) != 0) { sub_080A6EE0(i); - DrawDirect(DRAW_DIRECT_VAL, 0x5c); + DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x5c); } } }