ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Decompiled two small functions, updated structs

Browse Source
This commit is contained in:
Phlosioneer 2019-02-23 23:38:32 -05:00
parent fb8dddf0f1
commit a7d2d986b2
2 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
asm/pokenav.s
View File

@ -5,32 +5,6 @@
.text
thumb_func_start sub_81C8224
sub_81C8224: @ 81C8224
push {lr}
ldr r0, =sub_81C8254
bl sub_81C7124
pop {r1}
bx r1
.pool
thumb_func_end sub_81C8224
thumb_func_start sub_81C8234
sub_81C8234: @ 81C8234
push {r4,lr}
movs r0, 0x11
bl GetSubstructPtr
adds r4, r0, 0
bl sub_81C8FE0
ldrb r0, [r4, 0x8]
bl RemoveWindow
movs r0, 0x11
bl FreeSubstruct
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_81C8234
thumb_func_start sub_81C8254
sub_81C8254: @ 81C8254
push {r4,lr}

24
src/pokenav.c
View File

@ -34,7 +34,7 @@ struct UnknownSubSubStruct_0203CF40 {
u16 unk2;
u16 unk4;
u16 unk6;
u8 unk8;
u8 windowId;
u8 unk9;
u16 unkA;
u16 unkC;
@ -56,7 +56,8 @@ struct UnknownSubStruct_0203CF40
struct UnknownSubStruct_81C81D4
{
u8 unk0[0x888];
struct UnknownSubSubStruct_0203CF40 unk0;
u8 unkE[0x878];
struct UnknownSubSubStruct_0203CF40 unk888;
u8 unk898[0xC];
};
@ -78,6 +79,7 @@ extern void sub_81CAADC(void);
extern u32 sub_81C99D4(void);
extern void sub_8199D98(void);
extern void sub_81C7D28(void);
extern void sub_81C8FE0(void);
extern u32 sub_81C9298(void);
extern u32 sub_81C941C(void);
extern u32 sub_81C9924(void);
@ -434,14 +436,14 @@ bool32 sub_81C70D8(u32 a0)
return FALSE;
}
bool32 sub_81C7124(u32 a0)
bool32 sub_81C7124(u32 (*a0)(s32))
{
s32 i;
for (i = 0; i < NUM_TASKS; i++)
{
if (gTasks[i].isActive
&& (gTasks[i].func == sub_81C7170 || gTasks[i].func == sub_81C71E4)
&& GetWordTaskArg(i, 1) == a0)
&& (void *)GetWordTaskArg(i, 1) == a0)
return TRUE;
}
return FALSE;
@ -740,7 +742,7 @@ void *AllocSubstruct(u32 index, u32 size)
return gUnknown_0203CF40->field10[index] = Alloc(size);
}
struct UnknownSubStruct_0203CF40 *GetSubstructPtr(u32 index)
void *GetSubstructPtr(u32 index)
{
return gUnknown_0203CF40->field10[index];
}
@ -1466,3 +1468,15 @@ bool32 sub_81C81D4(const void *arg0, void *arg1, s32 arg2)
return TRUE;
}
bool32 sub_81C8224(void) {
return sub_81C7124(sub_81C8254);
}
void sub_81C8234(void) {
struct UnknownSubStruct_81C81D4 *structPtr;
structPtr = GetSubstructPtr(0x11);
sub_81C8FE0();
RemoveWindow(structPtr->unk0.windowId);
FreeSubstruct(0x11);
}