Leahnaya/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2026-04-26 00:23:14 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Clean up names

Browse Source
This commit is contained in:
ferwardle 2026-02-24 09:37:36 -06:00
parent 41d27b5eb8
commit 877951e6b6
3 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/overlay_44.h
View File

@ -5,15 +5,15 @@
#include "heap.h"
#include "list_menu_2d.h"
typedef struct UnkStruct_ov44_02235340_1 {
typedef struct UnkStruct_ov44_02235004 {
u8 unk0[27];
u8 unk1B;
u8 unk1C[5];
u8 unk21;
} UnkStruct_ov44_02235340_1;
} UnkStruct_ov44_02235004;
typedef struct UnkStruct_ov44_02235340 {
UnkStruct_ov44_02235340_1* unk0;
UnkStruct_ov44_02235004* unk0;
u8 unk4;
u8 unk5;
u8 unk6;
@ -44,17 +44,17 @@ typedef struct UnkStruct_ov44_02235340 {
u8 unk2D;
u8 unk2E;
u8 unk2F;
BgConfig* unk30;
BgConfig* bgConfig;
u8 unk34[472];
struct ListMenu2D* unk20C;
struct ListMenu2D* listMenu2D;
} UnkStruct_ov44_02235340;
typedef struct sub_struct {
typedef struct UnkStruct_ov44_02235340_sub {
u8 unk0;
u8 unk1;
u8 unk2;
u8 unk3;
} sub_struct;
} UnkStruct_ov44_02235340_sub;
extern const struct WindowTemplate ov44_0223645C;

2
main.lsf
View File

@ -812,7 +812,7 @@ Overlay OVY_44
{
After OVY_42
Object asm/overlay_44.o
Object src/overlay_44_t.o
Object src/overlay_44_02235340.o
}
Overlay OVY_45
{

120
src/overlay_44_t.c → src/overlay_44_02235340.c
View File

@ -22,16 +22,16 @@ s32 ov44_02234E08(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
}
if (ov44_0223442C(arg0) == 1) {
sub_02037BEC();
sub_02037AC0(0xE);
sub_02037AC0(14);
ov44_022342E0(arg0, arg1, heapID);
ov44_02233860(&arg0->unk30, arg1, 0x66, heapID);
ov44_02233860(&arg0->bgConfig, arg1, 102, heapID);
ov44_02234440(arg0);
arg0->unk8 = 0x12C;
arg0->unk8 = 300;
ov44_022342B8(arg0);
arg0->unk5 = 0xB;
} else if (0x400 & gSystem.newKeys) {
arg0->unk5 = 11;
} else if (1024 & gSystem.newKeys) {
ov44_022342E0(arg0, arg1, heapID);
arg0->unk5 = 0x12;
arg0->unk5 = 18;
}
return 0;
}
@ -39,18 +39,18 @@ s32 ov44_02234E08(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
s32 ov44_02234EA4(UnkStruct_ov44_02235340* arg0) {
s32 temp_r0;
if (sub_02037B38(0xE) != 0) {
if (sub_02037B38(14) != 0) {
s16 subroutine_arg0 = (s16) arg0->unk0->unk1B;
if (ov44_02233F64(arg0) != sub_02037454()) {
temp_r0 = arg0->unk8 - 1;
arg0->unk8 = temp_r0;
if (temp_r0 <= 0) {
arg0->unk5 = 0xF;
arg0->unk5 = 15;
}
return 0;
}
if (sub_02037C0C(sub_0203769C(), &subroutine_arg0) == 1) {
arg0->unk5 = 0xC;
arg0->unk5 = 12;
}
}
return 0;
@ -75,7 +75,7 @@ s32 ov44_02234EF4(UnkStruct_ov44_02235340* arg0) {
if (*temp_r0 == arg0->unk0->unk1B) {
var_r5 += 1;
} else {
arg0->unk5 = 0xF;
arg0->unk5 = 15;
}
}
} else {
@ -85,20 +85,20 @@ s32 ov44_02234EF4(UnkStruct_ov44_02235340* arg0) {
} while (var_r4 < temp_r7);
}
if (var_r5 == temp_r7) {
arg0->unk5 = 0xD;
arg0->unk5 = 13;
}
return 0;
}
s32 ov44_02234F44(UnkStruct_ov44_02235340* arg0) {
sub_020398D4(1, 1);
sub_02037AC0(0x12);
arg0->unk5 = 0xE;
sub_02037AC0(18);
arg0->unk5 = 14;
return 0;
}
s32 ov44_02234F60(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
if (sub_02037B38(0x12) != 0) {
if (sub_02037B38(18) != 0) {
ov44_022342E0(arg0, arg1, heapID);
arg0->unk7 = 1;
return 1;
@ -107,24 +107,24 @@ s32 ov44_02234F60(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
}
s32 ov44_02234F88(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
if (arg0->unk20C != NULL) {
Clear2dMenuWindowAndDelete(arg0->unk20C, heapID);
arg0->unk20C = NULL;
if (arg0->listMenu2D != NULL) {
Clear2dMenuWindowAndDelete(arg0->listMenu2D, heapID);
arg0->listMenu2D = NULL;
}
ov44_02233A34(&arg0->unk30);
ov44_02233A34(&arg0->bgConfig);
ov44_022342E0(arg0, arg1, heapID);
arg0->unk5 = 0x10;
arg0->unk5 = 16;
return 0;
}
s32 ov44_02234FC4(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
ov44_02233860(&arg0->unk30, arg1, 0x76, heapID);
arg0->unk5 = 0x11;
ov44_02233860(&arg0->bgConfig, arg1, 118, heapID);
arg0->unk5 = 17;
return 0;
}
s32 ov44_02234FDC(UnkStruct_ov44_02235340* arg0) {
if (ov44_02233914(&arg0->unk30) == 0) {
if (ov44_02233914(&arg0->bgConfig) == 0) {
return 0;
}
sub_02039358();
@ -139,27 +139,27 @@ s32 ov44_02235004(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
ov44_02233F6C(arg0, heapID);
if (arg0->unk0->unk21 == 1) {
var_r2 = 0x7D;
var_r2 = 125;
} else {
var_r2 = 0x7C;
var_r2 = 124;
}
ov44_02233860(&arg0->unk30, arg1, var_r2, heapID);
arg0->unk5 = 0x13;
ov44_02233860(&arg0->bgConfig, arg1, var_r2, heapID);
arg0->unk5 = 19;
return 0;
}
s32 ov44_02235038(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
ov44_02233F6C(arg0, heapID);
if (ov44_0223442C(arg0) == 1) {
arg0->unk5 = 0xA;
ov44_02233954(&arg0->unk30);
arg0->unk5 = 10;
ov44_02233954(&arg0->bgConfig);
return 0;
}
if (ov44_02233914(&arg0->unk30) == 0) {
if (ov44_02233914(&arg0->bgConfig) == 0) {
return 0;
}
arg0->unk20C = Std_CreateYesNoMenu(arg0->unk30, &ov44_0223645C, 0x30, 4, heapID);
arg0->unk5 = 0x14;
arg0->listMenu2D = Std_CreateYesNoMenu(arg0->bgConfig, &ov44_0223645C, 48, 4, heapID);
arg0->unk5 = 20;
return 0;
}
@ -168,43 +168,43 @@ s32 ov44_02235090(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
ov44_02233F6C(arg0, heapID);
if (ov44_0223442C(arg0) == 1) {
arg0->unk5 = 0xA;
ov44_02233954(&arg0->unk30);
Clear2dMenuWindowAndDelete(arg0->unk20C, heapID);
arg0->unk20C = 0;
arg0->unk5 = 10;
ov44_02233954(&arg0->bgConfig);
Clear2dMenuWindowAndDelete(arg0->listMenu2D, heapID);
arg0->listMenu2D = 0;
return 0;
}
temp_r0 = Handle2dMenuInput_DeleteOnFinish(arg0->unk20C, heapID);
temp_r0 = Handle2dMenuInput_DeleteOnFinish(arg0->listMenu2D, heapID);
if (temp_r0 != -1) {
if (temp_r0 == 0) {
ov44_02233D38(arg0, heapID);
ov44_022340B4(arg0);
}
arg0->unk5 = 8;
arg0->unk20C = 0;
arg0->listMenu2D = 0;
}
return 0;
}
s32 ov44_02235100(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
arg0->unk26 = sub_02034870(0);
if (arg0->unk26 == 0x20) {
if (arg0->unk26 == 32) {
GF_AssertFail();
}
ov44_02233C88(&arg0->unk30, arg1, 0, 0, heapID);
ov44_02233C88(&arg0->bgConfig, arg1, 0, 0, heapID);
sub_02039358();
arg0->unk27 = 0;
ov44_02233860(&arg0->unk30, arg1, 0x84, heapID);
arg0->unk5 = 0x16;
ov44_02233860(&arg0->bgConfig, arg1, 132, heapID);
arg0->unk5 = 22;
return 0;
}
s32 ov44_02235158(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
if (ov44_02233914(&arg0->unk30) == 0) {
if (ov44_02233914(&arg0->bgConfig) == 0) {
return 0;
}
arg0->unk20C = Std_CreateYesNoMenu(arg0->unk30, &ov44_0223645C, 0x30, 4, heapID);
arg0->unk5 = 0x17;
arg0->listMenu2D = Std_CreateYesNoMenu(arg0->bgConfig, &ov44_0223645C, 48, 4, heapID);
arg0->unk5 = 23;
return 0;
}
@ -212,24 +212,24 @@ s32 ov44_0223518C(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
s32 temp_r0;
s8 var_r0;
temp_r0 = Handle2dMenuInput_DeleteOnFinish(arg0->unk20C, heapID);
temp_r0 = Handle2dMenuInput_DeleteOnFinish(arg0->listMenu2D, heapID);
if (temp_r0 != -1) {
if (temp_r0 == 0) {
var_r0 = 0x18;
var_r0 = 24;
} else {
var_r0 = 0x1D;
var_r0 = 29;
}
arg0->unk5 = var_r0;
arg0->unk20C = 0;
arg0->listMenu2D = 0;
}
return 0;
}
s32 ov44_022351BC(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
ov44_02233860(&arg0->unk30, arg1, 0x11, heapID);
ov44_02233860(&arg0->bgConfig, arg1, 17, heapID);
ov44_022342B8(arg0);
arg0->unk8 = 0x5A;
arg0->unk5 = 0x19;
arg0->unk8 = 90;
arg0->unk5 = 25;
return 0;
}
@ -238,11 +238,11 @@ s32 ov44_022351DC(UnkStruct_ov44_02235340* arg0, u8* arg1) {
arg0->unk8 = arg0->unk8 - 1;
return 0;
}
if (ov44_02233914(&arg0->unk30) == 0) {
if (ov44_02233914(&arg0->bgConfig) == 0) {
return 0;
}
if (ov44_02233E80(arg0->unk26, *arg1) != 0) {
arg0->unk5 = 0x1A;
arg0->unk5 = 26;
}
return 0;
}
@ -253,13 +253,13 @@ s32 ov44_02235218(UnkStruct_ov44_02235340* arg0, s32 arg1, enum HeapID heapID) {
sub_020378E4(0);
ov44_022342E0(arg0, arg1, heapID);
BeginNormalPaletteFade(3, 0, 0, 0, 6, 1, heapID);
arg0->unk5 = 0x1B;
arg0->unk5 = 27;
}
return 0;
}
s32 ov44_02235268(UnkStruct_ov44_02235340* arg0, UnkStruct_ov44_02235340* arg1, enum HeapID heapID) {
sub_struct* temp_r0;
UnkStruct_ov44_02235340_sub* temp_r0;
if (IsPaletteFadeFinished() != 0) {
sub_02034354(arg1->unk8, 0);
@ -267,25 +267,25 @@ s32 ov44_02235268(UnkStruct_ov44_02235340* arg0, UnkStruct_ov44_02235340* arg1,
ov44_02234204(arg0);
ov44_02233214(arg0, heapID);
arg0 = arg0;
memset(&arg0->unk30, 0, 0x7e << 2);
memset(&arg0->bgConfig, 0, 504);
ov44_02234028(arg0);
ov44_022331C4(arg0, arg1, heapID);
sub_0203A880();
arg0->unk12 = 0;
arg0->unk13 = 0;
temp_r0 = (sub_struct*)&arg0->unk14;
temp_r0 = (UnkStruct_ov44_02235340_sub*)&arg0->unk14;
arg0->unk14 = 0;
temp_r0->unk1 = 0;
temp_r0->unk2 = 0;
temp_r0->unk3 = 0;
temp_r0 = (sub_struct*)&arg0->unk18;
temp_r0 = (UnkStruct_ov44_02235340_sub*)&arg0->unk18;
arg0->unk18 = 0;
temp_r0->unk1 = 0;
temp_r0->unk2 = 0;
temp_r0->unk3 = 0;
MI_CpuFill8(&arg0->unk1C, 1, 4);
MI_CpuFill8(&arg0->unk20, 1, 4);
temp_r0 = (sub_struct*)&arg0->unk28;
temp_r0 = (UnkStruct_ov44_02235340_sub*)&arg0->unk28;
arg0->unk24 = 0;
arg0->unk26 = 0;
arg0->unk28 = 0;
@ -293,7 +293,7 @@ s32 ov44_02235268(UnkStruct_ov44_02235340* arg0, UnkStruct_ov44_02235340* arg1,
temp_r0->unk2 = 0;
temp_r0->unk3 = 0;
BeginNormalPaletteFade(3, 1, 1, 0, 6, 1, heapID);
arg0->unk5 = 0x1C;
arg0->unk5 = 28;
}
return 0;
}