mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-14 20:43:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match some subtask2 functions

Browse Source
This commit is contained in:
Tal Hayon
2022-04-11 14:30:11 +03:00
parent 02cec8ca8d
commit 157990d545
5 changed files with 174 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/subtask2.c
+174 -15
View File
@@ -33,6 +33,7 @@ extern u16* gMoreSpritePtrs[];
extern Screen gUnk_03001020;
extern u8 gUnk_02024090[];
extern u8 gUnk_03000420[];
extern u16 gUnk_02017AA0[];
void sub_080A5CFC(u32, void*, u32);
void sub_080A6FB4(u32, u32);
@@ -42,7 +43,7 @@ void sub_080A70AC(const KeyButtonLayout* layout);
u32 sub_080A6F40();
void sub_080A67C4(u32);
void sub_080A68D4();
u32 sub_080A69E0();
s32 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);
@@ -77,6 +78,14 @@ typedef struct {
extern sturct_gUnk_08128F58 gUnk_08128F58[];
typedef struct {
u8 unk0;
u8 unk1;
u16 unk2;
u16 unk4;
u16 unk6;
} struct_sub_080A698C;
extern void (*const gUnk_08128DCC[])(void);
void sub_080A6378(void);
@@ -850,9 +859,105 @@ void sub_080A667C(void) {
sub_080A6FB4(gMenu.field_0x3, 0);
}
ASM_FUNC("asm/non_matching/subtask2/sub_080A66D0.inc", void sub_080A66D0())
void sub_080A66D0(void) {
u32 bVar2;
u32 bVar3;
u8 bVar4;
u32 uVar5;
u32 uVar8;
struct_sub_080A698C* ptr;
const struct_gUnk_08128E94* ptr2;
ASM_FUNC("asm/non_matching/subtask2/sub_080A67C4.inc", void sub_080A67C4(u32 param_1))
gOamCmd._4 = 0;
gOamCmd._6 = 0;
gOamCmd.x = 0x78;
ptr2 = &gUnk_08128E94[gMenu.field_0x3];
gGenericMenu.unk2c++;
if (gGenericMenu.unk2b != 1 && ((gGenericMenu.unk2c & 0x10) != 0)) {
gOamCmd._8 = 0x800;
if (gMenu.field_0xa != 0) {
gOamCmd.y = 0xc;
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x71);
}
if (ptr2->unk2 > gMenu.field_0xa) {
gOamCmd.y = 0x84;
DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x72);
}
}
bVar2 = ptr2->unk7;
bVar3 = ptr2->unk3;
uVar5 = gMenu.field_0xa;
gOamCmd._4 = 0;
gOamCmd._6 = 0;
gOamCmd._8 = 0xc00;
bVar4 = gGenericMenu.unk2c & 0x20;
for (ptr = (struct_sub_080A698C*)&gMapDataBottomSpecial; ptr->unk2 != 0; ptr++) {
uVar8 = 0;
if (ptr->unk0 == 1) {
if (bVar4 != 0) {
uVar8 = 1;
}
} else if (bVar4 == 0) {
uVar8 = 1;
}
if (uVar8 != 0) {
gOamCmd.x = ptr->unk4 + bVar2;
gOamCmd.y = ptr->unk6 + bVar3 - uVar5;
DrawDirect(ptr->unk2, ptr->unk1);
}
}
}
void sub_080A67C4(u32 param_1) {
u16* puVar2;
int i;
int iVar4;
s32 room;
const struct_gUnk_08128E94* ptr;
LoadPaletteGroup(param_1 + 0xba);
iVar4 = param_1 + 0x5f;
switch (param_1) {
case 0x9:
if (CheckGlobalFlag(TATEKAKE_HOUSE)) {
iVar4 = 0x70;
}
break;
case 0xb:
if (CheckKinstoneFused(0xe)) {
iVar4 = 0x71;
}
break;
case 0xe:
if (gUI.roomControls.area == 8) {
room = gUI.roomControls.room;
iVar4 = (u8)(room % 3) + 0x72;
}
break;
}
LoadGfxGroup(iVar4);
ptr = &gUnk_08128E94[param_1];
puVar2 = &gUnk_02017AA0[gUnk_03003DE4 * 0x500];
for (i = 0; i <= 7; puVar2++, i++) {
*puVar2 = 0x1e0a;
}
for (i = 8; i < (int)(ptr->unk5 + ptr->unk4); puVar2++, i++) {
*puVar2 = 0x1e0b;
}
for (; i < 0xa0; puVar2++, i++) {
*puVar2 = 0x1e0a;
}
sub_0805622C(&gUnk_02017AA0[gUnk_03003DE4 * 0x500], REG_ADDR_BG3CNT, 0xa2600001);
gMenu.field_0xa = ptr->unk2 >> 1;
MemClear(&gMapDataBottomSpecial, 0x400);
}
void sub_080A68D4(void) {
u32 uVar1;
@@ -887,18 +992,10 @@ void sub_080A68D4(void) {
}
}
typedef struct {
u8 unk0;
u8 unk1;
u16 unk2;
u16 unk4;
u16 unk6;
} struct_sub_080A698C;
void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4) {
int iVar1;
iVar1 = sub_080A69E0();
iVar1 = sub_080A69E0(param_1, param_2);
if (0 < iVar1) {
((struct_sub_080A698C*)&gMapDataBottomSpecial)[gGenericMenu.unk2d].unk0 = param_4 >> 8;
((struct_sub_080A698C*)&gMapDataBottomSpecial)[gGenericMenu.unk2d].unk1 = param_4;
@@ -909,7 +1006,7 @@ void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4) {
}
}
u32 sub_080A69E0(u32 param_1, u32 param_2) {
s32 sub_080A69E0(u32 param_1, u32 param_2) {
const struct_08127F94* pbVar1;
int iVar3;
@@ -968,7 +1065,56 @@ void Subtask_LocalMapHint() {
CopyOAM();
}
ASM_FUNC("asm/non_matching/subtask2/sub_080A6B04.inc", void sub_080A6B04())
void sub_080A6B04(void) {
u32 bVar1;
u32 uVar2;
u32 uVar3;
u32 uVar4;
int uVar6;
u32 uVar7;
struct_080C9CBC* ptr;
struct_080FE320* ptr2;
const struct_gUnk_08128E94* ptr3;
sub_080A4D34();
sub_080A4DB8(6);
ptr = &gUnk_080C9CBC[gFuseInfo._3];
ptr2 = &gUnk_080FE320[ptr->evt_type];
bVar1 = ptr->_5[1];
uVar3 = ptr2->_c;
uVar4 = ptr2->_e;
uVar2 = sub_080A6A80(uVar3, uVar4)->_4;
gMenu.field_0x3 = uVar2;
gGenericMenu.unk2b = 1;
sub_080A67C4(uVar2);
sub_080A6FB4(uVar2, 2);
SetColor(0, 0x475f);
SetColor(0x5f, 0x475f);
MemFill16(0x5001, &gBG3Buffer, sizeof(gBG3Buffer));
if ((gPlayerState.flags & PL_NO_CAP) != 0) {
uVar7 = 101;
} else {
uVar7 = 100;
}
sub_080A698C(gRoomTransition.player_status.overworld_map_x, gRoomTransition.player_status.overworld_map_y,
DRAW_DIRECT_SPRITE_INDEX, uVar7 + 0x100);
sub_080A698C(uVar3, uVar4, DRAW_DIRECT_SPRITE_INDEX, bVar1 + 100);
uVar4 = sub_080A69E0(uVar3, uVar4) >> 0x10;
ptr3 = &gUnk_08128E94[gMenu.field_0x3];
gMenu.field_0xa = 0;
if (ptr3->unk2 != 0) {
uVar6 = uVar4 - 0x3c;
if (uVar6 > 0) {
if (ptr3->unk2 < uVar6) {
uVar6 = ptr3->unk2;
}
gMenu.field_0xa = uVar6;
}
}
gMenu.transitionTimer = 0x1e;
SetMenuType(1);
SetFade(FADE_INSTANT, 8);
}
void sub_080A6C1C(void) {
if (!gFadeControl.active) {
@@ -1147,7 +1293,20 @@ void sub_080A6E70(void) {
}
}
ASM_FUNC("asm/non_matching/subtask2/sub_080A6EE0.inc", void sub_080A6EE0(u32 param_1))
void sub_080A6EE0(u32 param_1) {
u32 x;
u32 y;
RoomHeader* roomHeader;
const ScreenTransitionData* ptr = &gUnk_08128024[param_1];
x = (u16)ptr->playerXPos;
y = (u16)ptr->playerYPos;
roomHeader = &gAreaRoomHeaders[ptr->area][ptr->room];
x += roomHeader->map_x;
y += roomHeader->map_y;
gOamCmd.x = (s32)(x * 0xa0) / 0xf90 + 0x28;
gOamCmd.y = (s32)(y * 0xa0) / 0xf90 + 0xc;
}
u32 sub_080A6F40(void) {
extern u8 gUnk_08128F38[];