more documenting

This commit is contained in:
Seth Barberee 2023-02-12 09:24:40 -08:00
parent d0eb9a938f
commit ba733a79c5
9 changed files with 18 additions and 17 deletions

View File

@ -3962,7 +3962,7 @@ sub_8020D90:
bcc _08020DC6
cmp r0, 0x3
bne _08020DC6
bl sub_801E930
bl GulpinIsNextMoveLinked
ldr r1, _08020DB8
ldr r1, [r1]
strb r0, [r1, 0x14]

View File

@ -8,8 +8,8 @@ struct unkStruct_203B26C
s32 state;
u32 unk8;
s16 speciesNum; // species of chosen Pokemon
u8 unkE;
struct Move * unk10;
bool8 isNextMoveLinked;
struct Move * moves;
u32 unk14;
u32 unk18;
u16 unk1C;

View File

@ -58,11 +58,11 @@ struct UnkInputStruct
/* 0x5 */ u32 unk5;
/* 0x9 */ u32 unk9;
/* 0xD */ u32 unkD;
/* 0x12 */ u32 unk11;
/* 0x16 */ u32 unk15;
/* 0x1A */ u32 unk19;
/* 0x1E */ u32 unk1D;
/* 0x24 */ u32 unk24;
/* 0x11 */ u32 unk11;
/* 0x15 */ u32 unk15;
/* 0x19 */ u32 unk19;
/* 0x1D */ u32 unk1D;
/* 0x21 */ u32 unk21;
/* 0x28 */ u8 unk28;
/* 0x29 */ u8 a_button;
/* 0x2A */ u8 b_button;

View File

@ -74,5 +74,6 @@ void CleanUpMenu(void);
bool8 sub_80363E0(void);
struct unkStruct_8035D94 *sub_8035D94(void);
void sub_8035DA0(void);
struct MainMenu *GetMainMenu(void);
#endif // GUARD_MAIN_MENU_H

View File

@ -53,7 +53,7 @@ void InitHeapInternal(void);
void DoInitHeap(struct HeapDescriptor *, struct HeapSettings *, struct HeapFreeListElement *, u32);
void InitSubHeap(struct HeapDescriptor *, struct HeapMemoryBlock *, u32);
s32 _LocateSet(struct HeapDescriptor *heap, s32 size, s32 param_3);
void *MemoryAlloc(s32 size, s32 b);
void *MemoryAlloc(s32 size, s32 group);
void MemoryFree(void *a);
#endif // GUARD_MEMORY_H

View File

@ -4,7 +4,7 @@
struct MenuItem
{
const u8 *text;
u32 menuAction; // action??
s32 menuAction; // action??
};
#endif // GUARD_MENU_H

View File

@ -31,7 +31,7 @@ u32 DisplayGulpinDialogueSprite(s32 param_1,s16 pokeSpecies,struct Move *param_3
gUnknown_203B26C = MemoryAlloc(sizeof(struct unkStruct_203B26C),8);
gUnknown_203B26C->unk0 = param_1;
gUnknown_203B26C->speciesNum = species_32;
gUnknown_203B26C->unk10 = param_3;
gUnknown_203B26C->moves = param_3;
gUnknown_203B26C->unk1C = param_3[4].id;
if (param_1 == 0) {
@ -81,9 +81,9 @@ u32 sub_801E8C0(void)
return 0;
}
u8 sub_801E930(void)
bool8 GulpinIsNextMoveLinked(void)
{
return gUnknown_203B26C->unkE;
return gUnknown_203B26C->isNextMoveLinked;
}
void sub_801E93C(void)

View File

@ -36,7 +36,7 @@ void sub_801ED28(void)
break;
case 2:
PlaySound(0x133);
gUnknown_203B26C->unkE = IsNextMoveLinked(gUnknown_203B26C->unk20, gUnknown_203B26C->unk10);
gUnknown_203B26C->isNextMoveLinked = IsNextMoveLinked(gUnknown_203B26C->unk20, gUnknown_203B26C->moves);
UpdateGulpinShopState(4);
break;
case 3:
@ -67,7 +67,7 @@ void sub_801EDC0(void)
{
case 4:
sub_801F214();
RemoveLinkSequenceFromMoves8(gUnknown_203B26C->unk10, gUnknown_203B26C->unk20);
RemoveLinkSequenceFromMoves8(gUnknown_203B26C->moves, gUnknown_203B26C->unk20);
gUnknown_203B26C->state = 5;
break;
case 1:

View File

@ -54,9 +54,9 @@ error:
heap,size,atb,group);
}
void *MemoryAlloc(s32 size, s32 b)
void *MemoryAlloc(s32 size, s32 group)
{
DoAlloc(&gMainHeapDescriptor, size, b);
DoAlloc(&gMainHeapDescriptor, size, group);
}
void MemoryFree(void *a)