summaryrefslogtreecommitdiff
path: root/src/code_80972F4.c
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2022-03-21 17:48:40 -0700
committerSeth Barberee <seth.barberee@gmail.com>2022-03-21 17:48:40 -0700
commit57f540b320ae8439fe4b42c6149641b877c7ea73 (patch)
treed131e5351b684a671cb8b5c62a7e8ed925ca773e /src/code_80972F4.c
parent46420815f4fd1f374ee48ee447bb42539e1a669c (diff)
fix a few nonmatchings and code cleanup
Diffstat (limited to 'src/code_80972F4.c')
-rw-r--r--src/code_80972F4.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/code_80972F4.c b/src/code_80972F4.c
index c0fa1a3..1c7e125 100644
--- a/src/code_80972F4.c
+++ b/src/code_80972F4.c
@@ -2,8 +2,8 @@
#include "pokemon.h"
#include "wonder_mail.h"
-extern void xxx_save_poke_sub_4_80902F4(struct unkStruct_8094924*, struct unkPokeSubStruct_4*);
-extern void xxx_restore_poke_sub_4_8090314(struct unkStruct_8094924*, struct unkPokeSubStruct_4*);
+extern void SaveDungeonLocation(struct unkStruct_8094924*, struct DungeonLocation*);
+extern void RestoreDungeonLocation(struct unkStruct_8094924*, struct DungeonLocation*);
extern void sub_80015C0(u32, u32);
struct unkStruct_8097270
@@ -11,7 +11,7 @@ struct unkStruct_8097270
u8 unk0;
u8 unk1;
u8 unk2;
- struct unkPokeSubStruct_4 unk4;
+ struct DungeonLocation unk4;
u32 unk8;
u16 unkC;
u16 unkE;
@@ -24,7 +24,7 @@ struct unkStruct_8097270
struct subStruct_203B490
{
// size: 0xC
- struct unkPokeSubStruct_4 unk0;
+ struct DungeonLocation unk0;
u32 unk4;
u32 unk8;
};
@@ -109,7 +109,7 @@ u32 sub_8096FA0(u8 *r0, u32 size)
{
RestoreIntegerBits(&backup, &gUnknown_203B490->unk230[index].unk8, 0x20);
RestoreIntegerBits(&backup, &gUnknown_203B490->unk230[index].unk4, 0x18);
- xxx_restore_poke_sub_4_8090314(&backup, &gUnknown_203B490->unk230[index].unk0);
+ RestoreDungeonLocation(&backup, &gUnknown_203B490->unk230[index].unk0);
}
nullsub_102(&backup);
return backup.unk8;
@@ -153,7 +153,7 @@ u32 sub_80970D8(u8 *r0, u32 size)
{
SaveIntegerBits(&backup, &gUnknown_203B490->unk230[index].unk8, 0x20);
SaveIntegerBits(&backup, &gUnknown_203B490->unk230[index].unk4, 0x18);
- xxx_save_poke_sub_4_80902F4(&backup, &gUnknown_203B490->unk230[index].unk0);
+ SaveDungeonLocation(&backup, &gUnknown_203B490->unk230[index].unk0);
}
nullsub_102(&backup);
return backup.unk8;
@@ -171,7 +171,7 @@ void sub_80971EC(struct unkStruct_8094924 *a, struct unkStruct_8097270 *b)
RestoreIntegerBits(a, &b->unk12, 8);
RestoreIntegerBits(a, &b->unk13, 6);
RestoreIntegerBits(a, &b->unk8, 0x18);
- xxx_restore_poke_sub_4_8090314(a, &b->unk4);
+ RestoreDungeonLocation(a, &b->unk4);
}
void sub_8097270(struct unkStruct_8094924 *a, struct unkStruct_8097270 *b)
@@ -186,7 +186,7 @@ void sub_8097270(struct unkStruct_8094924 *a, struct unkStruct_8097270 *b)
SaveIntegerBits(a, &b->unk12, 8);
SaveIntegerBits(a, &b->unk13, 6);
SaveIntegerBits(a, &b->unk8, 0x18);
- xxx_save_poke_sub_4_80902F4(a, &b->unk4);
+ SaveDungeonLocation(a, &b->unk4);
}
void sub_80972F4(void)